drm/i915/display: Use struct intel_display instead of struct drm_i915_private
authorMika Kahola <mika.kahola@intel.com>
Wed, 27 Nov 2024 07:32:00 +0000 (09:32 +0200)
committerMika Kahola <mika.kahola@intel.com>
Wed, 4 Dec 2024 12:09:35 +0000 (14:09 +0200)
Let's start using struct intel_display instead of struct drm_i915_private
when introducing new code. No functional changes.

v2: Drop tc_to_intel_display() helper function (Jani)

Signed-off-by: Mika Kahola <mika.kahola@intel.com>
Reviewed-by: Chaitanya Kumar Borah <chaitanya.kumar.borah@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20241127073200.124907-3-mika.kahola@intel.com
drivers/gpu/drm/i915/display/intel_tc.c

index 82e82e8ec11aeac1c892a1f3d169d0a8d3b19cf5..33b8f27720760c3065d830d795e7c7ce829ca1fd 100644 (file)
@@ -1043,10 +1043,9 @@ static void xelpdp_tc_power_request_wa(struct intel_display *display, bool enabl
 
 static void __xelpdp_tc_phy_enable_tcss_power(struct intel_tc_port *tc, bool enable)
 {
-       struct drm_i915_private *i915 = tc_to_i915(tc);
-       struct intel_display *display = &i915->display;
+       struct intel_display *display = to_intel_display(tc->dig_port);
        enum port port = tc->dig_port->base.port;
-       i915_reg_t reg = XELPDP_PORT_BUF_CTL1(i915, port);
+       i915_reg_t reg = XELPDP_PORT_BUF_CTL1(display, port);
        u32 val;
 
        assert_tc_cold_blocked(tc);
@@ -1054,12 +1053,12 @@ static void __xelpdp_tc_phy_enable_tcss_power(struct intel_tc_port *tc, bool ena
        if (DISPLAY_VER(display) == 30)
                xelpdp_tc_power_request_wa(display, enable);
 
-       val = intel_de_read(i915, reg);
+       val = intel_de_read(display, reg);
        if (enable)
                val |= XELPDP_TCSS_POWER_REQUEST;
        else
                val &= ~XELPDP_TCSS_POWER_REQUEST;
-       intel_de_write(i915, reg, val);
+       intel_de_write(display, reg, val);
 }
 
 static bool xelpdp_tc_phy_enable_tcss_power(struct intel_tc_port *tc, bool enable)