Commit 0657b6b1 authored by Jani Nikula's avatar Jani Nikula Committed by Daniel Vetter

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: default avatarJani Nikula <jani.nikula@intel.com>
Reviewed-by: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
Reviewed-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent db1740a0
...@@ -826,8 +826,6 @@ typedef struct drm_i915_private { ...@@ -826,8 +826,6 @@ typedef struct drm_i915_private {
u16 orig_clock; u16 orig_clock;
int child_dev_num; int child_dev_num;
struct child_device_config *child_dev; struct child_device_config *child_dev;
struct drm_connector *int_lvds_connector;
struct drm_connector *int_edp_connector;
bool mchbar_need_disable; bool mchbar_need_disable;
......
...@@ -2831,10 +2831,8 @@ intel_dp_init(struct drm_device *dev, int output_reg, enum port port) ...@@ -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; intel_encoder->hot_plug = intel_dp_hot_plug;
if (is_edp(intel_dp)) { if (is_edp(intel_dp))
dev_priv->int_edp_connector = connector; intel_panel_setup_backlight(connector);
intel_panel_setup_backlight(dev);
}
intel_dp_add_properties(intel_dp, connector); intel_dp_add_properties(intel_dp, connector);
......
...@@ -444,7 +444,7 @@ extern void intel_pch_panel_fitting(struct drm_device *dev, ...@@ -444,7 +444,7 @@ extern void intel_pch_panel_fitting(struct drm_device *dev,
struct drm_display_mode *adjusted_mode); struct drm_display_mode *adjusted_mode);
extern u32 intel_panel_get_max_backlight(struct drm_device *dev); extern u32 intel_panel_get_max_backlight(struct drm_device *dev);
extern void intel_panel_set_backlight(struct drm_device *dev, u32 level); 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, extern void intel_panel_enable_backlight(struct drm_device *dev,
enum pipe pipe); enum pipe pipe);
extern void intel_panel_disable_backlight(struct drm_device *dev); extern void intel_panel_disable_backlight(struct drm_device *dev);
......
...@@ -1103,11 +1103,9 @@ bool intel_lvds_init(struct drm_device *dev) ...@@ -1103,11 +1103,9 @@ bool intel_lvds_init(struct drm_device *dev)
DRM_DEBUG_KMS("lid notifier registration failed\n"); DRM_DEBUG_KMS("lid notifier registration failed\n");
lvds_connector->lid_notifier.notifier_call = NULL; lvds_connector->lid_notifier.notifier_call = NULL;
} }
/* keep the LVDS connector */
dev_priv->int_lvds_connector = connector;
drm_sysfs_connector_add(connector); drm_sysfs_connector_add(connector);
intel_panel_setup_backlight(dev); intel_panel_setup_backlight(connector);
return true; return true;
......
...@@ -416,21 +416,14 @@ static const struct backlight_ops intel_panel_bl_ops = { ...@@ -416,21 +416,14 @@ static const struct backlight_ops intel_panel_bl_ops = {
.get_brightness = intel_panel_get_brightness, .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 drm_i915_private *dev_priv = dev->dev_private;
struct backlight_properties props; struct backlight_properties props;
struct drm_connector *connector;
intel_panel_init_backlight(dev); 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)); memset(&props, 0, sizeof(props));
props.type = BACKLIGHT_RAW; props.type = BACKLIGHT_RAW;
props.max_brightness = _intel_panel_get_max_backlight(dev); props.max_brightness = _intel_panel_get_max_backlight(dev);
...@@ -460,9 +453,9 @@ void intel_panel_destroy_backlight(struct drm_device *dev) ...@@ -460,9 +453,9 @@ void intel_panel_destroy_backlight(struct drm_device *dev)
backlight_device_unregister(dev_priv->backlight); backlight_device_unregister(dev_priv->backlight);
} }
#else #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; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment