From: Nemesa Garg <nemesa.garg@intel.com>
Date: Thu, 15 Jan 2026 11:39:48 +0000 (+0530)
Subject: drm/i915/casf: Disable CASF with joiner
X-Git-Tag: v7.1-rc1~167^2~24^2~255
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=33fd0375f1c31e20db08535aa9ac36df8156af8a;p=thirdparty%2Flinux.git

drm/i915/casf: Disable CASF with joiner

Disable CASF with joiner as it is not supported
in hardware.

v2: Replace dmesg_WARN with drm_dbg_kms. [Jani]
v3: Modify commit message. [Suraj]

Signed-off-by: Nemesa Garg <nemesa.garg@intel.com>
Reviewed-by: Suraj Kandpal <suraj.kandpal@intel.com>
Signed-off-by: Suraj Kandpal <suraj.kandpal@intel.com>
Link: https://patch.msgid.link/20260115113948.641822-1-nemesa.garg@intel.com
---

diff --git a/drivers/gpu/drm/i915/display/intel_casf.c b/drivers/gpu/drm/i915/display/intel_casf.c
index 95339b496f241..0fe4398a1a4e3 100644
--- a/drivers/gpu/drm/i915/display/intel_casf.c
+++ b/drivers/gpu/drm/i915/display/intel_casf.c
@@ -116,6 +116,12 @@ int intel_casf_compute_config(struct intel_crtc_state *crtc_state)
 		return 0;
 	}
 
+	/* CASF with joiner not supported in hardware */
+	if (crtc_state->joiner_pipes) {
+		drm_dbg_kms(display->drm, "CASF not supported with joiner\n");
+		return -EINVAL;
+	}
+
 	crtc_state->hw.casf_params.casf_enable = true;
 
 	/*