Disable panel fitting if joiner is enabled as backporting of joiner part is required in case of pfit. Signed-off-by: Nemesa Garg <nemesa.garg@xxxxxxxxx> --- drivers/gpu/drm/i915/display/intel_pfit.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/gpu/drm/i915/display/intel_pfit.c b/drivers/gpu/drm/i915/display/intel_pfit.c index 50861aa78a89..e214e19f8174 100644 --- a/drivers/gpu/drm/i915/display/intel_pfit.c +++ b/drivers/gpu/drm/i915/display/intel_pfit.c @@ -187,6 +187,9 @@ static int pch_panel_fitting(struct intel_crtc_state *crtc_state, int pipe_src_h = drm_rect_height(&crtc_state->pipe_src); int ret, x, y, width, height; + if (crtc_state->joiner_pipes) + return 0; + /* Native modes don't need fitting */ if (adjusted_mode->crtc_hdisplay == pipe_src_w && adjusted_mode->crtc_vdisplay == pipe_src_h && -- 2.25.1
