Skip to content

Commit f38b4e9

Browse files
vsyrjalagregkh
authored andcommitted
drm/i915: Skip some timing checks on BXT/GLK DSI transcoders
[ Upstream commit 20c2dbf ] Apparently some BXT/GLK systems have DSI panels whose timings don't agree with the normal cpu transcoder hblank>=32 limitation. This is perhaps fine as there are no specific hblank/etc. limits listed for the BXT/GLK DSI transcoders. Move those checks out from the global intel_mode_valid() into into connector specific .mode_valid() hooks, skipping BXT/GLK DSI connectors. We'll leave the basic [hv]display/[hv]total checks in intel_mode_valid() as those seem like sensible upper limits regardless of the transcoder used. Cc: stable@vger.kernel.org Closes: https://gitlab.freedesktop.org/drm/intel/-/issues/9720 Fixes: 8f4b106 ("drm/i915: Check some transcoder timing minimum limits") Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20231127145028.4899-1-ville.syrjala@linux.intel.com Reviewed-by: Jani Nikula <jani.nikula@intel.com> (cherry picked from commit e0ef2da) Signed-off-by: Jani Nikula <jani.nikula@intel.com> Signed-off-by: Sasha Levin <sashal@kernel.org>
1 parent d9ef7b0 commit f38b4e9

File tree

12 files changed

+79
-3
lines changed

12 files changed

