Attachment 145190 Details for Bug 111501 – [PATCH] drm/i915: Don't advertise modes that exceed the max plane size

[patch] [PATCH] drm/i915: Don't advertise modes that exceed the max plane size

0001-drm-i915-Don-t-advertise-modes-that-exceed-the-max-p.patch (text/plain), 6.14 KB, created by Ville Syrjala on 2019-08-28 11:36:24 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ville Syrjala

Created: 2019-08-28 11:36:24 UTC

Size: 6.14 KB

patch

obsolete

>From 8a68ffcf43fee9677227afd3ae60e613bfd55952 Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?Ville=20Syrj=C3=A4l=C3=A4?= <ville.syrjala@linux.intel.com>
>Date: Wed, 28 Aug 2019 12:27:55 +0300
>Subject: [PATCH] drm/i915: Don't advertise modes that exceed the max plane
> size
>MIME-Version: 1.0
>Content-Type: text/plain; charset=UTF-8
>Content-Transfer-Encoding: 8bit
>
>Modern platforms allow the transcoders hdisplay/vdisplay to exceed the
>planes' max resolution. This has the nasty implication that modes on the
>connectors' mode list may not be usable when the user asks for a
>fullscreen plane. Seeing as that is the most common use case it seems
>prudent to filter out modes that don't allow for fullscreen planes to
>be enabled.
>
>Let's do that in the connetor .mode_valid() hook so that normally
>such modes are kept hidden but the user is still able to forcibly
>specify such a mode if they know they don't need fullscreen planes.
>
>This is in line with ealier policies regarding certain clock limits.
>The idea is to prevent the casual user from encountering a mode that
>would fail under typical conditions, but allow the expert user to
>force things if they so wish.
>
>Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=111501
>Signed-off-by: Ville SyrjÃ¤lÃ¤ <ville.syrjala@linux.intel.com>
>---
> drivers/gpu/drm/i915/display/intel_display.c | 35 ++++++++++++++++++++
> drivers/gpu/drm/i915/display/intel_display.h |  4 +++
> drivers/gpu/drm/i915/display/intel_dp.c      |  2 +-
> drivers/gpu/drm/i915/display/intel_dsi.c     |  3 +-
> drivers/gpu/drm/i915/display/intel_hdmi.c    |  4 ++-
> 5 files changed, 45 insertions(+), 3 deletions(-)
>
>diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
>index a9f8be2cd364..9eca781f6b9b 100644
>--- a/drivers/gpu/drm/i915/display/intel_display.c
>+++ b/drivers/gpu/drm/i915/display/intel_display.c
>@@ -15773,6 +15773,7 @@ intel_mode_valid(struct drm_device *dev,
> 			   DRM_MODE_FLAG_CLKDIV2))
> 		return MODE_BAD;
> 
>+	/* Transcoder timing limits */
> 	if (INTEL_GEN(dev_priv) >= 9 ||
> 	    IS_BROADWELL(dev_priv) || IS_HASWELL(dev_priv)) {
> 		hdisplay_max = 8192; /* FDI max 4096 handled elsewhere */
>@@ -15806,6 +15807,40 @@ intel_mode_valid(struct drm_device *dev,
> 	return MODE_OK;
> }
> 
>+enum drm_mode_status
>+intel_mode_valid_max_plane_size(struct drm_i915_private *dev_priv,
>+				const struct drm_display_mode *mode)
>+{
>+	int plane_width_max, plane_height_max;
>+
>+	/*
>+	 * Most people will probably want a fullscreen
>+	 * plane so let's not advertize modes that are
>+	 * too big for that.
>+	 */
>+	if (INTEL_GEN(dev_priv) >= 10 || IS_GEMINILAKE(dev_priv)) {
>+		plane_width_max = 5120;
>+		plane_height_max = 4096;
>+	} if (INTEL_GEN(dev_priv) >= 9) {
>+		plane_width_max = 4096;
>+		plane_height_max = 4096;
>+	} else {
>+		/*
>+		 * intel_mode_valid() should be
>+		 * sufficient on older platforms.
>+		 */
>+		return MODE_OK;
>+	}
>+
>+	if (mode->hdisplay > plane_width_max)
>+		return MODE_H_ILLEGAL;
>+
>+	if (mode->vdisplay > plane_height_max)
>+		return MODE_V_ILLEGAL;
>+
>+	return MODE_OK;
>+}
>+
> static const struct drm_mode_config_funcs intel_mode_funcs = {
> 	.fb_create = intel_user_framebuffer_create,
> 	.get_format_info = intel_get_format_info,
>diff --git a/drivers/gpu/drm/i915/display/intel_display.h b/drivers/gpu/drm/i915/display/intel_display.h
>index 03321fb4a703..059f31bf65aa 100644
>--- a/drivers/gpu/drm/i915/display/intel_display.h
>+++ b/drivers/gpu/drm/i915/display/intel_display.h
>@@ -32,6 +32,7 @@ enum link_m_n_set;
> struct dpll;
> struct drm_connector;
> struct drm_device;
>+struct drm_display_mode;
> struct drm_encoder;
> struct drm_file;
> struct drm_framebuffer;
>@@ -429,6 +430,9 @@ void lpt_disable_clkout_dp(struct drm_i915_private *dev_priv);
> u32 intel_plane_fb_max_stride(struct drm_i915_private *dev_priv,
> 			      u32 pixel_format, u64 modifier);
> bool intel_plane_can_remap(const struct intel_plane_state *plane_state);
>+enum drm_mode_status
>+intel_mode_valid_max_plane_size(struct drm_i915_private *dev_priv,
>+				const struct drm_display_mode *mode);
> enum phy intel_port_to_phy(struct drm_i915_private *i915, enum port port);
> 
> void intel_plane_destroy(struct drm_plane *plane);
>diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i915/display/intel_dp.c
>index 917f420d557c..42a3940070e4 100644
>--- a/drivers/gpu/drm/i915/display/intel_dp.c
>+++ b/drivers/gpu/drm/i915/display/intel_dp.c
>@@ -562,7 +562,7 @@ intel_dp_mode_valid(struct drm_connector *connector,
> 	if (mode->flags & DRM_MODE_FLAG_DBLCLK)
> 		return MODE_H_ILLEGAL;
> 
>-	return MODE_OK;
>+	return intel_mode_valid_max_plane_size(dev_priv, mode);
> }
> 
> u32 intel_dp_pack_aux(const u8 *src, int src_bytes)
>diff --git a/drivers/gpu/drm/i915/display/intel_dsi.c b/drivers/gpu/drm/i915/display/intel_dsi.c
>index 5fec02aceaed..a2a937109a5a 100644
>--- a/drivers/gpu/drm/i915/display/intel_dsi.c
>+++ b/drivers/gpu/drm/i915/display/intel_dsi.c
>@@ -55,6 +55,7 @@ int intel_dsi_get_modes(struct drm_connector *connector)
> enum drm_mode_status intel_dsi_mode_valid(struct drm_connector *connector,
> 					  struct drm_display_mode *mode)
> {
>+	struct drm_i915_private *dev_priv = to_i915(connector->dev);
> 	struct intel_connector *intel_connector = to_intel_connector(connector);
> 	const struct drm_display_mode *fixed_mode = intel_connector->panel.fixed_mode;
> 	int max_dotclk = to_i915(connector->dev)->max_dotclk_freq;
>@@ -73,7 +74,7 @@ enum drm_mode_status intel_dsi_mode_valid(struct drm_connector *connector,
> 			return MODE_CLOCK_HIGH;
> 	}
> 
>-	return MODE_OK;
>+	return intel_mode_valid_max_plane_size(dev_priv, mode);
> }
> 
> struct intel_dsi_host *intel_dsi_host_init(struct intel_dsi *intel_dsi,
>diff --git a/drivers/gpu/drm/i915/display/intel_hdmi.c b/drivers/gpu/drm/i915/display/intel_hdmi.c
>index 0f5a0c618e46..70583dfe0b5b 100644
>--- a/drivers/gpu/drm/i915/display/intel_hdmi.c
>+++ b/drivers/gpu/drm/i915/display/intel_hdmi.c
>@@ -2184,8 +2184,10 @@ intel_hdmi_mode_valid(struct drm_connector *connector,
> 			status = hdmi_port_clock_valid(hdmi, clock * 5 / 4,
> 						       true, force_dvi);
> 	}
>+	if (status != MODE_OK)
>+		return status;
> 
>-	return status;
>+	return intel_mode_valid_max_plane_size(dev_priv, mode);
> }
> 
> static bool hdmi_deep_color_possible(const struct intel_crtc_state *crtc_state,
>-- 
>2.21.0
>

Actions: View | Splinter Review

Attachments on bug 111501: 145190

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.