[Git][xorg-team/driver/xserver-xorg-video-ati][debian-unstable] 7 commits: Fix link failure with gcc 10

Julien Cristau pushed to branch debian-unstable at X Strike Force / driver / xserver-xorg-video-ati

Commits:

f223035f

by Adam Jackson at 2020-02-05T11:39:53-05:00

Fix link failure with gcc 10

Without the 'extern' this looks like a definition not just a
declaration, in every file that includes the header. gcc 10 is stricter
about this kind of multiple definition.

Reviewed-by: Michel Dänzer <mdaenzer@redhat.com>

4d84cf43

by Michel Dänzer at 2020-02-10T15:53:48+00:00

Handle NULL fb_ptr in pixmap_get_fb

This can happen when HW acceleration is disabled.

Fixes https://gitlab.freedesktop.org/xorg/driver/xf86-video-ati/issues/188

c0eb5dbd

by Alexey Sheplyakov at 2020-02-10T15:55:37+00:00

Don't crash X server if GPU acceleration is not available

Commit d1d8e3c8d0a0a0394d395eba171460501745209b causes X server
to fail on startup when GPU acceleration is not working (or is
disabled). The reason is that `radeon_get_pixmap_bo` function
gets called too early (before EXA has been initialized) and
fails with an assert:

 #0  __GI_raise (sig=<optimized out>) at ../sysdeps/unix/sysv/linux/raise.c:50
 #1  0x76ab1c6c in __GI_abort () at abort.c:79
 #2  0x76ac0b64 in __assert_fail_base (fmt=0x76bfbce4 "%s%s%s:%u: %s%sAssertion `%s' failed.\n%n", assertion=0x7658c80c "key->initialized", file=<optimized out>, line=121,
     function=0x7658d040 <__PRETTY_FUNCTION__.10607> "dixGetPrivateAddr") at assert.c:92
 #3  0x76ac0c0c in __GI___assert_fail (assertion=0x7658c80c "key->initialized", file=0x7658c9d0 "../include/privates.h", line=121,
     function=0x7658d040 <__PRETTY_FUNCTION__.10607> "dixGetPrivateAddr") at assert.c:101
 #4  0x76579e6c in dixGetPrivateAddr (key=<optimized out>, key=<optimized out>, privates=<optimized out>) at ../include/privates.h:121
 #5  0x7657a954 in dixGetPrivateAddr (key=<optimized out>, key=<optimized out>, privates=<optimized out>) at exa.c:70
 #6  dixGetPrivate (key=<optimized out>, privates=<optimized out>) at ../include/privates.h:136
 #7  exaGetPixmapDriverPrivate (pPix=<optimized out>) at exa.c:68
 #8  0x7623d460 in radeon_get_pixmap_bo (pPix=0x71c1b8) at radeon.h:804
 #9  radeon_get_pixmap_handle (pixmap=0x71c1b8, handle=0x7fa22328) at radeon_bo_helper.c:357
 #10 0x76244458 in radeon_pixmap_get_fb (pix=0x71c1b8) at radeon.h:886
 #11 drmmode_set_mode_major (crtc=0x691860, mode=0x69191c, rotation=<optimized out>, x=<optimized out>, y=<optimized out>) at drmmode_display.c:918
 #12 0x762467e8 in drmmode_set_desired_modes (pScrn=0x67c678, drmmode=<optimized out>, set_hw=1) at drmmode_display.c:3128
 #13 0x0047bfa4 in MapWindow (client=0x669ec8, pWin=0x7206c0) at window.c:2722
 #14 MapWindow (pWin=0x7206c0, client=0x669ec8) at window.c:2665
 #15 0x00449650 in dix_main (argc=3, argv=0x7fa22604, envp=<optimized out>) at main.c:247
 #16 0x76ab2198 in __libc_start_main (main=0x42db10 <main>, argc=3, argv=0x7fa22604, init=<optimized out>, fini=0x606434 <__libc_csu_fini>, rtld_fini=0x77229930 <_dl_fini>,
     stack_end=0x7fa225e0) at libc-start.c:308
 #17 0x0042db80 in __start () at ../sysdeps/mips/start.S:110

Don't call `exaGetPixmapDriverPrivate` if the acceleration (EXA) is not
enabled [yet] to avoid the problem.

Closes: https://gitlab.freedesktop.org/xorg/driver/xf86-video-ati/issues/188
Closes: https://bugzilla.altlinux.org/show_bug.cgi?id=37539

38453924

