xf86-video-amdgpu: Branch 'master'

[GitLab Mirror]

 src/drmmode_display.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit a923bedfd91d39977dbf95f296cf9b68439490f2
Author: Michel Dänzer <michel.daenzer at amd.com>
Date:   Fri Aug 31 12:44:37 2018 +0200

    Do not push the CM_GAMMA_LUT property values in drmmode_crtc_cm_init
    
    The crtc->gamma_lut values aren't initialized yet at this point, and
    the property values are pushed again from drmmode_setup_colormap
    anyway.
    
    Fixes intermittent flicker due to random gamma LUT values during server
    startup.
    
    Acked-by: Alex Deucher <alexander.deucher at amd.com>

diff --git a/src/drmmode_display.c b/src/drmmode_display.c
index 46be29d..6ef6a98 100644
--- a/src/drmmode_display.c
+++ b/src/drmmode_display.c
@@ -1863,7 +1863,7 @@ static void drmmode_crtc_cm_init(int drm_fd, xf86CrtcPtr crtc)
 		drmmode_crtc->ctm->matrix[8] = (uint64_t)1 << 32;
 
 	/* Push properties to reset properties currently in hardware */
-	for (i = 0; i < CM_DEGAMMA_LUT_SIZE; i++) {
+	for (i = 0; i < CM_GAMMA_LUT; i++) {
 		if (drmmode_crtc_push_cm_prop(crtc, i))
 			xf86DrvMsg(crtc->scrn->scrnIndex, X_ERROR,
 				   "Failed to initialize color management "