xf86-video-intel: 4 commits - src/sna/sna_accel.c src/sna/sna_display.c src/sna/sna.h

[Chris Wilson]

 src/sna/sna.h         |    2 +-
 src/sna/sna_accel.c   |    2 +-
 src/sna/sna_display.c |   12 ++++++------
 3 files changed, 8 insertions(+), 8 deletions(-)

New commits:
commit 166e8e9e5d79f64e30230d9520b9f6cafa7dd0d0
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Thu Jan 30 12:19:04 2014 +0000

    sna: Silence a compiler warning for mismatching const strings
    
    sna_display.c: In function 'preferred_mode':
    sna_display.c:3393:7: warning: assignment discards 'const' qualifier from pointer target type [enabled by default]
      mode = xf86GetOptValString(output->options, OPTION_PREFERRED_MODE);
    
    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 2829af1..a6e6f68 100644
--- a/src/sna/sna_display.c
+++ b/src/sna/sna_display.c
@@ -3388,7 +3388,7 @@ static void crtc_init_gamma(xf86CrtcPtr crtc) { }
 
 static const char *preferred_mode(xf86OutputPtr output)
 {
-	char *mode;
+	const char *mode;
 
 	mode = xf86GetOptValString(output->options, OPTION_PREFERRED_MODE);
 	if (mode)
commit ca2d9e69d08f5438a34dbf55ab058f5c4c3b3650
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Thu Jan 30 12:18:05 2014 +0000

    sna: Suppress warning for freeing a "constant" string
    
    We allocated and own the string, so we can free it!
    
    sna_display.c: In function 'sna_output_get_modes':
    sna_display.c:2314:4: warning: passing argument 1 of 'free' discards 'const' qualifier from pointer target type [enabled by default]
        free(current->name);
    
    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 22f1841..2829af1 100644
--- a/src/sna/sna_display.c
+++ b/src/sna/sna_display.c
@@ -2311,7 +2311,7 @@ sna_output_get_modes(xf86OutputPtr output)
 	if (current && (current->name == NULL || *current->name == '\0')) {
 		char *str = canonical_mode_name(current);
 		if (str) {
-			free(current->name);
+			free((char *)current->name);
 			current->name = str;
 		}
 	}
commit 5ef675159fd83ee393a86220eb4f8c514da8d0e7
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Thu Jan 30 12:17:02 2014 +0000

    sna: Handle char *backlight_iface
    
    The backlight_iface is a freeable string, in places we were assigning a
    constant string and later freeing it.
    
    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 0e9a07f..22f1841 100644
--- a/src/sna/sna_display.c
+++ b/src/sna/sna_display.c
@@ -352,7 +352,7 @@ sna_output_backlight_init(xf86OutputPtr output)
 
 	DBG(("%s: found 'wscons'\n", __FUNCTION__));
 
-	sna_output->backlight_iface = "wscons";
+	sna_output->backlight_iface = strdup("wscons");
 	sna_output->backlight_max = param.max;
 	sna_output->backlight_active_level = param.curval;
 }
@@ -471,14 +471,14 @@ has_user_backlight_override(xf86OutputPtr output)
 {
 	struct sna_output *sna_output = output->driver_private;
 	struct sna *sna = to_sna(output->scrn);
-	char *str;
+	const char *str;
 	int max;
 
 	str = xf86GetOptValString(sna->Options, OPTION_BACKLIGHT);
 	if (str == NULL)
 		return NULL;
 
-	sna_output->backlight_iface = str;
+	sna_output->backlight_iface = (char *)str;
 	max = sna_output_backlight_get_max(output);
 	sna_output->backlight_iface = NULL;
 	if (max <= 0) {
@@ -488,7 +488,7 @@ has_user_backlight_override(xf86OutputPtr output)
 		return NULL;
 	}
 
-	return str;
+	return strdup(str);
 }
 
 static char *
commit 76e430e92c19ea799547e4e6ae1f389ebc6eaac5
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Thu Jan 30 12:13:16 2014 +0000

    sna: Constify GCFunc to quieten the compiler.
    
    We keep a pointer to the old funcs when wrapping, this now needs to be const.
    
    sna_accel.c: In function 'sna_gc_move_to_cpu':
    sna_accel.c:4008:17: warning: assignment discards 'const' qualifier from pointer target type [enabled by default]
      sgc->old_funcs = gc->funcs;
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/sna/sna.h b/src/sna/sna.h
index 27f5708..76599fe 100644
--- a/src/sna/sna.h
+++ b/src/sna/sna.h
@@ -208,7 +208,7 @@ struct sna_gc {
 	long changes;
 	long serial;
 
-	GCFuncs *old_funcs;
+	const GCFuncs *old_funcs;
 	void *priv;
 };
 
diff --git a/src/sna/sna_accel.c b/src/sna/sna_accel.c
index 36ad9b3..abfc052 100644
--- a/src/sna/sna_accel.c
+++ b/src/sna/sna_accel.c
@@ -4068,7 +4068,7 @@ static void sna_gc_move_to_gpu(GCPtr gc)
 	assert(gc->funcs == (GCFuncs *)&sna_gc_funcs__cpu);
 
 	gc->ops = (GCOps *)&sna_gc_ops;
-	gc->funcs = sna_gc(gc)->old_funcs;
+	gc->funcs = (GCFuncs *)sna_gc(gc)->old_funcs;
 	assert(gc->funcs);
 	gc->pCompositeClip = sna_gc(gc)->priv;
 	assert(gc->pCompositeClip);