From a1499e2ab6acc141e5265426eafe576d6286b5bd Mon Sep 17 00:00:00 2001 From: Lauren Post Date: Mon, 28 Apr 2014 07:43:32 -0500 Subject: [PATCH] xf86-video-imxfb-vivante: Update to 3.10.17-1.0.0 GA Equivalent fix-hdmi-preferred patch was applied so remove with new version. Change-Id: I71be1a71b11415fced061ce6b7d13bf758c67bed Signed-off-by: Lauren Post Signed-off-by: Otavio Salvador --- .../fix-hdmi-preferred-mode.patch | 23 ------------------- .../xf86-video-imxfb-vivante_3.10.17-1.0.0.bb | 10 ++++---- 2 files changed, 4 insertions(+), 29 deletions(-) delete mode 100644 meta-fsl-arm/recipes-graphics/xorg-driver/xf86-video-imxfb-vivante/fix-hdmi-preferred-mode.patch diff --git a/meta-fsl-arm/recipes-graphics/xorg-driver/xf86-video-imxfb-vivante/fix-hdmi-preferred-mode.patch b/meta-fsl-arm/recipes-graphics/xorg-driver/xf86-video-imxfb-vivante/fix-hdmi-preferred-mode.patch deleted file mode 100644 index 2c2f5648..00000000 --- a/meta-fsl-arm/recipes-graphics/xorg-driver/xf86-video-imxfb-vivante/fix-hdmi-preferred-mode.patch +++ /dev/null @@ -1,23 +0,0 @@ -Fix HDMI preferred mode choosing - -This fixes the HDMI setting to use the preferred mode instead of the -lowest resolution by default. - -Upstream-Status: Pending - -Signed-off-by: Jon Nettleton -Signed-off-by: Otavio Salvador - -diff --git a/EXA/src/vivante_fbdev/imx_display.c b/EXA/src/vivante_fbdev/imx_display.c -index af6dcfc..cf49003 100644 ---- a/EXA/src/vivante_fbdev/imx_display.c -+++ b/EXA/src/vivante_fbdev/imx_display.c -@@ -879,6 +879,8 @@ imxDisplayGetModes(ScrnInfoPtr pScrn, const char* fbDeviceName) - (mode->HDisplay > 0) && - (mode->VDisplay > 0)) { - -+ mode->type = M_T_PREFERRED; -+ - xf86PrintModeline(pScrn->scrnIndex, mode); - modesList = xf86ModesAdd(modesList, mode); - } diff --git a/meta-fsl-arm/recipes-graphics/xorg-driver/xf86-video-imxfb-vivante_3.10.17-1.0.0.bb b/meta-fsl-arm/recipes-graphics/xorg-driver/xf86-video-imxfb-vivante_3.10.17-1.0.0.bb index b4734bdf..67d88637 100644 --- a/meta-fsl-arm/recipes-graphics/xorg-driver/xf86-video-imxfb-vivante_3.10.17-1.0.0.bb +++ b/meta-fsl-arm/recipes-graphics/xorg-driver/xf86-video-imxfb-vivante_3.10.17-1.0.0.bb @@ -12,12 +12,10 @@ DEPENDS += "virtual/xserver virtual/libx11 virtual/libgal-x11 gpu-viv-bin-mx6q p LIC_FILES_CHKSUM = "file://EXA/src/vivante_fbdev/vivante.h;endline=19;md5=641ac6e6d013833e36290797f4d7089c" -# FIXME: Drop 'beta' suffix for GA release -SRC_URI = "${FSL_MIRROR}/xserver-xorg-video-imx-viv-${PV}_beta.tar.gz" -SRC_URI[md5sum] = "fee0e4820fe3f89e5f36a0b343e4a33f" -SRC_URI[sha256sum] = "b65aef86943cb0fcd2dd7ded01215038dcf2761779ce39186ab3c8c2d4b010b1" +SRC_URI = "${FSL_MIRROR}/xserver-xorg-video-imx-viv-${PV}.tar.gz" -SRC_URI += "file://fix-hdmi-preferred-mode.patch" +SRC_URI[md5sum] = "697d9a3fb244eb95eae4207bf2d9c321" +SRC_URI[sha256sum] = "9178c6b721e55645bedf6d2cfaf836f5c6e2684673215358a6b6845c10a7a085" EXTRA_OEMAKE += "-C EXA/src -f makefile.linux prefix=${D}/usr \ sysroot=${STAGING_DIR_TARGET} \ @@ -29,7 +27,7 @@ CFLAGS += "-I${STAGING_INCDIR}/xorg \ -I${STAGING_INCDIR}/drm \ -I../../DRI_1.10.4/src" -S = "${WORKDIR}/xserver-xorg-video-imx-viv-${PV}_beta/" +S = "${WORKDIR}/xserver-xorg-video-imx-viv-${PV}/" # FIXME: The Freescale provided Makefile has hardcodec include paths # and this does not work in case prefix is different than /usr, -- 2.40.1