During disable sequence for MIPI encoder in command mode, disable MIPI display self-refresh mode bit in Pipe Ctrl reg. v2: Use crtc state flag instead of loop over encoders (Daniel) Signed-off-by: Gaurav K Singh <gaurav.k.singh@xxxxxxxxx> Signed-off-by: Yogesh Mohan Marimuthu <yogesh.mohan.marimuthu@xxxxxxxxx> Signed-off-by: Shobhit Kumar <shobhit.kumar@xxxxxxxxx> --- drivers/gpu/drm/i915/intel_display.c | 3 +++ drivers/gpu/drm/i915/intel_drv.h | 3 +++ drivers/gpu/drm/i915/intel_dsi.c | 3 +++ 3 files changed, 9 insertions(+) diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 0285af9..c2a5cdf 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -2159,6 +2159,9 @@ static void intel_disable_pipe(struct intel_crtc *crtc) if ((val & PIPECONF_ENABLE) == 0) return; + if (crtc->config->dsi_self_refresh) + val = val & ~PIPECONF_MIPI_DSR_ENABLE; + /* * Double wide has implications for planes * so best keep it disabled when not needed. diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h index b3d16ce..58fcd7d 100644 --- a/drivers/gpu/drm/i915/intel_drv.h +++ b/drivers/gpu/drm/i915/intel_drv.h @@ -452,6 +452,9 @@ struct intel_crtc_state { bool double_wide; bool dp_encoder_is_mst; + + bool dsi_self_refresh; + int pbn; struct intel_crtc_scaler_state scaler_state; diff --git a/drivers/gpu/drm/i915/intel_dsi.c b/drivers/gpu/drm/i915/intel_dsi.c index d2b5d49..d812e07 100644 --- a/drivers/gpu/drm/i915/intel_dsi.c +++ b/drivers/gpu/drm/i915/intel_dsi.c @@ -307,6 +307,9 @@ static bool intel_dsi_compute_config(struct intel_encoder *encoder, DRM_DEBUG_KMS("\n"); + if (is_cmd_mode(intel_dsi)) + config->dsi_self_refresh = true; + if (fixed_mode) intel_fixed_panel_mode(fixed_mode, adjusted_mode); -- 1.7.9.5 _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx http://lists.freedesktop.org/mailman/listinfo/intel-gfx