From: Ville Syrjälä Date: Mon, 13 Sep 2021 14:44:34 +0000 (+0300) Subject: drm/i915: Configure TRANSCONF just the once with bigjoiner X-Git-Tag: v5.16-rc1~140^2~9^2~47 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ef46972ac8518caf8c8409b750f4728ba8b820ea;p=thirdparty%2Flinux.git drm/i915: Configure TRANSCONF just the once with bigjoiner Let's not configure the single transcoder's TRANSCONF multiple times with bigjoiner. No real harm I suppose but since we already have the bigjoiner if statement directly above might as well suck this in there and skip the redundant programming. Signed-off-by: Ville Syrjälä Link: https://patchwork.freedesktop.org/patch/msgid/20210913144440.23008-11-ville.syrjala@linux.intel.com Reviewed-by: Manasi Navare --- diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c index d731c12da718f..a4453dd1bb518 100644 --- a/drivers/gpu/drm/i915/display/intel_display.c +++ b/drivers/gpu/drm/i915/display/intel_display.c @@ -3215,10 +3215,9 @@ static void hsw_crtc_enable(struct intel_atomic_state *state, &new_crtc_state->fdi_m_n, NULL); hsw_set_frame_start_delay(new_crtc_state); - } - if (!transcoder_is_dsi(cpu_transcoder)) hsw_set_transconf(new_crtc_state); + } crtc->active = true;