All of lore.kernel.org
 help / color / mirror / Atom feed
* [RESEND PATCH 1/5] drm/i915/backlight: Restore backlight on resume, v2.
@ 2018-12-17  9:50 Maarten Lankhorst
  2018-12-17  9:50 ` [RESEND PATCH 2/5] drm/i915/backlight: Fix backlight takeover on LPT, v2 Maarten Lankhorst
                   ` (18 more replies)
  0 siblings, 19 replies; 25+ messages in thread
From: Maarten Lankhorst @ 2018-12-17  9:50 UTC (permalink / raw)
  To: intel-gfx; +Cc: Hans de Goede, Basil Eric Rabi, Tolga Cakir

Restore our saved values for backlight. This way even with fastset on
S4 resume we will correctly restore the backlight to the active values.

Changes since v1:
- Call enable_backlight() when backlight.level is set. On suspend
  backlight.enabled is always cleared, this makes it not a good
  indicator. Also check for crtc->state->active.

Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Cc: Tolga Cakir <cevelnet@gmail.com>
Cc: Basil Eric Rabi <ericbasil.rabi@gmail.com>
Cc: Hans de Goede <jwrdegoede@fedoraproject.org>
Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reported-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
---
 drivers/gpu/drm/i915/intel_display.c |  2 ++
 drivers/gpu/drm/i915/intel_drv.h     |  1 +
 drivers/gpu/drm/i915/intel_panel.c   | 30 ++++++++++++++++++++++++++++
 3 files changed, 33 insertions(+)

diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 2c3f3f68d506..86e7b145fd98 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -15887,7 +15887,9 @@ void intel_display_resume(struct drm_device *dev)
 	if (!ret)
 		ret = __intel_display_resume(dev, state, &ctx);
 
+	intel_panel_restore_backlight(dev_priv);
 	intel_enable_ipc(dev_priv);
+
 	drm_modeset_drop_locks(&ctx);
 	drm_modeset_acquire_fini(&ctx);
 
diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
index cb3a055f18c8..a0551742bcf4 100644
--- a/drivers/gpu/drm/i915/intel_drv.h
+++ b/drivers/gpu/drm/i915/intel_drv.h
@@ -2003,6 +2003,7 @@ int intel_panel_init(struct intel_panel *panel,
 		     struct drm_display_mode *fixed_mode,
 		     struct drm_display_mode *downclock_mode);
 void intel_panel_fini(struct intel_panel *panel);
+void intel_panel_restore_backlight(struct drm_i915_private *dev_priv);
 void intel_fixed_panel_mode(const struct drm_display_mode *fixed_mode,
 			    struct drm_display_mode *adjusted_mode);
 void intel_pch_panel_fitting(struct intel_crtc *crtc,
diff --git a/drivers/gpu/drm/i915/intel_panel.c b/drivers/gpu/drm/i915/intel_panel.c
index ee3e0842d542..799284fcd57d 100644
--- a/drivers/gpu/drm/i915/intel_panel.c
+++ b/drivers/gpu/drm/i915/intel_panel.c
@@ -1903,6 +1903,36 @@ intel_panel_init_backlight_funcs(struct intel_panel *panel)
 	}
 }
 
+void intel_panel_restore_backlight(struct drm_i915_private *dev_priv)
+{
+	struct intel_connector *connector;
+	struct drm_connector_list_iter conn_iter;
+
+	/* Kill all the work that may have been queued by hpd. */
+	drm_connector_list_iter_begin(&dev_priv->drm, &conn_iter);
+	for_each_intel_connector_iter(connector, &conn_iter) {
+		struct intel_panel *panel = &connector->panel;
+		const struct drm_connector_state *conn_state =
+			connector->base.state;
+
+		if (!panel->backlight.present)
+			continue;
+
+		if (panel->backlight.level && conn_state->crtc &&
+		    conn_state->crtc->state->active) {
+			const struct intel_crtc_state *crtc_state =
+				to_intel_crtc_state(conn_state->crtc->state);
+
+			intel_panel_enable_backlight(crtc_state, conn_state);
+		} else {
+			WARN(panel->backlight.enabled, "Backlight enabled without crtc\n");
+
+			intel_panel_disable_backlight(conn_state);
+		}
+	}
+	drm_connector_list_iter_end(&conn_iter);
+}
+
 int intel_panel_init(struct intel_panel *panel,
 		     struct drm_display_mode *fixed_mode,
 		     struct drm_display_mode *downclock_mode)
