rpms/xorg-x11-drv-amd/OLPC-2 amd-build-fixes.patch, NONE, 1.1 lx-downscaling-fix.patch, NONE, 1.1

[Daniel Williams (dcbw)]

Author: dcbw

Update of /cvs/extras/rpms/xorg-x11-drv-amd/OLPC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26739

Added Files:
	amd-build-fixes.patch lx-downscaling-fix.patch 
Log Message:
Oops, add the new patches


amd-build-fixes.patch:

--- NEW FILE amd-build-fixes.patch ---
diff --git a/src/amd_gx_accel.c b/src/amd_gx_accel.c
index 98b7fee..e488e60 100644
--- a/src/amd_gx_accel.c
+++ b/src/amd_gx_accel.c
@@ -168,7 +168,7 @@ static const int PDfn_SM[16] = {
 };
 
 #ifdef OPT_ACCEL
-static _X_INLINE CARD32 amd_gx_BppToRasterMode(int bpp)
+static __inline__ CARD32 amd_gx_BppToRasterMode(int bpp)
 {
     switch (bpp) {
     case 16:

lx-downscaling-fix.patch:

--- NEW FILE lx-downscaling-fix.patch ---
diff --git a/src/amd_lx_video.c b/src/amd_lx_video.c
index e1e51aa..a4cd91b 100644
--- a/src/amd_lx_video.c
+++ b/src/amd_lx_video.c
@@ -365,6 +365,7 @@ LXDisplayVideo(ScrnInfoPtr pScrni, int id, short width, short height,
   unsigned long yExtra, uvExtra = 0;
   DF_VIDEO_POSITION vidPos;
   DF_VIDEO_SOURCE_PARAMS vSrcParams;
+  int err;
 
   memset(&vSrcParams, 0, sizeof(vSrcParams));
 
@@ -401,16 +402,14 @@ LXDisplayVideo(ScrnInfoPtr pScrni, int id, short width, short height,
 
   /* Set up scaling */
   df_set_video_filter_coefficients(NULL, 1);
-  
-  if ((drawW >= srcW) && (drawH >= srcH))
-    df_set_video_scale(width, height, drawW, drawH, 
-		       DF_SCALEFLAG_CHANGEX | DF_SCALEFLAG_CHANGEY);
-  else if (drawW < srcW)
-    df_set_video_scale(drawW, height, drawW, drawH,
-		       DF_SCALEFLAG_CHANGEX | DF_SCALEFLAG_CHANGEY);
-  else if (drawH < srcH)
-    df_set_video_scale(width, drawH, drawW, drawH,
-		       DF_SCALEFLAG_CHANGEX | DF_SCALEFLAG_CHANGEY);
+
+  err = df_set_video_scale(width, height, drawW, drawH, 
+                DF_SCALEFLAG_CHANGEX | DF_SCALEFLAG_CHANGEY);
+  if (err != CIM_STATUS_OK) {
+    /* Note the problem, but do nothing for now. */
+    ErrorF("Video scale factor too large: %dx%d -> %dx%d\n",
+           width, height, drawW, drawH);
+  }
   
   /* Figure out clipping */