From: Hans de Goede Date: Thu, 23 Jul 2015 15:20:12 +0000 (+0200) Subject: drm/nouveau/nv46: Change mc subdev oclass from nv44 to nv4c X-Git-Tag: v3.16.35~689 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=76f189bc94d9724b60c8040690b7aa49bf2a678f;p=thirdparty%2Fkernel%2Fstable.git drm/nouveau/nv46: Change mc subdev oclass from nv44 to nv4c commit 0a363e85cdafbceeee6a49b91c604d0d4d070dc7 upstream. 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 Signed-off-by: Ben Skeggs Cc: Ilia Mirkin [ luis: backported to 3.16: - file rename: drivers/gpu/drm/nouveau/nvkm/engine/device/nv40.c -> drivers/gpu/drm/nouveau/core/engine/device/nv40.c ] Signed-off-by: Luis Henriques --- diff --git a/drivers/gpu/drm/nouveau/core/engine/device/nv40.c b/drivers/gpu/drm/nouveau/core/engine/device/nv40.c index 1130a62be2c7c..a09cd56437ef8 100644 --- a/drivers/gpu/drm/nouveau/core/engine/device/nv40.c +++ b/drivers/gpu/drm/nouveau/core/engine/device/nv40.c @@ -265,7 +265,7 @@ nv40_identify(struct nouveau_device *device) device->oclass[NVDEV_SUBDEV_CLOCK ] = &nv40_clock_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;