Rename drmmode_display to intel_display

And fixup all the drmmode_* functions to have an intel prefix and
categorise those into intel_mode, intel_crtc, intel_output and
intel_property so that the functions are a little more self-descriptive
and, more importantly, are consistent.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>

1 files changed, 4 insertions, 12 deletions

diff --git a/src/intel_driver.c b/src/intel_driver.c
index d09c4328..1ef16ed4 100644
--- a/src/intel_driver.c
+++ b/src/intel_driver.c
@@ -599,7 +599,7 @@ static Bool I830PreInit(ScrnInfoPtr scrn, int flags)
 		return FALSE;
 	}
 
-	if (!drmmode_pre_init(scrn, intel->drmSubFD, intel->cpp)) {
+	if (!intel_mode_pre_init(scrn, intel->drmSubFD, intel->cpp)) {
 		PreInitCleanup(scrn);
 		return FALSE;
 	}
@@ -762,7 +762,7 @@ Bool intel_crtc_on(xf86CrtcPtr crtc)
 	for (i = 0; i < xf86_config->num_output; i++) {
 		xf86OutputPtr output = xf86_config->output[i];
 		if (output->crtc == crtc &&
-		    drmmode_output_dpms_status(output) == DPMSModeOn)
+		    intel_output_dpms_status(output) == DPMSModeOn)
 			active_outputs++;
 	}
 
@@ -771,14 +771,6 @@ Bool intel_crtc_on(xf86CrtcPtr crtc)
 	return FALSE;
 }
 
-int intel_crtc_to_pipe(xf86CrtcPtr crtc)
-{
-	ScrnInfoPtr scrn = crtc->scrn;
-	intel_screen_private *intel = intel_get_screen_private(scrn);
-
-	return drmmode_get_pipe_from_crtc_id(intel->bufmgr, crtc);
-}
-
 static void
 intel_flush_callback(CallbackListPtr *list,
 		     pointer user_data, pointer call_data)
@@ -1042,7 +1034,7 @@ static void I830FreeScreen(int scrnIndex, int flags)
 	intel_screen_private *intel = intel_get_screen_private(scrn);
 
 	if (intel) {
-		drmmode_fini(intel);
+		intel_mode_fini(intel);
 		intel_close_drm_master(intel);
 		intel_bufmgr_fini(intel);
 
@@ -1122,7 +1114,7 @@ static Bool I830CloseScreen(int scrnIndex, ScreenPtr screen)
 
 	if (intel->front_buffer) {
 		intel_set_pixmap_bo(screen->GetScreenPixmap(screen), NULL);
-		drmmode_remove_fb(intel);
+		intel_mode_remove_fb(intel);
 		drm_intel_bo_unreference(intel->front_buffer);
 		intel->front_buffer = NULL;
 	}