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

Commit f6262bda authored by Dhinakaran Pandiyan's avatar Dhinakaran Pandiyan Committed by Ville Syrjälä
Browse files

drm/i915: Don't enable backlight at setup time. 



Maarten and Ville noticed that we are enabling backlight via DP aux very
early in the modeset_init path via the intel_dp_aux_setup_backlight()
function, since commit e7156c83 ("drm/i915: Add Backlight Control using
DPCD for eDP connectors (v9)"). Looks like all we need to do during
_setup_backlight() is read the current brightness state instead of
modifying it.

v2: Rewrote commit message.

Cc: Ville Syrjala <ville.syrjala@linux.intel.com>
Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Cc: Jani Nikula <jani.nikula@intel.com>
Cc: Yetunde Adebisi <yetundex.adebisi@intel.com>
Signed-off-by: default avatarDhinakaran Pandiyan <dhinakaran.pandiyan@intel.com>
Reviewed-by: default avatarMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
Acked-by: default avatarJani Nikula <jani.nikula@intel.com>
Tested-by: default avatarPuthikorn Voravootivat <puthik@chromium.org>
Fixes: e7156c83 ("drm/i915: Add Backlight Control using DPCD for eDP connectors (v9)")
Link: http://patchwork.freedesktop.org/patch/msgid/1497384239-2965-1-git-send-email-dhinakaran.pandiyan@intel.com


Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
parent 29962aca

drivers/gpu/drm/i915/intel_dp_aux_backlight.c

+0 −10
Original line number Diff line number Diff line
@@ -80,10 +80,6 @@ static uint32_t intel_dp_aux_get_backlight(struct intel_connector *connector) 
static void

intel_dp_aux_set_backlight(const struct drm_connector_state *conn_state, u32 level)

{

	/*

	 * conn_state->best_encoder is likely NULL when called from

	 * intel_dp_aux_setup_backlight()

	 */

	struct intel_connector *connector = to_intel_connector(conn_state->connector);

	struct intel_dp *intel_dp = enc_to_intel_dp(&connector->encoder->base);

	uint8_t vals[2] = { 0x0 };
@@ -106,10 +102,6 @@ static void intel_dp_aux_enable_backlight(const struct intel_crtc_state *crtc_st 
					  const struct drm_connector_state *conn_state)

{

	struct intel_connector *connector = to_intel_connector(conn_state->connector);

	/*

	 * conn_state->best_encoder (and crtc_state) are NULL when called from

	 * intel_dp_aux_setup_backlight()

	 */

	struct intel_dp *intel_dp = enc_to_intel_dp(&connector->encoder->base);

	uint8_t dpcd_buf = 0;

	uint8_t edp_backlight_mode = 0;
@@ -156,8 +148,6 @@ static int intel_dp_aux_setup_backlight(struct intel_connector *connector, 
	struct intel_dp *intel_dp = enc_to_intel_dp(&connector->encoder->base);

	struct intel_panel *panel = &connector->panel;



	intel_dp_aux_enable_backlight(NULL, connector->base.state);



	if (intel_dp->edp_dpcd[2] & DP_EDP_BACKLIGHT_BRIGHTNESS_BYTE_COUNT)

		panel->backlight.max = 0xFFFF;

	else