diff --git a/src/compat-api.h b/src/compat-api.h
index 6d3262d0..caf9ab33 100644
--- a/src/compat-api.h
+++ b/src/compat-api.h
@@ -73,8 +73,6 @@ region_get_boxes(const RegionRec *r, const BoxRec **s, const BoxRec **e)
 #define ddPutImage_ARGS DrawablePtr draw, XvPortPtr port, GCPtr gc, INT16 src_x, INT16 src_y, CARD16 src_w, CARD16 src_h, INT16 drw_x, INT16 drw_y, CARD16 drw_w, CARD16 drw_h, XvImagePtr format, unsigned char *buf, Bool sync, CARD16 width, CARD16 height
 #define ddQueryImageAttributes_ARGS XvPortPtr port, XvImagePtr format, unsigned short *w, unsigned short *h, int *pitches, int *offsets
 
-#define isGPU(S) (S)->is_gpu
-
 #define PixmapSyncDirtyHelper(d, dd) PixmapSyncDirtyHelper(d)
 
 #define PixmapDirtyDst(d) ((d)->secondary_dst)
diff --git a/src/sna/sna_display.c b/src/sna/sna_display.c
index d664002f..cec5c4aa 100644
--- a/src/sna/sna_display.c
+++ b/src/sna/sna_display.c
@@ -2273,7 +2273,7 @@ void sna_copy_fbcon(struct sna *sna)
 	int dx, dy;
 	int i;
 
-	if (wedged(sna) || isGPU(sna->scrn))
+	if (wedged(sna) || (sna->scrn->is_gpu))
 		return;
 
 	DBG(("%s\n", __FUNCTION__));
@@ -2393,7 +2393,7 @@ static bool use_shadow(struct sna *sna, xf86CrtcPtr crtc)
 		return true;
 	}
 
-	if (!isGPU(sna->scrn)) {
+	if (!(sna->scrn->is_gpu)) {
 		struct sna_pixmap *priv;
 
 		priv = sna_pixmap_force_to_gpu(sna->front, MOVE_READ | __MOVE_SCANOUT);
@@ -5853,7 +5853,7 @@ static void copy_front(struct sna *sna, PixmapPtr old, PixmapPtr new)
 
 	DBG(("%s\n", __FUNCTION__));
 
-	if (wedged(sna) || isGPU(sna->scrn))
+	if (wedged(sna) || (sna->scrn->is_gpu))
 		return;
 
 	old_priv = sna_pixmap_force_to_gpu(old, MOVE_READ);
@@ -7833,7 +7833,7 @@ bool sna_mode_pre_init(ScrnInfoPtr scrn, struct sna *sna)
 	}
 
 	probe_capabilities(sna);
-	sna->mode.hidden = !isGPU(scrn); /* No DPMS passthrough */
+	sna->mode.hidden = !(scrn->is_gpu); /* No DPMS passthrough */
 
 	if (!xf86GetOptValInteger(sna->Options, OPTION_VIRTUAL, &num_fake))
 		num_fake = 1;