drm/i915: Backlight setup requires connector so pass it as parameter

Get rid of saved int_lvds_connector and int_edp_connector in
drm_i915_private.

Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Reviewed-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index 9cdd653708102020f416542e1f4cadf677fd1a5e..23c01f8a25cabd919d345bc81b79b5afa155a14c 100644 (file)
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -826,8 +826,6 @@ typedef struct drm_i915_private {
        u16 orig_clock;
        int child_dev_num;
        struct child_device_config *child_dev;
-       struct drm_connector *int_lvds_connector;
-       struct drm_connector *int_edp_connector;
 
        bool mchbar_need_disable;
 

diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
index d868ba7f8ad2c32070ae0dc4baf07928d414c105..015d8747147e9d1cc92c4ffc8e56e9e23b172c4f 100644 (file)
--- a/drivers/gpu/drm/i915/intel_dp.c
+++ b/drivers/gpu/drm/i915/intel_dp.c
@@ -2831,10 +2831,8 @@ intel_dp_init(struct drm_device *dev, int output_reg, enum port port)
 
        intel_encoder->hot_plug = intel_dp_hot_plug;
 
-       if (is_edp(intel_dp)) {
-               dev_priv->int_edp_connector = connector;
-               intel_panel_setup_backlight(dev);
-       }
+       if (is_edp(intel_dp))
+               intel_panel_setup_backlight(connector);
 
        intel_dp_add_properties(intel_dp, connector);
 

diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
index 0c2a20ffa1c9f551a4b12ba554ea3429078345e1..fa388fdbfe08938f25c94fb9071f0ba42c9309ee 100644 (file)
--- a/drivers/gpu/drm/i915/intel_drv.h
+++ b/drivers/gpu/drm/i915/intel_drv.h
@@ -444,7 +444,7 @@ extern void intel_pch_panel_fitting(struct drm_device *dev,
                                    struct drm_display_mode *adjusted_mode);
 extern u32 intel_panel_get_max_backlight(struct drm_device *dev);
 extern void intel_panel_set_backlight(struct drm_device *dev, u32 level);
-extern int intel_panel_setup_backlight(struct drm_device *dev);
+extern int intel_panel_setup_backlight(struct drm_connector *connector);
 extern void intel_panel_enable_backlight(struct drm_device *dev,
                                         enum pipe pipe);
 extern void intel_panel_disable_backlight(struct drm_device *dev);

diff --git a/drivers/gpu/drm/i915/intel_lvds.c b/drivers/gpu/drm/i915/intel_lvds.c
index 6cb5fc6121f98bc747577586423f99c0db98b7a3..8c2754042da4800ccc11a8b528bf44876e38adb4 100644 (file)
--- a/drivers/gpu/drm/i915/intel_lvds.c
+++ b/drivers/gpu/drm/i915/intel_lvds.c
@@ -1103,11 +1103,9 @@ out:
                DRM_DEBUG_KMS("lid notifier registration failed\n");
                lvds_connector->lid_notifier.notifier_call = NULL;
        }
-       /* keep the LVDS connector */
-       dev_priv->int_lvds_connector = connector;
        drm_sysfs_connector_add(connector);
 
-       intel_panel_setup_backlight(dev);
+       intel_panel_setup_backlight(connector);
 
        return true;
 

diff --git a/drivers/gpu/drm/i915/intel_panel.c b/drivers/gpu/drm/i915/intel_panel.c
index e019b236986128bae46c61bf49180f7ec2502a0d..d9752a3bf1f8e64d0d7abf72a4fb73d8d56d48ca 100644 (file)
--- a/drivers/gpu/drm/i915/intel_panel.c
+++ b/drivers/gpu/drm/i915/intel_panel.c
@@ -416,21 +416,14 @@ static const struct backlight_ops intel_panel_bl_ops = {
        .get_brightness = intel_panel_get_brightness,
 };
 
-int intel_panel_setup_backlight(struct drm_device *dev)
+int intel_panel_setup_backlight(struct drm_connector *connector)
 {
+       struct drm_device *dev = connector->dev;
        struct drm_i915_private *dev_priv = dev->dev_private;
        struct backlight_properties props;
-       struct drm_connector *connector;
 
        intel_panel_init_backlight(dev);
 
-       if (dev_priv->int_lvds_connector)
-               connector = dev_priv->int_lvds_connector;
-       else if (dev_priv->int_edp_connector)
-               connector = dev_priv->int_edp_connector;
-       else
-               return -ENODEV;
-
        memset(&props, 0, sizeof(props));
        props.type = BACKLIGHT_RAW;
        props.max_brightness = _intel_panel_get_max_backlight(dev);
@@ -460,9 +453,9 @@ void intel_panel_destroy_backlight(struct drm_device *dev)
                backlight_device_unregister(dev_priv->backlight);
 }
 #else
-int intel_panel_setup_backlight(struct drm_device *dev)
+int intel_panel_setup_backlight(struct drm_connector *connector)
 {
-       intel_panel_init_backlight(dev);
+       intel_panel_init_backlight(connector->dev);
        return 0;
 }