Commit 1650be74 authored by Mika Kahola's avatar Mika Kahola Committed by Jani Nikula

drm/i915: Intel panel detection cleanup

Let's switch to use private dev_priv instead of dev when detecting
intel panels.
Signed-off-by: default avatarMika Kahola <mika.kahola@intel.com>
Reviewed-by: default avatarJani Nikula <jani.nikula@intel.com>
Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1481616169-16210-2-git-send-email-mika.kahola@intel.com
parent c1617abc
...@@ -4183,9 +4183,10 @@ static enum drm_connector_status ...@@ -4183,9 +4183,10 @@ static enum drm_connector_status
edp_detect(struct intel_dp *intel_dp) edp_detect(struct intel_dp *intel_dp)
{ {
struct drm_device *dev = intel_dp_to_dev(intel_dp); struct drm_device *dev = intel_dp_to_dev(intel_dp);
struct drm_i915_private *dev_priv = to_i915(dev);
enum drm_connector_status status; enum drm_connector_status status;
status = intel_panel_detect(dev); status = intel_panel_detect(dev_priv);
if (status == connector_status_unknown) if (status == connector_status_unknown)
status = connector_status_connected; status = connector_status_connected;
......
...@@ -1608,7 +1608,7 @@ int intel_panel_setup_backlight(struct drm_connector *connector, ...@@ -1608,7 +1608,7 @@ int intel_panel_setup_backlight(struct drm_connector *connector,
void intel_panel_enable_backlight(struct intel_connector *connector); void intel_panel_enable_backlight(struct intel_connector *connector);
void intel_panel_disable_backlight(struct intel_connector *connector); void intel_panel_disable_backlight(struct intel_connector *connector);
void intel_panel_destroy_backlight(struct drm_connector *connector); void intel_panel_destroy_backlight(struct drm_connector *connector);
enum drm_connector_status intel_panel_detect(struct drm_device *dev); enum drm_connector_status intel_panel_detect(struct drm_i915_private *dev_priv);
extern struct drm_display_mode *intel_find_panel_downclock( extern struct drm_display_mode *intel_find_panel_downclock(
struct drm_device *dev, struct drm_device *dev,
struct drm_display_mode *fixed_mode, struct drm_display_mode *fixed_mode,
......
...@@ -460,13 +460,13 @@ static bool intel_lvds_compute_config(struct intel_encoder *intel_encoder, ...@@ -460,13 +460,13 @@ static bool intel_lvds_compute_config(struct intel_encoder *intel_encoder,
static enum drm_connector_status static enum drm_connector_status
intel_lvds_detect(struct drm_connector *connector, bool force) intel_lvds_detect(struct drm_connector *connector, bool force)
{ {
struct drm_device *dev = connector->dev; struct drm_i915_private *dev_priv = to_i915(connector->dev);
enum drm_connector_status status; enum drm_connector_status status;
DRM_DEBUG_KMS("[CONNECTOR:%d:%s]\n", DRM_DEBUG_KMS("[CONNECTOR:%d:%s]\n",
connector->base.id, connector->name); connector->base.id, connector->name);
status = intel_panel_detect(dev); status = intel_panel_detect(dev_priv);
if (status != connector_status_unknown) if (status != connector_status_unknown)
return status; return status;
......
...@@ -375,10 +375,8 @@ void intel_gmch_panel_fitting(struct intel_crtc *intel_crtc, ...@@ -375,10 +375,8 @@ void intel_gmch_panel_fitting(struct intel_crtc *intel_crtc,
} }
enum drm_connector_status enum drm_connector_status
intel_panel_detect(struct drm_device *dev) intel_panel_detect(struct drm_i915_private *dev_priv)
{ {
struct drm_i915_private *dev_priv = to_i915(dev);
/* Assume that the BIOS does not lie through the OpRegion... */ /* Assume that the BIOS does not lie through the OpRegion... */
if (!i915.panel_ignore_lid && dev_priv->opregion.lid_state) { if (!i915.panel_ignore_lid && dev_priv->opregion.lid_state) {
return *dev_priv->opregion.lid_state & 0x1 ? return *dev_priv->opregion.lid_state & 0x1 ?
......
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