Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

drivers/gpu/drm/i915/intel_dp.c

+2 −1
Original line number Diff line number Diff line
@@ -4183,9 +4183,10 @@ static enum drm_connector_status 
edp_detect(struct intel_dp *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;



	status = intel_panel_detect(dev);

	status = intel_panel_detect(dev_priv);

	if (status == connector_status_unknown)

		status = connector_status_connected;

drivers/gpu/drm/i915/intel_drv.h

+1 −1
Original line number Diff line number Diff line
@@ -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_disable_backlight(struct intel_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(

				struct drm_device *dev,

				struct drm_display_mode *fixed_mode,

drivers/gpu/drm/i915/intel_lvds.c

+2 −2
Original line number Diff line number Diff line
@@ -460,13 +460,13 @@ static bool intel_lvds_compute_config(struct intel_encoder *intel_encoder, 
static enum drm_connector_status

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;



	DRM_DEBUG_KMS("[CONNECTOR:%d:%s]\n",

		      connector->base.id, connector->name);



	status = intel_panel_detect(dev);

	status = intel_panel_detect(dev_priv);

	if (status != connector_status_unknown)

		return status;

drivers/gpu/drm/i915/intel_panel.c

+1 −3
Original line number Diff line number Diff line
@@ -375,10 +375,8 @@ void intel_gmch_panel_fitting(struct intel_crtc *intel_crtc, 
}



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... */

	if (!i915.panel_ignore_lid && dev_priv->opregion.lid_state) {

		return *dev_priv->opregion.lid_state & 0x1 ?