Commit abd02118 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-intel-fixes-2023-12-07' of... 

Merge tag 'drm-intel-fixes-2023-12-07' of git://anongit.freedesktop.org/drm/drm-intel

 into drm-fixes

drm/i915 fixes for v6.7-rc5:
- d21a3962 ("drm/i915: Call intel_pre_plane_updates() also for pipes
  getting enabled") in the previous fixes pull depends on a change that
  wasn't included. Pick it up.
- Relax BXT/GLK DSI transcoder hblank limits
- Fix DP MST .mode_valid_ctx() return values
- Reject DP MST modes that require bigjoiner (as it's not yet supported on DP MST)
- Fix _intel_dsb_commit() variable type to allow negative values

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
From: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/87msum1hv8.fsf@intel.com
parents 33924328 9f269070

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

+7 −0
Original line number Diff line number Diff line
@@ -1440,6 +1440,13 @@ 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);

	enum drm_mode_status status;



	status = intel_cpu_transcoder_mode_valid(i915, mode);

	if (status != MODE_OK)

		return status;



	/* FIXME: DSC? */

	return intel_dsi_mode_valid(connector, mode);

}

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

+5 −0
Original line number Diff line number Diff line
@@ -348,8 +348,13 @@ intel_crt_mode_valid(struct drm_connector *connector, 
	struct drm_device *dev = connector->dev;

	struct drm_i915_private *dev_priv = to_i915(dev);

	int max_dotclk = dev_priv->max_dotclk_freq;

	enum drm_mode_status status;

	int max_clock;



	status = intel_cpu_transcoder_mode_valid(dev_priv, mode);

	if (status != MODE_OK)

		return status;



	if (mode->flags & DRM_MODE_FLAG_DBLSCAN)

		return MODE_NO_DBLESCAN;

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

+10 −0
Original line number Diff line number Diff line
@@ -7869,6 +7869,16 @@ enum drm_mode_status intel_mode_valid(struct drm_device *dev, 
	    mode->vtotal > vtotal_max)

		return MODE_V_ILLEGAL;



	return MODE_OK;

}



enum drm_mode_status intel_cpu_transcoder_mode_valid(struct drm_i915_private *dev_priv,

						     const struct drm_display_mode *mode)

{

	/*

	 * Additional transcoder timing limits,

	 * excluding BXT/GLK DSI transcoders.

	 */

	if (DISPLAY_VER(dev_priv) >= 5) {

		if (mode->hdisplay < 64 ||

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

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

+3 −0
Original line number Diff line number Diff line
@@ -403,6 +403,9 @@ enum drm_mode_status 
intel_mode_valid_max_plane_size(struct drm_i915_private *dev_priv,

				const struct drm_display_mode *mode,

				bool bigjoiner);

enum drm_mode_status

intel_cpu_transcoder_mode_valid(struct drm_i915_private *i915,

				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);

bool is_trans_port_sync_master(const struct intel_crtc_state *state);

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

+4 −0
Original line number Diff line number Diff line
@@ -1172,6 +1172,10 @@ intel_dp_mode_valid(struct drm_connector *_connector, 
	enum drm_mode_status status;

	bool dsc = false, bigjoiner = false;



	status = intel_cpu_transcoder_mode_valid(dev_priv, mode);

	if (status != MODE_OK)

		return status;



	if (mode->flags & DRM_MODE_FLAG_DBLCLK)

		return MODE_H_ILLEGAL;