Skip to content

Commit 8d371db

Browse files
author
Ander Conselvan de Oliveira
committed
drm/i915/glk: Load the degamma LUT even in legacy gamma mode
In Geminilake, the degamma table is enabled or disabled by the pipe CSC enable bit, so its active even when running in the legacy gamma mode. So always set sane values for that table, since the default value is all zeroes. This fixes blank screens after a suspend/resume cycle while legacy gamma is in use. Signed-off-by: Ander Conselvan de Oliveira <[email protected]> Reviewed-by: Ville Syrjälä <[email protected]> Link: http://patchwork.freedesktop.org/patch/msgid/[email protected]
1 parent 9f235df commit 8d371db

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

drivers/gpu/drm/i915/intel_color.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -483,12 +483,13 @@ static void glk_load_luts(struct drm_crtc_state *state)
483483
struct intel_crtc_state *intel_state = to_intel_crtc_state(state);
484484
enum pipe pipe = to_intel_crtc(crtc)->pipe;
485485

486+
glk_load_degamma_lut(state);
487+
486488
if (crtc_state_is_legacy(state)) {
487489
haswell_load_luts(state);
488490
return;
489491
}
490492

491-
glk_load_degamma_lut(state);
492493
bdw_load_gamma_lut(state, 0);
493494

494495
intel_state->gamma_mode = GAMMA_MODE_MODE_10BIT;

0 commit comments

Comments
 (0)