[PATCH xf86-video-ati] Fix build for XServer 1.13

[PATCH xf86-video-ati] Fix build for XServer 1.13

[Jochen Rollwagen]

[-- Attachment #1: Type: text/plain, Size: 900 bytes --]

Latest git build stops with the error message

radeon_kms.c: In function 'RADEONWindowExposures_oneshot':
radeon_kms.c:1644:45: error: expected expression before 'RegionPtr'
      pScreen->WindowExposures(pWin, pRegion, RegionPtr pBSRegion);

This patch fixes the build.
---
  src/radeon_kms.c |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/radeon_kms.c b/src/radeon_kms.c
index 572dfcc..7a561fa 100644
--- a/src/radeon_kms.c
+++ b/src/radeon_kms.c
@@ -1641,7 +1641,7 @@ static void 
RADEONWindowExposures_oneshot(WindowPtr pWin, RegionPtr pRegion

      pScreen->WindowExposures = info->WindowExposures;
  #if XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(1,16,99,901,0)
-    pScreen->WindowExposures(pWin, pRegion, RegionPtr pBSRegion);
+    pScreen->WindowExposures(pWin, pRegion, pBSRegion);
  #else
      pScreen->WindowExposures(pWin, pRegion);
  #endif
-- 
1.7.9.5


[-- Attachment #2: 0001-Fix-build-for-XServer-1.13.patch --]
[-- Type: text/x-patch, Size: 1136 bytes --]

>From 8246f1af42cd174501c95c0ba5c00908ace41de9 Mon Sep 17 00:00:00 2001
From: Jochen Rollwagen <joro-2013-zqRNUXuvxA0b1SvskN2V4Q@public.gmane.org>
Date: Sun, 5 Mar 2017 11:32:38 +0100
Subject: [PATCH xf86-video-ati] Fix build for XServer 1.13

Latest git build stops with the error message

radeon_kms.c: In function 'RADEONWindowExposures_oneshot':
radeon_kms.c:1644:45: error: expected expression before 'RegionPtr'
     pScreen->WindowExposures(pWin, pRegion, RegionPtr pBSRegion);

This patch fixes the build.
---
 src/radeon_kms.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/radeon_kms.c b/src/radeon_kms.c
index 572dfcc..7a561fa 100644
--- a/src/radeon_kms.c
+++ b/src/radeon_kms.c
@@ -1641,7 +1641,7 @@ static void RADEONWindowExposures_oneshot(WindowPtr pWin, RegionPtr pRegion
 
     pScreen->WindowExposures = info->WindowExposures;
 #if XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(1,16,99,901,0)
-    pScreen->WindowExposures(pWin, pRegion, RegionPtr pBSRegion);
+    pScreen->WindowExposures(pWin, pRegion, pBSRegion);
 #else
     pScreen->WindowExposures(pWin, pRegion);
 #endif
-- 
1.7.9.5


[-- Attachment #3: Type: text/plain, Size: 154 bytes --]

_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

Re: [PATCH xf86-video-ati] Fix build for XServer 1.13

[Michel Dänzer]

On 05/03/17 07:38 PM, Jochen Rollwagen wrote:
> Latest git build stops with the error message
> 
> radeon_kms.c: In function 'RADEONWindowExposures_oneshot':
> radeon_kms.c:1644:45: error: expected expression before 'RegionPtr'
>      pScreen->WindowExposures(pWin, pRegion, RegionPtr pBSRegion);
> 
> This patch fixes the build.
> ---
>  src/radeon_kms.c |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/src/radeon_kms.c b/src/radeon_kms.c
> index 572dfcc..7a561fa 100644
> --- a/src/radeon_kms.c
> +++ b/src/radeon_kms.c
> @@ -1641,7 +1641,7 @@ static void
> RADEONWindowExposures_oneshot(WindowPtr pWin, RegionPtr pRegion
> 
>      pScreen->WindowExposures = info->WindowExposures;
>  #if XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(1,16,99,901,0)
> -    pScreen->WindowExposures(pWin, pRegion, RegionPtr pBSRegion);
> +    pScreen->WindowExposures(pWin, pRegion, pBSRegion);
>  #else
>      pScreen->WindowExposures(pWin, pRegion);
>  #endif

Reviewed and pushed, thanks!


P.S. In the future, please add your Signed-off-by to patches you want to
be applied.

-- 
Earthling Michel Dänzer               |               http://www.amd.com
Libre software enthusiast             |             Mesa and X developer
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

Re: [PATCH] xf86-video-ati: Fix build for xserver < 1.13

[Michel Dänzer]

On 25/11/16 03:00 AM, Jochen Rollwagen wrote:
> Subject: [PATCH] fix build for xserver < 1.13
> 
> same procedure every few patches.....

Sorry about that. I pushed your patch (with the indentation fixed up),
thanks.


-- 
Earthling Michel Dänzer               |               http://www.amd.com
Libre software enthusiast             |             Mesa and X developer

_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

[PATCH] xf86-video-ati: Fix build for xserver < 1.13

[Jochen Rollwagen]

[-- Attachment #1: Type: text/plain, Size: 832 bytes --]

Subject: [PATCH] fix build for xserver < 1.13

same procedure every few patches.....
---
  src/radeon_kms.c |    6 +++++-
  1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/radeon_kms.c b/src/radeon_kms.c
index a5943d1..ec099c9 100644
--- a/src/radeon_kms.c
+++ b/src/radeon_kms.c
@@ -360,7 +360,11 @@ static Bool 
RADEONCreateScreenResources_KMS(ScreenPtr pScre
en)
      radeon_glamor_create_screen_resources(pScreen);

      info->callback_event_type = -1;
-    if (!pScreen->isGPU && (damage_ext = CheckExtension("DAMAGE"))) {
+    if (
+#ifdef RADEON_PIXMAP_SHARING
+        !pScreen->isGPU &&
+#endif
+        (damage_ext = CheckExtension("DAMAGE"))) {
      info->callback_event_type = damage_ext->eventBase + XDamageNotify;

      if (!AddCallback(&FlushCallback, radeon_flush_callback, pScrn))
-- 
1.7.9.5


[-- Attachment #2: 0001-fix-build-for-xserver-1.13.patch --]
[-- Type: text/x-patch, Size: 1000 bytes --]

>From d3bf43ba5ca62dc2409b58cb4f79efe387bf891f Mon Sep 17 00:00:00 2001
From: Jochen Rollwagen <joro-2013-zqRNUXuvxA0b1SvskN2V4Q@public.gmane.org>
Date: Thu, 24 Nov 2016 18:44:01 +0100
Subject: [PATCH] fix build for xserver < 1.13

same procedure every few patches.....
---
 src/radeon_kms.c |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/radeon_kms.c b/src/radeon_kms.c
index a5943d1..ec099c9 100644
--- a/src/radeon_kms.c
+++ b/src/radeon_kms.c
@@ -360,7 +360,11 @@ static Bool RADEONCreateScreenResources_KMS(ScreenPtr pScreen)
 	radeon_glamor_create_screen_resources(pScreen);
 
     info->callback_event_type = -1;
-    if (!pScreen->isGPU && (damage_ext = CheckExtension("DAMAGE"))) {
+    if (
+#ifdef RADEON_PIXMAP_SHARING
+	    !pScreen->isGPU &&
+#endif    
+    	(damage_ext = CheckExtension("DAMAGE"))) {
 	info->callback_event_type = damage_ext->eventBase + XDamageNotify;
 
 	if (!AddCallback(&FlushCallback, radeon_flush_callback, pScrn))
-- 
1.7.9.5


[-- Attachment #3: Type: text/plain, Size: 154 bytes --]

_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx