Commit e98ce0d7 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge remote branch 'nouveau/drm-nouveau-next' of /ssd/git/drm-nouveau-next into drm-fixes 

* 'nouveau/drm-nouveau-next' of /ssd/git/drm-nouveau-next:
  drm/nv50: fix display on 0x50
  drm/nouveau: correctly pair hwmon_init and hwmon_fini
parents a55205e2 c4534fdf

drivers/gpu/drm/nouveau/nouveau_pm.c

+1 −1
Original line number Diff line number Diff line
@@ -443,7 +443,7 @@ nouveau_hwmon_fini(struct drm_device *dev) 
	struct nouveau_pm_engine *pm = &dev_priv->engine.pm;



	if (pm->hwmon) {

		sysfs_remove_group(&pm->hwmon->kobj, &hwmon_attrgroup);

		sysfs_remove_group(&dev->pdev->dev.kobj, &hwmon_attrgroup);

		hwmon_device_unregister(pm->hwmon);

	}

#endif

drivers/gpu/drm/nouveau/nv50_evo.c

+1 −2
Original line number Diff line number Diff line
@@ -283,8 +283,7 @@ nv50_evo_create(struct drm_device *dev) 
			nv50_evo_channel_del(&dev_priv->evo);

			return ret;

		}

	} else

	if (dev_priv->chipset != 0x50) {

	} else {

		ret = nv50_evo_dmaobj_new(evo, 0x3d, NvEvoFB16, 0x70, 0x19,

					  0, 0xffffffff, 0x00010000);

		if (ret) {

CRA Git | Maintained and supported by SUSTech CRA and CCSE