-- 
2.19.2

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply related	[flat|nested] 25+ messages in thread

end of thread, other threads:[~2019-01-02 10:15 UTC | newest]

Thread overview: 25+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-12-17  9:50 [RESEND PATCH 1/5] drm/i915/backlight: Restore backlight on resume, v2 Maarten Lankhorst
2018-12-17  9:50 ` [RESEND PATCH 2/5] drm/i915/backlight: Fix backlight takeover on LPT, v2 Maarten Lankhorst
2018-12-18  9:49   ` [HACK for CI] drm/i915: Update crtc scaler settings when update_pipe is set Maarten Lankhorst
2018-12-28 14:45   ` [RESEND PATCH 2/5] drm/i915/backlight: Fix backlight takeover on LPT, v2 Jani Nikula
2018-12-17  9:50 ` [RESEND PATCH 3/5] drm/i915: Enable fastset for non-boot modesets Maarten Lankhorst
2018-12-18 16:00   ` [RESEND, " Hans de Goede
2018-12-17  9:50 ` [PATCH 4/5] drm/i915: Make HW readout mark CRTC scaler as in use Maarten Lankhorst
2018-12-18 16:01   ` [4/5] " Hans de Goede
2018-12-17  9:50 ` [RESEND PATCH 5/5] drm/i915: Re-enable fastset by default Maarten Lankhorst
2018-12-17 10:32 ` ✗ Fi.CI.CHECKPATCH: warning for series starting with [RESEND,1/5] drm/i915/backlight: Restore backlight on resume, v2 Patchwork
2018-12-17 10:34 ` ✗ Fi.CI.SPARSE: " Patchwork
2018-12-17 10:49 ` ✓ Fi.CI.BAT: success " Patchwork
2018-12-17 12:50 ` ✗ Fi.CI.IGT: failure " Patchwork
2018-12-18 10:02 ` ✗ Fi.CI.CHECKPATCH: warning for series starting with [RESEND,1/5] drm/i915/backlight: Restore backlight on resume, v2. (rev2) Patchwork
2018-12-18 10:28 ` ✓ Fi.CI.BAT: success " Patchwork
2018-12-18 11:38 ` ✗ Fi.CI.IGT: failure " Patchwork
2018-12-21 13:57 ` ✗ Fi.CI.CHECKPATCH: warning for series starting with [RESEND,1/5] drm/i915/backlight: Restore backlight on resume, v2. (rev3) Patchwork
2018-12-21 14:17 ` ✗ Fi.CI.BAT: failure " Patchwork
2018-12-21 15:11 ` ✗ Fi.CI.CHECKPATCH: warning for series starting with [RESEND,1/5] drm/i915/backlight: Restore backlight on resume, v2. (rev4) Patchwork
2018-12-21 15:29 ` ✗ Fi.CI.BAT: failure " Patchwork
2018-12-21 18:37 ` ✗ Fi.CI.CHECKPATCH: warning for series starting with [RESEND,1/5] drm/i915/backlight: Restore backlight on resume, v2. (rev5) Patchwork
2018-12-21 18:59 ` ✓ Fi.CI.BAT: success " Patchwork
2018-12-21 23:53 ` ✓ Fi.CI.IGT: " Patchwork
2018-12-28 10:10 ` [RESEND PATCH 1/5] drm/i915/backlight: Restore backlight on resume, v2 Jani Nikula
2019-01-02 10:14   ` Maarten Lankhorst

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.