xf86-video-intel: src/sna/sna_display.c src/sna/sna_display_fake.c

[Chris Wilson]

 src/sna/sna_display.c      |    8 ++++----
 src/sna/sna_display_fake.c |    8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

New commits:
commit 1b8fc8715598e7bf756ccfa99a6da59bab48c2a0
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Thu Mar 7 10:12:14 2013 +0000

    sna: Disambiguate sna_crtc_resize()
    
    sna_crtc_resize() operates upon the whole configuration rather than a
    single crtc like the other sna_crtc_* so rename it to make it distinct.
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/sna/sna_display.c b/src/sna/sna_display.c
index be6c61d..710d783 100644
--- a/src/sna/sna_display.c
+++ b/src/sna/sna_display.c
@@ -2462,7 +2462,7 @@ migrate_dirty_tracking(struct sna *sna, PixmapPtr old_front)
 }
 
 static Bool
-sna_crtc_resize(ScrnInfoPtr scrn, int width, int height)
+sna_mode_resize(ScrnInfoPtr scrn, int width, int height)
 {
 	xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
 	struct sna *sna = to_sna(scrn);
@@ -2630,8 +2630,8 @@ sna_page_flip(struct sna *sna,
 	return count;
 }
 
-static const xf86CrtcConfigFuncsRec sna_crtc_config_funcs = {
-	sna_crtc_resize
+static const xf86CrtcConfigFuncsRec sna_mode_funcs = {
+	sna_mode_resize
 };
 
 static void set_size_range(struct sna *sna)
@@ -2655,7 +2655,7 @@ bool sna_mode_pre_init(ScrnInfoPtr scrn, struct sna *sna)
 	if (!mode->kmode)
 		return sna_mode_fake_init(sna);
 
-	xf86CrtcConfigInit(scrn, &sna_crtc_config_funcs);
+	xf86CrtcConfigInit(scrn, &sna_mode_funcs);
 
 	for (i = 0; i < mode->kmode->count_crtcs; i++)
 		sna_crtc_init(scrn, mode, i);
diff --git a/src/sna/sna_display_fake.c b/src/sna/sna_display_fake.c
index 775810a..b8723a3 100644
--- a/src/sna/sna_display_fake.c
+++ b/src/sna/sna_display_fake.c
@@ -248,7 +248,7 @@ migrate_dirty_tracking(struct sna *sna, PixmapPtr old_front)
 }
 
 static Bool
-sna_crtc_resize(ScrnInfoPtr scrn, int width, int height)
+sna_mode_resize(ScrnInfoPtr scrn, int width, int height)
 {
 	struct sna *sna = to_sna(scrn);
 	ScreenPtr screen = scrn->pScreen;
@@ -298,15 +298,15 @@ sna_crtc_resize(ScrnInfoPtr scrn, int width, int height)
 	return TRUE;
 }
 
-static const xf86CrtcConfigFuncsRec sna_crtc_config_funcs = {
-	sna_crtc_resize
+static const xf86CrtcConfigFuncsRec sna_mode_funcs = {
+	sna_mode_resize
 };
 
 bool sna_mode_fake_init(struct sna *sna)
 {
 	ScrnInfoPtr scrn = sna->scrn;
 
-	xf86CrtcConfigInit(scrn, &sna_crtc_config_funcs);
+	xf86CrtcConfigInit(scrn, &sna_mode_funcs);
 
 	if (!sna_crtc_fake(sna))
 		return false;