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-03 13:47:28 -0500
committerJustin M. Forbes <jforbes@fedoraproject.org>2020-06-03 13:47:28 -0500
commit95dc4cf28c756d993d2080a495935006100a62a2 (patch)
treeaf11132f73d16ba11373f61a12eb6b1c9c8f4d69 /0001-disp-hda-gf119-select-HDA-device-entry-based-on-boun.patch
parent49d6a971ac73ed6e56c93207c43272f54630d01b (diff)
downloadkernel-95dc4cf28c756d993d2080a495935006100a62a2.tar.gz
kernel-95dc4cf28c756d993d2080a495935006100a62a2.tar.xz
kernel-95dc4cf28c756d993d2080a495935006100a62a2.zip
kernel-5.8.0-0.rc0.20200603gitd6f9469a03d8.1
* Wed Jun 03 2020 CKI@GitLab <cki-project@redhat.com> [5.8.0-0.rc0.20200603gitd6f9469a03d8.1] - d6f9469a03d8 rebase - Fix configs for Fedora ("Justin M. Forbes") - Fix update_scripts.sh unselective pattern sub (David Howells) - Updated changelog for the release based on b0c3ba31be3e ("CKI@GitLab") - Drop the static path configuration for the Sphinx docs (Jeremy Cline) - Sign off generated configuration patches (Jeremy Cline) - Use __make macro instead of make (Tom Stellard) - redhat/configs: Enable CONFIG_SMC91X and disable CONFIG_SMC911X (Prarit Bhargava) [http://bugzilla.redhat.com/1722136] Resolves: rhbz# 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, 0 insertions, 49 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
deleted file mode 100644
index 714d1a0f3..000000000
--- a/0001-disp-hda-gf119-select-HDA-device-entry-based-on-boun.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-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
-