[1/2] xf86-video-intel: Fix build with -fno-common

Submitted by Khem Raj on Aug. 5, 2020, 7:08 p.m. | Patch ID: 175067

Details

Message ID 20200805190819.935438-1-raj.khem@gmail.com
State Master Next
Commit 19456d1806fdcbad4cba45b14ea52116470553c3
Headers show

Commit Message

Khem Raj Aug. 5, 2020, 7:08 p.m. 
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 ...0001-i810-Make-I810PatternROP-extern.patch | 29 +++++++++++++++++++
 .../xorg-driver/xf86-video-intel_git.bb       |  1 +
 2 files changed, 30 insertions(+)
 create mode 100644 meta/recipes-graphics/xorg-driver/xf86-video-intel/0001-i810-Make-I810PatternROP-extern.patch

Patch hide | download patch | download mbox 

diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-intel/0001-i810-Make-I810PatternROP-extern.patch b/meta/recipes-graphics/xorg-driver/xf86-video-intel/0001-i810-Make-I810PatternROP-extern.patch
new file mode 100644
index 0000000000..610efd65d9
--- /dev/null
+++ b/meta/recipes-graphics/xorg-driver/xf86-video-intel/0001-i810-Make-I810PatternROP-extern.patch
@@ -0,0 +1,29 @@ 
+From c9a9791576025e46f4411342c0e29ffcc79869ca Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Wed, 5 Aug 2020 11:51:54 -0700
+Subject: [PATCH] i810: Make I810PatternROP extern
+
+Its also defined in i810_accel.c
+Fixes build with -fno-common
+
+Upstream-Status: Pending
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ src/legacy/i810/i810.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/legacy/i810/i810.h b/src/legacy/i810/i810.h
+index 347188c9..19be049c 100644
+--- a/src/legacy/i810/i810.h
++++ b/src/legacy/i810/i810.h
+@@ -322,6 +322,6 @@ extern void I810InitMC(ScreenPtr pScreen);
+ extern const OptionInfoRec *I810AvailableOptions(int chipid, int busid);
+ 
+ extern const int I810CopyROP[16];
+-const int I810PatternROP[16];
++extern const int I810PatternROP[16];
+ 
+ #endif /* _I810_H_ */
+-- 
+2.28.0
+
diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-intel_git.bb b/meta/recipes-graphics/xorg-driver/xf86-video-intel_git.bb
index 7ab2236237..3c97b8c4f4 100644
--- a/meta/recipes-graphics/xorg-driver/xf86-video-intel_git.bb
+++ b/meta/recipes-graphics/xorg-driver/xf86-video-intel_git.bb
@@ -15,6 +15,7 @@  S = "${WORKDIR}/git"
 
 SRC_URI = "git://anongit.freedesktop.org/xorg/driver/xf86-video-intel \
            file://0001-Sync-i915_pciids-upto-8717c6b7414f.patch \
+           file://0001-i810-Make-I810PatternROP-extern.patch \
 "
 
 UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+)"

Comments

Anuj Mittal Aug. 6, 2020, 1:38 a.m. 
On Wed, 2020-08-05 at 12:08 -0700, Khem Raj wrote:
> Signed-off-by: Khem Raj <raj.khem@gmail.com>

> ---

>  ...0001-i810-Make-I810PatternROP-extern.patch | 29

> +++++++++++++++++++

>  .../xorg-driver/xf86-video-intel_git.bb       |  1 +

>  2 files changed, 30 insertions(+)

>  create mode 100644 meta/recipes-graphics/xorg-driver/xf86-video-

> intel/0001-i810-Make-I810PatternROP-extern.patch

> 

> diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-intel/0001-

> i810-Make-I810PatternROP-extern.patch b/meta/recipes-graphics/xorg-

> driver/xf86-video-intel/0001-i810-Make-I810PatternROP-extern.patch

> new file mode 100644

> index 0000000000..610efd65d9

> --- /dev/null

> +++ b/meta/recipes-graphics/xorg-driver/xf86-video-intel/0001-i810-

> Make-I810PatternROP-extern.patch

> @@ -0,0 +1,29 @@

> +From c9a9791576025e46f4411342c0e29ffcc79869ca Mon Sep 17 00:00:00

> 2001

> +From: Khem Raj <raj.khem@gmail.com>

> +Date: Wed, 5 Aug 2020 11:51:54 -0700

> +Subject: [PATCH] i810: Make I810PatternROP extern

> +

> +Its also defined in i810_accel.c

> +Fixes build with -fno-common

> +

> +Upstream-Status: Pending


Should we take this exact same change so we can mark this as a
backport?

https://gitlab.freedesktop.org/xorg/driver/xf86-video-intel/-/commit/652d93cbbdc159c0883f1b626ea48e28bac63ae3

Thanks,

Anuj

> +Signed-off-by: Khem Raj <raj.khem@gmail.com>

> +---

> + src/legacy/i810/i810.h | 2 +-

> + 1 file changed, 1 insertion(+), 1 deletion(-)

> +

> +diff --git a/src/legacy/i810/i810.h b/src/legacy/i810/i810.h

> +index 347188c9..19be049c 100644

> +--- a/src/legacy/i810/i810.h

> ++++ b/src/legacy/i810/i810.h

> +@@ -322,6 +322,6 @@ extern void I810InitMC(ScreenPtr pScreen);

> + extern const OptionInfoRec *I810AvailableOptions(int chipid, int

> busid);

> + 

> + extern const int I810CopyROP[16];

> +-const int I810PatternROP[16];

> ++extern const int I810PatternROP[16];

