Bug 100196 - [BAT] [BDW SKL BXT KBL] igt@drv_hangman@error-state-basic timeouts
Summary: [BAT] [BDW SKL BXT KBL] igt@drv_hangman@error-state-basic timeouts
Status: CLOSED FIXED
Alias: None
Product: DRI
Classification: Unclassified
Component: DRM/Intel (show other bugs)
Version: DRI git
Hardware: Other All
: medium normal
Assignee: Intel GFX Bugs mailing list
QA Contact: Intel GFX Bugs mailing list
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2017-03-14 12:42 UTC by Martin Peres
Modified: 2017-03-14 14:55 UTC (History)
1 user (show)

See Also:
i915 platform:
i915 features:

Attachments

Description Martin Peres 2017-03-14 12:42:41 UTC 
One of the following commits broke igt@drv_hangman@error-state-basic on a BDW+:

c9a5148 drm-tip: 2017y-03m-14d-10h-57m-07s UTC integration manifest
ee5cb7c drm: qxl: add missing return check
43c2794 drm: virtio: fix kmem_cache_alloc error check
8f68d59 drm/i915: Stop using RP_DOWN_EI on Baytrail
0f5418e drm/i915: Drop support for I915_EXEC_CONSTANTS_* execbuf parameters.
35a3abf drm/i915: Only enable hotplug interrupts if the display interrupts are enabled
4565bf5 drm/i915: Disable engine->irq_tasklet around resets
c3f0470 drm-tip: 2017y-03m-14d-10h-24m-36s UTC integration manifest
da9a796 drm/i915: Split GEM resetting into 3 phases

Nothing in the log to help debug the issue. Here is the result page: https://intel-gfx-ci.01.org/CI/CI_DRM_2334/fi-bdw-5557u/igt@drv_hangman@error-state-basic.html
Comment 1 Chris Wilson 2017-03-14 12:54:05 UTC 
Actually it wasn't those but the merge between drm-intel-fixes and drm-intel-next-queued:

11:37 < ickle> j4ni: I missed 8d613c539c74fa9055f88f4116196d7c820bd98f from the reset cherry-picks
11:38 < ickle> that would avoid the silent merge conflict
Comment 2 Jani Nikula 2017-03-14 13:43:09 UTC 
This is now in drm-intel-fixes:

commit 1b2e5ea0b7061be3ffdcd85918c2f428edace4ba
Author: Chris Wilson <chris@chris-wilson.co.uk>
Date:   Sun Feb 12 17:19:59 2017 +0000

    drm/i915: Always call i915_gem_reset_finish() following i915_gem_reset_prepare()
    
    As i915_gem_reset_finish() undoes the steps from
    i915_gem_reset_prepare() to leave the system in a fully-working state,
    e.g. to be able to free the breadcrumb signal threads, make sure that we
    always call it even on the error path.
    
    Fixes: da9a796f5475 ("drm/i915: Split GEM resetting into 3 phases")
    Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
    Link: http://patchwork.freedesktop.org/patch/msgid/20170212172002.23072-2-chris@chris-wilson.co.uk
    Reviewed-by: Mika Kuoppala <mika.kuoppala@intel.com>
    (cherry picked from commit 8d613c539c74fa9055f88f4116196d7c820bd98f)
    Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Comment 3 Martin Peres 2017-03-14 14:47:45 UTC 
Looks good in CI. Thanks!

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.