summaryrefslogtreecommitdiff
path: root/drivers/gpu/drm/i915/intel_pm.c
diff options
context:
space:
mode:
authorDaniel Vetter <daniel.vetter@ffwll.ch>2012-06-16 18:29:44 +0200
committerDaniel Vetter <daniel.vetter@ffwll.ch>2012-06-18 10:43:54 +0200
commite080b915ecea3fff3e0d8d380a221677add419a5 (patch)
tree0410b73ccf9cc25a9efe2d97d4930783618e888d /drivers/gpu/drm/i915/intel_pm.c
parent208482232de3590cee4757dfabe5d8cee8c6e626 (diff)
downloadlwn-e080b915ecea3fff3e0d8d380a221677add419a5.tar.gz
lwn-e080b915ecea3fff3e0d8d380a221677add419a5.zip
drm/i915: fixup hangman rebase goof-up
I've added a bit of logic such that running the hangman test on chips without any hw reset support at all doesn't wedge the gpu because the reset failed. This relied on checking for non-null stop_rings. Unfortunately I've botched a rebase somewhere and stop_rings is still cleared at the old place before the reset code. Fix this up so that running the i-g-t tests on gen2/3 doesn't result in a wedged gpu. v2: Actually remove the lines instead of adding them twice ... my git license should be revoked immediately. Signed-Off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_pm.c')
0 files changed, 0 insertions, 0 deletions