From: José Roberto de Souza Date: Fri, 25 Jun 2021 23:56:00 +0000 (-0700) Subject: drm/i915/display: Disable FBC when PSR2 is enabled display 12 and newer X-Git-Tag: v5.15-rc1~148^2~9^2~74 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=425057e725934b46760b0386b18bb4eb8ee066a7;p=thirdparty%2Fkernel%2Flinux.git drm/i915/display: Disable FBC when PSR2 is enabled display 12 and newer This is now a requirement for all display 12 and newer, not only for tigerlake. BSpec: 50422 Cc: Gwan-gyeong Mun Signed-off-by: José Roberto de Souza Reviewed-by: Lucas De Marchi Link: https://patchwork.freedesktop.org/patch/msgid/20210625235600.765677-2-jose.souza@intel.com --- diff --git a/drivers/gpu/drm/i915/display/intel_fbc.c b/drivers/gpu/drm/i915/display/intel_fbc.c index 82effb64a3b9c..ddfc17e21668a 100644 --- a/drivers/gpu/drm/i915/display/intel_fbc.c +++ b/drivers/gpu/drm/i915/display/intel_fbc.c @@ -912,11 +912,11 @@ static bool intel_fbc_can_activate(struct intel_crtc *crtc) } /* - * Tigerlake is not supporting FBC with PSR2. + * Display 12+ is not supporting FBC with PSR2. * Recommendation is to keep this combination disabled * Bspec: 50422 HSD: 14010260002 */ - if (fbc->state_cache.psr2_active && IS_TIGERLAKE(dev_priv)) { + if (fbc->state_cache.psr2_active && DISPLAY_VER(dev_priv) >= 12) { fbc->no_fbc_reason = "not supported with PSR2"; return false; }