openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

drm/i915: read out hw state earlier v2 

We want to do this early on before we try to fetch the plane config,
which depends on some of the pipe config state.

Note that the important part is that we do this before we initialize
gem, since otherwise we can't properly pre-reserve the stolen memory
for framebuffers inherited from the bios.

v2: split back out from get_plane_config change (Daniel)
    update for recent locking & reset changes (Jesse)

Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
[danvet: Explain a bit more why we need to move this.]
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
This commit is contained in:
Jesse Barnes 2014-02-11 15:28:56 -08:00 committed by Daniel Vetter
parent 9d6612516d
commit fa9fa083d0
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/gpu/drm/i915/intel_display.c
View File

@ -11072,6 +11072,8 @@ void intel_modeset_init(struct drm_device *dev)
/* Just in case the BIOS is doing something questionable. */ /* Just in case the BIOS is doing something questionable. */
intel_disable_fbc(dev); intel_disable_fbc(dev);
intel_modeset_setup_hw_state(dev, false);
} }
static void static void
@ -11439,10 +11441,6 @@ void intel_modeset_gem_init(struct drm_device *dev)
intel_modeset_init_hw(dev); intel_modeset_init_hw(dev);
intel_setup_overlay(dev); intel_setup_overlay(dev);
mutex_lock(&dev->mode_config.mutex);
intel_modeset_setup_hw_state(dev, false);
mutex_unlock(&dev->mode_config.mutex);
} }
void intel_modeset_cleanup(struct drm_device *dev) void intel_modeset_cleanup(struct drm_device *dev)