by Niclas Zeising at 2020-04-14T18:53:26+02:00

Fix return value check of drmIoctl()

When the drmModeSetCursor2() call was replaced with bare drmIoctl() call in
92df7097, a bug was introduced.  With the use of drmModeSetCursor2(),
the return value from drmIoctl() (which calls ioctl()) were mangled, if
they were negative, they were replaced by -errno by a wrapper function
in xf86drMode.c in libdrm.  After replacing drmModeSetCursor2() with the
call to drmIoctl(), this mangling no longer happens, and we need to
explicitly check if the call to drmIoctl() fails, which is indicated by
returning -1, and then why it failed, by checking errno.
If the error indicated by errno is EINVAL, then we can't use the
DRM_IOCTL_MODE_CURSOR2 ioctl(), and need to fall back to the
DRM_IOCTL_MODE_CURSOR ioctl().

This bug can manifest itself by an invisible hw cursor on systems where the
DRM_IOCTL_MODE_CURSOR2 is not implemented by the graphics driver.

Credit also to Alexey Dokuchaev for help with developing the fix and
testing.

This fixes #190

Signed-off-by: Niclas Zeising <zeising@daemonic.se>
Reviewed-by: Michel Dänzer <mdaenzer@redhat.com>

8da3e456

by Dave Airlie at 2020-07-13T09:16:47+10:00

ati: cleanup terminology to use primary/secondary

The X server changed some API/ABIs here.

Based on amdgpu patch by Michel

b72fc967

by Julien Cristau at 2020-09-18T14:17:27+02:00

Merge branch 'master' of https://gitlab.freedesktop.org/xorg/driver/xf86-video-ati into debian-unstable

f0be7172
by Julien Cristau at 2020-09-18T14:58:16+02:00
```
Upload to unstable
```

Changes:

debian/changelog

 -xserver-xorg-video-ati (1:19.1.0-2) UNRELEASED; urgency=medium
 +xserver-xorg-video-ati (1:19.1.0-2) unstable; urgency=medium
 +  * Team upload
++
 +  [ Debian Janitor ]
    * Trim trailing whitespace.
    * Bump debhelper from old 11 to 12.
    * Set debhelper-compat version in Build-Depends.
    * Set upstream metadata fields: Repository, Repository-Browse.
    * Update standards version to 4.2.1, no changes needed.
 - -- Debian Janitor <janitor@jelmer.uk>  Wed, 18 Dec 2019 19:12:09 +0000
 +  [ Julien Cristau ]
 +  * Pull fixes from upstream master including a GCC 10 build fix
 +    (closes: #957998).
++
 + -- Julien Cristau <jcristau@debian.org>  Fri, 18 Sep 2020 14:58:08 +0200
  xserver-xorg-video-ati (1:19.1.0-1) unstable; urgency=medium

man/radeon.man

@@ -290,7 +290,7 @@ on. If this option is set, the default value of the property is 'on' or 'off'
  accordingly. If this option isn't set, the default value of the property is
  .B auto,
  which means that TearFree is on for rotated outputs, outputs with RandR
 -transforms applied and for RandR 1.4 slave outputs, otherwise off.
 +transforms applied and for RandR 1.4 secondary outputs, otherwise off.
  .TP
  .BI "Option \*qAccelMethod\*q \*q" "string" \*q
  Chooses between available acceleration architectures.  Valid values are

src/compat-api.h

@@ -34,4 +34,10 @@
  #define BLOCKHANDLER_ARGS pScreen, pTimeout, pReadmask
  #endif
 +#if ABI_VIDEODRV_VERSION < SET_ABI_VERSION(25, 2)
 +#define current_primary current_master
 +#define primary_pixmap master_pixmap
 +#define secondary_dst slave_dst
 +#endif
++
  #endif

src/drmmode_display.c

@@ -720,7 +720,7 @@ drmmode_crtc_prime_scanout_update(xf86CrtcPtr crtc, DisplayModePtr mode,
  		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;
+ 			}
@@ -1275,7 +1275,7 @@ drmmode_show_cursor (xf86CrtcPtr crtc)
  	    arg.hot_y = yhot;
  	    ret = drmIoctl(pRADEONEnt->fd, DRM_IOCTL_MODE_CURSOR2, &arg);
 -	    if (ret == -EINVAL)
 +	    if (ret == -1 && errno == EINVAL)
  		use_set_cursor2 = FALSE;
  	    else
  		return;
@@ -1356,7 +1356,7 @@ drmmode_set_scanout_pixmap(xf86CrtcPtr crtc, PixmapPtr ppix)
  	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;
+ 		}
+ 	}

