drop queue-4.4/drm-i915-whitelist-context-local-timestamp-in-the-gen9-cmdparser.patch

diff --git a/queue-4.4/drm-i915-whitelist-context-local-timestamp-in-the-gen9-cmdparser.patch b/queue-4.4/drm-i915-whitelist-context-local-timestamp-in-the-gen9-cmdparser.patch
deleted file mode 100644 (file)
index f376539..0000000
--- a/queue-4.4/drm-i915-whitelist-context-local-timestamp-in-the-gen9-cmdparser.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 273500ae71711c040d258a7b3f4b6f44c368fff2 Mon Sep 17 00:00:00 2001
-From: Chris Wilson <chris@chris-wilson.co.uk>
-Date: Mon, 1 Jun 2020 17:19:42 +0100
-Subject: drm/i915: Whitelist context-local timestamp in the gen9 cmdparser
-
-From: Chris Wilson <chris@chris-wilson.co.uk>
-
-commit 273500ae71711c040d258a7b3f4b6f44c368fff2 upstream.
-
-Allow batch buffers to read their own _local_ cumulative HW runtime of
-their logical context.
-
-Fixes: 0f2f39758341 ("drm/i915: Add gen9 BCS cmdparsing")
-Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
-Cc: Mika Kuoppala <mika.kuoppala@linux.intel.com>
-Cc: <stable@vger.kernel.org> # v5.4+
-Reviewed-by: Mika Kuoppala <mika.kuoppala@linux.intel.com>
-Link: https://patchwork.freedesktop.org/patch/msgid/20200601161942.30854-1-chris@chris-wilson.co.uk
-(cherry picked from commit f9496520df11de00fbafc3cbd693b9570d600ab3)
-Signed-off-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- drivers/gpu/drm/i915/i915_cmd_parser.c |    4 ++++
- 1 file changed, 4 insertions(+)
-
---- a/drivers/gpu/drm/i915/i915_cmd_parser.c
-+++ b/drivers/gpu/drm/i915/i915_cmd_parser.c
-@@ -469,6 +469,9 @@ struct drm_i915_reg_descriptor {
- #define REG32(address, ...)                             \
-       { .addr = address, __VA_ARGS__ }
- 
-+#define REG32_IDX(_reg, idx) \
-+      { .addr = _reg(idx) }
-+
- /*
-  * Convenience macro for adding 64-bit registers.
-  *
-@@ -541,6 +544,7 @@ static const struct drm_i915_reg_descrip
-       REG64_IDX(RING_TIMESTAMP, BSD_RING_BASE),
-       REG32(BCS_SWCTRL),
-       REG64_IDX(RING_TIMESTAMP, BLT_RING_BASE),
-+      REG32_IDX(RING_CTX_TIMESTAMP, BLT_RING_BASE),
-       REG64_IDX(BCS_GPR, 0),
-       REG64_IDX(BCS_GPR, 1),
-       REG64_IDX(BCS_GPR, 2),

diff --git a/queue-4.4/series b/queue-4.4/series
index 636264805d0ac5a4f68510377ac284d4dd8f8c82..76a5f91143f76a6ff53ab297466a397f3f845660 100644 (file)
--- a/queue-4.4/series
+++ b/queue-4.4/series
@@ -1,5 +1,4 @@
 s390-fix-syscall_get_error-for-compat-processes.patch
-drm-i915-whitelist-context-local-timestamp-in-the-gen9-cmdparser.patch
 clk-sunxi-fix-incorrect-usage-of-round_down.patch
 i2c-piix4-detect-secondary-smbus-controller-on-amd-a.patch
 clk-qcom-msm8916-fix-the-address-location-of-pll-con.patch