Home Home > GIT Browse > linux-next
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.cz>2018-09-25 14:43:31 +0200
committerJiri Kosina <jkosina@suse.cz>2018-09-25 14:43:31 +0200
commita898779d7675209fe9f0b23538be8f83ebbc1c6c (patch)
tree03715bbba3d6fc7179f2e8e9c344e5d5518d96ee
parent55fca67b330dc563338834e9d330f84ec3a379b0 (diff)
parent4d1aa0861846f2fa8a9d1426bb6183a44e9d55e8 (diff)
Merge remote-tracking branch 'origin/users/tzimmermann/SLE15/for-next' into SLE15rpm-4.12.14-25.19
-rw-r--r--blacklist.conf3
-rw-r--r--patches.fixes/0001-drm-amdgpu-update-tmr-mc-address.patch41
-rw-r--r--series.conf1
3 files changed, 45 insertions, 0 deletions
diff --git a/blacklist.conf b/blacklist.conf
index cfb390cd65..8cebac841e 100644
--- a/blacklist.conf
+++ b/blacklist.conf
@@ -474,3 +474,6 @@ f113e64121ba9f4791332248b315d9f57ee33a6b # cosmetic fix
a6f572084fbee8b30f91465f4a085d7a90901c57 # bnc#1107070
3d95b89e573bb8460886ff2ca769b067bfcc50aa # cosmetic fix
f861e3e28a3016a2064d9f600eaa92a530b732b4 # ASoC: rt5677: not applicable
+235ac9de625a0a586093ad81b3de6f7d7ab913ed # VCN not supported by amdgpu driver v4.12
+4d77c0f676e910fb1f1870738aa4bd168f253621 # VCN not supported by amdgpu driver v4.12
+
diff --git a/patches.fixes/0001-drm-amdgpu-update-tmr-mc-address.patch b/patches.fixes/0001-drm-amdgpu-update-tmr-mc-address.patch
new file mode 100644
index 0000000000..a3c0e294d7
--- /dev/null
+++ b/patches.fixes/0001-drm-amdgpu-update-tmr-mc-address.patch
@@ -0,0 +1,41 @@
+From 435198f33b56d7b875a8173a0227ddf0de285aa1 Mon Sep 17 00:00:00 2001
+From: James Zhu <jzhums@gmail.com>
+Date: Fri, 10 Aug 2018 00:31:39 +0800
+Subject: [PATCH] drm/amdgpu: update tmr mc address
+References: bsc#1100132
+Patch-mainline: v4.18-rc7
+Git-commit: 435198f33b56d7b875a8173a0227ddf0de285aa1
+
+Update tmr mc address with firmware loading address
+which is returned from PSP firmware
+
+Backporting notes:
+
+ * use function-local variable 'cmd_buf_mem'
+
+Signed-off-by: James Zhu <James.Zhu@amd.com>
+Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
+Acked-by: Huang Rui <ray.huang@amd.com>
+Reviewed-by: Likun Gao <Likun.Gao@amd.com>
+Signed-off-by: Likun Gao <Likun.Gao@amd.com>
+Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
+Cc: stable@vger.kernel.org
+Acked-by: Thomas Zimmermann <tzimmermann@suse.de>
+---
+ drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
+@@ -133,6 +133,11 @@ psp_cmd_submit_buf(struct psp_context *p
+ msleep(1);
+ }
+
++ if (ucode) {
++ ucode->tmr_mc_addr_lo = cmd_buf_mem->resp.fw_addr_lo;
++ ucode->tmr_mc_addr_hi = cmd_buf_mem->resp.fw_addr_hi;
++ }
++
+ amdgpu_bo_free_kernel(&cmd_buf_bo,
+ &cmd_buf_mc_addr,
+ (void **)&cmd_buf_mem);
diff --git a/series.conf b/series.conf
index 995d9d3c8b..0d50ab3e83 100644
--- a/series.conf
+++ b/series.conf
@@ -17071,6 +17071,7 @@
patches.arch/powerpc-64s-move-machine-check-SLB-flushing-to-mm-sl.patch
patches.drivers/0009-arm64-mm-check-for-upper-PAGE_SHIFT-bits-in-pfn_vali.patch
patches.drivers/drm-amdgpu-add-tmr-mc-address-into-amdgpu_firmware_i.patch
+ patches.fixes/0001-drm-amdgpu-update-tmr-mc-address.patch
patches.drivers/drm-amdgpu-add-new-firmware-id-for-VCN.patch
patches.drivers/drm-i915-Unmask-user-interrupts-writes-into-HWSP-on-
patches.fixes/0001-drm-i915-Restore-user-forcewake-domains-across-suspe.patch