Attachment 8080 Details for Bug 7697 – Unify offset checking

[patch] Unify offset checking

drm-r300-check-offset.diff (text/plain), 5.90 KB, created by Michel Dänzer on 2006-12-12 22:57:46 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Michel Dänzer

Created: 2006-12-12 22:57:46 UTC

Size: 5.90 KB

patch

obsolete

>diff --git a/shared-core/r300_cmdbuf.c b/shared-core/r300_cmdbuf.c
>index c65ffd5..0c04b5f 100644
>--- a/shared-core/r300_cmdbuf.c
>+++ b/shared-core/r300_cmdbuf.c
>@@ -242,26 +242,6 @@ static __inline__ int r300_check_range(unsigned reg, int count)
> 	return 0;
> }
> 
>-/*
>- * we expect offsets passed to the framebuffer to be either within video 
>- * memory or within AGP space 
>- */
>-static __inline__ int r300_check_offset(drm_radeon_private_t *dev_priv,
>-					u32 offset)
>-{
>-	/* we realy want to check against end of video aperture
>-	   but this value is not being kept.
>-	   This code is correct for now (does the same thing as the
>-	   code that sets MC_FB_LOCATION) in radeon_cp.c */
>-	if (offset >= dev_priv->fb_location &&
>-	    offset < (dev_priv->fb_location + dev_priv->fb_size))
>-		return 0;
>-	if (offset >= dev_priv->gart_vm_start &&
>-	    offset < (dev_priv->gart_vm_start + dev_priv->gart_size))
>-		return 0;
>-	return 1;
>-}
>-
> static __inline__ int r300_emit_carefully_checked_packet0(drm_radeon_private_t *
> 							  dev_priv,
> 							  drm_radeon_kcmd_buffer_t
>@@ -290,7 +270,7 @@ static __inline__ int r300_emit_carefully_checked_packet0(drm_radeon_private_t *
> 		case MARK_SAFE:
> 			break;
> 		case MARK_CHECK_OFFSET:
>-			if (r300_check_offset(dev_priv, (u32) values[i])) {
>+			if (!radeon_check_offset(dev_priv, (u32) values[i])) {
> 				DRM_ERROR
> 				    ("Offset failed range check (reg=%04x sz=%d)\n",
> 				     reg, sz);
>@@ -452,7 +432,7 @@ static __inline__ int r300_emit_3d_load_vbpntr(drm_radeon_private_t *dev_priv,
> 	i = 1;
> 	while ((k < narrays) && (i < (count + 1))) {
> 		i++;		/* skip attribute field */
>-		if (r300_check_offset(dev_priv, payload[i])) {
>+		if (!radeon_check_offset(dev_priv, payload[i])) {
> 			DRM_ERROR
> 			    ("Offset failed range check (k=%d i=%d) while processing 3D_LOAD_VBPNTR packet.\n",
> 			     k, i);
>@@ -463,7 +443,7 @@ static __inline__ int r300_emit_3d_load_vbpntr(drm_radeon_private_t *dev_priv,
> 		if (k == narrays)
> 			break;
> 		/* have one more to process, they come in pairs */
>-		if (r300_check_offset(dev_priv, payload[i])) {
>+		if (!radeon_check_offset(dev_priv, payload[i])) {
> 			DRM_ERROR
> 			    ("Offset failed range check (k=%d i=%d) while processing 3D_LOAD_VBPNTR packet.\n",
> 			     k, i);
>@@ -508,7 +488,7 @@ static __inline__ int r300_emit_bitblt_multi(drm_radeon_private_t *dev_priv,
> 		if (cmd[1] & (RADEON_GMC_SRC_PITCH_OFFSET_CNTL 
> 			      | RADEON_GMC_DST_PITCH_OFFSET_CNTL)) {
> 			offset = cmd[2] << 10;
>-			ret = r300_check_offset(dev_priv, offset);
>+			ret = !radeon_check_offset(dev_priv, offset);
> 			if (ret) {
> 				DRM_ERROR("Invalid bitblt first offset is %08X\n", offset);
> 				return DRM_ERR(EINVAL);
>@@ -518,7 +498,7 @@ static __inline__ int r300_emit_bitblt_multi(drm_radeon_private_t *dev_priv,
> 		if ((cmd[1] & RADEON_GMC_SRC_PITCH_OFFSET_CNTL) &&
> 		    (cmd[1] & RADEON_GMC_DST_PITCH_OFFSET_CNTL)) {
> 			offset = cmd[3] << 10;
>-			ret = r300_check_offset(dev_priv, offset);
>+			ret = !radeon_check_offset(dev_priv, offset);
> 			if (ret) {
> 				DRM_ERROR("Invalid bitblt second offset is %08X\n", offset);
> 				return DRM_ERR(EINVAL);
>@@ -551,7 +531,7 @@ static __inline__ int r300_emit_indx_buffer(drm_radeon_private_t *dev_priv,
> 		DRM_ERROR("Invalid indx_buffer reg address %08X\n", cmd[1]);
> 		return DRM_ERR(EINVAL);
> 	}
>-	ret = r300_check_offset(dev_priv, cmd[2]);
>+	ret = !radeon_check_offset(dev_priv, cmd[2]);
> 	if (ret) {
> 		DRM_ERROR("Invalid indx_buffer offset is %08X\n", cmd[2]);
> 		return DRM_ERR(EINVAL);
>diff --git a/shared-core/radeon_drv.h b/shared-core/radeon_drv.h
>index 6ea2a17..5c426fe 100644
>--- a/shared-core/radeon_drv.h
>+++ b/shared-core/radeon_drv.h
>@@ -306,6 +306,21 @@ extern int radeon_no_wb;
> extern drm_ioctl_desc_t radeon_ioctls[];
> extern int radeon_max_ioctl;
> 
>+/* Check whether the given hardware address is inside the framebuffer or the
>+ * GART area.
>+ */
>+static __inline__ int radeon_check_offset(drm_radeon_private_t *dev_priv,
>+					  u64 off)
>+{
>+	u32 fb_start = dev_priv->fb_location;
>+	u32 fb_end = fb_start + dev_priv->fb_size - 1;
>+	u32 gart_start = dev_priv->gart_vm_start;
>+	u32 gart_end = gart_start + dev_priv->gart_size - 1;
>+
>+	return ((off >= fb_start && off <= fb_end) ||
>+		(off >= gart_start && off <= gart_end));
>+}
>+
> 				/* radeon_cp.c */
> extern int radeon_cp_init(DRM_IOCTL_ARGS);
> extern int radeon_cp_start(DRM_IOCTL_ARGS);
>diff --git a/shared-core/radeon_state.c b/shared-core/radeon_state.c
>index bf5e3d2..40b7d6c 100644
>--- a/shared-core/radeon_state.c
>+++ b/shared-core/radeon_state.c
>@@ -43,10 +43,7 @@ static __inline__ int radeon_check_and_fixup_offset(drm_radeon_private_t *
> 						    u32 * offset)
> {
> 	u64 off = *offset;
>-	u32 fb_start = dev_priv->fb_location;
>-	u32 fb_end = fb_start + dev_priv->fb_size - 1;
>-	u32 gart_start = dev_priv->gart_vm_start;
>-	u32 gart_end = gart_start + dev_priv->gart_size - 1;
>+	u32 fb_end = dev_priv->fb_location + dev_priv->fb_size - 1;
> 	struct drm_radeon_driver_file_fields *radeon_priv;
> 
> 	/* Hrm ... the story of the offset ... So this function converts
>@@ -66,8 +63,7 @@ static __inline__ int radeon_check_and_fixup_offset(drm_radeon_private_t *
> 	/* First, the best case, the offset already lands in either the
> 	 * framebuffer or the GART mapped space
> 	 */
>-	if ((off >= fb_start && off <= fb_end) ||
>-	    (off >= gart_start && off <= gart_end))
>+	if (radeon_check_offset(dev_priv, off))
> 		return 0;
> 
> 	/* Ok, that didn't happen... now check if we have a zero based
>@@ -81,11 +77,10 @@ static __inline__ int radeon_check_and_fixup_offset(drm_radeon_private_t *
> 
> 	/* Finally, assume we aimed at a GART offset if beyond the fb */
> 	if (off > fb_end)
>-		off = off - fb_end - 1 + gart_start;
>+		off = off - fb_end - 1 + dev_priv->gart_vm_start;
> 
> 	/* Now recheck and fail if out of bounds */
>-	if ((off >= fb_start && off <= fb_end) ||
>-	    (off >= gart_start && off <= gart_end)) {
>+	if (radeon_check_offset(dev_priv, off)) {
> 		DRM_DEBUG("offset fixed up to 0x%x\n", (unsigned int)off);
> 		*offset = off;
> 		return 0;

Actions: View | Splinter Review

Attachments on bug 7697: 7431 | 7985 | 8039 | 8040 | 8080

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.