]> www.infradead.org Git - users/willy/xarray.git/commitdiff
drm/i915/tc: Validate the pin assignment on all platforms
authorImre Deak <imre.deak@intel.com>
Tue, 5 Aug 2025 07:36:53 +0000 (10:36 +0300)
committerImre Deak <imre.deak@intel.com>
Wed, 13 Aug 2025 12:03:10 +0000 (15:03 +0300)
Validate the pin assignment on ICL-TGL, similarly to how this is done on
MTL+. ICL supports all the pin assignments, while TGL+ supports only the
NONE, C, D, E pin assignments.

Reviewed-by: Mika Kahola <mika.kahola@intel.com>
Link: https://lore.kernel.org/r/20250805073700.642107-13-imre.deak@intel.com
Signed-off-by: Imre Deak <imre.deak@intel.com>
drivers/gpu/drm/i915/display/intel_tc.c

index d1f17d2f236cc134a4f273c5c6f85371c9678eb9..0170967241633114cc95397dd56c91acfb4dd430 100644 (file)
@@ -282,17 +282,35 @@ intel_tc_port_get_pin_assignment(struct intel_digital_port *dig_port)
 {
        struct intel_display *display = to_intel_display(dig_port);
        struct intel_tc_port *tc = to_tc_port(dig_port);
+       enum intel_tc_pin_assignment pin_assignment;
        intel_wakeref_t wakeref;
-       u32 pin_mask;
+       u32 val;
 
        with_intel_display_power(display, POWER_DOMAIN_DISPLAY_CORE, wakeref)
-               pin_mask = intel_de_read(display, PORT_TX_DFLEXPA1(tc->phy_fia));
+               val = intel_de_read(display, PORT_TX_DFLEXPA1(tc->phy_fia));
 
-       drm_WARN_ON(display->drm, pin_mask == 0xffffffff);
+       drm_WARN_ON(display->drm, val == 0xffffffff);
        assert_tc_cold_blocked(tc);
 
-       return (pin_mask & DP_PIN_ASSIGNMENT_MASK(tc->phy_fia_idx)) >>
-              DP_PIN_ASSIGNMENT_SHIFT(tc->phy_fia_idx);
+       pin_assignment = (val & DP_PIN_ASSIGNMENT_MASK(tc->phy_fia_idx)) >>
+                        DP_PIN_ASSIGNMENT_SHIFT(tc->phy_fia_idx);
+
+       switch (pin_assignment) {
+       case INTEL_TC_PIN_ASSIGNMENT_A:
+       case INTEL_TC_PIN_ASSIGNMENT_B:
+       case INTEL_TC_PIN_ASSIGNMENT_F:
+               drm_WARN_ON(display->drm, DISPLAY_VER(display) > 11);
+               break;
+       case INTEL_TC_PIN_ASSIGNMENT_NONE:
+       case INTEL_TC_PIN_ASSIGNMENT_C:
+       case INTEL_TC_PIN_ASSIGNMENT_D:
+       case INTEL_TC_PIN_ASSIGNMENT_E:
+               break;
+       default:
+               MISSING_CASE(pin_assignment);
+       }
+
+       return pin_assignment;
 }
 
 static int lnl_tc_port_get_max_lane_count(struct intel_digital_port *dig_port)