Commit 3a9a1f89 authored by Jani Nikula's avatar Jani Nikula
Browse files

drm/i915/sdvo: convert intel_sdvo.[ch] to struct intel_display 



Going forward, struct intel_display is the main display device data
pointer. Convert as much as possible of intel_sdvo.[ch] to struct
intel_display.

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/2e79909f8a060d7ff1744911f8da9300eb1f225c.1739378095.git.jani.nikula@intel.com
parent 53ba0e1d

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

+1 −2
Original line number Diff line number Diff line
@@ -67,7 +67,6 @@ static bool intel_hdmi_get_hw_state(struct intel_encoder *encoder, 
				    enum pipe *pipe)

{

	struct intel_display *display = to_intel_display(encoder);

	struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);

	struct intel_hdmi *intel_hdmi = enc_to_intel_hdmi(encoder);

	intel_wakeref_t wakeref;

	bool ret;
@@ -77,7 +76,7 @@ static bool intel_hdmi_get_hw_state(struct intel_encoder *encoder, 
	if (!wakeref)

		return false;



	ret = intel_sdvo_port_enabled(dev_priv, intel_hdmi->hdmi_reg, pipe);

	ret = intel_sdvo_port_enabled(display, intel_hdmi->hdmi_reg, pipe);



	intel_display_power_put(display, encoder->power_domain, wakeref);

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

+3 −3
Original line number Diff line number Diff line
@@ -8235,7 +8235,7 @@ void intel_setup_outputs(struct drm_i915_private *dev_priv) 


		if (intel_de_read(dev_priv, PCH_HDMIB) & SDVO_DETECTED) {

			/* PCH SDVOB multiplex with HDMIB */

			found = intel_sdvo_init(dev_priv, PCH_SDVOB, PORT_B);

			found = intel_sdvo_init(display, PCH_SDVOB, PORT_B);

			if (!found)

				g4x_hdmi_init(display, PCH_HDMIB, PORT_B);

			if (!found && (intel_de_read(dev_priv, PCH_DP_B) & DP_DETECTED))
@@ -8314,7 +8314,7 @@ void intel_setup_outputs(struct drm_i915_private *dev_priv) 


		if (intel_de_read(dev_priv, GEN3_SDVOB) & SDVO_DETECTED) {

			drm_dbg_kms(&dev_priv->drm, "probing SDVOB\n");

			found = intel_sdvo_init(dev_priv, GEN3_SDVOB, PORT_B);

			found = intel_sdvo_init(display, GEN3_SDVOB, PORT_B);

			if (!found && IS_G4X(dev_priv)) {

				drm_dbg_kms(&dev_priv->drm,

					    "probing HDMI on SDVOB\n");
@@ -8329,7 +8329,7 @@ void intel_setup_outputs(struct drm_i915_private *dev_priv) 


		if (intel_de_read(dev_priv, GEN3_SDVOB) & SDVO_DETECTED) {

			drm_dbg_kms(&dev_priv->drm, "probing SDVOC\n");

			found = intel_sdvo_init(dev_priv, GEN3_SDVOC, PORT_C);

			found = intel_sdvo_init(display, GEN3_SDVOC, PORT_C);

		}



		if (!found && (intel_de_read(dev_priv, GEN3_SDVOC) & SDVO_DETECTED)) {

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

+1 −1
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ static void assert_pch_hdmi_disabled(struct drm_i915_private *dev_priv, 
	enum pipe port_pipe;

	bool state;



	state = intel_sdvo_port_enabled(dev_priv, hdmi_reg, &port_pipe);

	state = intel_sdvo_port_enabled(display, hdmi_reg, &port_pipe);



	INTEL_DISPLAY_STATE_WARN(display, state && port_pipe == pipe,

				 "PCH HDMI %c enabled on transcoder %c, should be disabled\n",

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

+140 −141

File changed.

Preview size limit exceeded, changes collapsed.

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

+5 −5
Original line number Diff line number Diff line
@@ -10,22 +10,22 @@ 


#include "i915_reg_defs.h"



struct drm_i915_private;

enum pipe;

enum port;

struct intel_display;



#ifdef I915

bool intel_sdvo_port_enabled(struct drm_i915_private *dev_priv,

bool intel_sdvo_port_enabled(struct intel_display *display,

			     i915_reg_t sdvo_reg, enum pipe *pipe);

bool intel_sdvo_init(struct drm_i915_private *dev_priv,

bool intel_sdvo_init(struct intel_display *display,

		     i915_reg_t reg, enum port port);

#else

static inline bool intel_sdvo_port_enabled(struct drm_i915_private *dev_priv,

static inline bool intel_sdvo_port_enabled(struct intel_display *display,

					   i915_reg_t sdvo_reg, enum pipe *pipe)

{

	return false;

}

static inline bool intel_sdvo_init(struct drm_i915_private *dev_priv,

static inline bool intel_sdvo_init(struct intel_display *display,

				   i915_reg_t reg, enum port port)

{

	return false;