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

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: 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/e06ef0e2cc34d42918f3208362587a17ea34e28f.1739378095.git.jani.nikula@intel.com
parent 6a5c7ea5

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

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

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

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

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

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

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

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

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

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

}