OSDN Git Service

drm/i915: Don't check modeset state in the hw state force restore path
authorAnder Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com>
Tue, 16 Jun 2015 08:49:43 +0000 (11:49 +0300)
committerJani Nikula <jani.nikula@intel.com>
Wed, 17 Jun 2015 11:17:41 +0000 (14:17 +0300)
commite62d8dc0aa9f7493bcee3cbc4bf666a23a2d2f17
tree3aab6d3c39448b0f9e40962341464ffb07eb1755
parent41d232b7c891fcecb358784645633850936a95c7
drm/i915: Don't check modeset state in the hw state force restore path

Since the force restore logic will restore the CRTCs state one at a
time, it is possible that the state will be inconsistent until the whole
operation finishes. A call to intel_modeset_check_state() is done once
it's over, so don't check the state multiple times in between. This
regression was introduced in:

commit 7f27126ea3db6ade886f18fd39caf0ff0cd1d37f
Author: Jesse Barnes <jbarnes@virtuousgeek.org>
Date:   Wed Nov 5 14:26:06 2014 -0800

    drm/i915: factor out compute_config from __intel_set_mode v3

v2: Rename check parameter to force_restore. (Matt)

Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=94431
Cc: Jesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: Ander Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com>
Reviewed-by: Matt Roper <matthew.d.roper@intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
drivers/gpu/drm/i915/intel_display.c