--- /dev/null
+From f30da187cdcd0939288038e11fb3bfbd1b655564 Mon Sep 17 00:00:00 2001
+From: Daniel Vetter <daniel.vetter@ffwll.ch>
+Date: Thu, 11 Apr 2013 20:22:50 +0200
+Subject: drm/i915: don't check inconsistent modeset state when force-restoring
+
+From: Daniel Vetter <daniel.vetter@ffwll.ch>
+
+commit f30da187cdcd0939288038e11fb3bfbd1b655564 upstream.
+
+It will be only consistent once we've restored all the crtcs. Since a
+bunch of other callers also want to just restore a single crtc, add a
+boolean to disable checking only where it doesn't make sense.
+
+Note that intel_modeset_setup_hw_state already has a call to
+intel_modeset_check_state at the end, so we don't reduce the amount of
+checking.
+
+v2: Try harder not to create a big patch (Chris).
+
+v3: Even smaller (still Chris). Also fix a trailing space.
+
+References: https://lkml.org/lkml/2013/3/16/60
+Cc: Tomas Melin <tomas.melin@iki.fi>
+Cc: Richard Cochran <richardcochran@gmail.com>
+Cc: Chris Wilson <chris@chris-wilson.co.uk>
+Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
+Tested-by: Tomas Melin <tomas.melin@iki.fi>
+Tested-by: Richard Cochran <richardcochran@gmail.com>
+Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/gpu/drm/i915/intel_display.c | 32 ++++++++++++++++++++++++++------
+ 1 file changed, 26 insertions(+), 6 deletions(-)
+
+--- a/drivers/gpu/drm/i915/intel_display.c
++++ b/drivers/gpu/drm/i915/intel_display.c
+@@ -7771,9 +7771,9 @@ intel_modeset_check_state(struct drm_dev
+ }
+ }
+
+-int intel_set_mode(struct drm_crtc *crtc,
+- struct drm_display_mode *mode,
+- int x, int y, struct drm_framebuffer *fb)
++static int __intel_set_mode(struct drm_crtc *crtc,
++ struct drm_display_mode *mode,
++ int x, int y, struct drm_framebuffer *fb)
+ {
+ struct drm_device *dev = crtc->dev;
+ drm_i915_private_t *dev_priv = dev->dev_private;
+@@ -7863,8 +7863,6 @@ done:
+ if (ret && crtc->enabled) {
+ crtc->hwmode = *saved_hwmode;
+ crtc->mode = *saved_mode;
+- } else {
+- intel_modeset_check_state(dev);
+ }
+
+ out:
+@@ -7872,6 +7870,20 @@ out:
+ return ret;
+ }
+
++int intel_set_mode(struct drm_crtc *crtc,
++ struct drm_display_mode *mode,
++ int x, int y, struct drm_framebuffer *fb)
++{
++ int ret;
++
++ ret = __intel_set_mode(crtc, mode, x, y, fb);
++
++ if (ret == 0)
++ intel_modeset_check_state(crtc->dev);
++
++ return ret;
++}
++
+ void intel_crtc_restore_mode(struct drm_crtc *crtc)
+ {
+ intel_set_mode(crtc, &crtc->mode, crtc->x, crtc->y, crtc->fb);
+@@ -9172,8 +9184,16 @@ void intel_modeset_setup_hw_state(struct
+ }
+
+ if (force_restore) {
++ /*
++ * We need to use raw interfaces for restoring state to avoid
++ * checking (bogus) intermediate states.
++ */
+ for_each_pipe(pipe) {
+- intel_crtc_restore_mode(dev_priv->pipe_to_crtc_mapping[pipe]);
++ struct drm_crtc *crtc =
++ dev_priv->pipe_to_crtc_mapping[pipe];
++
++ __intel_set_mode(crtc, &crtc->mode, crtc->x, crtc->y,
++ crtc->fb);
+ }
+
+ i915_redisable_vga(dev);
--- /dev/null
+From dc652f90e088798bfa31f496ba994ddadd5d5680 Mon Sep 17 00:00:00 2001
+From: Jani Nikula <jani.nikula@intel.com>
+Date: Fri, 12 Apr 2013 15:18:38 +0300
+Subject: drm/i915: ensure single initialization and cleanup of backlight device
+
+From: Jani Nikula <jani.nikula@intel.com>
+
+commit dc652f90e088798bfa31f496ba994ddadd5d5680 upstream.
+
+Backlight cleanup in the eDP connector destroy callback caused the
+backlight device to be removed on some systems that first initialized LVDS
+and then attempted to initialize eDP. Prevent multiple backlight
+initializations, and ensure backlight cleanup is only done once by moving
+it to modeset cleanup.
+
+A small wrinkle is the introduced asymmetry in backlight
+setup/cleanup. This could be solved by adding refcounting, but it seems
+overkill considering that there should only ever be one backlight device.
+
+Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=55701
+Signed-off-by: Jani Nikula <jani.nikula@intel.com>
+Tested-by: Peter Verthez <peter.verthez@skynet.be>
+Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/gpu/drm/i915/intel_display.c | 3 +++
+ drivers/gpu/drm/i915/intel_dp.c | 5 +----
+ drivers/gpu/drm/i915/intel_lvds.c | 1 -
+ drivers/gpu/drm/i915/intel_panel.c | 7 ++++++-
+ 4 files changed, 10 insertions(+), 6 deletions(-)
+
+--- a/drivers/gpu/drm/i915/intel_display.c
++++ b/drivers/gpu/drm/i915/intel_display.c
+@@ -9256,6 +9256,9 @@ void intel_modeset_cleanup(struct drm_de
+ /* flush any delayed tasks or pending work */
+ flush_scheduled_work();
+
++ /* destroy backlight, if any, before the connectors */
++ intel_panel_destroy_backlight(dev);
++
+ drm_mode_config_cleanup(dev);
+
+ intel_cleanup_overlay(dev);
+--- a/drivers/gpu/drm/i915/intel_dp.c
++++ b/drivers/gpu/drm/i915/intel_dp.c
+@@ -2538,17 +2538,14 @@ done:
+ static void
+ intel_dp_destroy(struct drm_connector *connector)
+ {
+- struct drm_device *dev = connector->dev;
+ struct intel_dp *intel_dp = intel_attached_dp(connector);
+ struct intel_connector *intel_connector = to_intel_connector(connector);
+
+ if (!IS_ERR_OR_NULL(intel_connector->edid))
+ kfree(intel_connector->edid);
+
+- if (is_edp(intel_dp)) {
+- intel_panel_destroy_backlight(dev);
++ if (is_edp(intel_dp))
+ intel_panel_fini(&intel_connector->panel);
+- }
+
+ drm_sysfs_connector_remove(connector);
+ drm_connector_cleanup(connector);
+--- a/drivers/gpu/drm/i915/intel_lvds.c
++++ b/drivers/gpu/drm/i915/intel_lvds.c
+@@ -618,7 +618,6 @@ static void intel_lvds_destroy(struct dr
+ if (!IS_ERR_OR_NULL(lvds_connector->base.edid))
+ kfree(lvds_connector->base.edid);
+
+- intel_panel_destroy_backlight(connector->dev);
+ intel_panel_fini(&lvds_connector->base.panel);
+
+ drm_sysfs_connector_remove(connector);
+--- a/drivers/gpu/drm/i915/intel_panel.c
++++ b/drivers/gpu/drm/i915/intel_panel.c
+@@ -422,6 +422,9 @@ int intel_panel_setup_backlight(struct d
+
+ intel_panel_init_backlight(dev);
+
++ if (WARN_ON(dev_priv->backlight))
++ return -ENODEV;
++
+ memset(&props, 0, sizeof(props));
+ props.type = BACKLIGHT_RAW;
+ props.max_brightness = _intel_panel_get_max_backlight(dev);
+@@ -447,8 +450,10 @@ int intel_panel_setup_backlight(struct d
+ void intel_panel_destroy_backlight(struct drm_device *dev)
+ {
+ struct drm_i915_private *dev_priv = dev->dev_private;
+- if (dev_priv->backlight)
++ if (dev_priv->backlight) {
+ backlight_device_unregister(dev_priv->backlight);
++ dev_priv->backlight = NULL;
++ }
+ }
+ #else
+ int intel_panel_setup_backlight(struct drm_connector *connector)
projects / thirdparty / kernel / stable-queue.git / commitdiff