> + 

> + #endif /* _I810_H_ */

> +-- 

> +2.28.0

> +

> diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-

> intel_git.bb b/meta/recipes-graphics/xorg-driver/xf86-video-

> intel_git.bb

> index 7ab2236237..3c97b8c4f4 100644

> --- a/meta/recipes-graphics/xorg-driver/xf86-video-intel_git.bb

> +++ b/meta/recipes-graphics/xorg-driver/xf86-video-intel_git.bb

> @@ -15,6 +15,7 @@ S = "${WORKDIR}/git"

>  

>  SRC_URI = "git://anongit.freedesktop.org/xorg/driver/xf86-video-

> intel \

>             file://0001-Sync-i915_pciids-upto-8717c6b7414f.patch \

> +           file://0001-i810-Make-I810PatternROP-extern.patch \

>  "

>  

>  UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+)"

>
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.

View/Reply Online (#141260): https://lists.openembedded.org/g/openembedded-core/message/141260
Mute This Topic: https://lists.openembedded.org/mt/76014141/3617530
Group Owner: openembedded-core+owner@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub  [oe-patchwork@oe-patch.openembedded.org]
-=-=-=-=-=-=-=-=-=-=-=-
Khem Raj Aug. 6, 2020, 4:32 a.m. 
On Wed, Aug 5, 2020 at 6:38 PM Mittal, Anuj <anuj.mittal@intel.com> wrote:

> On Wed, 2020-08-05 at 12:08 -0700, Khem Raj wrote:
> > Signed-off-by: Khem Raj <raj.khem@gmail.com>
> > ---
> >  ...0001-i810-Make-I810PatternROP-extern.patch | 29
> > +++++++++++++++++++
> >  .../xorg-driver/xf86-video-intel_git.bb       |  1 +
> >  2 files changed, 30 insertions(+)
> >  create mode 100644 meta/recipes-graphics/xorg-driver/xf86-video-
> > intel/0001-i810-Make-I810PatternROP-extern.patch
> >
> > diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-intel/0001-
> > i810-Make-I810PatternROP-extern.patch b/meta/recipes-graphics/xorg-
> > driver/xf86-video-intel/0001-i810-Make-I810PatternROP-extern.patch
> > new file mode 100644
> > index 0000000000..610efd65d9
> > --- /dev/null
> > +++ b/meta/recipes-graphics/xorg-driver/xf86-video-intel/0001-i810-
> > Make-I810PatternROP-extern.patch
> > @@ -0,0 +1,29 @@
> > +From c9a9791576025e46f4411342c0e29ffcc79869ca Mon Sep 17 00:00:00
> > 2001
> > +From: Khem Raj <raj.khem@gmail.com>
> > +Date: Wed, 5 Aug 2020 11:51:54 -0700
> > +Subject: [PATCH] i810: Make I810PatternROP extern
> > +
> > +Its also defined in i810_accel.c
> > +Fixes build with -fno-common
> > +
> > +Upstream-Status: Pending
>
> Should we take this exact same change so we can mark this as a
> backport?
>
>
> https://gitlab.freedesktop.org/xorg/driver/xf86-video-intel/-/commit/652d93cbbdc159c0883f1b626ea48e28bac63ae3


I think that’s better will just add the backport bits and send v2

<https://gitlab.freedesktop.org/xorg/driver/xf86-video-intel/-/commit/652d93cbbdc159c0883f1b626ea48e28bac63ae3>
>
> Thanks,
>
> Anuj
>
> > +Signed-off-by: Khem Raj <raj.khem@gmail.com>
> > +---
> > + src/legacy/i810/i810.h | 2 +-
> > + 1 file changed, 1 insertion(+), 1 deletion(-)
> > +
> > +diff --git a/src/legacy/i810/i810.h b/src/legacy/i810/i810.h
> > +index 347188c9..19be049c 100644
> > +--- a/src/legacy/i810/i810.h
> > ++++ b/src/legacy/i810/i810.h
> > +@@ -322,6 +322,6 @@ extern void I810InitMC(ScreenPtr pScreen);
> > + extern const OptionInfoRec *I810AvailableOptions(int chipid, int
> > busid);
> > +
> > + extern const int I810CopyROP[16];
> > +-const int I810PatternROP[16];
> > ++extern const int I810PatternROP[16];
> > +
> > + #endif /* _I810_H_ */
> > +--
> > +2.28.0
> > +
> > diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-
> > intel_git.bb b/meta/recipes-graphics/xorg-driver/xf86-video-
> > intel_git.bb
> > index 7ab2236237..3c97b8c4f4 100644
> > --- a/meta/recipes-graphics/xorg-driver/xf86-video-intel_git.bb
> > +++ b/meta/recipes-graphics/xorg-driver/xf86-video-intel_git.bb
> > @@ -15,6 +15,7 @@ S = "${WORKDIR}/git"
> >
> >  SRC_URI = "git://anongit.freedesktop.org/xorg/driver/xf86-video-
> > intel \
> >             file://0001-Sync-i915_pciids-upto-8717c6b7414f.patch \
> > +           file://0001-i810-Make-I810PatternROP-extern.patch \
> >  "
> >
> >  UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+)"
> > 
>
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.

View/Reply Online (#141261): https://lists.openembedded.org/g/openembedded-core/message/141261
Mute This Topic: https://lists.openembedded.org/mt/76014141/3617530
Group Owner: openembedded-core+owner@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub  [oe-patchwork@oe-patch.openembedded.org]
-=-=-=-=-=-=-=-=-=-=-=-