drm/i915/display: convert assert_port_valid() to struct intel_display

Going forward, struct intel_display is the main display device data
pointer. Convert the assert_port_valid() helper to struct intel_display,
allowing further conversions elsewhere.

Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/e06ef0e2cc34d42918f3208362587a17ea34e28f.1739378095.git.jani.nikula@intel.com

diff --git a/drivers/gpu/drm/i915/display/g4x_dp.c b/drivers/gpu/drm/i915/display/g4x_dp.c
index f50ab9a3f3e9532b2bf20b61a9aa3172b57920e7..b6cb5c74a32e50f8a25e0f911ca87d5ae69cb58d 100644 (file)
--- a/drivers/gpu/drm/i915/display/g4x_dp.c
+++ b/drivers/gpu/drm/i915/display/g4x_dp.c
@@ -1286,7 +1286,7 @@ bool g4x_dp_init(struct intel_display *display,
        struct drm_encoder *encoder;
        struct intel_connector *intel_connector;
 
-       if (!assert_port_valid(dev_priv, port))
+       if (!assert_port_valid(display, port))
                return false;
 
        devdata = intel_bios_encoder_data_lookup(display, port);

diff --git a/drivers/gpu/drm/i915/display/g4x_hdmi.c b/drivers/gpu/drm/i915/display/g4x_hdmi.c
index 6670cf101b9ae2f2a9394b7d86bfc53662f75984..5b2df1014c10aa36603f641893f9ceed827c97e6 100644 (file)
--- a/drivers/gpu/drm/i915/display/g4x_hdmi.c
+++ b/drivers/gpu/drm/i915/display/g4x_hdmi.c
@@ -691,7 +691,7 @@ bool g4x_hdmi_init(struct intel_display *display,
        struct intel_encoder *intel_encoder;
        struct intel_connector *intel_connector;
 
-       if (!assert_port_valid(dev_priv, port))
+       if (!assert_port_valid(display, port))
                return false;
 
        if (!assert_hdmi_port_valid(display, port))

diff --git a/drivers/gpu/drm/i915/display/intel_crt.c b/drivers/gpu/drm/i915/display/intel_crt.c
index fb1feda46b5b71b260a9893e1870e35fe7e4cd41..53b2aa0f3d20fac95a363b1035fd0bb44aab4e96 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_crt.c
+++ b/drivers/gpu/drm/i915/display/intel_crt.c
@@ -1099,7 +1099,7 @@ void intel_crt_init(struct intel_display *display)
        connector->base.polled = connector->polled;
 
        if (HAS_DDI(display)) {
-               assert_port_valid(dev_priv, PORT_E);
+               assert_port_valid(display, PORT_E);
 
                crt->base.port = PORT_E;
                crt->base.get_config = hsw_crt_get_config;

diff --git a/drivers/gpu/drm/i915/display/intel_ddi.c b/drivers/gpu/drm/i915/display/intel_ddi.c
index ee1fb01c979555065f9db75d2fd3365109bfb90e..db3f27468e8b0e7effc7dd8483b9bef06dac8d39 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_ddi.c
+++ b/drivers/gpu/drm/i915/display/intel_ddi.c
@@ -5128,7 +5128,7 @@ void intel_ddi_init(struct intel_display *display,
                return;
        }
 
-       if (!assert_port_valid(dev_priv, port))
+       if (!assert_port_valid(display, port))
                return;
 
        if (port_in_use(dev_priv, port)) {

diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
index 8fc099709a88e30c6df4dcbfeb566e15c3feed09..d00b004567e83b2ad38c86bb1bc48033f2a5671e 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_display.c
+++ b/drivers/gpu/drm/i915/display/intel_display.c
@@ -8187,9 +8187,9 @@ static bool intel_ddi_crt_present(struct drm_i915_private *dev_priv)
        return true;
 }
 
-bool assert_port_valid(struct drm_i915_private *i915, enum port port)
+bool assert_port_valid(struct intel_display *display, enum port port)
 {
-       return !drm_WARN(&i915->drm, !(DISPLAY_RUNTIME_INFO(i915)->port_mask & BIT(port)),
+       return !drm_WARN(display->drm, !(DISPLAY_RUNTIME_INFO(display)->port_mask & BIT(port)),
                         "Platform does not support port %c\n", port_name(port));
 }
 

diff --git a/drivers/gpu/drm/i915/display/intel_display.h b/drivers/gpu/drm/i915/display/intel_display.h
index 503e2ea1d0298ec2357f1d719b9c51d15b763448..9439da737f5bc2d4588dd8894f27d23ac70625ab 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_display.h
+++ b/drivers/gpu/drm/i915/display/intel_display.h
@@ -579,7 +579,7 @@ void assert_transcoder(struct intel_display *display,
 #define assert_transcoder_enabled(d, t) assert_transcoder(d, t, true)
 #define assert_transcoder_disabled(d, t) assert_transcoder(d, t, false)
 
-bool assert_port_valid(struct drm_i915_private *i915, enum port port);
+bool assert_port_valid(struct intel_display *display, enum port port);
 
 /*
  * Use INTEL_DISPLAY_STATE_WARN(x) (rather than WARN() and WARN_ON()) for hw

diff --git a/drivers/gpu/drm/i915/display/intel_dvo.c b/drivers/gpu/drm/i915/display/intel_dvo.c
index abf19dfd6d9d042188f2531fa4ce3457c897241b..c4888e6f52a18f844b1b7a5da39153eb8d1f923a 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_dvo.c
+++ b/drivers/gpu/drm/i915/display/intel_dvo.c
@@ -524,7 +524,7 @@ void intel_dvo_init(struct drm_i915_private *i915)
                return;
        }
 
-       assert_port_valid(i915, intel_dvo->dev.port);
+       assert_port_valid(display, intel_dvo->dev.port);
 
        encoder->type = INTEL_OUTPUT_DVO;
        encoder->power_domain = POWER_DOMAIN_PORT_OTHER;

diff --git a/drivers/gpu/drm/i915/display/intel_sdvo.c b/drivers/gpu/drm/i915/display/intel_sdvo.c
index 44452ed69fff46afcb325cb4fd28807eb2fb6255..f7067696dec96fd09b78696635ab420b12798438 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_sdvo.c
+++ b/drivers/gpu/drm/i915/display/intel_sdvo.c
@@ -3386,11 +3386,12 @@ static bool assert_sdvo_port_valid(struct drm_i915_private *dev_priv,
 bool intel_sdvo_init(struct drm_i915_private *dev_priv,
                     i915_reg_t sdvo_reg, enum port port)
 {
+       struct intel_display *display = &dev_priv->display;
        struct intel_encoder *intel_encoder;
        struct intel_sdvo *intel_sdvo;
        int i;
 
-       if (!assert_port_valid(dev_priv, port))
+       if (!assert_port_valid(display, port))
                return false;
 
        if (!assert_sdvo_port_valid(dev_priv, port))