Attachment 17389 Details for Bug 16512 – Radeon driver src code diff

[patch] Radeon driver src code diff

radeon.diff (text/plain), 2.48 KB, created by Brad Smith on 2008-06-26 00:27:44 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Brad Smith

Created: 2008-06-26 00:27:44 UTC

Size: 2.48 KB

patch

obsolete

>--- radeon_accel.c.orig	Thu Jun 26 03:22:05 2008
>+++ radeon_accel.c	Thu Jun 26 03:22:30 2008
>@@ -371,7 +371,7 @@ void RADEONEngineInit(ScrnInfoPtr pScrn)
> 		   info->CurrentLayout.bitsPerPixel);
> 
> #ifdef XF86DRI
>-    if (info->directRenderingEnabled && (IS_R300_3D | IS_R500_3D)) {
>+    if (info->directRenderingEnabled && (IS_R300_3D || IS_R500_3D)) {
> 	drmRadeonGetParam np;
> 	int num_pipes;
> 
>@@ -419,11 +419,11 @@ void RADEONEngineInit(ScrnInfoPtr pScrn)
> 	}
>     }
> 
>-    if (IS_R300_3D | IS_R500_3D)
>+    if (IS_R300_3D || IS_R500_3D)
> 	xf86DrvMsg(pScrn->scrnIndex, X_INFO,
> 		   "num pipes is %d\n", info->num_gb_pipes);
> 
>-    if (IS_R300_3D | IS_R500_3D) {
>+    if (IS_R300_3D || IS_R500_3D) {
> 	uint32_t gb_tile_config = (R300_ENABLE_TILING | R300_TILE_SIZE_16 | R300_SUBPIXEL_1_16);
> 
> 	switch(info->num_gb_pipes) {
>--- radeon_exa_render.c.orig	Thu Jun 26 03:23:14 2008
>+++ radeon_exa_render.c	Thu Jun 26 03:23:44 2008
>@@ -1978,7 +1978,7 @@ static void FUNC_NAME(RadeonCompositeTile)(PixmapPtr p
> 		 RADEON_CP_VC_CNTL_VTX_FMT_RADEON_MODE |
> 		 (4 << RADEON_CP_VC_CNTL_NUM_SHIFT));
>     } else {
>-	if (IS_R300_3D | IS_R500_3D)
>+	if (IS_R300_3D || IS_R500_3D)
> 	    BEGIN_RING(4 * vtx_count + 4);
> 	else
> 	    BEGIN_RING(4 * vtx_count + 2);
>@@ -1991,7 +1991,7 @@ static void FUNC_NAME(RadeonCompositeTile)(PixmapPtr p
>     }
> 
> #else /* ACCEL_CP */
>-    if (IS_R300_3D | IS_R500_3D)
>+    if (IS_R300_3D || IS_R500_3D)
> 	BEGIN_ACCEL(2 + vtx_count * 4);
>     else
> 	BEGIN_ACCEL(1 + vtx_count * 4);
>@@ -2032,7 +2032,7 @@ static void FUNC_NAME(RadeonCompositeTile)(PixmapPtr p
> 		xFixedToFloat(srcTopRight.x) / info->texW[0],     xFixedToFloat(srcTopRight.y) / info->texH[0]);
>     }
> 
>-    if (IS_R300_3D | IS_R500_3D)
>+    if (IS_R300_3D || IS_R500_3D)
> 	/* flushing is pipelined, free/finish is not */
> 	OUT_ACCEL_REG(R300_RB3D_DSTCACHE_CTLSTAT, R300_DC_FLUSH_3D);
> 
>@@ -2114,7 +2114,7 @@ static void FUNC_NAME(RadeonDoneComposite)(PixmapPtr p
> 
>     ENTER_DRAW(0);
> 
>-    if (IS_R300_3D | IS_R500_3D) {
>+    if (IS_R300_3D || IS_R500_3D) {
> 	BEGIN_ACCEL(2);
> 	OUT_ACCEL_REG(R300_RB3D_DSTCACHE_CTLSTAT, R300_RB3D_DC_FLUSH_ALL);
>     } else
>--- radeon_textured_videofuncs.c.orig	Thu Jun 26 03:21:14 2008
>+++ radeon_textured_videofuncs.c	Thu Jun 26 03:21:43 2008
>@@ -643,7 +643,7 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScr
> 	pBox++;
>     }
> 
>-    if (IS_R300_3D | IS_R500_3D) {
>+    if (IS_R300_3D || IS_R500_3D) {
> 	BEGIN_VIDEO(2);
> 	OUT_VIDEO_REG(R300_RB3D_DSTCACHE_CTLSTAT, R300_RB3D_DC_FLUSH_ALL);
>     } else

Actions: View | Splinter Review

Attachments on bug 16512: 17384 | 17389

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.