[1/1] xf86-video-intel: backport a patch to fix a compile failure

Submitted by rongqing.li@windriver.com on June 28, 2013, 1:11 a.m.

Details

Message ID 391d4b34129e491a4ee0c6737369e8470c3b98ca.1372381458.git.rongqing.li@windriver.com
State New
Headers show

Commit Message

rongqing.li@windriver.com June 28, 2013, 1:11 a.m.
From: "Roy.Li" <rongqing.li@windriver.com>

backport a patch to fix a compile failure when xorg-xserver's version
is less than 1.10

Signed-off-by: Roy.Li <rongqing.li@windriver.com>
---
 ...-compilation-error-with-xorg-xserver-1.10.patch |   31 ++++++++++++++++++++
 .../xorg-driver/xf86-video-intel_2.21.9.bb         |    2 ++
 2 files changed, 33 insertions(+)
 create mode 100644 meta/recipes-graphics/xorg-driver/xf86-video-intel/0001-uxa-fix-the-compilation-error-with-xorg-xserver-1.10.patch

Patch hide | download patch | download mbox

diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-intel/0001-uxa-fix-the-compilation-error-with-xorg-xserver-1.10.patch b/meta/recipes-graphics/xorg-driver/xf86-video-intel/0001-uxa-fix-the-compilation-error-with-xorg-xserver-1.10.patch
new file mode 100644
index 0000000..0d0d99f
--- /dev/null
+++ b/meta/recipes-graphics/xorg-driver/xf86-video-intel/0001-uxa-fix-the-compilation-error-with-xorg-xserver-1.10.patch
@@ -0,0 +1,31 @@ 
+From b5e85e495e55e2537d305b7bebacdf6f97b66199 Mon Sep 17 00:00:00 2001
+From: "Roy.Li" <rongqing.li@windriver.com>
+Date: Thu, 27 Jun 2013 14:10:14 +0800
+Subject: [PATCH] uxa: fix the compilation error with xorg-xserver <= 1.10
+
+Upstream-Status: Backported
+
+struct _Screen has no canDoBGNoneRoot when ABI_VIDEODRV_VERSION is less than 10.0
+
+Signed-off-by: Roy.Li <rongqing.li@windriver.com>
+---
+ src/intel_display.c |    2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/intel_display.c b/src/intel_display.c
+index 17168e5..0acb86d 100644
+--- a/src/intel_display.c
++++ b/src/intel_display.c
+@@ -2113,7 +2113,9 @@ void intel_copy_fb(ScrnInfoPtr scrn)
+ 				0, 0,
+ 				scrn->virtualX, scrn->virtualY);
+ 	intel->uxa_driver->done_copy(dst);
++#if ABI_VIDEODRV_VERSION >= SET_ABI_VERSION(10, 0)
+ 	pScreen->canDoBGNoneRoot = TRUE;
++#endif
+ 
+ cleanup_dst:
+ 	(*pScreen->DestroyPixmap)(dst);
+-- 
+1.7.10.4
+
diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-intel_2.21.9.bb b/meta/recipes-graphics/xorg-driver/xf86-video-intel_2.21.9.bb
index 6112089..01c767b 100644
--- a/meta/recipes-graphics/xorg-driver/xf86-video-intel_2.21.9.bb
+++ b/meta/recipes-graphics/xorg-driver/xf86-video-intel_2.21.9.bb
@@ -12,6 +12,8 @@  LIC_FILES_CHKSUM = "file://COPYING;md5=8730ad58d11c7bbad9a7066d69f7808e"
 DEPENDS += "virtual/libx11 drm xf86driproto glproto \
 	    virtual/libgl xineramaproto xf86driproto libpciaccess udev"
 
+SRC_URI += "file://0001-uxa-fix-the-compilation-error-with-xorg-xserver-1.10.patch"
+
 PACKAGECONFIG ??= ""
 PACKAGECONFIG[sna] = "--enable-sna,--disable-sna"
 PACKAGECONFIG[xvmc] = "--enable-xvmc,--disable-xvmc,libxvmc"

Comments

Saul Wold June 28, 2013, 5:41 p.m.
On 06/27/2013 06:11 PM, rongqing.li@windriver.com wrote:
> From: "Roy.Li" <rongqing.li@windriver.com>
>
> backport a patch to fix a compile failure when xorg-xserver's version
> is less than 1.10
>
I am not understanding why we need this patch, our xorg-xserver version 
is at 1.14, why would we need to have patch for an older version of the 
server?

