Aurelien
/
xf86-video-intel
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sna: Always read back the gamma, even for a inactive CRTC 

Even if the CRTC is inactive, we still need to initialise the gamma
tables.

Reported-and-tested-by: Timo Kamph <timo@kamph.org>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=66563
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
This commit is contained in:
Chris Wilson 2013-07-03 22:44:46 +01:00
parent 4def5ecf6e
commit ebf4517a0b
1 changed files with 28 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
src/sna/sna_display.c
View File

@ -3001,32 +3001,7 @@ static bool sna_probe_initial_configuration(struct sna *sna)
crtc->enabled = FALSE; crtc->enabled = FALSE;
crtc->desiredMode.status = MODE_NOMODE; crtc->desiredMode.status = MODE_NOMODE;
VG_CLEAR(mode); /* Initialize the gamma ramps */
mode.crtc_id = sna_crtc->id;
if (drmIoctl(sna->kgem.fd, DRM_IOCTL_MODE_GETCRTC, &mode))
continue;
if (!mode.mode_valid)
continue;
memset(&crtc->desiredMode, 0, sizeof(crtc->desiredMode));
mode_from_kmode(scrn, &mode.mode, &crtc->desiredMode);
crtc->desiredRotation = RR_Rotate_0;
crtc->desiredX = mode.x;
crtc->desiredY = mode.y;
crtc->desiredTransformPresent = FALSE;
crtc->mode = crtc->desiredMode;
crtc->mode.name = NULL;
crtc->x = mode.x;
crtc->y = mode.y;
crtc->rotation = RR_Rotate_0;
crtc->transformPresent = FALSE;
memset(&crtc->panningTotalArea, 0, sizeof(BoxRec));
memset(&crtc->panningTrackingArea, 0, sizeof(BoxRec));
memset(crtc->panningBorder, 0, 4 * sizeof(INT16));
gamma = malloc(3 * mode.gamma_size * sizeof(uint16_t)); gamma = malloc(3 * mode.gamma_size * sizeof(uint16_t));
if (gamma) { if (gamma) {
struct drm_mode_crtc_lut lut; struct drm_mode_crtc_lut lut;
@ -3058,6 +3033,33 @@ static bool sna_probe_initial_configuration(struct sna *sna)
crtc->gamma_green = gamma + mode.gamma_size; crtc->gamma_green = gamma + mode.gamma_size;
crtc->gamma_blue = gamma + 2*mode.gamma_size; crtc->gamma_blue = gamma + 2*mode.gamma_size;
} }
/* Retrieve the current mode */
VG_CLEAR(mode);
mode.crtc_id = sna_crtc->id;
if (drmIoctl(sna->kgem.fd, DRM_IOCTL_MODE_GETCRTC, &mode))
continue;
if (!mode.mode_valid)
continue;
memset(&crtc->desiredMode, 0, sizeof(crtc->desiredMode));
mode_from_kmode(scrn, &mode.mode, &crtc->desiredMode);
crtc->desiredRotation = RR_Rotate_0;
crtc->desiredX = mode.x;
crtc->desiredY = mode.y;
crtc->desiredTransformPresent = FALSE;
crtc->mode = crtc->desiredMode;
crtc->mode.name = NULL;
crtc->x = mode.x;
crtc->y = mode.y;
crtc->rotation = RR_Rotate_0;
crtc->transformPresent = FALSE;
memset(&crtc->panningTotalArea, 0, sizeof(BoxRec));
memset(&crtc->panningTrackingArea, 0, sizeof(BoxRec));
memset(crtc->panningBorder, 0, 4 * sizeof(INT16));
} }
/* Reconstruct outputs pointing to active CRTC */ /* Reconstruct outputs pointing to active CRTC */