This is a note to let you know that I've just added the patch titled
drm/i915: don't check inconsistent modeset state when force-restoring
to the 3.9-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
drm-i915-don-t-check-inconsistent-modeset-state-when-force-restoring.patch
and it can be found in the queue-3.9 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From f30da187cdcd0939288038e11fb3bfbd1b655564 Mon Sep 17 00:00:00 2001
From: Daniel Vetter <daniel.vetter@xxxxxxxx>
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@xxxxxxxx>
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@xxxxxx>
Cc: Richard Cochran <richardcochran@xxxxxxxxx>
Cc: Chris Wilson <chris@xxxxxxxxxxxxxxxxxx>
Reviewed-by: Chris Wilson <chris@xxxxxxxxxxxxxxxxxx>
Tested-by: Tomas Melin <tomas.melin@xxxxxx>
Tested-by: Richard Cochran <richardcochran@xxxxxxxxx>
Signed-off-by: Daniel Vetter <daniel.vetter@xxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
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);
Patches currently in stable-queue which might be from daniel.vetter@xxxxxxxx are
queue-3.9/drm-prime-keep-a-reference-from-the-handle-to-exported-dma-buf-v6.patch
queue-3.9/drm-i915-use-mlc-l3-for-context-objects.patch
queue-3.9/drm-i915-set-cpt-fdi-rx-polarity-bits-based-on-vbt.patch
queue-3.9/drm-i915-fix-sdvo-connector-and-encoder-get_hw_state-functions.patch
queue-3.9/drm-i915-ensure-single-initialization-and-cleanup-of-backlight-device.patch
queue-3.9/drm-prime-fix-refcounting-on-the-dmabuf-import-error-path.patch
queue-3.9/drm-i915-don-t-check-inconsistent-modeset-state-when-force-restoring.patch
queue-3.9/drm-i915-add-no-lvds-quirk-for-fujitsu-esprimo-q900.patch
queue-3.9/drm-i915-workaround-incoherence-between-fences-and-llc-across-multiple-cpus.patch
queue-3.9/drm-i915-fix-sdvo-connector-get_hw_state-function.patch
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html