xf86-video-imxfb: Fix Xorg driver with newer API

The previous patch which ported the Xorg driver for newer API had a
mistaken change which broke the acceleration support; this patch fixes
it reverting the mislanding changes.

Change-Id: I74ebb311706af37c4f4141e42074e7ba81d9e671
Signed-off-by: Daiane Angolini <daiane.angolini@freescale.com>

diff --git a/meta-fsl-arm/recipes-graphics/xorg-driver/xf86-video-imxfb/Make-video-API-forward-and-backward-compatible.patch b/meta-fsl-arm/recipes-graphics/xorg-driver/xf86-video-imxfb/Make-video-API-forward-and-backward-compatible.patch
index acfda91201e95715b0c4705fc411b6279a8d57c3..2ac6311fb13e356497050ad852ffb54d8192d57f 100644 (file)
--- a/meta-fsl-arm/recipes-graphics/xorg-driver/xf86-video-imxfb/Make-video-API-forward-and-backward-compatible.patch
+++ b/meta-fsl-arm/recipes-graphics/xorg-driver/xf86-video-imxfb/Make-video-API-forward-and-backward-compatible.patch
@@ -282,7 +282,7 @@ index 178e36e..f4b3e38 100644
 +imxScreenInit(SCREEN_INIT_ARGS_DECL)
  {
 -      ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
-+      SCRN_INFO_PTR(pScreen);
++      ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
        ImxPtr fPtr = IMXPTR(pScrn);
        VisualPtr visual;
        int init_picture = 0;

diff --git a/meta-fsl-arm/recipes-graphics/xorg-driver/xf86-video-imxfb/xserver-1.14-compat.patch b/meta-fsl-arm/recipes-graphics/xorg-driver/xf86-video-imxfb/xserver-1.14-compat.patch
index a1e05a2d5d0d43dc6dfb9e4ed7da605980c15ea3..14ccbbf98abfeba59db960795f06d2b83bc03f45 100644 (file)
--- a/meta-fsl-arm/recipes-graphics/xorg-driver/xf86-video-imxfb/xserver-1.14-compat.patch
+++ b/meta-fsl-arm/recipes-graphics/xorg-driver/xf86-video-imxfb/xserver-1.14-compat.patch
@@ -24,3 +24,11 @@ Index: xserver-xorg-video-imx-11.09.01/src/imx_driver.c
  #include "micmap.h"
  #include "colormapst.h"
  #include "xf86cmap.h"
+@@ -722,7 +721,6 @@ imxScreenInit(SCREEN_INIT_ARGS_DECL)
+       /* Initialize for X extensions. */
+       imxExtInit();
+ 
+-      miInitializeBackingStore(pScreen);
+       xf86SetBackingStore(pScreen);
+ 
+       /* software cursor */