summaryrefslogtreecommitdiffstats
path: root/0001-disp-hda-gf119-select-HDA-device-entry-based-on-boun.patch
diff options
context:
space:
mode:
authorJustin M. Forbes <jforbes@fedoraproject.org>2020-06-10 17:15:58 -0500
committerJustin M. Forbes <jforbes@fedoraproject.org>2020-06-10 17:15:58 -0500
commit614b7d7d7b10d8e3f146bed311215f818be5accd (patch)
treeff92323ae8547b034624753824df4568b1079918 /0001-disp-hda-gf119-select-HDA-device-entry-based-on-boun.patch
parentf74d84eda2966af5c10fcae2ef90a940f96943a0 (diff)
downloadkernel-614b7d7d7b10d8e3f146bed311215f818be5accd.tar.gz
kernel-614b7d7d7b10d8e3f146bed311215f818be5accd.tar.xz
kernel-614b7d7d7b10d8e3f146bed311215f818be5accd.zip
Initial 5.7.2 rebase
Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
Diffstat (limited to '0001-disp-hda-gf119-select-HDA-device-entry-based-on-boun.patch')
-rw-r--r--0001-disp-hda-gf119-select-HDA-device-entry-based-on-boun.patch49
1 files changed, 49 insertions, 0 deletions
diff --git a/0001-disp-hda-gf119-select-HDA-device-entry-based-on-boun.patch b/0001-disp-hda-gf119-select-HDA-device-entry-based-on-boun.patch
new file mode 100644
index 000000000..714d1a0f3
--- /dev/null
+++ b/0001-disp-hda-gf119-select-HDA-device-entry-based-on-boun.patch
@@ -0,0 +1,49 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Ben Skeggs <bskeggs@redhat.com>
+Date: Wed, 6 May 2020 14:40:58 +1000
+Subject: [PATCH] disp/hda/gf119-: select HDA device entry based on bound head
+
+Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
+---
+ drivers/gpu/drm/nouveau/nvkm/engine/disp/hdagf119.c | 7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/hdagf119.c b/drivers/gpu/drm/nouveau/nvkm/engine/disp/hdagf119.c
+index 8a0ec7db5145..19d2d58344e4 100644
+--- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/hdagf119.c
++++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/hdagf119.c
+@@ -28,14 +28,14 @@ gf119_hda_device_entry(struct nvkm_ior *ior, int head)
+ {
+ struct nvkm_device *device = ior->disp->engine.subdev.device;
+ const u32 hoff = 0x800 * head;
+- nvkm_mask(device, 0x616548 + hoff, 0x00000070, 0x00000000);
++ nvkm_mask(device, 0x616548 + hoff, 0x00000070, head << 4);
+ }
+
+ void
+ gf119_hda_eld(struct nvkm_ior *ior, int head, u8 *data, u8 size)
+ {
+ struct nvkm_device *device = ior->disp->engine.subdev.device;
+- const u32 soff = 0x030 * ior->id;
++ const u32 soff = 0x030 * ior->id + (head * 0x04);
+ int i;
+
+ for (i = 0; i < size; i++)
+@@ -49,6 +49,7 @@ void
+ gf119_hda_hpd(struct nvkm_ior *ior, int head, bool present)
+ {
+ struct nvkm_device *device = ior->disp->engine.subdev.device;
++ const u32 soff = 0x030 * ior->id + (head * 0x04);
+ u32 data = 0x80000000;
+ u32 mask = 0x80000001;
+ if (present) {
+@@ -57,5 +58,5 @@ gf119_hda_hpd(struct nvkm_ior *ior, int head, bool present)
+ } else {
+ mask |= 0x00000002;
+ }
+- nvkm_mask(device, 0x10ec10 + ior->id * 0x030, mask, data);
++ nvkm_mask(device, 0x10ec10 + soff, mask, data);
+ }
+--
+2.26.2
+