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

drm/i915/display: convert intel_cpu_transcoder_mode_valid() to intel_display 



Going forward, struct intel_display is the main display device data
pointer. Convert the intel_cpu_transcoder_mode_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/f9246a00a2e7aabaffb86f863915a4307e1fd3f8.1739378095.git.jani.nikula@intel.com
parent 3a9a1f89

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

+2 −2
Original line number Diff line number Diff line
@@ -1460,10 +1460,10 @@ static void gen11_dsi_post_disable(struct intel_atomic_state *state, 
static enum drm_mode_status gen11_dsi_mode_valid(struct drm_connector *connector,

						 struct drm_display_mode *mode)

{

	struct drm_i915_private *i915 = to_i915(connector->dev);

	struct intel_display *display = to_intel_display(connector->dev);

	enum drm_mode_status status;



	status = intel_cpu_transcoder_mode_valid(i915, mode);

	status = intel_cpu_transcoder_mode_valid(display, mode);

	if (status != MODE_OK)

		return status;

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

+1 −1
Original line number Diff line number Diff line
@@ -360,7 +360,7 @@ intel_crt_mode_valid(struct drm_connector *connector, 
	enum drm_mode_status status;

	int max_clock;



	status = intel_cpu_transcoder_mode_valid(dev_priv, mode);

	status = intel_cpu_transcoder_mode_valid(display, mode);

	if (status != MODE_OK)

		return status;

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

+3 −3
Original line number Diff line number Diff line
@@ -8463,14 +8463,14 @@ enum drm_mode_status intel_mode_valid(struct drm_device *dev, 
	return MODE_OK;

}



enum drm_mode_status intel_cpu_transcoder_mode_valid(struct drm_i915_private *dev_priv,

enum drm_mode_status intel_cpu_transcoder_mode_valid(struct intel_display *display,

						     const struct drm_display_mode *mode)

{

	/*

	 * Additional transcoder timing limits,

	 * excluding BXT/GLK DSI transcoders.

	 */

	if (DISPLAY_VER(dev_priv) >= 5) {

	if (DISPLAY_VER(display) >= 5) {

		if (mode->hdisplay < 64 ||

		    mode->htotal - mode->hdisplay < 32)

			return MODE_H_ILLEGAL;
@@ -8489,7 +8489,7 @@ enum drm_mode_status intel_cpu_transcoder_mode_valid(struct drm_i915_private *de 
	 * Cantiga+ cannot handle modes with a hsync front porch of 0.

	 * WaPruneModeWithIncorrectHsyncOffset:ctg,elk,ilk,snb,ivb,vlv,hsw.

	 */

	if ((DISPLAY_VER(dev_priv) >= 5 || IS_G4X(dev_priv)) &&

	if ((DISPLAY_VER(display) >= 5 || display->platform.g4x) &&

	    mode->hsync_start == mode->hdisplay)

		return MODE_H_ILLEGAL;

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

+1 −1
Original line number Diff line number Diff line
@@ -428,7 +428,7 @@ intel_mode_valid_max_plane_size(struct drm_i915_private *dev_priv, 
				const struct drm_display_mode *mode,

				int num_joined_pipes);

enum drm_mode_status

intel_cpu_transcoder_mode_valid(struct drm_i915_private *i915,

intel_cpu_transcoder_mode_valid(struct intel_display *display,

				const struct drm_display_mode *mode);

enum phy intel_port_to_phy(struct drm_i915_private *i915, enum port port);

bool is_trans_port_sync_mode(const struct intel_crtc_state *state);

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

+1 −1
Original line number Diff line number Diff line
@@ -1407,7 +1407,7 @@ intel_dp_mode_valid(struct drm_connector *_connector, 
	bool dsc = false;

	int num_joined_pipes;



	status = intel_cpu_transcoder_mode_valid(dev_priv, mode);

	status = intel_cpu_transcoder_mode_valid(display, mode);

	if (status != MODE_OK)

		return status;