]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commit
drm/i915: gen6_enable_rps() wants to be called after ring initialisation
authorChris Wilson <chris@chris-wilson.co.uk>
Wed, 9 May 2012 10:56:28 +0000 (11:56 +0100)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Sat, 19 May 2012 20:38:29 +0000 (22:38 +0200)
commit1833b134454d5300d8a9d07b78876a20395f01a9
tree5a55265e3a927613c265c28a6fdc0037a139a431
parent0e43406bcc1868a316eea6012a0a09d992c53521
drm/i915: gen6_enable_rps() wants to be called after ring initialisation

Currently we call gen6_enable_rps() (which writes into the per-ring
register mmio space) from intel_modeset_init_hw() which is called before
we initialise the rings. If we defer intel_modeset_init_hw() until
afterwards (in the intel_modeset_gem_init() phase) all is well.

v2: Rectify ordering of gem vs display HW init upon resume. (Daniel)

v3: Fix up locking. (Paulo)

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
[danvet: Smash Paulo's locking fix onto Chris' patch.]
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
drivers/gpu/drm/i915/i915_drv.c
drivers/gpu/drm/i915/i915_suspend.c
drivers/gpu/drm/i915/intel_display.c