1 files changed, 16 insertions, 10 deletions

diff --git a/drivers/gpu/drm/nouveau/nouveau_backlight.c b/drivers/gpu/drm/nouveau/nouveau_backlight.c
index d3a9c6e02477..00a55dfdba82 100644
--- a/drivers/gpu/drm/nouveau/nouveau_backlight.c
+++ b/drivers/gpu/drm/nouveau/nouveau_backlight.c
@@ -88,18 +88,20 @@ static const struct backlight_ops nv50_bl_ops = {
         .update_status = nv50_set_intensity,
 };
 
-static int nouveau_nv40_backlight_init(struct drm_device *dev)
+static int nouveau_nv40_backlight_init(struct drm_connector *connector)
 {
-        struct backlight_properties props;
+        struct drm_device *dev = connector->dev;
         struct drm_nouveau_private *dev_priv = dev->dev_private;
+        struct backlight_properties props;
         struct backlight_device *bd;
 
         if (!(nv_rd32(dev, NV40_PMC_BACKLIGHT) & NV40_PMC_BACKLIGHT_MASK))
                 return 0;
 
         memset(&props, 0, sizeof(struct backlight_properties));
+        props.type = BACKLIGHT_RAW;
         props.max_brightness = 31;
-        bd = backlight_device_register("nv_backlight", &dev->pdev->dev, dev,
+        bd = backlight_device_register("nv_backlight", &connector->kdev, dev,
                                        &nv40_bl_ops, &props);
         if (IS_ERR(bd))
                 return PTR_ERR(bd);
@@ -111,18 +113,20 @@ static int nouveau_nv40_backlight_init(struct drm_device *dev)
         return 0;
 }
 
-static int nouveau_nv50_backlight_init(struct drm_device *dev)
+static int nouveau_nv50_backlight_init(struct drm_connector *connector)
 {
-        struct backlight_properties props;
+        struct drm_device *dev = connector->dev;
         struct drm_nouveau_private *dev_priv = dev->dev_private;
+        struct backlight_properties props;
         struct backlight_device *bd;
 
         if (!nv_rd32(dev, NV50_PDISPLAY_SOR_BACKLIGHT))
                 return 0;
 
         memset(&props, 0, sizeof(struct backlight_properties));
+        props.type = BACKLIGHT_RAW;
         props.max_brightness = 1025;
-        bd = backlight_device_register("nv_backlight", &dev->pdev->dev, dev,
+        bd = backlight_device_register("nv_backlight", &connector->kdev, dev,
                                        &nv50_bl_ops, &props);
         if (IS_ERR(bd))
                 return PTR_ERR(bd);
@@ -133,8 +137,9 @@ static int nouveau_nv50_backlight_init(struct drm_device *dev)
         return 0;
 }
 
-int nouveau_backlight_init(struct drm_device *dev)
+int nouveau_backlight_init(struct drm_connector *connector)
 {
+        struct drm_device *dev = connector->dev;
         struct drm_nouveau_private *dev_priv = dev->dev_private;
 
 #ifdef CONFIG_ACPI
@@ -147,9 +152,9 @@ int nouveau_backlight_init(struct drm_device *dev)
 
         switch (dev_priv->card_type) {
         case NV_40:
-                return nouveau_nv40_backlight_init(dev);
+                return nouveau_nv40_backlight_init(connector);
         case NV_50:
-                return nouveau_nv50_backlight_init(dev);
+                return nouveau_nv50_backlight_init(connector);
         default:
                 break;
         }
@@ -157,8 +162,9 @@ int nouveau_backlight_init(struct drm_device *dev)
         return 0;
 }
 
-void nouveau_backlight_exit(struct drm_device *dev)
+void nouveau_backlight_exit(struct drm_connector *connector)
 {
+        struct drm_device *dev = connector->dev;
         struct drm_nouveau_private *dev_priv = dev->dev_private;
 
         if (dev_priv->backlight) {