xf86-video-intel: 2 commits - src/sna/sna_display.c src/sna/sna_driver.c

[Chris Wilson]

 src/sna/sna_display.c |   10 +++++-----
 src/sna/sna_driver.c  |    4 +++-
 2 files changed, 8 insertions(+), 6 deletions(-)

New commits:
commit a19da0ea517127052ae49cdd6441e8b6077ca523
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Sun Feb 24 11:22:01 2013 +0000

    sna: Reduce DefaultDepth to 16 on older chipsets
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/sna/sna_driver.c b/src/sna/sna_driver.c
index ffeaead..b73f3c5 100644
--- a/src/sna/sna_driver.c
+++ b/src/sna/sna_driver.c
@@ -453,6 +453,7 @@ static Bool sna_pre_init(ScrnInfoPtr scrn, int flags)
 	struct sna *sna;
 	rgb defaultWeight = { 0, 0, 0 };
 	EntityInfoPtr pEnt;
+	int preferred_depth;
 	int flags24;
 	Gamma zeros = { 0.0, 0.0, 0.0 };
 	int fd;
@@ -508,7 +509,8 @@ static Bool sna_pre_init(ScrnInfoPtr scrn, int flags)
 
 	flags24 = Support32bppFb | PreferConvert24to32 | SupportConvert24to32;
 
-	if (!xf86SetDepthBpp(scrn, 0, 0, 0, flags24))
+	preferred_depth = sna->info->gen < 040 ? 16 : 24;
+	if (!xf86SetDepthBpp(scrn, preferred_depth, 0, 0, flags24))
 		return FALSE;
 
 	switch (scrn->depth) {
commit d7bba8512c6db5f58448b513d1f4290938b0abd3
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Sat Feb 23 10:56:08 2013 +0000

    sna: Tidy a call to set the gamma before setting up a CRTC
    
    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 a294f7c..fb282fd 100644
--- a/src/sna/sna_display.c
+++ b/src/sna/sna_display.c
@@ -1248,11 +1248,11 @@ sna_crtc_set_mode_major(xf86CrtcPtr crtc, DisplayModePtr mode,
 	assert(mode->HDisplay <= sna->mode.kmode->max_width &&
 	       mode->VDisplay <= sna->mode.kmode->max_height);
 
-	crtc->funcs->gamma_set(crtc,
-			       crtc->gamma_red,
-			       crtc->gamma_green,
-			       crtc->gamma_blue,
-			       crtc->gamma_size);
+	drmModeCrtcSetGamma(sna->kgem.fd, sna_crtc->id,
+			    crtc->gamma_size,
+			    crtc->gamma_red,
+			    crtc->gamma_green,
+			    crtc->gamma_blue);
 
 	saved_kmode = sna_crtc->kmode;
 	saved_bo = sna_crtc->bo;