diff options
| author |   jsg <jsg@openbsd.org> | 2014-02-15 14:19:44 +0000 |
|---|---|---|
| committer | jsg <jsg@openbsd.org> | 2014-02-15 14:19:44 +0000 |
| commit | 62045d1baf5ba1ac14ab4099356cce393fdb1350 (patch) | |
| tree | fce5ad5f21dc6a7b370012dbd5a0a0157cb2191c | |
| parent | make ISP_NOFIRMWARE work here too (diff) | |
| download | wireguard-openbsd-62045d1baf5ba1ac14ab4099356cce393fdb1350.tar.xz wireguard-openbsd-62045d1baf5ba1ac14ab4099356cce393fdb1350.zip | |
drm/radeon: skip colorbuffer checking if COLOR_INFO.FORMAT is set to INVALID
From Marek Olsak
de17d04713f1efa68e9e7bfbeab7e91fe495e012 in ubuntu 3.8
56492e0fac2dbaf7735ffd66b206a90624917789 in mainline linux
| -rw-r--r-- | sys/dev/pci/drm/radeon/evergreen_cs.c | 7 | ||||
| -rw-r--r-- | sys/dev/pci/drm/radeon/r600_cs.c | 7 |
2 files changed, 10 insertions, 4 deletions
diff --git a/sys/dev/pci/drm/radeon/evergreen_cs.c b/sys/dev/pci/drm/radeon/evergreen_cs.c index 5a3cdb64979..fec496feb0a 100644 --- a/sys/dev/pci/drm/radeon/evergreen_cs.c +++ b/sys/dev/pci/drm/radeon/evergreen_cs.c @@ -1,4 +1,4 @@ -/* $OpenBSD: evergreen_cs.c,v 1.2 2014/02/09 11:03:31 jsg Exp $ */ +/* $OpenBSD: evergreen_cs.c,v 1.3 2014/02/15 14:19:44 jsg Exp $ */ /* * Copyright 2010 Advanced Micro Devices, Inc. * Copyright 2008 Red Hat Inc. @@ -975,7 +975,10 @@ static int evergreen_cs_track_check(struct radeon_cs_parser *p) if (track->cb_dirty) { tmp = track->cb_target_mask; for (i = 0; i < 8; i++) { - if ((tmp >> (i * 4)) & 0xF) { + u32 format = G_028C70_FORMAT(track->cb_color_info[i]); + + if (format != V_028C70_COLOR_INVALID && + (tmp >> (i * 4)) & 0xF) { /* at least one component is enabled */ if (track->cb_color_bo[i] == NULL) { dev_warn(p->dev, "%s:%d mask 0x%08X | 0x%08X no cb for %d\n", diff --git a/sys/dev/pci/drm/radeon/r600_cs.c b/sys/dev/pci/drm/radeon/r600_cs.c index 18b3a2fe2f9..94ecf3d2a4d 100644 --- a/sys/dev/pci/drm/radeon/r600_cs.c +++ b/sys/dev/pci/drm/radeon/r600_cs.c @@ -1,4 +1,4 @@ -/* $OpenBSD: r600_cs.c,v 1.2 2014/02/09 11:03:31 jsg Exp $ */ +/* $OpenBSD: r600_cs.c,v 1.3 2014/02/15 14:19:44 jsg Exp $ */ /* * Copyright 2008 Advanced Micro Devices, Inc. * Copyright 2008 Red Hat Inc. @@ -761,7 +761,10 @@ static int r600_cs_track_check(struct radeon_cs_parser *p) } for (i = 0; i < 8; i++) { - if ((tmp >> (i * 4)) & 0xF) { + u32 format = G_0280A0_FORMAT(track->cb_color_info[i]); + + if (format != V_0280A0_COLOR_INVALID && + (tmp >> (i * 4)) & 0xF) { /* at least one component is enabled */ if (track->cb_color_bo[i] == NULL) { dev_warn(p->dev, "%s:%d mask 0x%08X | 0x%08X no cb for %d\n", |