drm/nv50/backlight: take the sor into account when bashing regs

[firefly-linux-kernel-4.4.55.git] / drivers / gpu / drm / nouveau / nouveau_state.c

diff --git a/drivers/gpu/drm/nouveau/nouveau_state.c b/drivers/gpu/drm/nouveau/nouveau_state.c
index baaecf10a585beafb9fb7458292ef4e7586eab04..50df52da3aad6e539df79fda575c1a1408990627 100644 (file)
--- a/drivers/gpu/drm/nouveau/nouveau_state.c
+++ b/drivers/gpu/drm/nouveau/nouveau_state.c
@@ -728,6 +728,8 @@ nouveau_card_init(struct drm_device *dev)
        if (ret)
                goto out_irq;
 
+       nouveau_backlight_init(dev);
+
        if (dev_priv->eng[NVOBJ_ENGINE_GR]) {
                ret = nouveau_fence_init(dev);
                if (ret)
@@ -757,6 +759,7 @@ out_chan:
 out_fence:
        nouveau_fence_fini(dev);
 out_disp:
+       nouveau_backlight_exit(dev);
        engine->display.destroy(dev);
 out_irq:
        nouveau_irq_fini(dev);
@@ -817,6 +820,7 @@ static void nouveau_card_takedown(struct drm_device *dev)
                nouveau_fence_fini(dev);
        }
 
+       nouveau_backlight_exit(dev);
        engine->display.destroy(dev);
        drm_mode_config_cleanup(dev);