Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 56492e0f authored Jan 08, 2014 by Marek Olšák Committed by Alex Deucher Jan 08, 2014

drm/radeon: skip colorbuffer checking if COLOR_INFO.FORMAT is set to INVALID



This fixes a bug which was causing rejections of valid GPU commands
from userspace.

Signed-off-by: Marek Olšák <marek.olsak@amd.com>
Cc: stable@vger.kernel.org
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

parent 37016951

drivers/gpu/drm/radeon/evergreen_cs.c

+4 −1

Original line number	Diff line number	Diff line
		@@ -967,7 +967,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",

drivers/gpu/drm/radeon/r600_cs.c

+4 −1

Original line number	Diff line number	Diff line
		@@ -749,7 +749,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",