Commit 74f1d789 authored by Ville Syrjälä's avatar Ville Syrjälä

drm/i915: Limit MST modes based on plane size too

When adding the max plane size checks to the .mode_valid() hooks
I naturally forgot about MST. Take care of that one as well.

Cc: Manasi Navare <manasi.d.navare@intel.com>
Cc: Sean Paul <sean@poorly.run>
Cc: José Roberto de Souza <jose.souza@intel.com>
Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Fixes: 2d20411e ("drm/i915: Don't advertise modes that exceed the max plane size")
Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20191001154629.11063-1-ville.syrjala@linux.intel.comReviewed-by: default avatarJosé Roberto de Souza <jose.souza@intel.com>
parent 4fb87831
...@@ -424,6 +424,7 @@ static enum drm_mode_status ...@@ -424,6 +424,7 @@ static enum drm_mode_status
intel_dp_mst_mode_valid(struct drm_connector *connector, intel_dp_mst_mode_valid(struct drm_connector *connector,
struct drm_display_mode *mode) struct drm_display_mode *mode)
{ {
struct drm_i915_private *dev_priv = to_i915(connector->dev);
struct intel_connector *intel_connector = to_intel_connector(connector); struct intel_connector *intel_connector = to_intel_connector(connector);
struct intel_dp *intel_dp = intel_connector->mst_port; struct intel_dp *intel_dp = intel_connector->mst_port;
int max_dotclk = to_i915(connector->dev)->max_dotclk_freq; int max_dotclk = to_i915(connector->dev)->max_dotclk_freq;
...@@ -451,7 +452,7 @@ intel_dp_mst_mode_valid(struct drm_connector *connector, ...@@ -451,7 +452,7 @@ intel_dp_mst_mode_valid(struct drm_connector *connector,
if (mode_rate > max_rate || mode->clock > max_dotclk) if (mode_rate > max_rate || mode->clock > max_dotclk)
return MODE_CLOCK_HIGH; return MODE_CLOCK_HIGH;
return MODE_OK; return intel_mode_valid_max_plane_size(dev_priv, mode);
} }
static struct drm_encoder *intel_mst_atomic_best_encoder(struct drm_connector *connector, static struct drm_encoder *intel_mst_atomic_best_encoder(struct drm_connector *connector,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment