drm/i915: Pass intel_connector to intel_vrr_is_capable()

Pass intel_connector instead of drm_connector to
intel_vrr_is_capable(). Will result in less ugly casts.

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

diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i915/display/intel_dp.c
index d55acc4..0deba9d 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_dp.c
+++ b/drivers/gpu/drm/i915/display/intel_dp.c
@@ -4523,7 +4523,7 @@ intel_dp_set_edid(struct intel_dp *intel_dp)
        edid = intel_dp_get_edid(intel_dp);
        connector->detect_edid = edid;
 
-       vrr_capable = intel_vrr_is_capable(&connector->base);
+       vrr_capable = intel_vrr_is_capable(connector);
        drm_dbg_kms(&i915->drm, "[CONNECTOR:%d:%s] VRR capable: %s\n",
                    connector->base.base.id, connector->base.name, str_yes_no(vrr_capable));
        drm_connector_set_vrr_capable_property(&connector->base, vrr_capable);

diff --git a/drivers/gpu/drm/i915/display/intel_vrr.c b/drivers/gpu/drm/i915/display/intel_vrr.c
index 396f2f9..081e52d 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_vrr.c
+++ b/drivers/gpu/drm/i915/display/intel_vrr.c
@@ -9,17 +9,17 @@
 #include "intel_display_types.h"
 #include "intel_vrr.h"
 
-bool intel_vrr_is_capable(struct drm_connector *connector)
+bool intel_vrr_is_capable(struct intel_connector *connector)
 {
+       const struct drm_display_info *info = &connector->base.display_info;
+       struct drm_i915_private *i915 = to_i915(connector->base.dev);
        struct intel_dp *intel_dp;
-       const struct drm_display_info *info = &connector->display_info;
-       struct drm_i915_private *i915 = to_i915(connector->dev);
 
-       if (connector->connector_type != DRM_MODE_CONNECTOR_eDP &&
-           connector->connector_type != DRM_MODE_CONNECTOR_DisplayPort)
+       if (connector->base.connector_type != DRM_MODE_CONNECTOR_eDP &&
+           connector->base.connector_type != DRM_MODE_CONNECTOR_DisplayPort)
                return false;
 
-       intel_dp = intel_attached_dp(to_intel_connector(connector));
+       intel_dp = intel_attached_dp(connector);
        /*
         * DP Sink is capable of VRR video timings if
         * Ignore MSA bit is set in DPCD.
@@ -97,7 +97,7 @@ intel_vrr_compute_config(struct intel_crtc_state *crtc_state,
        const struct drm_display_info *info = &connector->base.display_info;
        int vmin, vmax;
 
-       if (!intel_vrr_is_capable(&connector->base))
+       if (!intel_vrr_is_capable(connector))
                return;
 
        if (adjusted_mode->flags & DRM_MODE_FLAG_INTERLACE)

diff --git a/drivers/gpu/drm/i915/display/intel_vrr.h b/drivers/gpu/drm/i915/display/intel_vrr.h
index 1c2da57..9fda113 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_vrr.h
+++ b/drivers/gpu/drm/i915/display/intel_vrr.h
@@ -8,15 +8,15 @@
 
 #include <linux/types.h>
 
-struct drm_connector;
 struct drm_connector_state;
 struct intel_atomic_state;
+struct intel_connector;
 struct intel_crtc;
 struct intel_crtc_state;
 struct intel_dp;
 struct intel_encoder;
 
-bool intel_vrr_is_capable(struct drm_connector *connector);
+bool intel_vrr_is_capable(struct intel_connector *connector);
 void intel_vrr_check_modeset(struct intel_atomic_state *state);
 void intel_vrr_compute_config(struct intel_crtc_state *crtc_state,
                              struct drm_connector_state *conn_state);