src/drmmode_display.h

@@ -262,7 +262,7 @@ Bool drmmode_wait_vblank(xf86CrtcPtr crtc, drmVBlankSeqType type,
  			 uint64_t *ust, uint32_t *result_seq);
 -miPointerSpriteFuncRec drmmode_sprite_funcs;
 +extern miPointerSpriteFuncRec drmmode_sprite_funcs;
  #endif

src/evergreen_state.h

@@ -350,7 +350,7 @@ extern void *RADEONEXACreatePixmap2(ScreenPtr pScreen, int width, int height,
  				    int *new_pitch);
  extern void RADEONEXADestroyPixmap(ScreenPtr pScreen, void *driverPriv);
  extern Bool RADEONEXAPixmapIsOffscreen(PixmapPtr pPix);
 -extern Bool RADEONEXASharePixmapBacking(PixmapPtr ppix, ScreenPtr slave, void **handle_p);
 +extern Bool RADEONEXASharePixmapBacking(PixmapPtr ppix, ScreenPtr secondary, void **handle_p);
  extern Bool RADEONEXASetSharedPixmapBacking(PixmapPtr ppix, void *handle);
  #endif

src/r600_state.h

@@ -321,6 +321,6 @@ extern void *RADEONEXACreatePixmap2(ScreenPtr pScreen, int width, int height,
  				    int *new_pitch);
  extern void RADEONEXADestroyPixmap(ScreenPtr pScreen, void *driverPriv);
  extern Bool RADEONEXAPixmapIsOffscreen(PixmapPtr pPix);
 -extern Bool RADEONEXASharePixmapBacking(PixmapPtr ppix, ScreenPtr slave, void **handle_p);
 +extern Bool RADEONEXASharePixmapBacking(PixmapPtr ppix, ScreenPtr secondary, void **handle_p);
  extern Bool RADEONEXASetSharedPixmapBacking(PixmapPtr ppix, void *handle);
  #endif

src/radeon.h

