pkgsrc-Changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

CVS commit: pkgsrc/x11/xf86-video-ati



Module Name:    pkgsrc
Committed By:   hauke
Date:           Tue Jul 19 11:59:05 UTC 2022

Modified Files:
        pkgsrc/x11/xf86-video-ati: Makefile distinfo
        pkgsrc/x11/xf86-video-ati/patches: patch-src_radeon.h
Added Files:
        pkgsrc/x11/xf86-video-ati/patches: patch-src_drmmode__display.c
            patch-src_radeon__kms.c

Log Message:
Unbreak by adapting to upstream's Language Policing, where necessary:

master -> primary, slave -> secondary


To generate a diff of this commit:
cvs rdiff -u -r1.55 -r1.56 pkgsrc/x11/xf86-video-ati/Makefile
cvs rdiff -u -r1.41 -r1.42 pkgsrc/x11/xf86-video-ati/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/x11/xf86-video-ati/patches/patch-src_drmmode__display.c
cvs rdiff -u -r1.1 -r1.2 pkgsrc/x11/xf86-video-ati/patches/patch-src_radeon.h
cvs rdiff -u -r0 -r1.6 \
    pkgsrc/x11/xf86-video-ati/patches/patch-src_radeon__kms.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/x11/xf86-video-ati/Makefile
diff -u pkgsrc/x11/xf86-video-ati/Makefile:1.55 pkgsrc/x11/xf86-video-ati/Makefile:1.56
--- pkgsrc/x11/xf86-video-ati/Makefile:1.55     Sun Apr 10 08:53:20 2022
+++ pkgsrc/x11/xf86-video-ati/Makefile  Tue Jul 19 11:59:05 2022
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.55 2022/04/10 08:53:20 nia Exp $
+# $NetBSD: Makefile,v 1.56 2022/07/19 11:59:05 hauke Exp $
 
 DISTNAME=      xf86-video-ati-19.1.0
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    x11
 MASTER_SITES=  ${MASTER_SITE_XORG:=driver/}
 EXTRACT_SUFX=  .tar.bz2

Index: pkgsrc/x11/xf86-video-ati/distinfo
diff -u pkgsrc/x11/xf86-video-ati/distinfo:1.41 pkgsrc/x11/xf86-video-ati/distinfo:1.42
--- pkgsrc/x11/xf86-video-ati/distinfo:1.41     Tue Oct 26 11:34:41 2021
+++ pkgsrc/x11/xf86-video-ati/distinfo  Tue Jul 19 11:59:05 2022
@@ -1,7 +1,9 @@
-$NetBSD: distinfo,v 1.41 2021/10/26 11:34:41 nia Exp $
+$NetBSD: distinfo,v 1.42 2022/07/19 11:59:05 hauke Exp $
 
 BLAKE2s (xf86-video-ati-19.1.0.tar.bz2) = 07180b71f7a5bb49dfb06a3c763120607799603ae82a79d90fd7733c45e3d8f3
 SHA512 (xf86-video-ati-19.1.0.tar.bz2) = 73a81f6c492daf2e89067fb52b3033dc0fe6841f109627ddca1aee54a45a738c8c134443753a2a2aaa2c131e1d560057ebc76351ff2304c16407df3ff568fcd6
 Size (xf86-video-ati-19.1.0.tar.bz2) = 904558 bytes
 SHA1 (patch-configure) = bdd1014b215af69c2bb837d36829e12e86eb5764
-SHA1 (patch-src_radeon.h) = f51b077af01a111269ecb2d86b9eac45e0ba6853
+SHA1 (patch-src_drmmode__display.c) = 70f9271286f9190f79815dd0643ad6bac78b4d66
+SHA1 (patch-src_radeon.h) = d3921c60f64e3e74633b8e7b6623eece6b0c64c5
+SHA1 (patch-src_radeon__kms.c) = 8179d6adf5fcce312c9b930a81b4b69d2931fe8f

