Commit b7c5334a authored by Alex Deucher's avatar Alex Deucher
Browse files

drm/radeon: use dev_warn_once() in CS parsers 

Older GPUs did not support memory protection, so the kernel
driver would validate the command submissions (CS) from userspace
to avoid the GPU accessing any memory it shouldn't.

Change any error messages in that validation to dev_warn_once() to
avoid spamming the kernel log in the event of a bad CS.  If users
see any of these messages they should report them to the user space
component, which in most cases is mesa
(https://gitlab.freedesktop.org/mesa/mesa/-/issues

).

Cc: Borislav Petkov (AMD) <bp@alien8.de>
Acked-by: default avatarBorislav Petkov (AMD) <bp@alien8.de>
Link: https://lore.kernel.org/r/20250829171655.GBaLHgh3VOvuM1UfJg@fat_crate.local


Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 86b6f02a

drivers/gpu/drm/radeon/evergreen_cs.c

+264 −259

File changed.

Preview size limit exceeded, changes collapsed.

drivers/gpu/drm/radeon/r100.c

+108 −107
Original line number Diff line number Diff line
@@ -1298,7 +1298,7 @@ int r100_reloc_pitch_offset(struct radeon_cs_parser *p, 


	r = radeon_cs_packet_next_reloc(p, &reloc, 0);

	if (r) {

		DRM_ERROR("No reloc for ib[%d]=0x%04X\n",

		dev_warn_once(p->dev, "No reloc for ib[%d]=0x%04X\n",

			      idx, reg);

		radeon_cs_dump_packet(p, pkt);

		return r;
@@ -1313,7 +1313,7 @@ int r100_reloc_pitch_offset(struct radeon_cs_parser *p, 
			tile_flags |= RADEON_DST_TILE_MACRO;

		if (reloc->tiling_flags & RADEON_TILING_MICRO) {

			if (reg == RADEON_SRC_PITCH_OFFSET) {

				DRM_ERROR("Cannot src blit from microtiled surface\n");

				dev_warn_once(p->dev, "Cannot src blit from microtiled surface\n");

				radeon_cs_dump_packet(p, pkt);

				return -EINVAL;

			}
@@ -1342,7 +1342,7 @@ int r100_packet3_load_vbpntr(struct radeon_cs_parser *p, 
	track = (struct r100_cs_track *)p->track;

	c = radeon_get_ib_value(p, idx++) & 0x1F;

	if (c > 16) {

	    DRM_ERROR("Only 16 vertex buffers are allowed %d\n",

	    dev_warn_once(p->dev, "Only 16 vertex buffers are allowed %d\n",

			  pkt->opcode);

	    radeon_cs_dump_packet(p, pkt);

	    return -EINVAL;
@@ -1351,7 +1351,7 @@ int r100_packet3_load_vbpntr(struct radeon_cs_parser *p, 
	for (i = 0; i < (c - 1); i += 2, idx += 3) {

		r = radeon_cs_packet_next_reloc(p, &reloc, 0);

		if (r) {

			DRM_ERROR("No reloc for packet3 %d\n",

			dev_warn_once(p->dev, "No reloc for packet3 %d\n",

				      pkt->opcode);

			radeon_cs_dump_packet(p, pkt);

			return r;
@@ -1364,7 +1364,7 @@ int r100_packet3_load_vbpntr(struct radeon_cs_parser *p, 
		track->arrays[i + 0].esize &= 0x7F;

		r = radeon_cs_packet_next_reloc(p, &reloc, 0);

		if (r) {

			DRM_ERROR("No reloc for packet3 %d\n",

			dev_warn_once(p->dev, "No reloc for packet3 %d\n",

				      pkt->opcode);

			radeon_cs_dump_packet(p, pkt);

			return r;
@@ -1377,7 +1377,7 @@ int r100_packet3_load_vbpntr(struct radeon_cs_parser *p, 
	if (c & 1) {

		r = radeon_cs_packet_next_reloc(p, &reloc, 0);

		if (r) {

			DRM_ERROR("No reloc for packet3 %d\n",

			dev_warn_once(p->dev, "No reloc for packet3 %d\n",

				      pkt->opcode);

			radeon_cs_dump_packet(p, pkt);

			return r;
@@ -1470,12 +1470,12 @@ int r100_cs_packet_parse_vline(struct radeon_cs_parser *p) 
	/* check its a wait until and only 1 count */

	if (waitreloc.reg != RADEON_WAIT_UNTIL ||

	    waitreloc.count != 0) {

		DRM_ERROR("vline wait had illegal wait until segment\n");

		dev_warn_once(p->dev, "vline wait had illegal wait until segment\n");

		return -EINVAL;

	}



	if (radeon_get_ib_value(p, waitreloc.idx + 1) != RADEON_WAIT_CRTC_VLINE) {

		DRM_ERROR("vline wait had illegal wait until\n");

		dev_warn_once(p->dev, "vline wait had illegal wait until\n");

		return -EINVAL;

	}
@@ -1493,7 +1493,7 @@ int r100_cs_packet_parse_vline(struct radeon_cs_parser *p) 
	reg = R100_CP_PACKET0_GET_REG(header);

	crtc = drm_crtc_find(rdev_to_drm(p->rdev), p->filp, crtc_id);

	if (!crtc) {

		DRM_ERROR("cannot find crtc %d\n", crtc_id);

		dev_warn_once(p->dev, "cannot find crtc %d\n", crtc_id);

		return -ENOENT;

	}

	radeon_crtc = to_radeon_crtc(crtc);
@@ -1514,7 +1514,7 @@ int r100_cs_packet_parse_vline(struct radeon_cs_parser *p) 
			header |= RADEON_CRTC2_GUI_TRIG_VLINE >> 2;

			break;

		default:

			DRM_ERROR("unknown crtc reloc\n");

			dev_warn_once(p->dev, "unknown crtc reloc\n");

			return -EINVAL;

		}

		ib[h_idx] = header;
@@ -1599,7 +1599,7 @@ static int r100_packet0_check(struct radeon_cs_parser *p, 
	case RADEON_CRTC_GUI_TRIG_VLINE:

		r = r100_cs_packet_parse_vline(p);

		if (r) {

			DRM_ERROR("No reloc for ib[%d]=0x%04X\n",

			dev_warn_once(p->dev, "No reloc for ib[%d]=0x%04X\n",

				  idx, reg);

			radeon_cs_dump_packet(p, pkt);

			return r;
@@ -1616,7 +1616,7 @@ static int r100_packet0_check(struct radeon_cs_parser *p, 
	case RADEON_RB3D_DEPTHOFFSET:

		r = radeon_cs_packet_next_reloc(p, &reloc, 0);

		if (r) {

			DRM_ERROR("No reloc for ib[%d]=0x%04X\n",

			dev_warn_once(p->dev, "No reloc for ib[%d]=0x%04X\n",

				      idx, reg);

			radeon_cs_dump_packet(p, pkt);

			return r;
@@ -1629,7 +1629,7 @@ static int r100_packet0_check(struct radeon_cs_parser *p, 
	case RADEON_RB3D_COLOROFFSET:

		r = radeon_cs_packet_next_reloc(p, &reloc, 0);

		if (r) {

			DRM_ERROR("No reloc for ib[%d]=0x%04X\n",

			dev_warn_once(p->dev, "No reloc for ib[%d]=0x%04X\n",

				      idx, reg);

			radeon_cs_dump_packet(p, pkt);

			return r;
@@ -1645,7 +1645,7 @@ static int r100_packet0_check(struct radeon_cs_parser *p, 
		i = (reg - RADEON_PP_TXOFFSET_0) / 24;

		r = radeon_cs_packet_next_reloc(p, &reloc, 0);

		if (r) {

			DRM_ERROR("No reloc for ib[%d]=0x%04X\n",

			dev_warn_once(p->dev, "No reloc for ib[%d]=0x%04X\n",

				      idx, reg);

			radeon_cs_dump_packet(p, pkt);

			return r;
@@ -1672,7 +1672,7 @@ static int r100_packet0_check(struct radeon_cs_parser *p, 
		i = (reg - RADEON_PP_CUBIC_OFFSET_T0_0) / 4;

		r = radeon_cs_packet_next_reloc(p, &reloc, 0);

		if (r) {

			DRM_ERROR("No reloc for ib[%d]=0x%04X\n",

			dev_warn_once(p->dev, "No reloc for ib[%d]=0x%04X\n",

				      idx, reg);

			radeon_cs_dump_packet(p, pkt);

			return r;
@@ -1690,7 +1690,7 @@ static int r100_packet0_check(struct radeon_cs_parser *p, 
		i = (reg - RADEON_PP_CUBIC_OFFSET_T1_0) / 4;

		r = radeon_cs_packet_next_reloc(p, &reloc, 0);

		if (r) {

			DRM_ERROR("No reloc for ib[%d]=0x%04X\n",

			dev_warn_once(p->dev, "No reloc for ib[%d]=0x%04X\n",

				      idx, reg);

			radeon_cs_dump_packet(p, pkt);

			return r;
@@ -1708,7 +1708,7 @@ static int r100_packet0_check(struct radeon_cs_parser *p, 
		i = (reg - RADEON_PP_CUBIC_OFFSET_T2_0) / 4;

		r = radeon_cs_packet_next_reloc(p, &reloc, 0);

		if (r) {

			DRM_ERROR("No reloc for ib[%d]=0x%04X\n",

			dev_warn_once(p->dev, "No reloc for ib[%d]=0x%04X\n",

				      idx, reg);

			radeon_cs_dump_packet(p, pkt);

			return r;
@@ -1726,7 +1726,7 @@ static int r100_packet0_check(struct radeon_cs_parser *p, 
	case RADEON_RB3D_COLORPITCH:

		r = radeon_cs_packet_next_reloc(p, &reloc, 0);

		if (r) {

			DRM_ERROR("No reloc for ib[%d]=0x%04X\n",

			dev_warn_once(p->dev, "No reloc for ib[%d]=0x%04X\n",

				      idx, reg);

			radeon_cs_dump_packet(p, pkt);

			return r;
@@ -1768,7 +1768,7 @@ static int r100_packet0_check(struct radeon_cs_parser *p, 
			track->cb[0].cpp = 4;

			break;

		default:

			DRM_ERROR("Invalid color buffer format (%d) !\n",

			dev_warn_once(p->dev, "Invalid color buffer format (%d) !\n",

				      ((idx_value >> RADEON_RB3D_COLOR_FORMAT_SHIFT) & 0x1f));

			return -EINVAL;

		}
@@ -1797,7 +1797,7 @@ static int r100_packet0_check(struct radeon_cs_parser *p, 
	case RADEON_RB3D_ZPASS_ADDR:

		r = radeon_cs_packet_next_reloc(p, &reloc, 0);

		if (r) {

			DRM_ERROR("No reloc for ib[%d]=0x%04X\n",

			dev_warn_once(p->dev, "No reloc for ib[%d]=0x%04X\n",

				      idx, reg);

			radeon_cs_dump_packet(p, pkt);

			return r;
@@ -1927,7 +1927,7 @@ int r100_cs_track_check_pkt3_indx_buffer(struct radeon_cs_parser *p, 
	idx = pkt->idx + 1;

	value = radeon_get_ib_value(p, idx + 2);

	if ((value + 1) > radeon_bo_size(robj)) {

		DRM_ERROR("[drm] Buffer too small for PACKET3 INDX_BUFFER "

		dev_warn_once(p->dev, "[drm] Buffer too small for PACKET3 INDX_BUFFER "

			      "(need %u have %lu) !\n",

			      value + 1,

			      radeon_bo_size(robj));
@@ -1957,7 +1957,7 @@ static int r100_packet3_check(struct radeon_cs_parser *p, 
	case PACKET3_INDX_BUFFER:

		r = radeon_cs_packet_next_reloc(p, &reloc, 0);

		if (r) {

			DRM_ERROR("No reloc for packet3 %d\n", pkt->opcode);

			dev_warn_once(p->dev, "No reloc for packet3 %d\n", pkt->opcode);

			radeon_cs_dump_packet(p, pkt);

			return r;

		}
@@ -1971,7 +1971,7 @@ static int r100_packet3_check(struct radeon_cs_parser *p, 
		/* 3D_RNDR_GEN_INDX_PRIM on r100/r200 */

		r = radeon_cs_packet_next_reloc(p, &reloc, 0);

		if (r) {

			DRM_ERROR("No reloc for packet3 %d\n", pkt->opcode);

			dev_warn_once(p->dev, "No reloc for packet3 %d\n", pkt->opcode);

			radeon_cs_dump_packet(p, pkt);

			return r;

		}
@@ -1992,7 +1992,7 @@ static int r100_packet3_check(struct radeon_cs_parser *p, 
		break;

	case PACKET3_3D_DRAW_IMMD:

		if (((radeon_get_ib_value(p, idx + 1) >> 4) & 0x3) != 3) {

			DRM_ERROR("PRIM_WALK must be 3 for IMMD draw\n");

			dev_warn_once(p->dev, "PRIM_WALK must be 3 for IMMD draw\n");

			return -EINVAL;

		}

		track->vtx_size = r100_get_vtx_size(radeon_get_ib_value(p, idx + 0));
@@ -2005,7 +2005,7 @@ static int r100_packet3_check(struct radeon_cs_parser *p, 
		/* triggers drawing using in-packet vertex data */

	case PACKET3_3D_DRAW_IMMD_2:

		if (((radeon_get_ib_value(p, idx) >> 4) & 0x3) != 3) {

			DRM_ERROR("PRIM_WALK must be 3 for IMMD draw\n");

			dev_warn_once(p->dev, "PRIM_WALK must be 3 for IMMD draw\n");

			return -EINVAL;

		}

		track->vap_vf_cntl = radeon_get_ib_value(p, idx);
@@ -2051,7 +2051,7 @@ static int r100_packet3_check(struct radeon_cs_parser *p, 
	case PACKET3_NOP:

		break;

	default:

		DRM_ERROR("Packet3 opcode %x not supported\n", pkt->opcode);

		dev_warn_once(p->dev, "Packet3 opcode %x not supported\n", pkt->opcode);

		return -EINVAL;

	}

	return 0;
@@ -2093,7 +2093,7 @@ int r100_cs_parse(struct radeon_cs_parser *p) 
			r = r100_packet3_check(p, &pkt);

			break;

		default:

			DRM_ERROR("Unknown packet type %d !\n",

			dev_warn_once(p->dev, "Unknown packet type %d !\n",

				      pkt.type);

			return -EINVAL;

		}
@@ -2105,19 +2105,19 @@ int r100_cs_parse(struct radeon_cs_parser *p) 


static void r100_cs_track_texture_print(struct r100_cs_track_texture *t)

{

	DRM_ERROR("pitch                      %d\n", t->pitch);

	DRM_ERROR("use_pitch                  %d\n", t->use_pitch);

	DRM_ERROR("width                      %d\n", t->width);

	DRM_ERROR("width_11                   %d\n", t->width_11);

	DRM_ERROR("height                     %d\n", t->height);

	DRM_ERROR("height_11                  %d\n", t->height_11);

	DRM_ERROR("num levels                 %d\n", t->num_levels);

	DRM_ERROR("depth                      %d\n", t->txdepth);

	DRM_ERROR("bpp                        %d\n", t->cpp);

	DRM_ERROR("coordinate type            %d\n", t->tex_coord_type);

	DRM_ERROR("width round to power of 2  %d\n", t->roundup_w);

	DRM_ERROR("height round to power of 2 %d\n", t->roundup_h);

	DRM_ERROR("compress format            %d\n", t->compress_format);

	DRM_DEBUG("pitch                      %d\n", t->pitch);

	DRM_DEBUG("use_pitch                  %d\n", t->use_pitch);

	DRM_DEBUG("width                      %d\n", t->width);

	DRM_DEBUG("width_11                   %d\n", t->width_11);

	DRM_DEBUG("height                     %d\n", t->height);

	DRM_DEBUG("height_11                  %d\n", t->height_11);

	DRM_DEBUG("num levels                 %d\n", t->num_levels);

	DRM_DEBUG("depth                      %d\n", t->txdepth);

	DRM_DEBUG("bpp                        %d\n", t->cpp);

	DRM_DEBUG("coordinate type            %d\n", t->tex_coord_type);

	DRM_DEBUG("width round to power of 2  %d\n", t->roundup_w);

	DRM_DEBUG("height round to power of 2 %d\n", t->roundup_h);

	DRM_DEBUG("compress format            %d\n", t->compress_format);

}



static int r100_track_compress_size(int compress_format, int w, int h)
@@ -2172,7 +2172,8 @@ static int r100_cs_track_cube(struct radeon_device *rdev, 
		size += track->textures[idx].cube_info[face].offset;



		if (size > radeon_bo_size(cube_robj)) {

			DRM_ERROR("Cube texture offset greater than object size %lu %lu\n",

			dev_warn_once(rdev->dev,

				      "Cube texture offset greater than object size %lu %lu\n",

				      size, radeon_bo_size(cube_robj));

			r100_cs_track_texture_print(&track->textures[idx]);

			return -1;
@@ -2196,7 +2197,7 @@ static int r100_cs_track_texture_check(struct radeon_device *rdev, 
			continue;

		robj = track->textures[u].robj;

		if (robj == NULL) {

			DRM_ERROR("No texture bound to unit %u\n", u);

			dev_warn_once(rdev->dev, "No texture bound to unit %u\n", u);

			return -EINVAL;

		}

		size = 0;
@@ -2249,12 +2250,12 @@ static int r100_cs_track_texture_check(struct radeon_device *rdev, 
				size *= 6;

			break;

		default:

			DRM_ERROR("Invalid texture coordinate type %u for unit "

			dev_warn_once(rdev->dev, "Invalid texture coordinate type %u for unit "

				      "%u\n", track->textures[u].tex_coord_type, u);

			return -EINVAL;

		}

		if (size > radeon_bo_size(robj)) {

			DRM_ERROR("Texture of unit %u needs %lu bytes but is "

			dev_warn_once(rdev->dev, "Texture of unit %u needs %lu bytes but is "

				      "%lu\n", u, size, radeon_bo_size(robj));

			r100_cs_track_texture_print(&track->textures[u]);

			return -EINVAL;
@@ -2277,16 +2278,16 @@ int r100_cs_track_check(struct radeon_device *rdev, struct r100_cs_track *track) 


	for (i = 0; i < num_cb; i++) {

		if (track->cb[i].robj == NULL) {

			DRM_ERROR("[drm] No buffer for color buffer %d !\n", i);

			dev_warn_once(rdev->dev, "[drm] No buffer for color buffer %d !\n", i);

			return -EINVAL;

		}

		size = track->cb[i].pitch * track->cb[i].cpp * track->maxy;

		size += track->cb[i].offset;

		if (size > radeon_bo_size(track->cb[i].robj)) {

			DRM_ERROR("[drm] Buffer too small for color buffer %d "

			dev_warn_once(rdev->dev, "[drm] Buffer too small for color buffer %d "

				      "(need %lu have %lu) !\n", i, size,

				      radeon_bo_size(track->cb[i].robj));

			DRM_ERROR("[drm] color buffer %d (%u %u %u %u)\n",

			dev_warn_once(rdev->dev, "[drm] color buffer %d (%u %u %u %u)\n",

				      i, track->cb[i].pitch, track->cb[i].cpp,

				      track->cb[i].offset, track->maxy);

			return -EINVAL;
@@ -2296,16 +2297,16 @@ int r100_cs_track_check(struct radeon_device *rdev, struct r100_cs_track *track) 


	if (track->zb_dirty && track->z_enabled) {

		if (track->zb.robj == NULL) {

			DRM_ERROR("[drm] No buffer for z buffer !\n");

			dev_warn_once(rdev->dev, "[drm] No buffer for z buffer !\n");

			return -EINVAL;

		}

		size = track->zb.pitch * track->zb.cpp * track->maxy;

		size += track->zb.offset;

		if (size > radeon_bo_size(track->zb.robj)) {

			DRM_ERROR("[drm] Buffer too small for z buffer "

			dev_warn_once(rdev->dev, "[drm] Buffer too small for z buffer "

				      "(need %lu have %lu) !\n", size,

				      radeon_bo_size(track->zb.robj));

			DRM_ERROR("[drm] zbuffer (%u %u %u %u)\n",

			dev_warn_once(rdev->dev, "[drm] zbuffer (%u %u %u %u)\n",

				      track->zb.pitch, track->zb.cpp,

				      track->zb.offset, track->maxy);

			return -EINVAL;
@@ -2315,17 +2316,17 @@ int r100_cs_track_check(struct radeon_device *rdev, struct r100_cs_track *track) 


	if (track->aa_dirty && track->aaresolve) {

		if (track->aa.robj == NULL) {

			DRM_ERROR("[drm] No buffer for AA resolve buffer %d !\n", i);

			dev_warn_once(rdev->dev, "[drm] No buffer for AA resolve buffer %d !\n", i);

			return -EINVAL;

		}

		/* I believe the format comes from colorbuffer0. */

		size = track->aa.pitch * track->cb[0].cpp * track->maxy;

		size += track->aa.offset;

		if (size > radeon_bo_size(track->aa.robj)) {

			DRM_ERROR("[drm] Buffer too small for AA resolve buffer %d "

			dev_warn_once(rdev->dev, "[drm] Buffer too small for AA resolve buffer %d "

				      "(need %lu have %lu) !\n", i, size,

				      radeon_bo_size(track->aa.robj));

			DRM_ERROR("[drm] AA resolve buffer %d (%u %u %u %u)\n",

			dev_warn_once(rdev->dev, "[drm] AA resolve buffer %d (%u %u %u %u)\n",

				      i, track->aa.pitch, track->cb[0].cpp,

				      track->aa.offset, track->maxy);

			return -EINVAL;
@@ -2344,17 +2345,17 @@ int r100_cs_track_check(struct radeon_device *rdev, struct r100_cs_track *track) 
		for (i = 0; i < track->num_arrays; i++) {

			size = track->arrays[i].esize * track->max_indx * 4UL;

			if (track->arrays[i].robj == NULL) {

				DRM_ERROR("(PW %u) Vertex array %u no buffer "

				dev_warn_once(rdev->dev, "(PW %u) Vertex array %u no buffer "

					      "bound\n", prim_walk, i);

				return -EINVAL;

			}

			if (size > radeon_bo_size(track->arrays[i].robj)) {

				dev_err(rdev->dev, "(PW %u) Vertex array %u "

				dev_warn_once(rdev->dev, "(PW %u) Vertex array %u "

					      "need %lu dwords have %lu dwords\n",

					      prim_walk, i, size >> 2,

					      radeon_bo_size(track->arrays[i].robj)

					      >> 2);

				DRM_ERROR("Max indices %u\n", track->max_indx);

				dev_warn_once(rdev->dev, "Max indices %u\n", track->max_indx);

				return -EINVAL;

			}

		}
@@ -2363,12 +2364,12 @@ int r100_cs_track_check(struct radeon_device *rdev, struct r100_cs_track *track) 
		for (i = 0; i < track->num_arrays; i++) {

			size = track->arrays[i].esize * (nverts - 1) * 4UL;

			if (track->arrays[i].robj == NULL) {

				DRM_ERROR("(PW %u) Vertex array %u no buffer "

				dev_warn_once(rdev->dev, "(PW %u) Vertex array %u no buffer "

					      "bound\n", prim_walk, i);

				return -EINVAL;

			}

			if (size > radeon_bo_size(track->arrays[i].robj)) {

				dev_err(rdev->dev, "(PW %u) Vertex array %u "

				dev_warn_once(rdev->dev, "(PW %u) Vertex array %u "

					      "need %lu dwords have %lu dwords\n",

					      prim_walk, i, size >> 2,

					      radeon_bo_size(track->arrays[i].robj)
@@ -2380,15 +2381,15 @@ int r100_cs_track_check(struct radeon_device *rdev, struct r100_cs_track *track) 
	case 3:

		size = track->vtx_size * nverts;

		if (size != track->immd_dwords) {

			DRM_ERROR("IMMD draw %u dwors but needs %lu dwords\n",

			dev_warn_once(rdev->dev, "IMMD draw %u dwors but needs %lu dwords\n",

				      track->immd_dwords, size);

			DRM_ERROR("VAP_VF_CNTL.NUM_VERTICES %u, VTX_SIZE %u\n",

			dev_warn_once(rdev->dev, "VAP_VF_CNTL.NUM_VERTICES %u, VTX_SIZE %u\n",

				      nverts, track->vtx_size);

			return -EINVAL;

		}

		break;

	default:

		DRM_ERROR("[drm] Invalid primitive walk %d for VAP_VF_CNTL\n",

		dev_warn_once(rdev->dev, "[drm] Invalid primitive walk %d for VAP_VF_CNTL\n",

			      prim_walk);

		return -EINVAL;

	}

drivers/gpu/drm/radeon/r200.c

+17 −17
Original line number Diff line number Diff line
@@ -163,7 +163,7 @@ int r200_packet0_check(struct radeon_cs_parser *p, 
	case RADEON_CRTC_GUI_TRIG_VLINE:

		r = r100_cs_packet_parse_vline(p);

		if (r) {

			DRM_ERROR("No reloc for ib[%d]=0x%04X\n",

			dev_warn_once(p->dev, "No reloc for ib[%d]=0x%04X\n",

				      idx, reg);

			radeon_cs_dump_packet(p, pkt);

			return r;
@@ -180,7 +180,7 @@ int r200_packet0_check(struct radeon_cs_parser *p, 
	case RADEON_RB3D_DEPTHOFFSET:

		r = radeon_cs_packet_next_reloc(p, &reloc, 0);

		if (r) {

			DRM_ERROR("No reloc for ib[%d]=0x%04X\n",

			dev_warn_once(p->dev, "No reloc for ib[%d]=0x%04X\n",

				      idx, reg);

			radeon_cs_dump_packet(p, pkt);

			return r;
@@ -193,7 +193,7 @@ int r200_packet0_check(struct radeon_cs_parser *p, 
	case RADEON_RB3D_COLOROFFSET:

		r = radeon_cs_packet_next_reloc(p, &reloc, 0);

		if (r) {

			DRM_ERROR("No reloc for ib[%d]=0x%04X\n",

			dev_warn_once(p->dev, "No reloc for ib[%d]=0x%04X\n",

				      idx, reg);

			radeon_cs_dump_packet(p, pkt);

			return r;
@@ -212,7 +212,7 @@ int r200_packet0_check(struct radeon_cs_parser *p, 
		i = (reg - R200_PP_TXOFFSET_0) / 24;

		r = radeon_cs_packet_next_reloc(p, &reloc, 0);

		if (r) {

			DRM_ERROR("No reloc for ib[%d]=0x%04X\n",

			dev_warn_once(p->dev, "No reloc for ib[%d]=0x%04X\n",

				      idx, reg);

			radeon_cs_dump_packet(p, pkt);

			return r;
@@ -265,7 +265,7 @@ int r200_packet0_check(struct radeon_cs_parser *p, 
		face = (reg - ((i * 24) + R200_PP_TXOFFSET_0)) / 4;

		r = radeon_cs_packet_next_reloc(p, &reloc, 0);

		if (r) {

			DRM_ERROR("No reloc for ib[%d]=0x%04X\n",

			dev_warn_once(p->dev, "No reloc for ib[%d]=0x%04X\n",

				      idx, reg);

			radeon_cs_dump_packet(p, pkt);

			return r;
@@ -283,7 +283,7 @@ int r200_packet0_check(struct radeon_cs_parser *p, 
	case RADEON_RB3D_COLORPITCH:

		r = radeon_cs_packet_next_reloc(p, &reloc, 0);

		if (r) {

			DRM_ERROR("No reloc for ib[%d]=0x%04X\n",

			dev_warn_once(p->dev, "No reloc for ib[%d]=0x%04X\n",

				      idx, reg);

			radeon_cs_dump_packet(p, pkt);

			return r;
@@ -326,12 +326,12 @@ int r200_packet0_check(struct radeon_cs_parser *p, 
			track->cb[0].cpp = 4;

			break;

		default:

			DRM_ERROR("Invalid color buffer format (%d) !\n",

			dev_warn_once(p->dev, "Invalid color buffer format (%d) !\n",

				      ((idx_value >> RADEON_RB3D_COLOR_FORMAT_SHIFT) & 0x1f));

			return -EINVAL;

		}

		if (idx_value & RADEON_DEPTHXY_OFFSET_ENABLE) {

			DRM_ERROR("No support for depth xy offset in kms\n");

			dev_warn_once(p->dev, "No support for depth xy offset in kms\n");

			return -EINVAL;

		}
@@ -360,7 +360,7 @@ int r200_packet0_check(struct radeon_cs_parser *p, 
	case RADEON_RB3D_ZPASS_ADDR:

		r = radeon_cs_packet_next_reloc(p, &reloc, 0);

		if (r) {

			DRM_ERROR("No reloc for ib[%d]=0x%04X\n",

			dev_warn_once(p->dev, "No reloc for ib[%d]=0x%04X\n",

				      idx, reg);

			radeon_cs_dump_packet(p, pkt);

			return r;

drivers/gpu/drm/radeon/r300.c

+33 −33
Original line number Diff line number Diff line
@@ -645,7 +645,7 @@ static int r300_packet0_check(struct radeon_cs_parser *p, 
	case RADEON_CRTC_GUI_TRIG_VLINE:

		r = r100_cs_packet_parse_vline(p);

		if (r) {

			DRM_ERROR("No reloc for ib[%d]=0x%04X\n",

			dev_warn_once(p->dev, "No reloc for ib[%d]=0x%04X\n",

				      idx, reg);

			radeon_cs_dump_packet(p, pkt);

			return r;
@@ -664,7 +664,7 @@ static int r300_packet0_check(struct radeon_cs_parser *p, 
		i = (reg - R300_RB3D_COLOROFFSET0) >> 2;

		r = radeon_cs_packet_next_reloc(p, &reloc, 0);

		if (r) {

			DRM_ERROR("No reloc for ib[%d]=0x%04X\n",

			dev_warn_once(p->dev, "No reloc for ib[%d]=0x%04X\n",

				      idx, reg);

			radeon_cs_dump_packet(p, pkt);

			return r;
@@ -677,7 +677,7 @@ static int r300_packet0_check(struct radeon_cs_parser *p, 
	case R300_ZB_DEPTHOFFSET:

		r = radeon_cs_packet_next_reloc(p, &reloc, 0);

		if (r) {

			DRM_ERROR("No reloc for ib[%d]=0x%04X\n",

			dev_warn_once(p->dev, "No reloc for ib[%d]=0x%04X\n",

				      idx, reg);

			radeon_cs_dump_packet(p, pkt);

			return r;
@@ -706,7 +706,7 @@ static int r300_packet0_check(struct radeon_cs_parser *p, 
		i = (reg - R300_TX_OFFSET_0) >> 2;

		r = radeon_cs_packet_next_reloc(p, &reloc, 0);

		if (r) {

			DRM_ERROR("No reloc for ib[%d]=0x%04X\n",

			dev_warn_once(p->dev, "No reloc for ib[%d]=0x%04X\n",

				      idx, reg);

			radeon_cs_dump_packet(p, pkt);

			return r;
@@ -762,7 +762,7 @@ static int r300_packet0_check(struct radeon_cs_parser *p, 
		/* RB3D_CCTL */

		if ((idx_value & (1 << 10)) && /* CMASK_ENABLE */

		    p->rdev->cmask_filp != p->filp) {

			DRM_ERROR("Invalid RB3D_CCTL: Cannot enable CMASK.\n");

			dev_warn_once(p->dev, "Invalid RB3D_CCTL: Cannot enable CMASK.\n");

			return -EINVAL;

		}

		track->num_cb = ((idx_value >> 5) & 0x3) + 1;
@@ -779,7 +779,7 @@ static int r300_packet0_check(struct radeon_cs_parser *p, 
		if (!(p->cs_flags & RADEON_CS_KEEP_TILING_FLAGS)) {

			r = radeon_cs_packet_next_reloc(p, &reloc, 0);

			if (r) {

				DRM_ERROR("No reloc for ib[%d]=0x%04X\n",

				dev_warn_once(p->dev, "No reloc for ib[%d]=0x%04X\n",

					      idx, reg);

				radeon_cs_dump_packet(p, pkt);

				return r;
@@ -812,7 +812,7 @@ static int r300_packet0_check(struct radeon_cs_parser *p, 
			break;

		case 5:

			if (p->rdev->family < CHIP_RV515) {

				DRM_ERROR("Invalid color buffer format (%d)!\n",

				dev_warn_once(p->dev, "Invalid color buffer format (%d)!\n",

					      ((idx_value >> 21) & 0xF));

				return -EINVAL;

			}
@@ -827,7 +827,7 @@ static int r300_packet0_check(struct radeon_cs_parser *p, 
			track->cb[i].cpp = 16;

			break;

		default:

			DRM_ERROR("Invalid color buffer format (%d) !\n",

			dev_warn_once(p->dev, "Invalid color buffer format (%d) !\n",

				      ((idx_value >> 21) & 0xF));

			return -EINVAL;

		}
@@ -853,7 +853,7 @@ static int r300_packet0_check(struct radeon_cs_parser *p, 
			track->zb.cpp = 4;

			break;

		default:

			DRM_ERROR("Invalid z buffer format (%d) !\n",

			dev_warn_once(p->dev, "Invalid z buffer format (%d) !\n",

				      (idx_value & 0xF));

			return -EINVAL;

		}
@@ -864,7 +864,7 @@ static int r300_packet0_check(struct radeon_cs_parser *p, 
		if (!(p->cs_flags & RADEON_CS_KEEP_TILING_FLAGS)) {

			r = radeon_cs_packet_next_reloc(p, &reloc, 0);

			if (r) {

				DRM_ERROR("No reloc for ib[%d]=0x%04X\n",

				dev_warn_once(p->dev, "No reloc for ib[%d]=0x%04X\n",

					      idx, reg);

				radeon_cs_dump_packet(p, pkt);

				return r;
@@ -962,7 +962,7 @@ static int r300_packet0_check(struct radeon_cs_parser *p, 
			break;

		case R300_TX_FORMAT_ATI2N:

			if (p->rdev->family < CHIP_R420) {

				DRM_ERROR("Invalid texture format %u\n",

				dev_warn_once(p->dev, "Invalid texture format %u\n",

					      (idx_value & 0x1F));

				return -EINVAL;

			}
@@ -974,7 +974,7 @@ static int r300_packet0_check(struct radeon_cs_parser *p, 
			track->textures[i].compress_format = R100_TRACK_COMP_DXT35;

			break;

		default:

			DRM_ERROR("Invalid texture format %u\n",

			dev_warn_once(p->dev, "Invalid texture format %u\n",

				      (idx_value & 0x1F));

			return -EINVAL;

		}
@@ -1041,7 +1041,7 @@ static int r300_packet0_check(struct radeon_cs_parser *p, 
					R100_TRACK_COMP_DXT1;

			}

		} else if (idx_value & (1 << 14)) {

			DRM_ERROR("Forbidden bit TXFORMAT_MSB\n");

			dev_warn_once(p->dev, "Forbidden bit TXFORMAT_MSB\n");

			return -EINVAL;

		}

		track->tex_dirty = true;
@@ -1079,7 +1079,7 @@ static int r300_packet0_check(struct radeon_cs_parser *p, 
	case R300_ZB_ZPASS_ADDR:

		r = radeon_cs_packet_next_reloc(p, &reloc, 0);

		if (r) {

			DRM_ERROR("No reloc for ib[%d]=0x%04X\n",

			dev_warn_once(p->dev, "No reloc for ib[%d]=0x%04X\n",

				      idx, reg);

			radeon_cs_dump_packet(p, pkt);

			return r;
@@ -1121,7 +1121,7 @@ static int r300_packet0_check(struct radeon_cs_parser *p, 
	case R300_RB3D_AARESOLVE_OFFSET:

		r = radeon_cs_packet_next_reloc(p, &reloc, 0);

		if (r) {

			DRM_ERROR("No reloc for ib[%d]=0x%04X\n",

			dev_warn_once(p->dev, "No reloc for ib[%d]=0x%04X\n",

				      idx, reg);

			radeon_cs_dump_packet(p, pkt);

			return r;
@@ -1191,7 +1191,7 @@ static int r300_packet3_check(struct radeon_cs_parser *p, 
	case PACKET3_INDX_BUFFER:

		r = radeon_cs_packet_next_reloc(p, &reloc, 0);

		if (r) {

			DRM_ERROR("No reloc for packet3 %d\n", pkt->opcode);

			dev_warn_once(p->dev, "No reloc for packet3 %d\n", pkt->opcode);

			radeon_cs_dump_packet(p, pkt);

			return r;

		}
@@ -1207,7 +1207,7 @@ static int r300_packet3_check(struct radeon_cs_parser *p, 
		 * PRIM_WALK must be equal to 3 vertex data in embedded

		 * in cmd stream */

		if (((radeon_get_ib_value(p, idx + 1) >> 4) & 0x3) != 3) {

			DRM_ERROR("PRIM_WALK must be 3 for IMMD draw\n");

			dev_warn_once(p->dev, "PRIM_WALK must be 3 for IMMD draw\n");

			return -EINVAL;

		}

		track->vap_vf_cntl = radeon_get_ib_value(p, idx + 1);
@@ -1222,7 +1222,7 @@ static int r300_packet3_check(struct radeon_cs_parser *p, 
		 * PRIM_WALK must be equal to 3 vertex data in embedded

		 * in cmd stream */

		if (((radeon_get_ib_value(p, idx) >> 4) & 0x3) != 3) {

			DRM_ERROR("PRIM_WALK must be 3 for IMMD draw\n");

			dev_warn_once(p->dev, "PRIM_WALK must be 3 for IMMD draw\n");

			return -EINVAL;

		}

		track->vap_vf_cntl = radeon_get_ib_value(p, idx);
@@ -1272,7 +1272,7 @@ static int r300_packet3_check(struct radeon_cs_parser *p, 
	case PACKET3_NOP:

		break;

	default:

		DRM_ERROR("Packet3 opcode %x not supported\n", pkt->opcode);

		dev_warn_once(p->dev, "Packet3 opcode %x not supported\n", pkt->opcode);

		return -EINVAL;

	}

	return 0;
@@ -1308,7 +1308,7 @@ int r300_cs_parse(struct radeon_cs_parser *p) 
			r = r300_packet3_check(p, &pkt);

			break;

		default:

			DRM_ERROR("Unknown packet type %d !\n", pkt.type);

			dev_warn_once(p->dev, "Unknown packet type %d !\n", pkt.type);

			return -EINVAL;

		}

		if (r) {

drivers/gpu/drm/radeon/r600_cs.c

+227 −218

File changed.

Preview size limit exceeded, changes collapsed.