Commit b97b4291 authored by Jani Nikula's avatar Jani Nikula
Browse files

drm/i915/hpd: drop dev_priv parameter from intel_hpd_pin_default() 



The function doesn't use the parameter for anything. Drop it.

Reviewed-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/4347a0f71a1a8c515617cf06471486d9bbb4a026.1739378095.git.jani.nikula@intel.com
parent a40249ee

drivers/gpu/drm/i915/display/g4x_dp.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

drivers/gpu/drm/i915/display/g4x_hdmi.c

+1 −1
Original line number Diff line number Diff line
@@ -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

drivers/gpu/drm/i915/display/intel_ddi.c

+1 −1
Original line number Diff line number Diff line
@@ -5364,7 +5364,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));

drivers/gpu/drm/i915/display/intel_hotplug.c

+1 −3
Original line number Diff line number Diff line
@@ -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;

}

drivers/gpu/drm/i915/display/intel_hotplug.h

+1 −2
Original line number Diff line number Diff line
@@ -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);