> -----Original Message-----
> From: Intel-xe <intel-xe-boun...@lists.freedesktop.org> On Behalf Of Jani
> Nikula
> Sent: Wednesday, February 12, 2025 10:07 PM
> To: intel-gfx@lists.freedesktop.org; intel...@lists.freedesktop.org
> Cc: Nikula, Jani <jani.nik...@intel.com>
> Subject: [PATCH 06/14] drm/i915/hpd: drop dev_priv parameter from
> intel_hpd_pin_default()
>
> The function doesn't use the parameter for anything. Drop it.
>
> Signed-off-by: Jani Nikula <jani.nik...@intel.com>
LGTM,
Reviewed-by: Suraj Kandpal <suraj.kand...@intel.com>
> ---
> drivers/gpu/drm/i915/display/g4x_dp.c | 2 +-
> drivers/gpu/drm/i915/display/g4x_hdmi.c | 2 +-
> drivers/gpu/drm/i915/display/intel_ddi.c | 2 +-
> drivers/gpu/drm/i915/display/intel_hotplug.c | 4 +---
> drivers/gpu/drm/i915/display/intel_hotplug.h | 3 +--
> 5 files changed, 5 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/g4x_dp.c
> b/drivers/gpu/drm/i915/display/g4x_dp.c
> index b6cb5c74a32e..4b51a4e47f63 100644
> --- a/drivers/gpu/drm/i915/display/g4x_dp.c
> +++ b/drivers/gpu/drm/i915/display/g4x_dp.c
> @@ -1393,7 +1393,7 @@ bool g4x_dp_init(struct intel_display *display,
> }
> intel_encoder->cloneable = 0;
> intel_encoder->port = port;
> - intel_encoder->hpd_pin = intel_hpd_pin_default(dev_priv, port);
> + intel_encoder->hpd_pin = intel_hpd_pin_default(port);
>
> dig_port->hpd_pulse = intel_dp_hpd_pulse;
>
> diff --git a/drivers/gpu/drm/i915/display/g4x_hdmi.c
> b/drivers/gpu/drm/i915/display/g4x_hdmi.c
> index 5b2df1014c10..1cd2e68e6ec5 100644
> --- a/drivers/gpu/drm/i915/display/g4x_hdmi.c
> +++ b/drivers/gpu/drm/i915/display/g4x_hdmi.c
> @@ -771,7 +771,7 @@ bool g4x_hdmi_init(struct intel_display *display,
> intel_encoder->pipe_mask = ~0;
> }
> intel_encoder->cloneable = BIT(INTEL_OUTPUT_ANALOG);
> - intel_encoder->hpd_pin = intel_hpd_pin_default(dev_priv, port);
> + intel_encoder->hpd_pin = intel_hpd_pin_default(port);
> /*
> * BSpec is unclear about HDMI+HDMI cloning on g4x, but it seems
> * to work on real hardware. And since g4x can send infoframes to
> diff --git a/drivers/gpu/drm/i915/display/intel_ddi.c
> b/drivers/gpu/drm/i915/display/intel_ddi.c
> index ab382adaba56..ce7097937d70 100644
> --- a/drivers/gpu/drm/i915/display/intel_ddi.c
> +++ b/drivers/gpu/drm/i915/display/intel_ddi.c
> @@ -5368,7 +5368,7 @@ void intel_ddi_init(struct intel_display *display,
> else if (DISPLAY_VER(dev_priv) == 9 && !IS_BROXTON(dev_priv))
> encoder->hpd_pin = skl_hpd_pin(dev_priv, port);
> else
> - encoder->hpd_pin = intel_hpd_pin_default(dev_priv, port);
> + encoder->hpd_pin = intel_hpd_pin_default(port);
>
> ddi_buf_ctl = intel_de_read(dev_priv, DDI_BUF_CTL(port));
>
> diff --git a/drivers/gpu/drm/i915/display/intel_hotplug.c
> b/drivers/gpu/drm/i915/display/intel_hotplug.c
> index d2e0002c5dc3..9c935afc60aa 100644
> --- a/drivers/gpu/drm/i915/display/intel_hotplug.c
> +++ b/drivers/gpu/drm/i915/display/intel_hotplug.c
> @@ -82,15 +82,13 @@
>
> /**
> * intel_hpd_pin_default - return default pin associated with certain port.
> - * @dev_priv: private driver data pointer
> * @port: the hpd port to get associated pin
> *
> * It is only valid and used by digital port encoder.
> *
> * Return pin that is associatade with @port.
> */
> -enum hpd_pin intel_hpd_pin_default(struct drm_i915_private *dev_priv,
> - enum port port)
> +enum hpd_pin intel_hpd_pin_default(enum port port)
> {
> return HPD_PORT_A + port - PORT_A;
> }
> diff --git a/drivers/gpu/drm/i915/display/intel_hotplug.h
> b/drivers/gpu/drm/i915/display/intel_hotplug.h
> index a17253ddec83..d2ca9d2f1d39 100644
> --- a/drivers/gpu/drm/i915/display/intel_hotplug.h
> +++ b/drivers/gpu/drm/i915/display/intel_hotplug.h
> @@ -24,8 +24,7 @@ void intel_hpd_trigger_irq(struct intel_digital_port
> *dig_port); void intel_hpd_init(struct drm_i915_private *dev_priv); void
> intel_hpd_init_early(struct drm_i915_private *i915); void
> intel_hpd_cancel_work(struct drm_i915_private *dev_priv); -enum hpd_pin
> intel_hpd_pin_default(struct drm_i915_private *dev_priv,
> - enum port port);
> +enum hpd_pin intel_hpd_pin_default(enum port port);
> bool intel_hpd_disable(struct drm_i915_private *dev_priv, enum hpd_pin
> pin); void intel_hpd_enable(struct drm_i915_private *dev_priv, enum
> hpd_pin pin); void intel_hpd_debugfs_register(struct drm_i915_private
> *i915);
> --
> 2.39.5
