]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
drm/i915/psr: Add bits per pixel limitation
authorJosé Roberto de Souza <jose.souza@intel.com>
Thu, 28 Nov 2019 01:48:48 +0000 (17:48 -0800)
committerJosé Roberto de Souza <jose.souza@intel.com>
Mon, 2 Dec 2019 20:06:13 +0000 (12:06 -0800)
PSR2 HW only support a limited number of bits per pixel, if mode has
more than supported PSR2 should not be enabled.

BSpec: 50422
BSpec: 7713
Cc: Gwan-gyeong Mun <gwan-gyeong.mun@intel.com>
Cc: Matt Roper <matthew.d.roper@intel.com>
Reviewed-by: Lucas De Marchi <lucas.demarchi@intel.com>
Reviewed-by: Matt Roper <matthew.d.roper@intel.com>
Signed-off-by: José Roberto de Souza <jose.souza@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20191128014852.214135-1-jose.souza@intel.com
drivers/gpu/drm/i915/display/intel_psr.c

index c1d133362b764c87defac7b851b91258a70280ae..0d84ea28bc6f168ac3d9af5d9c7ccf904c281699 100644 (file)
@@ -608,7 +608,7 @@ static bool intel_psr2_config_valid(struct intel_dp *intel_dp,
        struct drm_i915_private *dev_priv = dp_to_i915(intel_dp);
        int crtc_hdisplay = crtc_state->hw.adjusted_mode.crtc_hdisplay;
        int crtc_vdisplay = crtc_state->hw.adjusted_mode.crtc_vdisplay;
-       int psr_max_h = 0, psr_max_v = 0;
+       int psr_max_h = 0, psr_max_v = 0, max_bpp = 0;
 
        if (!dev_priv->psr.sink_psr2_support)
                return false;
@@ -632,12 +632,15 @@ static bool intel_psr2_config_valid(struct intel_dp *intel_dp,
        if (INTEL_GEN(dev_priv) >= 12) {
                psr_max_h = 5120;
                psr_max_v = 3200;
+               max_bpp = 30;
        } else if (INTEL_GEN(dev_priv) >= 10 || IS_GEMINILAKE(dev_priv)) {
                psr_max_h = 4096;
                psr_max_v = 2304;
+               max_bpp = 24;
        } else if (IS_GEN(dev_priv, 9)) {
                psr_max_h = 3640;
                psr_max_v = 2304;
+               max_bpp = 24;
        }
 
        if (crtc_hdisplay > psr_max_h || crtc_vdisplay > psr_max_v) {
@@ -647,6 +650,12 @@ static bool intel_psr2_config_valid(struct intel_dp *intel_dp,
                return false;
        }
 
+       if (crtc_state->pipe_bpp > max_bpp) {
+               DRM_DEBUG_KMS("PSR2 not enabled, pipe bpp %d > max supported %d\n",
+                             crtc_state->pipe_bpp, max_bpp);
+               return false;
+       }
+
        /*
         * HW sends SU blocks of size four scan lines, which means the starting
         * X coordinate and Y granularity requirements will always be met. We