Index: pkgsrc/x11/xf86-video-ati/patches/patch-src_radeon.h
diff -u pkgsrc/x11/xf86-video-ati/patches/patch-src_radeon.h:1.1 pkgsrc/x11/xf86-video-ati/patches/patch-src_radeon.h:1.2
--- pkgsrc/x11/xf86-video-ati/patches/patch-src_radeon.h:1.1    Sun Mar  8 18:30:54 2020
+++ pkgsrc/x11/xf86-video-ati/patches/patch-src_radeon.h        Tue Jul 19 11:59:05 2022
@@ -1,7 +1,9 @@
-$NetBSD: patch-src_radeon.h,v 1.1 2020/03/08 18:30:54 maya Exp $
+$NetBSD: patch-src_radeon.h,v 1.2 2022/07/19 11:59:05 hauke Exp $
 
 Backport upstream commits to fix crash with options NoAccel
 
+Upstream interface change: slave -> secondary, master -> primary
+
 From 4d84cf438e7f1bebf0053035ef0292e9fed257d1 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michel=20D=C3=A4nzer?= <mdaenzer%redhat.com@localhost>
 Date: Fri, 29 Nov 2019 16:37:32 +0100
@@ -14,6 +16,26 @@ Subject: Don't crash X server if GPU acc
 
 --- src/radeon.h.orig  2019-10-15 16:16:29.000000000 +0000
 +++ src/radeon.h
