drop drm-nouveau-mmu-nv4a-use-nv04-mmu-rather-than-the-nv44-one.patch

diff --git a/queue-4.11/drm-nouveau-mmu-nv4a-use-nv04-mmu-rather-than-the-nv44-one.patch b/queue-4.11/drm-nouveau-mmu-nv4a-use-nv04-mmu-rather-than-the-nv44-one.patch
deleted file mode 100644 (file)
index 50f3534..0000000
--- a/queue-4.11/drm-nouveau-mmu-nv4a-use-nv04-mmu-rather-than-the-nv44-one.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From ac799acaa4d8db4f7dcd968b15c9596c80a4677f Mon Sep 17 00:00:00 2001
-From: Ilia Mirkin <imirkin@alum.mit.edu>
-Date: Sat, 18 Mar 2017 16:23:10 -0400
-Subject: drm/nouveau/mmu/nv4a: use nv04 mmu rather than the nv44 one
-
-From: Ilia Mirkin <imirkin@alum.mit.edu>
-
-commit ac799acaa4d8db4f7dcd968b15c9596c80a4677f upstream.
-
-The NV4A (aka NV44A) is an oddity in the family. It only comes in AGP
-and PCI varieties, rather than a core PCIE chip with a bridge for
-AGP/PCI as necessary. As a result, it appears that the MMU is also
-non-functional. For AGP cards, the vast majority of the NV4A lineup,
-this worked out since we force AGP cards to use the nv04 mmu. However
-for PCI variants, this did not work.
-
-Switching to the NV04 MMU makes it work like a charm. Thanks to mwk for
-the suggestion. This should be a no-op for NV4A AGP boards, as they were
-using it already.
-
-Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=70388
-Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu>
-Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- drivers/gpu/drm/nouveau/nvkm/engine/device/base.c |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c
-+++ b/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c
-@@ -584,7 +584,7 @@ nv44_chipset = {
-       .i2c = nv04_i2c_new,
-       .imem = nv40_instmem_new,
-       .mc = nv44_mc_new,
--      .mmu = nv44_mmu_new,
-+      .mmu = nv04_mmu_new,
-       .pci = nv40_pci_new,
-       .therm = nv40_therm_new,
-       .timer = nv41_timer_new,

diff --git a/queue-4.11/series b/queue-4.11/series
index 651f046996142929c333331acc13ae05b0b320bb..0384dc6466dcf6d7fdaad17a577ff18608676b06 100644 (file)
--- a/queue-4.11/series
+++ b/queue-4.11/series
@@ -51,7 +51,6 @@ ath9k_htc-fix-null-deref-at-probe.patch
 drm-amdgpu-make-display-watermark-calculations-more-accurate.patch
 drm-amdgpu-avoid-overflows-divide-by-zero-in-latency_watermark-calculations.patch
 drm-amdgpu-add-missing-lb_vblank_lead_lines-setup-to-dce-6-path.patch
-drm-nouveau-mmu-nv4a-use-nv04-mmu-rather-than-the-nv44-one.patch
 drm-nouveau-therm-remove-ineffective-workarounds-for-alarm-bugs.patch
 drm-nouveau-kms-nv50-fix-source-rect-only-plane-updates.patch
 drm-nouveau-kms-nv50-skip-core-channel-cursor-update-on-position-only-changes.patch

diff --git a/queue-4.4/drm-nouveau-mmu-nv4a-use-nv04-mmu-rather-than-the-nv44-one.patch b/queue-4.4/drm-nouveau-mmu-nv4a-use-nv04-mmu-rather-than-the-nv44-one.patch
deleted file mode 100644 (file)
index 50f3534..0000000
--- a/queue-4.4/drm-nouveau-mmu-nv4a-use-nv04-mmu-rather-than-the-nv44-one.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From ac799acaa4d8db4f7dcd968b15c9596c80a4677f Mon Sep 17 00:00:00 2001
-From: Ilia Mirkin <imirkin@alum.mit.edu>
-Date: Sat, 18 Mar 2017 16:23:10 -0400
-Subject: drm/nouveau/mmu/nv4a: use nv04 mmu rather than the nv44 one
-
-From: Ilia Mirkin <imirkin@alum.mit.edu>
-
-commit ac799acaa4d8db4f7dcd968b15c9596c80a4677f upstream.
-
-The NV4A (aka NV44A) is an oddity in the family. It only comes in AGP
-and PCI varieties, rather than a core PCIE chip with a bridge for
-AGP/PCI as necessary. As a result, it appears that the MMU is also
-non-functional. For AGP cards, the vast majority of the NV4A lineup,
-this worked out since we force AGP cards to use the nv04 mmu. However
-for PCI variants, this did not work.
-
-Switching to the NV04 MMU makes it work like a charm. Thanks to mwk for
-the suggestion. This should be a no-op for NV4A AGP boards, as they were
-using it already.
-
-Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=70388
-Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu>
-Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- drivers/gpu/drm/nouveau/nvkm/engine/device/base.c |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c
-+++ b/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c
-@@ -584,7 +584,7 @@ nv44_chipset = {
-       .i2c = nv04_i2c_new,
-       .imem = nv40_instmem_new,
-       .mc = nv44_mc_new,
--      .mmu = nv44_mmu_new,
-+      .mmu = nv04_mmu_new,
-       .pci = nv40_pci_new,
-       .therm = nv40_therm_new,
-       .timer = nv41_timer_new,

diff --git a/queue-4.4/series b/queue-4.4/series
index 3b0efa0897f3bf2d37cd234faf5dda61ced437df..ecec82920aa8b221e4297681c43541d5573e4c95 100644 (file)
--- a/queue-4.4/series
+++ b/queue-4.4/series
@@ -28,7 +28,6 @@ ath9k_htc-add-support-of-airties-1eda-2315-ar9271-device.patch
 ath9k_htc-fix-null-deref-at-probe.patch
 drm-amdgpu-avoid-overflows-divide-by-zero-in-latency_watermark-calculations.patch
 drm-amdgpu-make-display-watermark-calculations-more-accurate.patch
-drm-nouveau-mmu-nv4a-use-nv04-mmu-rather-than-the-nv44-one.patch
 drm-nouveau-therm-remove-ineffective-workarounds-for-alarm-bugs.patch
 drm-nouveau-tmr-ack-interrupt-before-processing-alarms.patch
 drm-nouveau-tmr-fix-corruption-of-the-pending-list-when-rescheduling-an-alarm.patch

diff --git a/queue-4.9/drm-nouveau-mmu-nv4a-use-nv04-mmu-rather-than-the-nv44-one.patch b/queue-4.9/drm-nouveau-mmu-nv4a-use-nv04-mmu-rather-than-the-nv44-one.patch
deleted file mode 100644 (file)
index 50f3534..0000000
--- a/queue-4.9/drm-nouveau-mmu-nv4a-use-nv04-mmu-rather-than-the-nv44-one.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From ac799acaa4d8db4f7dcd968b15c9596c80a4677f Mon Sep 17 00:00:00 2001
-From: Ilia Mirkin <imirkin@alum.mit.edu>
-Date: Sat, 18 Mar 2017 16:23:10 -0400
-Subject: drm/nouveau/mmu/nv4a: use nv04 mmu rather than the nv44 one
-
-From: Ilia Mirkin <imirkin@alum.mit.edu>
-
-commit ac799acaa4d8db4f7dcd968b15c9596c80a4677f upstream.
-
-The NV4A (aka NV44A) is an oddity in the family. It only comes in AGP
-and PCI varieties, rather than a core PCIE chip with a bridge for
-AGP/PCI as necessary. As a result, it appears that the MMU is also
-non-functional. For AGP cards, the vast majority of the NV4A lineup,
-this worked out since we force AGP cards to use the nv04 mmu. However
-for PCI variants, this did not work.
-
-Switching to the NV04 MMU makes it work like a charm. Thanks to mwk for
-the suggestion. This should be a no-op for NV4A AGP boards, as they were
-using it already.
-
-Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=70388
-Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu>
-Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- drivers/gpu/drm/nouveau/nvkm/engine/device/base.c |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c
-+++ b/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c
-@@ -584,7 +584,7 @@ nv44_chipset = {
-       .i2c = nv04_i2c_new,
-       .imem = nv40_instmem_new,
-       .mc = nv44_mc_new,
--      .mmu = nv44_mmu_new,
-+      .mmu = nv04_mmu_new,
-       .pci = nv40_pci_new,
-       .therm = nv40_therm_new,
-       .timer = nv41_timer_new,

diff --git a/queue-4.9/series b/queue-4.9/series
index 3d248819bfa7892fde5b81e1d07da18a3e175b7d..763b167dff9852b57fb8e355b938c1c954bc04a5 100644 (file)
--- a/queue-4.9/series
+++ b/queue-4.9/series
@@ -47,7 +47,6 @@ ath9k_htc-fix-null-deref-at-probe.patch
 drm-amdgpu-make-display-watermark-calculations-more-accurate.patch
 drm-amdgpu-avoid-overflows-divide-by-zero-in-latency_watermark-calculations.patch
 drm-amdgpu-add-missing-lb_vblank_lead_lines-setup-to-dce-6-path.patch
-drm-nouveau-mmu-nv4a-use-nv04-mmu-rather-than-the-nv44-one.patch
 drm-nouveau-therm-remove-ineffective-workarounds-for-alarm-bugs.patch
 drm-nouveau-tmr-ack-interrupt-before-processing-alarms.patch
 drm-nouveau-tmr-fix-corruption-of-the-pending-list-when-rescheduling-an-alarm.patch