src: move common_dri2_drawable_crtc()

Move common_dri2_drawable_crtc() to common_drm.c, renaaming it to
common_drm_drawable_covering_crtc().

Signed-off-by: Russell King <rmk@arm.linux.org.uk>

6 files changed, 27 insertions, 27 deletions

diff --git a/etnaviv/etnaviv_dri2.c b/etnaviv/etnaviv_dri2.c
index 3a53a36..f537b0c 100644
--- a/etnaviv/etnaviv_dri2.c
+++ b/etnaviv/etnaviv_dri2.c
@@ -206,7 +206,7 @@ static int etnaviv_dri2_ScheduleSwap(ClientPtr client, DrawablePtr draw,
 	xf86CrtcPtr crtc;
 	int ret;
 
-	crtc = common_dri2_drawable_crtc(draw);
+	crtc = common_drm_drawable_covering_crtc(draw);
 
 	/* Drawable not displayed... just complete */
 	if (!crtc)
diff --git a/src/common_drm.c b/src/common_drm.c
index ce503cc..44e8fc2 100644
--- a/src/common_drm.c
+++ b/src/common_drm.c
@@ -1320,6 +1320,27 @@ xf86CrtcPtr common_drm_covering_crtc(ScrnInfoPtr pScrn, BoxPtr box,
 	return best_crtc;
 }
 
+_X_EXPORT
+xf86CrtcPtr common_drm_drawable_covering_crtc(DrawablePtr pDraw)
+{
+	ScrnInfoPtr pScrn = xf86ScreenToScrn(pDraw->pScreen);
+	xf86CrtcPtr crtc;
+	BoxRec box, crtcbox;
+
+	box.x1 = pDraw->x;
+	box.y1 = pDraw->y;
+	box.x2 = box.x1 + pDraw->width;
+	box.y2 = box.y1 + pDraw->height;
+
+	crtc = common_drm_covering_crtc(pScrn, &box, NULL, &crtcbox);
+
+	/* Make sure the CRTC is valid and this is the real front buffer */
+	if (crtc && crtc->rotatedData)
+		crtc = NULL;
+
+	return crtc;
+}
+
 static inline uint32_t req_crtc(xf86CrtcPtr crtc)
 {
 	struct common_crtc_info *drmc = common_crtc(crtc);
diff --git a/src/common_drm_dri2.c b/src/common_drm_dri2.c
index 4065094..2c784d9 100644
--- a/src/common_drm_dri2.c
+++ b/src/common_drm_dri2.c
@@ -105,27 +105,6 @@ void common_dri2_wait_free(struct common_dri2_wait *wait)
 }
 
 _X_EXPORT
-xf86CrtcPtr common_dri2_drawable_crtc(DrawablePtr pDraw)
-{
-	ScrnInfoPtr pScrn = xf86ScreenToScrn(pDraw->pScreen);
-	xf86CrtcPtr crtc;
-	BoxRec box, crtcbox;
-
-	box.x1 = pDraw->x;
-	box.y1 = pDraw->y;
-	box.x2 = box.x1 + pDraw->width;
-	box.y2 = box.y1 + pDraw->height;
-
-	crtc = common_drm_covering_crtc(pScrn, &box, NULL, &crtcbox);
-
-	/* Make sure the CRTC is valid and this is the real front buffer */
-	if (crtc && crtc->rotatedData)
-		crtc = NULL;
-
-	return crtc;
-}
-
-_X_EXPORT
 Bool common_dri2_can_flip(DrawablePtr pDraw, struct common_dri2_wait *wait)
 {
 	ScrnInfoPtr pScrn = xf86ScreenToScrn(pDraw->pScreen);
@@ -267,7 +246,7 @@ _X_EXPORT
 int common_dri2_GetMSC(DrawablePtr draw, CARD64 *ust, CARD64 *msc)
 {
 	ScrnInfoPtr pScrn = xf86ScreenToScrn(draw->pScreen);
-	xf86CrtcPtr crtc = common_dri2_drawable_crtc(draw);
+	xf86CrtcPtr crtc = common_drm_drawable_covering_crtc(draw);
 	drmVBlank vbl;
 	int ret;
 
@@ -315,7 +294,7 @@ Bool common_dri2_ScheduleWaitMSC(ClientPtr client, DrawablePtr draw,
 	divisor &= 0xffffffff;
 	remainder &= 0xffffffff;
 
-	crtc = common_dri2_drawable_crtc(draw);
+	crtc = common_drm_drawable_covering_crtc(draw);
 	if (!crtc)
 		goto complete;
 
diff --git a/src/common_drm_dri2.h b/src/common_drm_dri2.h
index 941f020..3db84e0 100644
--- a/src/common_drm_dri2.h
+++ b/src/common_drm_dri2.h
@@ -71,8 +71,6 @@ static inline struct common_dri2_wait *common_dri2_wait_alloc(ClientPtr client,
 
 void common_dri2_wait_free(struct common_dri2_wait *wait);
 
-xf86CrtcPtr common_dri2_drawable_crtc(DrawablePtr pDraw);
-
 Bool common_dri2_can_flip(DrawablePtr pDraw, struct common_dri2_wait *wait);
 Bool common_dri2_may_flip(DrawablePtr pDraw, unsigned int attachment);
 
diff --git a/src/common_drm_helper.h b/src/common_drm_helper.h
index 53c3500..beaed5e 100644
--- a/src/common_drm_helper.h
+++ b/src/common_drm_helper.h
@@ -8,6 +8,8 @@
 xf86CrtcPtr common_drm_covering_crtc(ScrnInfoPtr pScrn, BoxPtr box,
 	xf86CrtcPtr desired, BoxPtr box_ret);
 
+xf86CrtcPtr common_drm_drawable_covering_crtc(DrawablePtr pDraw);
+
 int common_drm_vblank_get(ScrnInfoPtr pScrn, xf86CrtcPtr crtc,
 	drmVBlank *vbl, const char *func);
 
diff --git a/vivante/vivante_dri2.c b/vivante/vivante_dri2.c
index 8572799..661e183 100644
--- a/vivante/vivante_dri2.c
+++ b/vivante/vivante_dri2.c
@@ -211,7 +211,7 @@ vivante_dri2_ScheduleSwap(ClientPtr client, DrawablePtr draw,
 	CARD64 cur_msc;
 	int ret;
 
-	crtc = common_dri2_drawable_crtc(draw);
+	crtc = common_drm_drawable_covering_crtc(draw);
 
 	/* Drawable not displayed... just complete */
 	if (!crtc)