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

Commit 90d7cd24 authored by Maarten Lankhorst's avatar Maarten Lankhorst
Browse files

drm/i915: Pass connector state to intel_panel_set_backlight_acpi 

Passing the state is also needed to convert the backlight functions
to use the correct state instead of looking it up.

This is done as a separate commit to allow easier bisecting.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=100022


Signed-off-by: default avatarMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20170612102115.23665-3-maarten.lankhorst@linux.intel.com


Reviewed-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
parent b037d58f

drivers/gpu/drm/i915/intel_drv.h

+1 −1
Original line number Diff line number Diff line
@@ -1712,7 +1712,7 @@ void intel_pch_panel_fitting(struct intel_crtc *crtc, 
void intel_gmch_panel_fitting(struct intel_crtc *crtc,

			      struct intel_crtc_state *pipe_config,

			      int fitting_mode);

void intel_panel_set_backlight_acpi(struct intel_connector *connector,

void intel_panel_set_backlight_acpi(const struct drm_connector_state *conn_state,

				    u32 level, u32 max);

int intel_panel_setup_backlight(struct drm_connector *connector,

				enum pipe pipe);

drivers/gpu/drm/i915/intel_opregion.c

+1 −1
Original line number Diff line number Diff line
@@ -461,7 +461,7 @@ static u32 asle_set_backlight(struct drm_i915_private *dev_priv, u32 bclp) 
	DRM_DEBUG_KMS("updating opregion backlight %d/255\n", bclp);

	drm_connector_list_iter_begin(dev, &conn_iter);

	for_each_intel_connector_iter(connector, &conn_iter)

		intel_panel_set_backlight_acpi(connector, bclp, 255);

		intel_panel_set_backlight_acpi(connector->base.state, bclp, 255);

	drm_connector_list_iter_end(&conn_iter);

	asle->cblv = DIV_ROUND_UP(bclp * 100, 255) | ASLE_CBLV_VALID;

drivers/gpu/drm/i915/intel_panel.c

+4 −4
Original line number Diff line number Diff line
@@ -671,21 +671,21 @@ static void intel_panel_set_backlight(struct intel_connector *connector, 
/* set backlight brightness to level in range [0..max], assuming hw min is

 * respected.

 */

void intel_panel_set_backlight_acpi(struct intel_connector *connector,

void intel_panel_set_backlight_acpi(const struct drm_connector_state *conn_state,

				    u32 user_level, u32 user_max)

{

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

	struct drm_i915_private *dev_priv = to_i915(connector->base.dev);

	struct intel_panel *panel = &connector->panel;

	enum pipe pipe = intel_get_pipe_from_connector(connector);

	u32 hw_level;



	/*

	 * INVALID_PIPE may occur during driver init because

	 * Lack of crtc may occur during driver init because

	 * connection_mutex isn't held across the entire backlight

	 * setup + modeset readout, and the BIOS can issue the

	 * requests at any time.

	 */

	if (!panel->backlight.present || pipe == INVALID_PIPE)

	if (!panel->backlight.present || !conn_state->crtc)

		return;



	mutex_lock(&dev_priv->backlight_lock);