| Message ID | 1387240469-932-4-git-send-email-jbarnes@virtuousgeek.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Mon, Dec 16, 2013 at 04:34:25PM -0800, Jesse Barnes wrote: > We want to do this early on before we try to fetch the plane config, > which depends on some of the pipe config state. > > Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org> I've merged patches 2&3 from this series. This one here needs a backmerge which atm is blocked on Dave moving drm-fixes ahead ... -Daniel
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index a2cd692..8f3d033 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -10882,6 +10882,11 @@ void intel_modeset_init(struct drm_device *dev) /* Just in case the BIOS is doing something questionable. */ intel_disable_fbc(dev); + + drm_modeset_lock_all(dev); + drm_mode_config_reset(dev); + intel_modeset_setup_hw_state(dev, false); + drm_modeset_unlock_all(dev); } static void @@ -11249,11 +11254,6 @@ void intel_modeset_gem_init(struct drm_device *dev) intel_modeset_init_hw(dev); intel_setup_overlay(dev); - - drm_modeset_lock_all(dev); - drm_mode_config_reset(dev); - intel_modeset_setup_hw_state(dev, false); - drm_modeset_unlock_all(dev); } void intel_modeset_cleanup(struct drm_device *dev)
We want to do this early on before we try to fetch the plane config, which depends on some of the pipe config state. Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org> --- drivers/gpu/drm/i915/intel_display.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)