From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Tue, 17 Nov 2020 10:22:38 +0000 (+0100)
Subject: 5.4-stable patches
X-Git-Tag: v4.4.244~27
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6c3779648a6a10d2037e0da02a897f1999f3bd7a;p=thirdparty%2Fkernel%2Fstable-queue.git

5.4-stable patches

added patches:
	drm-i915-correctly-set-sfc-capability-for-video-engines.patch
---

diff --git a/queue-5.4/drm-i915-correctly-set-sfc-capability-for-video-engines.patch b/queue-5.4/drm-i915-correctly-set-sfc-capability-for-video-engines.patch
new file mode 100644
index 00000000000..f0321db7532
--- /dev/null
+++ b/queue-5.4/drm-i915-correctly-set-sfc-capability-for-video-engines.patch
@@ -0,0 +1,40 @@
+From 5ce6861d36ed5207aff9e5eead4c7cc38a986586 Mon Sep 17 00:00:00 2001
+From: Venkata Sandeep Dhanalakota <venkata.s.dhanalakota@intel.com>
+Date: Thu, 5 Nov 2020 17:18:42 -0800
+Subject: drm/i915: Correctly set SFC capability for video engines
+
+From: Venkata Sandeep Dhanalakota <venkata.s.dhanalakota@intel.com>
+
+commit 5ce6861d36ed5207aff9e5eead4c7cc38a986586 upstream.
+
+SFC capability of video engines is not set correctly because i915
+is testing for incorrect bits.
+
+Fixes: c5d3e39caa45 ("drm/i915: Engine discovery query")
+Cc: Matt Roper <matthew.d.roper@intel.com>
+Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
+Signed-off-by: Venkata Sandeep Dhanalakota <venkata.s.dhanalakota@intel.com>
+Signed-off-by: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
+Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
+Cc: <stable@vger.kernel.org> # v5.3+
+Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+Link: https://patchwork.freedesktop.org/patch/msgid/20201106011842.36203-1-daniele.ceraolospurio@intel.com
+(cherry picked from commit ad18fa0f5f052046cad96fee762b5c64f42dd86a)
+Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/gpu/drm/i915/gt/intel_engine_cs.c |    3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+--- a/drivers/gpu/drm/i915/gt/intel_engine_cs.c
++++ b/drivers/gpu/drm/i915/gt/intel_engine_cs.c
+@@ -354,7 +354,8 @@ static void __setup_engine_capabilities(
+ 		 * instances.
+ 		 */
+ 		if ((INTEL_GEN(i915) >= 11 &&
+-		     RUNTIME_INFO(i915)->vdbox_sfc_access & engine->mask) ||
++		     (RUNTIME_INFO(i915)->vdbox_sfc_access &
++		      BIT(engine->instance))) ||
+ 		    (INTEL_GEN(i915) >= 9 && engine->instance == 0))
+ 			engine->uabi_capabilities |=
+ 				I915_VIDEO_AND_ENHANCE_CLASS_CAPABILITY_SFC;
diff --git a/queue-5.4/series b/queue-5.4/series
index 553c9857a8d..abe7e4c1d1f 100644
--- a/queue-5.4/series
+++ b/queue-5.4/series
@@ -142,3 +142,4 @@ net-update-window_clamp-if-sock_rcvbuf-is-set.patch
 net-x25-fix-null-ptr-deref-in-x25_connect.patch
 tipc-fix-memory-leak-in-tipc_topsrv_start.patch
 r8169-fix-potential-skb-double-free-in-an-error-path.patch
+drm-i915-correctly-set-sfc-capability-for-video-engines.patch