[PATCH] Fix hang problem with GeForce GT 560 Ti and nouveau in 3.13-rc

[Sid Boyce <sboyce@blueyonder.co.uk>]

[-- Attachment #1: Type: text/plain, Size: 239 bytes --]


-- 
Sid Boyce ... Hamradio License G3VBV, Licensed Private Pilot
Emeritus IBM/Amdahl Mainframes and Sun/Fujitsu Servers Tech Support
Senior Staff Specialist, Cricket Coach
Microsoft Windows Free Zone - Linux used for all Computing Tasks


[-- Attachment #2: GF114_2.diff --]
[-- Type: text/x-patch, Size: 1397 bytes --]

This patch stops a console hang with VGA compatible controller: NVIDIA Corporation GF114 [GeForce GTX 560 Ti] (rev a1)
3.13-rc defines NVDEV_SUBDEV_MC as nvc3_mc_oclass, it needs to be defined as nvc0_mc_oclass
Signed off by: Sid Boyce (sboyce@blueyonder.co.uk)
Tested by: Sid Boyce (sboyce@blueyonder.co.uk)
---

drivers/gpu/drm/nouveau/core/engine/device/nvc0.c 1 -+
1 file changed, 1 insertion(+), 1 deletion(-)

INDEX: linux/drivers/gpu/drm/nouveau/core/engine/device/nvc0.c
=========================================================================
diff -up  a/drivers/gpu/drm/nouveau/core/engine/device/nvc0.c b/drivers/gpu/drm/nouveau/core/engine/device/nvc0.c
--- a/drivers/gpu/drm/nouveau/core/engine/device/nvc0.c	2013-11-23 13:03:23.797604441 +0000
+++ b/drivers/gpu/drm/nouveau/core/engine/device/nvc0.c	2014-01-02 02:13:32.445643092 +0000
@@ -161,7 +161,7 @@ nvc0_identify(struct nouveau_device *dev
 		device->oclass[NVDEV_SUBDEV_THERM  ] = &nva3_therm_oclass;
 		device->oclass[NVDEV_SUBDEV_MXM    ] = &nv50_mxm_oclass;
 		device->oclass[NVDEV_SUBDEV_DEVINIT] = &nvc0_devinit_oclass;
-		device->oclass[NVDEV_SUBDEV_MC     ] =  nvc3_mc_oclass;
+		device->oclass[NVDEV_SUBDEV_MC     ] =  nvc0_mc_oclass;
 		device->oclass[NVDEV_SUBDEV_BUS    ] =  nvc0_bus_oclass;
 		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;
 		device->oclass[NVDEV_SUBDEV_FB     ] =  nvc0_fb_oclass;