+79
-3
lines changed

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1500,6 +1500,13 @@ static void gen11_dsi_post_disable(struct intel_atomic_state *state,
15001500
static enum drm_mode_status gen11_dsi_mode_valid(struct drm_connector *connector,
15011501
struct drm_display_mode *mode)
15021502
{
1503+
struct drm_i915_private *i915 = to_i915(connector->dev);
1504+
enum drm_mode_status status;
1505+
1506+
status = intel_cpu_transcoder_mode_valid(i915, mode);
1507+
if (status != MODE_OK)
1508+
return status;
1509+
15031510
/* FIXME: DSC? */
15041511
return intel_dsi_mode_valid(connector, mode);
15051512
}

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -343,8 +343,13 @@ intel_crt_mode_valid(struct drm_connector *connector,
343343
struct drm_device *dev = connector->dev;
344344
struct drm_i915_private *dev_priv = to_i915(dev);
345345
int max_dotclk = dev_priv->max_dotclk_freq;
346+
enum drm_mode_status status;
346347
int max_clock;
347348

349+
status = intel_cpu_transcoder_mode_valid(dev_priv, mode);
350+
if (status != MODE_OK)
351+
return status;
352+
348353
if (mode->flags & DRM_MODE_FLAG_DBLSCAN)
349354
return MODE_NO_DBLESCAN;
350355

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

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8229,6 +8229,16 @@ intel_mode_valid(struct drm_device *dev,
82298229
mode->vtotal > vtotal_max)
82308230
return MODE_V_ILLEGAL;
82318231

8232+
return MODE_OK;
8233+
}
8234+
8235+
enum drm_mode_status intel_cpu_transcoder_mode_valid(struct drm_i915_private *dev_priv,
8236+
const struct drm_display_mode *mode)
8237+
{
8238+
/*
8239+
* Additional transcoder timing limits,
8240+
* excluding BXT/GLK DSI transcoders.
8241+
*/
82328242
if (DISPLAY_VER(dev_priv) >= 5) {
82338243
if (mode->hdisplay < 64 ||
82348244
mode->htotal - mode->hdisplay < 32)

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -554,6 +554,9 @@ enum drm_mode_status
554554
intel_mode_valid_max_plane_size(struct drm_i915_private *dev_priv,
555555
const struct drm_display_mode *mode,
556556
bool bigjoiner);
557+
enum drm_mode_status
558+
intel_cpu_transcoder_mode_valid(struct drm_i915_private *i915,
559+
const struct drm_display_mode *mode);
557560
enum phy intel_port_to_phy(struct drm_i915_private *i915, enum port port);
558561
bool is_trans_port_sync_mode(const struct intel_crtc_state *state);
559562
bool intel_crtc_is_bigjoiner_slave(const struct intel_crtc_state *crtc_state);

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -973,6 +973,10 @@ intel_dp_mode_valid(struct drm_connector *_connector,
973973
enum drm_mode_status status;
974974
bool dsc = false, bigjoiner = false;
975975

976+
status = intel_cpu_transcoder_mode_valid(dev_priv, mode);
977+
if (status != MODE_OK)
978+
return status;
979+
976980
if (mode->flags & DRM_MODE_FLAG_DBLCLK)
977981
return MODE_H_ILLEGAL;
978982

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -703,6 +703,10 @@ intel_dp_mst_mode_valid_ctx(struct drm_connector *connector,
703703
return 0;
704704
}
705705

706+
*status = intel_cpu_transcoder_mode_valid(dev_priv, mode);
707+
if (*status != MODE_OK)
708+
return 0;
709+
706710
if (mode->flags & DRM_MODE_FLAG_DBLSCAN) {
707711
*status = MODE_NO_DBLESCAN;
708712
return 0;

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -225,10 +225,16 @@ intel_dvo_mode_valid(struct drm_connector *connector,
225225
{
226226
struct intel_connector *intel_connector = to_intel_connector(connector);
227227
struct intel_dvo *intel_dvo = intel_attached_dvo(intel_connector);
228+
struct drm_i915_private *i915 = to_i915(intel_connector->base.dev);
228229
const struct drm_display_mode *fixed_mode =
229230
intel_panel_fixed_mode(intel_connector, mode);
230231
int max_dotclk = to_i915(connector->dev)->max_dotclk_freq;
231232
int target_clock = mode->clock;
233+
enum drm_mode_status status;
234+
235+
status = intel_cpu_transcoder_mode_valid(i915, mode);
236+
if (status != MODE_OK)
237+
return status;
232238

233239
if (mode->flags & DRM_MODE_FLAG_DBLSCAN)
234240
return MODE_NO_DBLESCAN;

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1987,6 +1987,10 @@ intel_hdmi_mode_valid(struct drm_connector *connector,
19871987
bool has_hdmi_sink = intel_has_hdmi_sink(hdmi, connector->state);
19881988
bool ycbcr_420_only;
19891989

1990+
status = intel_cpu_transcoder_mode_valid(dev_priv, mode);
1991+
if (status != MODE_OK)
1992+
return status;
1993+
19901994
if ((mode->flags & DRM_MODE_FLAG_3D_MASK) == DRM_MODE_FLAG_3D_FRAME_PACKING)
19911995
clock *= 2;
19921996

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -389,11 +389,16 @@ intel_lvds_mode_valid(struct drm_connector *connector,
389389
struct drm_display_mode *mode)
390390
{
391391
struct intel_connector *intel_connector = to_intel_connector(connector);
392+
struct drm_i915_private *i915 = to_i915(intel_connector->base.dev);
392393
const struct drm_display_mode *fixed_mode =
393394
intel_panel_fixed_mode(intel_connector, mode);
394395
int max_pixclk = to_i915(connector->dev)->max_dotclk_freq;
395396
enum drm_mode_status status;
396397

398+
status = intel_cpu_transcoder_mode_valid(i915, mode);
399+
if (status != MODE_OK)
400+
return status;
401+
397402
if (mode->flags & DRM_MODE_FLAG_DBLSCAN)
398403
return MODE_NO_DBLESCAN;
399404

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

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1873,13 +1873,19 @@ static enum drm_mode_status
18731873
intel_sdvo_mode_valid(struct drm_connector *connector,
18741874
struct drm_display_mode *mode)
18751875
{
1876+
struct drm_i915_private *i915 = to_i915(connector->dev);
18761877
struct intel_sdvo *intel_sdvo = intel_attached_sdvo(to_intel_connector(connector));
18771878
struct intel_sdvo_connector *intel_sdvo_connector =
18781879
to_intel_sdvo_connector(connector);
1879-
int max_dotclk = to_i915(connector->dev)->max_dotclk_freq;
18801880
bool has_hdmi_sink = intel_has_hdmi_sink(intel_sdvo_connector, connector->state);
1881+
int max_dotclk = i915->max_dotclk_freq;
1882+
enum drm_mode_status status;
18811883
int clock = mode->clock;
18821884

1885+
status = intel_cpu_transcoder_mode_valid(i915, mode);
1886+
if (status != MODE_OK)
1887+
return status;
1888+
18831889
if (mode->flags & DRM_MODE_FLAG_DBLSCAN)
18841890
return MODE_NO_DBLESCAN;
18851891

0 commit comments

Comments
 (0)