[Bug 101852] [BAT][GDG] igt at drv_hangman@error-state-basic incomplete in CI

bugzilla-daemon at freedesktop.org bugzilla-daemon at freedesktop.org
Fri Aug 4 11:54:27 UTC 2017


https://bugs.freedesktop.org/show_bug.cgi?id=101852

--- Comment #5 from Chris Wilson <chris at chris-wilson.co.uk> ---
And the not completely unsurprising result from the other side, is...

... drum roll ...

commit dfa2997055659b4e706a85fba481050cc7e7ad82
Author: Maarten Lankhorst <maarten.lankhorst at linux.intel.com>
Date:   Fri Aug 5 23:28:27 2016 +0300

    drm/i915: Fix modeset handling during gpu reset, v5.

    This function would call drm_modeset_lock_all, while the suspend/resume
    functions already have their own locking. Fix this by factoring out
    __intel_display_resume, and calling the atomic helpers for duplicating
    atomic state and disabling all crtc's during suspend.

    Changes since v1:
    - Deal with -EDEADLK right after lock_all and clean up calls
      to hw readout.
    - Always take all modeset locks so updates during gpu reset are blocked.
    Changes since v2:
    - Fix deadlock in intel_update_primary_planes.
    - Move WARN_ON(EDEADLK) to __intel_display_resume.
    - pctx -> ctx
    - only call __intel_display_resume on success in intel_display_resume.
    Changes since v3:
    - Rebase on top of dev_priv -> dev change.
    - Use drm_modeset_lock_all_ctx instead of drm_modeset_lock_all.
    Changes since v4 [by vsyrjala]:
    - Deal with skip_intermediate_wm
    - Update comment w.r.t. mode_config.mutex vs. ->detect()
    - Rebase due to INTEL_GEN() etc.

    Signed-off-by: Maarten Lankhorst <maarten.lankhorst at linux.intel.com>
    Fixes: e2c8b8701e2d ("drm/i915: Use atomic helpers for suspend, v2.")
    Cc: stable at vger.kernel.org
    Tested-by: Ville Syrjälä <ville.syrjala at linux.intel.com>
    Signed-off-by: Ville Syrjälä <ville.syrjala at linux.intel.com>
    Link:
http://patchwork.freedesktop.org/patch/msgid/1470428910-12125-2-git-send-email-ville.syrjala@linux.intel.com
    (cherry picked from commit 739748939974791b84629a8790527a16f76873a4)
    Signed-off-by: Jani Nikula <jani.nikula at intel.com>


But both are really a single patch implementing display reset using atomic.

-- 
You are receiving this mail because:
You are the assignee for the bug.
You are the QA Contact for the bug.
You are on the CC list for the bug.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.freedesktop.org/archives/intel-gfx-bugs/attachments/20170804/49e2b549/attachment-0001.html>


More information about the intel-gfx-bugs mailing list