Attachment 25262 Details for Bug 16198 – possible fix

[patch] possible fix

no_rs_tx_offset.diff (text/plain), 5.62 KB, created by Alex Deucher on 2009-04-29 12:19:53 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alex Deucher

Created: 2009-04-29 12:19:53 UTC

Size: 5.62 KB

patch

obsolete

>diff --git a/src/radeon_exa_render.c b/src/radeon_exa_render.c
>index 831a6ff..99020a4 100644
>--- a/src/radeon_exa_render.c
>+++ b/src/radeon_exa_render.c
>@@ -1499,7 +1499,7 @@ static Bool FUNC_NAME(R300PrepareComposite)(int op, PicturePtr pSrcPicture,
> 			   R300_RS_COUNT_HIRES_EN));
> 
> 	    /* R300_INST_COUNT_RS - highest RS instruction used */
>-	    OUT_ACCEL_REG(R300_RS_INST_COUNT, R300_INST_COUNT_RS(1) | R300_TX_OFFSET_RS(6));
>+	    OUT_ACCEL_REG(R300_RS_INST_COUNT, R300_INST_COUNT_RS(1));
> 
> 	    OUT_ACCEL_REG(R300_US_CODE_OFFSET, (R300_ALU_CODE_OFFSET(0) |
> 						R300_ALU_CODE_SIZE(0) |
>@@ -1521,7 +1521,7 @@ static Bool FUNC_NAME(R300PrepareComposite)(int op, PicturePtr pSrcPicture,
> 			  ((2 << R300_RS_COUNT_IT_COUNT_SHIFT) |
> 			   R300_RS_COUNT_HIRES_EN));
> 
>-	    OUT_ACCEL_REG(R300_RS_INST_COUNT, R300_INST_COUNT_RS(0) | R300_TX_OFFSET_RS(6));
>+	    OUT_ACCEL_REG(R300_RS_INST_COUNT, R300_INST_COUNT_RS(0));
> 
> 	    OUT_ACCEL_REG(R300_US_CODE_OFFSET, (R300_ALU_CODE_OFFSET(0) |
> 						R300_ALU_CODE_SIZE(0) |
>@@ -1748,7 +1748,7 @@ static Bool FUNC_NAME(R300PrepareComposite)(int op, PicturePtr pSrcPicture,
> 			   R300_RS_COUNT_HIRES_EN));
> 
> 	    /* 2 RS instructions: 1 for tex0 (src), 1 for tex1 (mask) */
>-	    OUT_ACCEL_REG(R300_RS_INST_COUNT, R300_INST_COUNT_RS(1) | R300_TX_OFFSET_RS(6));
>+	    OUT_ACCEL_REG(R300_RS_INST_COUNT, R300_INST_COUNT_RS(1));
> 
> 	    OUT_ACCEL_REG(R500_US_CODE_ADDR, (R500_US_CODE_START_ADDR(0) |
> 					      R500_US_CODE_END_ADDR(2)));
>@@ -1760,7 +1760,7 @@ static Bool FUNC_NAME(R300PrepareComposite)(int op, PicturePtr pSrcPicture,
> 			  ((2 << R300_RS_COUNT_IT_COUNT_SHIFT) |
> 			   R300_RS_COUNT_HIRES_EN));
> 
>-	    OUT_ACCEL_REG(R300_RS_INST_COUNT, R300_INST_COUNT_RS(0) | R300_TX_OFFSET_RS(6));
>+	    OUT_ACCEL_REG(R300_RS_INST_COUNT, R300_INST_COUNT_RS(0));
> 
> 	    OUT_ACCEL_REG(R500_US_CODE_ADDR, (R500_US_CODE_START_ADDR(0) |
> 					      R500_US_CODE_END_ADDR(1)));
>diff --git a/src/radeon_textured_videofuncs.c b/src/radeon_textured_videofuncs.c
>index dd6f862..41e99b1 100644
>--- a/src/radeon_textured_videofuncs.c
>+++ b/src/radeon_textured_videofuncs.c
>@@ -1257,7 +1257,7 @@ FUNC_NAME(R300DisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv)
> 					  R300_RS_COUNT_HIRES_EN));
> 
> 	    /* R300_INST_COUNT_RS - highest RS instruction used */
>-	    OUT_ACCEL_REG(R300_RS_INST_COUNT, R300_INST_COUNT_RS(1) | R300_TX_OFFSET_RS(6));
>+	    OUT_ACCEL_REG(R300_RS_INST_COUNT, R300_INST_COUNT_RS(1));
> 
> 	    /* Pixel stack frame size. */
> 	    OUT_ACCEL_REG(R300_US_PIXSIZE, 5);
>@@ -1601,7 +1601,7 @@ FUNC_NAME(R300DisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv)
>                           ((2 << R300_RS_COUNT_IT_COUNT_SHIFT) |
>                            R300_RS_COUNT_HIRES_EN));
> 	    /* R300_INST_COUNT_RS - highest RS instruction used */
>-	    OUT_ACCEL_REG(R300_RS_INST_COUNT, R300_INST_COUNT_RS(0) | R300_TX_OFFSET_RS(6));
>+	    OUT_ACCEL_REG(R300_RS_INST_COUNT, R300_INST_COUNT_RS(0));
> 
> 	    OUT_ACCEL_REG(R300_US_PIXSIZE, 0); /* highest temp used */
> 
>@@ -1738,7 +1738,7 @@ FUNC_NAME(R300DisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv)
> 			  ((2 << R300_RS_COUNT_IT_COUNT_SHIFT) |
> 			   R300_RS_COUNT_HIRES_EN));
> 	    /* R300_INST_COUNT_RS - highest RS instruction used */
>-	    OUT_ACCEL_REG(R300_RS_INST_COUNT, R300_INST_COUNT_RS(0) | R300_TX_OFFSET_RS(6));
>+	    OUT_ACCEL_REG(R300_RS_INST_COUNT, R300_INST_COUNT_RS(0));
> 
> 	    OUT_ACCEL_REG(R300_US_PIXSIZE, 2); /* highest temp used */
> 
>@@ -1962,7 +1962,7 @@ FUNC_NAME(R300DisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv)
> 			  ((2 << R300_RS_COUNT_IT_COUNT_SHIFT) |
> 			   R300_RS_COUNT_HIRES_EN));
> 	    /* R300_INST_COUNT_RS - highest RS instruction used */
>-	    OUT_ACCEL_REG(R300_RS_INST_COUNT, R300_INST_COUNT_RS(0) | R300_TX_OFFSET_RS(6));
>+	    OUT_ACCEL_REG(R300_RS_INST_COUNT, R300_INST_COUNT_RS(0));
> 
> 	    OUT_ACCEL_REG(R300_US_PIXSIZE, 1); /* highest temp used */
> 
>@@ -2688,7 +2688,7 @@ FUNC_NAME(R500DisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv)
> 			   R300_RS_COUNT_HIRES_EN));
> 
> 	    /* R300_INST_COUNT_RS - highest RS instruction used */
>-	    OUT_ACCEL_REG(R300_RS_INST_COUNT, R300_INST_COUNT_RS(1) | R300_TX_OFFSET_RS(6));
>+	    OUT_ACCEL_REG(R300_RS_INST_COUNT, R300_INST_COUNT_RS(1));
> 
> 	    /* Pixel stack frame size. */
> 	    OUT_ACCEL_REG(R300_US_PIXSIZE, 5);
>@@ -3159,7 +3159,7 @@ FUNC_NAME(R500DisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv)
> 			   R300_RS_COUNT_HIRES_EN));
> 
> 	    /* R300_INST_COUNT_RS - highest RS instruction used */
>-	    OUT_ACCEL_REG(R300_RS_INST_COUNT, R300_INST_COUNT_RS(0) | R300_TX_OFFSET_RS(6));
>+	    OUT_ACCEL_REG(R300_RS_INST_COUNT, R300_INST_COUNT_RS(0));
> 
> 	    /* Pixel stack frame size. */
> 	    OUT_ACCEL_REG(R300_US_PIXSIZE, 0); /* highest temp used */
>@@ -3323,7 +3323,7 @@ FUNC_NAME(R500DisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv)
> 			   R300_RS_COUNT_HIRES_EN));
> 
> 	    /* R300_INST_COUNT_RS - highest RS instruction used */
>-	    OUT_ACCEL_REG(R300_RS_INST_COUNT, R300_INST_COUNT_RS(0) | R300_TX_OFFSET_RS(6));
>+	    OUT_ACCEL_REG(R300_RS_INST_COUNT, R300_INST_COUNT_RS(0));
> 
> 	    /* Pixel stack frame size. */
> 	    OUT_ACCEL_REG(R300_US_PIXSIZE, 2); /* highest temp used */
>@@ -3560,7 +3560,7 @@ FUNC_NAME(R500DisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv)
> 			   R300_RS_COUNT_HIRES_EN));
> 
> 	    /* R300_INST_COUNT_RS - highest RS instruction used */
>-	    OUT_ACCEL_REG(R300_RS_INST_COUNT, R300_INST_COUNT_RS(0) | R300_TX_OFFSET_RS(6));
>+	    OUT_ACCEL_REG(R300_RS_INST_COUNT, R300_INST_COUNT_RS(0));
> 
> 	    /* Pixel stack frame size. */
> 	    OUT_ACCEL_REG(R300_US_PIXSIZE, 1); /* highest temp used */

Actions: View | Splinter Review

Attachments on bug 16198: 16869 | 16870 | 24459 | 25262 | 25392

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.