Attachment 14348 Details for Bug 13980 – newer patch with better offset checking

[patch] newer patch with better offset checking

radeon_largetexuploadfix.diff (text/plain), 1.57 KB, created by Roland Scheidegger on 2008-02-16 02:14:02 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Roland Scheidegger

Created: 2008-02-16 02:14:02 UTC

Size: 1.57 KB

patch

obsolete

>diff --git a/shared-core/radeon_state.c b/shared-core/radeon_state.c
>index 6f2e05b..70651d7 100644
>--- a/shared-core/radeon_state.c
>+++ b/shared-core/radeon_state.c
>@@ -1662,7 +1662,7 @@ static int radeon_cp_dispatch_texture(st
> 	u32 height;
> 	int i;
> 	u32 texpitch, microtile;
>-	u32 offset;
>+	u32 offset, byte_offset;
> 	RING_LOCALS;
> 
> 	if (radeon_check_and_fixup_offset(dev_priv, file_priv, &tex->offset)) {
>@@ -1727,6 +1727,13 @@ static int radeon_cp_dispatch_texture(st
> 	} else
> 		microtile = 0;
> 
>+	/* this might fail for zero-sized uploads - are those illegal? */
>+	if (!radeon_check_offset(dev_priv, tex->offset + image->height *
>+				blit_width - 1)) {
>+		DRM_ERROR("Invalid final destination offset\n");
>+		return -EINVAL;
>+	}
>+
> 	DRM_DEBUG("tex=%dx%d blit=%d\n", tex_width, tex->height, blit_width);
> 
> 	do {
>@@ -1840,6 +1847,7 @@ static int radeon_cp_dispatch_texture(st
> 		}
> 
> #undef RADEON_COPY_MT
>+		byte_offset = (image->y & ~2047) * blit_width;
> 		buf->file_priv = file_priv;
> 		buf->used = size;
> 		offset = dev_priv->gart_buffers_offset + buf->offset;
>@@ -1854,9 +1862,9 @@ static int radeon_cp_dispatch_texture(st
> 			 RADEON_DP_SRC_SOURCE_MEMORY |
> 			 RADEON_GMC_CLR_CMP_CNTL_DIS | RADEON_GMC_WR_MSK_DIS);
> 		OUT_RING((spitch << 22) | (offset >> 10));
>-		OUT_RING((texpitch << 22) | (tex->offset >> 10));
>+		OUT_RING((texpitch << 22) | ((tex->offset >> 10) + (byte_offset >> 10)));
> 		OUT_RING(0);
>-		OUT_RING((image->x << 16) | image->y);
>+		OUT_RING((image->x << 16) | (image->y % 2048));
> 		OUT_RING((image->width << 16) | height);
> 		RADEON_WAIT_UNTIL_2D_IDLE();
> 		ADVANCE_RING();

Actions: View | Splinter Review

Attachments on bug 13980: 13627 | 14348

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.