@@ -182,18 +182,18 @@ typedef enum {
  static inline ScreenPtr
 -radeon_master_screen(ScreenPtr screen)
 +radeon_primary_screen(ScreenPtr screen)
+ {
 -    if (screen->current_master)
 -	return screen->current_master;
 +    if (screen->current_primary)
 +	return screen->current_primary;
      return screen;
+ }
  static inline ScreenPtr
 -radeon_dirty_master(PixmapDirtyUpdatePtr dirty)
 +radeon_dirty_primary(PixmapDirtyUpdatePtr dirty)
+ {
 -    return radeon_master_screen(dirty->slave_dst->drawable.pScreen);
 +    return radeon_primary_screen(dirty->secondary_dst->drawable.pScreen);
+ }
  static inline DrawablePtr
@@ -790,8 +790,8 @@ static inline Bool radeon_set_pixmap_bo(PixmapPtr pPix, struct radeon_buffer *bo
  static inline struct radeon_buffer *radeon_get_pixmap_bo(PixmapPtr pPix)
+ {
 -#ifdef USE_GLAMOR
      RADEONInfoPtr info = RADEONPTR(xf86ScreenToScrn(pPix->drawable.pScreen));
 +#ifdef USE_GLAMOR
      if (info->use_glamor) {
  	struct radeon_pixmap *priv;
@@ -799,7 +799,7 @@ static inline struct radeon_buffer *radeon_get_pixmap_bo(PixmapPtr pPix)
  	return priv ? priv->bo : NULL;
      } else
  #endif
 -    {
 +    if (info->accelOn) {
  	struct radeon_exa_pixmap_priv *driver_priv;
  	driver_priv = exaGetPixmapDriverPrivate(pPix);
  	return driver_priv ? driver_priv->bo : NULL;
@@ -896,7 +896,7 @@ radeon_pixmap_get_fb(PixmapPtr pix)
  				   handle);
+     }
 -    return *fb_ptr;
 +    return fb_ptr ? *fb_ptr : NULL;
+ }

src/radeon_exa.c


     free(driverPriv);
 }
 
-Bool RADEONEXASharePixmapBacking(PixmapPtr ppix, ScreenPtr slave, void **fd_handle)
+Bool RADEONEXASharePixmapBacking(PixmapPtr ppix, ScreenPtr seconndary, void **fd_handle)
 {
     struct radeon_exa_pixmap_priv *driver_priv = exaGetPixmapDriverPrivate(ppix);
 

src/radeon_glamor.c

@@ -366,7 +366,7 @@ radeon_glamor_set_pixmap_bo(DrawablePtr drawable, PixmapPtr pixmap)
  static Bool
 -radeon_glamor_share_pixmap_backing(PixmapPtr pixmap, ScreenPtr slave,
 +radeon_glamor_share_pixmap_backing(PixmapPtr pixmap, ScreenPtr secondary,
  				   void **handle_p)
+ {
  	ScreenPtr screen = pixmap->drawable.pScreen;

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 dirty, RegionPtr region)
  	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 dirty, RegionPtr region)
  #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);
@@ -613,12 +613,12 @@ radeon_prime_scanout_update_abort(xf86CrtcPtr crtc, void *event_data)
  void
  radeon_sync_shared_pixmap(PixmapDirtyUpdatePtr dirty)
+ {
 -    ScreenPtr master_screen = radeon_dirty_master(dirty);
 +    ScreenPtr primary_screen = radeon_dirty_primary(dirty);
      PixmapDirtyUpdatePtr ent;
      RegionPtr region;
 -    xorg_list_for_each_entry(ent, &master_screen->pixmap_dirty_list, ent) {
 -	if (!radeon_dirty_src_equals(dirty, ent->slave_dst))
 +    xorg_list_for_each_entry(ent, &primary_screen->pixmap_dirty_list, ent) {
 +	if (!radeon_dirty_src_equals(dirty, ent->secondary_dst))
  	    continue;
  	region = dirty_region(ent);
@@ -631,45 +631,45 @@ radeon_sync_shared_pixmap(PixmapDirtyUpdatePtr dirty)
  #if HAS_SYNC_SHARED_PIXMAP
  static Bool
 -master_has_sync_shared_pixmap(ScrnInfoPtr scrn, PixmapDirtyUpdatePtr dirty)
 +primary_has_sync_shared_pixmap(ScrnInfoPtr scrn, PixmapDirtyUpdatePtr dirty)
+ {
 -    ScreenPtr master_screen = radeon_dirty_master(dirty);
 +    ScreenPtr primary_screen = radeon_dirty_primary(dirty);
 -    return !!master_screen->SyncSharedPixmap;
 +    return !!primary_screen->SyncSharedPixmap;
+ }
  static Bool
 -slave_has_sync_shared_pixmap(ScrnInfoPtr scrn, PixmapDirtyUpdatePtr dirty)
 +secondary_has_sync_shared_pixmap(ScrnInfoPtr scrn, PixmapDirtyUpdatePtr dirty)
+ {
 -    ScreenPtr slave_screen = dirty->slave_dst->drawable.pScreen;
 +    ScreenPtr secondary_screen = dirty->secondary_dst->drawable.pScreen;
 -    return !!slave_screen->SyncSharedPixmap;
 +    return !!secondary_screen->SyncSharedPixmap;
+ }
  static void
  call_sync_shared_pixmap(PixmapDirtyUpdatePtr dirty)
+ {
 -    ScreenPtr master_screen = radeon_dirty_master(dirty);
 +    ScreenPtr primary_screen = radeon_dirty_primary(dirty);
 -    master_screen->SyncSharedPixmap(dirty);
 +    primary_screen->SyncSharedPixmap(dirty);
+ }
  #else /* !HAS_SYNC_SHARED_PIXMAP */
  static Bool
 -master_has_sync_shared_pixmap(ScrnInfoPtr scrn, PixmapDirtyUpdatePtr dirty)
 +primary_has_sync_shared_pixmap(ScrnInfoPtr scrn, PixmapDirtyUpdatePtr dirty)
+ {
 -    ScrnInfoPtr master_scrn = xf86ScreenToScrn(radeon_dirty_master(dirty));
 +    ScrnInfoPtr primary_scrn = xf86ScreenToScrn(radeon_dirty_primary(dirty));
 -    return master_scrn->driverName == scrn->driverName;
 +    return primary_scrn->driverName == scrn->driverName;
+ }
  static Bool
 -slave_has_sync_shared_pixmap(ScrnInfoPtr scrn, PixmapDirtyUpdatePtr dirty)
 +secondary_has_sync_shared_pixmap(ScrnInfoPtr scrn, PixmapDirtyUpdatePtr dirty)
+ {
 -    ScrnInfoPtr slave_scrn = xf86ScreenToScrn(dirty->slave_dst->drawable.pScreen);
 +    ScrnInfoPtr secondary_scrn = xf86ScreenToScrn(dirty->secondary_dst->drawable.pScreen);
 -    return slave_scrn->driverName == scrn->driverName;
 +    return secondary_scrn->driverName == scrn->driverName;
+ }
  static void
@@ -684,12 +684,12 @@ call_sync_shared_pixmap(PixmapDirtyUpdatePtr dirty)
  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;
 -    /* Find the CRTC which is scanning out from this slave pixmap */
 +    /* Find the CRTC which is scanning out from this secondary pixmap */
      for (c = 0; c < xf86_config->num_crtc; c++) {
  	xf86CrtcPtr xf86_crtc = xf86_config->crtc[c];
  	drmmode_crtc_private_ptr drmmode_crtc = xf86_crtc->driver_private;
@@ -714,7 +714,7 @@ radeon_prime_scanout_do_update(xf86CrtcPtr crtc, unsigned scanout_id)
  	if (radeon_dirty_src_equals(dirty, drmmode_crtc->prime_scanout_pixmap)) {
  	    RegionPtr region;
 -	    if (master_has_sync_shared_pixmap(scrn, dirty))
 +	    if (primary_has_sync_shared_pixmap(scrn, dirty))
  		call_sync_shared_pixmap(dirty);
  	    region = dirty_region(dirty);
@@ -727,7 +727,7 @@ radeon_prime_scanout_do_update(xf86CrtcPtr crtc, unsigned scanout_id)
  		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(xf86CrtcPtr crtc, uint32_t frame, uint64_t u
  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(PixmapDirtyUpdatePtr dirty)
  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);
@@ -893,11 +893,11 @@ radeon_dirty_update(ScrnInfoPtr scrn)
  		if (screen->isGPU) {
  			PixmapDirtyUpdatePtr region_ent = ent;
 -			if (master_has_sync_shared_pixmap(scrn, ent)) {
 -				ScreenPtr master_screen = radeon_dirty_master(ent);
 +			if (primary_has_sync_shared_pixmap(scrn, ent)) {
 +				ScreenPtr primary_screen = radeon_dirty_primary(ent);
 -				xorg_list_for_each_entry(region_ent, &master_screen->pixmap_dirty_list, ent) {
 -					if (radeon_dirty_src_equals(ent, region_ent->slave_dst))
 +				xorg_list_for_each_entry(region_ent, &primary_screen->pixmap_dirty_list, ent) {
 +					if (radeon_dirty_src_equals(ent, region_ent->secondary_dst))
  						break;
+ 				}
+ 			}
@@ -921,7 +921,7 @@ radeon_dirty_update(ScrnInfoPtr scrn)
  			RegionDestroy(region);
  		} else {
 -			if (slave_has_sync_shared_pixmap(scrn, ent))
 +			if (secondary_has_sync_shared_pixmap(scrn, ent))
  				continue;
  			region = dirty_region(ent);
@@ -1216,7 +1216,7 @@ static void RADEONBlockHandler_KMS(BLOCKHANDLER_ARGS_DECL)
      (*pScreen->BlockHandler) (BLOCKHANDLER_ARGS);
      pScreen->BlockHandler = RADEONBlockHandler_KMS;
 -    if (!xf86ScreenToScrn(radeon_master_screen(pScreen))->vtSema)
 +    if (!xf86ScreenToScrn(radeon_primary_screen(pScreen))->vtSema)
  	return;
      if (!pScreen->isGPU)
@@ -2584,7 +2584,7 @@ CARD32 cleanup_black_fb(OsTimerPtr timer, CARD32 now, pointer data)
      xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
      int c;
 -    if (xf86ScreenToScrn(radeon_master_screen(screen))->vtSema)
 +    if (xf86ScreenToScrn(radeon_primary_screen(screen))->vtSema)
  	return 0;
      /* Unreference the all-black FB created by RADEONLeaveVT_KMS. After

...	...	@@ -282,7 +282,7 @@ void RADEONEXADestroyPixmap(ScreenPtr pScreen, void *driverPriv)
282	282	free(driverPriv);
283	283	}
284	284
285		-Bool RADEONEXASharePixmapBacking(PixmapPtr ppix, ScreenPtr slave, void **fd_handle)
	285	+Bool RADEONEXASharePixmapBacking(PixmapPtr ppix, ScreenPtr seconndary, void **fd_handle)
286	286	{
287	287	struct radeon_exa_pixmap_priv *driver_priv = exaGetPixmapDriverPrivate(ppix);
288	288