+@@ -184,8 +184,8 @@ typedef enum {
+ static inline ScreenPtr
+ radeon_master_screen(ScreenPtr screen)
+ {
+-    if (screen->current_master)
+-      return screen->current_master;
++    if (screen->current_primary)
++      return screen->current_primary;
+ 
+     return screen;
+ }
+@@ -193,7 +193,7 @@ radeon_master_screen(ScreenPtr screen)
+ static inline ScreenPtr
+ radeon_dirty_master(PixmapDirtyUpdatePtr dirty)
+ {
+-    return radeon_master_screen(dirty->slave_dst->drawable.pScreen);
++    return radeon_master_screen(dirty->secondary_dst->drawable.pScreen);
+ }
+ 
+ static inline DrawablePtr
 @@ -790,8 +790,8 @@ static inline Bool radeon_set_pixmap_bo(
  
  static inline struct radeon_buffer *radeon_get_pixmap_bo(PixmapPtr pPix)

Added files:

Index: pkgsrc/x11/xf86-video-ati/patches/patch-src_drmmode__display.c
diff -u /dev/null pkgsrc/x11/xf86-video-ati/patches/patch-src_drmmode__display.c:1.1
--- /dev/null   Tue Jul 19 11:59:05 2022
+++ pkgsrc/x11/xf86-video-ati/patches/patch-src_drmmode__display.c      Tue Jul 19 11:59:05 2022
@@ -0,0 +1,24 @@
+$NetBSD: patch-src_drmmode__display.c,v 1.1 2022/07/19 11:59:05 hauke Exp $
+
+Upstream interface change: slave -> secondary
+
+--- src/drmmode_display.c.orig 2019-10-15 16:16:29.000000000 +0000
++++ src/drmmode_display.c
+@@ -720,7 +720,7 @@ drmmode_crtc_prime_scanout_update(xf86Cr
+               xorg_list_for_each_entry(dirty, &screen->pixmap_dirty_list,
+                                        ent) {
+                       if (radeon_dirty_src_equals(dirty, drmmode_crtc->prime_scanout_pixmap)) {
+-                              dirty->slave_dst =
++                              dirty->secondary_dst =
+                                       drmmode_crtc->scanout[scanout_id].pixmap;
+                               break;
+                       }
+@@ -1356,7 +1356,7 @@ drmmode_set_scanout_pixmap(xf86CrtcPtr c
+ 
+       xorg_list_for_each_entry(dirty, &screen->pixmap_dirty_list, ent) {
+               if (radeon_dirty_src_equals(dirty, drmmode_crtc->prime_scanout_pixmap)) {
+-                      PixmapStopDirtyTracking(dirty->src, dirty->slave_dst);
++                      PixmapStopDirtyTracking(dirty->src, dirty->secondary_dst);
+                       break;
+               }
+       }

Index: pkgsrc/x11/xf86-video-ati/patches/patch-src_radeon__kms.c
diff -u /dev/null pkgsrc/x11/xf86-video-ati/patches/patch-src_radeon__kms.c:1.6
--- /dev/null   Tue Jul 19 11:59:05 2022
+++ pkgsrc/x11/xf86-video-ati/patches/patch-src_radeon__kms.c   Tue Jul 19 11:59:05 2022
@@ -0,0 +1,120 @@
+$NetBSD: patch-src_radeon__kms.c,v 1.6 2022/07/19 11:59:05 hauke Exp $
+
+Upstream interface change: slave -> secondary
+
+--- src/radeon_kms.c.orig      2019-10-15 16:16:29.000000000 +0000
++++ src/radeon_kms.c
+@@ -559,8 +559,8 @@ dirty_region(PixmapDirtyUpdatePtr dirty)
+       if (dirty->rotation != RR_Rotate_0) {
+               dstregion = transform_region(damageregion,
+                                            &dirty->f_inverse,
+-                                           dirty->slave_dst->drawable.width,
+-                                           dirty->slave_dst->drawable.height);
++                                           dirty->secondary_dst->drawable.width,
++                                           dirty->secondary_dst->drawable.height);
+       } else
+ #endif
+       {
+@@ -568,7 +568,7 @@ dirty_region(PixmapDirtyUpdatePtr dirty)
+ 
+           dstregion = RegionDuplicate(damageregion);
+           RegionTranslate(dstregion, -dirty->x, -dirty->y);
+-          PixmapRegionInit(&pixregion, dirty->slave_dst);
++          PixmapRegionInit(&pixregion, dirty->secondary_dst);
+           RegionIntersect(dstregion, dstregion, &pixregion);
+           RegionUninit(&pixregion);
+       }
+@@ -585,8 +585,8 @@ redisplay_dirty(PixmapDirtyUpdatePtr dir
+       if (RegionNil(region))
+               goto out;
+ 
+-      if (dirty->slave_dst->master_pixmap)
+-          DamageRegionAppend(&dirty->slave_dst->drawable, region);
++      if (dirty->secondary_dst->primary_pixmap)
++          DamageRegionAppend(&dirty->secondary_dst->drawable, region);
+ 
+ #ifdef HAS_DIRTYTRACKING_ROTATION
+       PixmapSyncDirtyHelper(dirty);
+@@ -595,8 +595,8 @@ redisplay_dirty(PixmapDirtyUpdatePtr dir
+ #endif
+ 
+       radeon_cs_flush_indirect(src_scrn);
+-      if (dirty->slave_dst->master_pixmap)
+-          DamageRegionProcessPending(&dirty->slave_dst->drawable);
++      if (dirty->secondary_dst->primary_pixmap)
++          DamageRegionProcessPending(&dirty->secondary_dst->drawable);
+ 
+ out:
+       DamageEmpty(dirty->damage);
+@@ -618,7 +618,7 @@ radeon_sync_shared_pixmap(PixmapDirtyUpd
+     RegionPtr region;
+ 
+     xorg_list_for_each_entry(ent, &master_screen->pixmap_dirty_list, ent) {
+-      if (!radeon_dirty_src_equals(dirty, ent->slave_dst))
++      if (!radeon_dirty_src_equals(dirty, ent->secondary_dst))
+           continue;
+ 
+       region = dirty_region(ent);
+@@ -641,7 +641,7 @@ master_has_sync_shared_pixmap(ScrnInfoPt
+ static Bool
+ slave_has_sync_shared_pixmap(ScrnInfoPtr scrn, PixmapDirtyUpdatePtr dirty)
+ {
+-    ScreenPtr slave_screen = dirty->slave_dst->drawable.pScreen;
++    ScreenPtr slave_screen = dirty->secondary_dst->drawable.pScreen;
+ 
+     return !!slave_screen->SyncSharedPixmap;
+ }
+@@ -667,7 +667,7 @@ master_has_sync_shared_pixmap(ScrnInfoPt
+ static Bool
+ slave_has_sync_shared_pixmap(ScrnInfoPtr scrn, PixmapDirtyUpdatePtr dirty)
+ {
+-    ScrnInfoPtr slave_scrn = xf86ScreenToScrn(dirty->slave_dst->drawable.pScreen);
++    ScrnInfoPtr slave_scrn = xf86ScreenToScrn(dirty->secondary_dst->drawable.pScreen);
+ 
+     return slave_scrn->driverName == scrn->driverName;
+ }
+@@ -684,7 +684,7 @@ call_sync_shared_pixmap(PixmapDirtyUpdat
+ static xf86CrtcPtr
+ radeon_prime_dirty_to_crtc(PixmapDirtyUpdatePtr dirty)
+ {
+-    ScreenPtr screen = dirty->slave_dst->drawable.pScreen;
++    ScreenPtr screen = dirty->secondary_dst->drawable.pScreen;
+     ScrnInfoPtr scrn = xf86ScreenToScrn(screen);
+     xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
+     int c;
+@@ -727,7 +727,7 @@ radeon_prime_scanout_do_update(xf86CrtcP
+               radeon_cs_flush_indirect(scrn);
+               RegionCopy(&drmmode_crtc->scanout_last_region, region);
+               RegionTranslate(region, -crtc->x, -crtc->y);
+-              dirty->slave_dst = drmmode_crtc->scanout[scanout_id].pixmap;
++              dirty->secondary_dst = drmmode_crtc->scanout[scanout_id].pixmap;
+           }
+ 
+           redisplay_dirty(dirty, region);
+@@ -754,7 +754,7 @@ radeon_prime_scanout_update_handler(xf86
+ static void
+ radeon_prime_scanout_update(PixmapDirtyUpdatePtr dirty)
+ {
+-    ScreenPtr screen = dirty->slave_dst->drawable.pScreen;
++    ScreenPtr screen = dirty->secondary_dst->drawable.pScreen;
+     ScrnInfoPtr scrn = xf86ScreenToScrn(screen);
+     RADEONEntPtr pRADEONEnt = RADEONEntPriv(scrn);
+     xf86CrtcPtr xf86_crtc = radeon_prime_dirty_to_crtc(dirty);
+@@ -818,7 +818,7 @@ radeon_prime_scanout_update(PixmapDirtyU
+ static void
+ radeon_prime_scanout_flip(PixmapDirtyUpdatePtr ent)
+ {
+-    ScreenPtr screen = ent->slave_dst->drawable.pScreen;
++    ScreenPtr screen = ent->secondary_dst->drawable.pScreen;
+     ScrnInfoPtr scrn = xf86ScreenToScrn(screen);
+     RADEONEntPtr pRADEONEnt = RADEONEntPriv(scrn);
+     xf86CrtcPtr crtc = radeon_prime_dirty_to_crtc(ent);
+@@ -897,7 +897,7 @@ radeon_dirty_update(ScrnInfoPtr scrn)
+                               ScreenPtr master_screen = radeon_dirty_master(ent);
+ 
+                               xorg_list_for_each_entry(region_ent, &master_screen->pixmap_dirty_list, ent) {
+-                                      if (radeon_dirty_src_equals(ent, region_ent->slave_dst))
++                                      if (radeon_dirty_src_equals(ent, region_ent->secondary_dst))
+                                               break;
+                               }
+                       }



Home | Main Index | Thread Index | Old Index