Sau!

> Signed-off-by: Roy.Li <rongqing.li@windriver.com>
> ---
>   ...-compilation-error-with-xorg-xserver-1.10.patch |   31 ++++++++++++++++++++
>   .../xorg-driver/xf86-video-intel_2.21.9.bb         |    2 ++
>   2 files changed, 33 insertions(+)
>   create mode 100644 meta/recipes-graphics/xorg-driver/xf86-video-intel/0001-uxa-fix-the-compilation-error-with-xorg-xserver-1.10.patch
>
> diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-intel/0001-uxa-fix-the-compilation-error-with-xorg-xserver-1.10.patch b/meta/recipes-graphics/xorg-driver/xf86-video-intel/0001-uxa-fix-the-compilation-error-with-xorg-xserver-1.10.patch
> new file mode 100644
> index 0000000..0d0d99f
> --- /dev/null
> +++ b/meta/recipes-graphics/xorg-driver/xf86-video-intel/0001-uxa-fix-the-compilation-error-with-xorg-xserver-1.10.patch
> @@ -0,0 +1,31 @@
> +From b5e85e495e55e2537d305b7bebacdf6f97b66199 Mon Sep 17 00:00:00 2001
> +From: "Roy.Li" <rongqing.li@windriver.com>
> +Date: Thu, 27 Jun 2013 14:10:14 +0800
> +Subject: [PATCH] uxa: fix the compilation error with xorg-xserver <= 1.10
> +
> +Upstream-Status: Backported
> +
> +struct _Screen has no canDoBGNoneRoot when ABI_VIDEODRV_VERSION is less than 10.0
> +
> +Signed-off-by: Roy.Li <rongqing.li@windriver.com>
> +---
> + src/intel_display.c |    2 ++
> + 1 file changed, 2 insertions(+)
> +
> +diff --git a/src/intel_display.c b/src/intel_display.c
> +index 17168e5..0acb86d 100644
> +--- a/src/intel_display.c
> ++++ b/src/intel_display.c
> +@@ -2113,7 +2113,9 @@ void intel_copy_fb(ScrnInfoPtr scrn)
> + 				0, 0,
> + 				scrn->virtualX, scrn->virtualY);
> + 	intel->uxa_driver->done_copy(dst);
> ++#if ABI_VIDEODRV_VERSION >= SET_ABI_VERSION(10, 0)
> + 	pScreen->canDoBGNoneRoot = TRUE;
> ++#endif
> +
> + cleanup_dst:
> + 	(*pScreen->DestroyPixmap)(dst);
> +--
> +1.7.10.4
> +
> diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-intel_2.21.9.bb b/meta/recipes-graphics/xorg-driver/xf86-video-intel_2.21.9.bb
> index 6112089..01c767b 100644
> --- a/meta/recipes-graphics/xorg-driver/xf86-video-intel_2.21.9.bb
> +++ b/meta/recipes-graphics/xorg-driver/xf86-video-intel_2.21.9.bb
> @@ -12,6 +12,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=8730ad58d11c7bbad9a7066d69f7808e"
>   DEPENDS += "virtual/libx11 drm xf86driproto glproto \
>   	    virtual/libgl xineramaproto xf86driproto libpciaccess udev"
>
> +SRC_URI += "file://0001-uxa-fix-the-compilation-error-with-xorg-xserver-1.10.patch"
> +
>   PACKAGECONFIG ??= ""
>   PACKAGECONFIG[sna] = "--enable-sna,--disable-sna"
>   PACKAGECONFIG[xvmc] = "--enable-xvmc,--disable-xvmc,libxvmc"
>
Ross Burton June 28, 2013, 6:11 p.m.
On 28 June 2013 18:41, Saul Wold <sgw@linux.intel.com> wrote:
>> backport a patch to fix a compile failure when xorg-xserver's version
>> is less than 1.10
>>
> I am not understanding why we need this patch, our xorg-xserver version is
> at 1.14, why would we need to have patch for an older version of the server?

Agreed.

meta-intel contains 1.9.3 but that's for the EMGD driver - I presume
this is a case of Wind River using an older X server for some reason,
and needing this patch?  In this case I'd say thanks for the
submission, but if this is purely for WR then we shouldn't merge it.

Ross