Skip to contentSkip to conversation

Disabling FBC when PSR2 SU update enabled

PATCH New Jason Le 2 participants 2 messages Jun 9, 2020

Subsystems (3)
lore
Share & tools
lore

Jason Le

author
#0 lore raw

PATCH v2 1/1 Disabling FBC when PSR2 SU update enabled

---
 drivers/gpu/drm/i915/display/intel_fbc.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/gpu/drm/i915/display/intel_fbc.c +3 -3
index 52bc7483adb5..1505d93c6685 100644
@@ -1419,9 +1419,9 @@ void intel_fbc_init(struct drm_i915_private *dev_priv)
 	drm_dbg_kms(&dev_priv->drm, "Sanitized enable_fbc value: %d\n",
 		    i915_modparams.enable_fbc);
 
-	if (i915_modparams.enable_psr) {
-               i915_modparams.enable_fbc = 0;
-                DRM_DEBUG_KMS("PSR enabled. FBC no longer needed.  Disable FBC. \n");
+	if (i915_modparams.enable_psr && dev_priv->psr.sink_psr2_support) {
+		i915_modparams.enable_fbc = 0;
+		DRM_DEBUG_KMS("PSR enabled. FBC no longer needed.  Disable FBC. \n");
 	}
 
 
Signature · 6 lines
2.17.1

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#1 lore raw

[Intel-gfx] ✗ Fi.CI.BUILD: failure for Disabling FBC when PSR2 SU update enabled

== Series Details ==

== Series Details ==

Series: Disabling FBC when PSR2 SU update enabled
URL : https://patchwork.freedesktop.org/series/78138/
State : failure

== Summary ==

Applying: Disabling FBC when PSR2 SU update enabled
Using index info to reconstruct a base tree...
M drivers/gpu/drm/i915/display/intel_fbc.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/i915/display/intel_fbc.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_fbc.c
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0001 Disabling FBC when PSR2 SU update enabled When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx