diff options
| author | Josh Boyer <jwboyer@fedoraproject.org> | 2015-08-27 09:10:41 -0400 |
|---|---|---|
| committer | Josh Boyer <jwboyer@fedoraproject.org> | 2015-08-27 09:10:44 -0400 |
| commit | 7a6072325a8e2011c116e641617b08fc8117c3d3 (patch) | |
| tree | 848bd98b58f6e9fbf910af3b3431deabbdb940cb | |
| parent | fc8febbaea93107ec794787199915ec355d67b1f (diff) | |
| download | kernel-7a6072325a8e2011c116e641617b08fc8117c3d3.tar.gz kernel-7a6072325a8e2011c116e641617b08fc8117c3d3.tar.xz kernel-7a6072325a8e2011c116e641617b08fc8117c3d3.zip | |
Add patch from Hans de Goede to fix nv46 based cards (rhbz 1257534)
| -rw-r--r-- | kernel.spec | 4 | ||||
| -rw-r--r-- | nv46-Change-mc-subdev-oclass-from-nv44-to-nv4c.patch | 33 |
2 files changed, 37 insertions, 0 deletions
diff --git a/kernel.spec b/kernel.spec index a2c6eb0a7..5a05391d0 100644 --- a/kernel.spec +++ b/kernel.spec @@ -596,6 +596,9 @@ Patch510: iSCSI-let-session-recovery_tmo-sysfs-writes-persist.patch #rhbz 1250717 Patch512: ext4-dont-manipulate-recovery-flag-when-freezing.patch +#rhbz 1257534 +Patch513: nv46-Change-mc-subdev-oclass-from-nv44-to-nv4c.patch + Patch904: kdbus.patch # END OF PATCH DEFINITIONS @@ -2035,6 +2038,7 @@ fi %changelog * Thu Aug 27 2015 Josh Boyer <jwboyer@fedoraproject.org> - 4.2.0-0.rc8.git2.1 - Linux v4.2-rc8-10-gf9ed72dde34e +- Add patch from Hans de Goede to fix nv46 based cards (rhbz 1257534) * Wed Aug 26 2015 Josh Boyer <jwboyer@fedoraproject.org> - 4.2.0-0.rc8.git1.1 - Linux v4.2-rc8-7-gf5db4b31b315 diff --git a/nv46-Change-mc-subdev-oclass-from-nv44-to-nv4c.patch b/nv46-Change-mc-subdev-oclass-from-nv44-to-nv4c.patch new file mode 100644 index 000000000..a6996faa1 --- /dev/null +++ b/nv46-Change-mc-subdev-oclass-from-nv44-to-nv4c.patch @@ -0,0 +1,33 @@ +From 16f4f5f0dc33698b841bce71cbc0dd991935b7e1 Mon Sep 17 00:00:00 2001 +From: Hans de Goede <hdegoede@redhat.com> +Date: Thu, 23 Jul 2015 17:20:12 +0200 +Subject: [PATCH] nv46: Change mc subdev oclass from nv44 to nv4c + +MSI interrupts appear to not work for nv46 based cards. Change the mc +subdev oclass for these cards from nv44 to nv4c, the nv4c mc code is +identical to the nv44 mc code except that it does not use msi +(it does not define a msi_rearm callback). + +BugLink: https://bugs.freedesktop.org/show_bug.cgi?id=90435 +Signed-off-by: Hans de Goede <hdegoede@redhat.com> +Signed-off-by: Ben Skeggs <bskeggs@redhat.com> +--- + drivers/gpu/drm/nouveau/nvkm/engine/device/nv40.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/device/nv40.c b/drivers/gpu/drm/nouveau/nvkm/engine/device/nv40.c +index c6301361d14f..b4ad791b4851 100644 +--- a/drivers/gpu/drm/nouveau/nvkm/engine/device/nv40.c ++++ b/drivers/gpu/drm/nouveau/nvkm/engine/device/nv40.c +@@ -265,7 +265,7 @@ nv40_identify(struct nvkm_device *device) + device->oclass[NVDEV_SUBDEV_CLK ] = &nv40_clk_oclass; + device->oclass[NVDEV_SUBDEV_THERM ] = &nv40_therm_oclass; + device->oclass[NVDEV_SUBDEV_DEVINIT] = nv1a_devinit_oclass; +- device->oclass[NVDEV_SUBDEV_MC ] = nv44_mc_oclass; ++ device->oclass[NVDEV_SUBDEV_MC ] = nv4c_mc_oclass; + device->oclass[NVDEV_SUBDEV_BUS ] = nv31_bus_oclass; + device->oclass[NVDEV_SUBDEV_TIMER ] = &nv04_timer_oclass; + device->oclass[NVDEV_SUBDEV_FB ] = nv46_fb_oclass; +-- +2.4.3 + |