Currently pipe scaling is not supported with the joiner. As casf requires pipe scaling, fail the atomic commit whenever joiner comes into picture.
Signed-off-by: Nemesa Garg <[email protected]> --- drivers/gpu/drm/i915/display/intel_casf.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/gpu/drm/i915/display/intel_casf.c b/drivers/gpu/drm/i915/display/intel_casf.c index 95339b496f24..259bc50d5ed8 100644 --- a/drivers/gpu/drm/i915/display/intel_casf.c +++ b/drivers/gpu/drm/i915/display/intel_casf.c @@ -116,6 +116,11 @@ int intel_casf_compute_config(struct intel_crtc_state *crtc_state) return 0; } + if (crtc_state->joiner_pipes) { + drm_WARN(display->drm, 0, "CASF not supported with joiner\n"); + return -EINVAL; + } + crtc_state->hw.casf_params.casf_enable = true; /* -- 2.25.1
