Michel Thierry c64992e035 drm/i915: Look for active requests earlier in the reset path ...

And store the active request so that we only search for it once.

v2: Check for request completion inside _prepare_engine, don't use
ECANCELED, remove unnecessary null checks (Chris).

v3: Capture active requests during reset_prepare and store it the
engine hangcheck obj.

v4: Rename commit, change i915_gem_reset_request to just confirm the
active_request is still incomplete, instead of engine_stalled (Chris).

v5: With style; pass the active request to gem_reset_engine, keep single
return in reset_prepare_engine (Chris).

v6: Moved before reset-engine code appears (Chris)

Suggested-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk> (v5)
Signed-off-by: Michel Thierry <michel.thierry@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20170615201828.23144-2-michel.thierry@intel.com
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/20170620095751.13127-3-chris@chris-wilson.co.uk

2017-06-20 21:00:03 +01:00

..

amd

Backmerge tag 'v4.12-rc3' into drm-next

2017-05-30 15:54:15 +10:00

arc

…

arm

Backmerge tag 'v4.12-rc3' into drm-next

2017-05-30 15:54:15 +10:00

armada

drm: Add DRM_MODE_ROTATE_ and DRM_MODE_REFLECT_ to UAPI

2017-05-22 09:49:48 +02:00

ast

drm/ast: fix include notation and remove -Iinclude/drm flag

2017-05-16 17:17:51 +02:00

atmel-hlcdc

Backmerge tag 'v4.12-rc3' into drm-next

2017-05-30 15:54:15 +10:00

bochs

drm/bochs: fix include notation and remove -Iinclude/drm flag

2017-05-16 17:18:23 +02:00

bridge

drm/bridge: fix include notation and remove -Iinclude/drm flag

2017-05-16 17:18:47 +02:00

cirrus

drm/cirrus: fix include notation and remove -Iinclude/drm flag

2017-05-16 17:18:56 +02:00

etnaviv

Backmerge tag 'v4.12-rc3' into drm-next

2017-05-30 15:54:15 +10:00

exynos

drm: drop drm_[cm]alloc* helpers

2017-05-18 17:22:39 +02:00

fsl-dcu

drm: convert drivers to use drm_of_find_panel_or_bridge

2017-04-06 17:00:27 -04:00

gma500

Backmerge tag 'v4.12-rc3' into drm-next

2017-05-30 15:54:15 +10:00

hisilicon

drm/hisilicon: fix include notation and remove -Iinclude/drm flag

2017-05-17 14:35:22 +02:00

i2c

drm/i2c: remove unneeded -Iinclude/drm compiler flag

2017-05-18 07:13:04 +02:00

i810

drm/i810: remove unneeded -Iinclude/drm compiler flag

2017-05-18 07:12:57 +02:00

i915

drm/i915: Look for active requests earlier in the reset path

2017-06-20 21:00:03 +01:00

imx

drm: Add DRM_MODE_ROTATE_ and DRM_MODE_REFLECT_ to UAPI

2017-05-22 09:49:48 +02:00

lib

…

mediatek

Merge tag 'drm-misc-next-2017-04-07' of git://anongit.freedesktop.org/git/drm-misc into drm-next

2017-04-11 07:41:10 +10:00

meson

drm: convert drivers to use of_graph_get_remote_node

2017-04-06 17:00:27 -04:00

mga

drm/mga: remove unneeded -Iinclude/drm compiler flag

2017-05-18 07:13:11 +02:00

mgag200

drm/mgag200: fix include notation and remove -Iinclude/drm flag

2017-05-17 14:35:31 +02:00

msm

drm: Add DRM_MODE_ROTATE_ and DRM_MODE_REFLECT_ to UAPI

2017-05-22 09:49:48 +02:00

mxsfb

drm: convert drivers to use drm_of_find_panel_or_bridge

2017-04-06 17:00:27 -04:00

nouveau

Backmerge tag 'v4.12-rc3' into drm-next

2017-05-30 15:54:15 +10:00

omapdrm

drm: Add DRM_MODE_ROTATE_ and DRM_MODE_REFLECT_ to UAPI

2017-05-22 09:49:48 +02:00

panel

Merge tag 'drm/panel/for-4.12-rc1' of git://anongit.freedesktop.org/tegra/linux into drm-next

2017-04-13 06:17:40 +10:00

pl111

drm/pl111: Fix return value check in pl111_amba_probe()

2017-05-22 13:34:14 -07:00

qxl

Backmerge tag 'v4.12-rc3' into drm-next

2017-05-30 15:54:15 +10:00

r128

drm/r128: remove unneeded -Iinclude/drm compiler flag

2017-05-18 07:13:23 +02:00

radeon

Backmerge tag 'v4.12-rc3' into drm-next

2017-05-30 15:54:15 +10:00

rcar-du

drm: rcar-du: Add HDMI outputs to R8A7795 device description

2017-04-04 17:04:21 +03:00

rockchip

drm/rockchip: analogix_dp: Remove unused check and variables

2017-05-02 14:44:28 -04:00

savage

drm/savage: remove unneeded -Iinclude/drm compiler flag

2017-05-18 07:13:34 +02:00

selftests

drm/mm: Split up long running selftests with cond_resched()

2017-05-04 08:11:46 +02:00

shmobile

drm: Add acquire ctx parameter to ->page_flip(_target)

2017-03-29 09:50:38 +02:00

sis

drm/sis: remove unneeded -Iinclude/drm compiler flag

2017-05-18 07:13:40 +02:00

sti

Merge remote-tracking branch 'airlied/drm-next' into drm-misc-next

2017-05-18 09:24:30 -04:00

stm

drm/stm: ltdc: fix duplicated arguments

2017-05-23 15:19:46 +02:00

sun4i

Merge tag 'sunxi-drm-for-4.12' of https://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux into drm-next

2017-04-20 13:19:34 +10:00

tdfx

drm/tdfx: remove unneeded -Iinclude/drm compiler flag

2017-05-18 07:13:47 +02:00

tegra

Merge tag 'drm-misc-next-2017-05-16' of git://anongit.freedesktop.org/git/drm-misc into drm-next

2017-05-18 12:57:06 +10:00

tilcdc

drm/tilcdc: fix include notation and remove -Iinclude/drm flag

2017-05-17 14:36:49 +02:00

tinydrm

drm/atomic: Introduce drm_atomic_helper_shutdown

2017-03-27 09:43:58 +02:00

ttm

drm: drop drm_[cm]alloc* helpers

2017-05-18 17:22:39 +02:00

udl

drm: drop drm_[cm]alloc* helpers

2017-05-18 17:22:39 +02:00

vc4

drm/vc4: fix include notation and remove -Iinclude/drm flag

2017-05-22 09:36:01 +02:00

vgem

drm/vgem: Fix return value check in vgem_init()

2017-05-22 09:47:34 +02:00

via

drm/via: remove unneeded -Iinclude/drm compiler flag

2017-05-18 07:14:05 +02:00

virtio

drm: drop drm_[cm]alloc* helpers

2017-05-18 17:22:39 +02:00

vmwgfx

drm: Add DRM_MODE_ROTATE_ and DRM_MODE_REFLECT_ to UAPI

2017-05-22 09:49:48 +02:00

zte

drm: zte: add VGA driver support

2017-05-04 13:53:05 +08:00

ati_pcigart.c

…

drm_agpsupport.c

…

drm_atomic_helper.c

drm: Add DRM_MODE_ROTATE_ and DRM_MODE_REFLECT_ to UAPI

2017-05-22 09:49:48 +02:00

drm_atomic.c

drm: Add DRM_MODE_ROTATE_ and DRM_MODE_REFLECT_ to UAPI

2017-05-22 09:49:48 +02:00

drm_auth.c

…

drm_blend.c

drm: Add DRM_MODE_ROTATE_ and DRM_MODE_REFLECT_ to UAPI

2017-05-22 09:49:48 +02:00

drm_bridge.c

…

drm_bufs.c

…

drm_cache.c

…

drm_color_mgmt.c

drm/doc: Interlink color manager docs better

2017-04-18 08:56:29 +02:00

drm_connector.c

drm/atomic: Add support for custom scaling mode properties, v2

2017-05-08 13:20:43 +02:00

drm_context.c

…

drm_crtc_helper_internal.h

…

drm_crtc_helper.c

drm: Add acquire ctx parameter to ->set_config

2017-03-29 09:56:25 +02:00

drm_crtc_internal.h

drm: extract legacy framebuffer remove

2017-04-06 10:22:43 +02:00

drm_crtc.c

drm: Take mode_config.mutex in setcrtc ioctl

2017-04-06 22:49:50 +02:00

drm_debugfs_crc.c

Revert "drm: Don't allow interruptions when opening debugfs/crc"

2017-04-07 16:18:28 -04:00

drm_debugfs.c

drm/debugfs: Add kerneldoc

2017-03-24 09:36:06 +01:00

drm_dma.c

…

drm_dp_aux_dev.c

…

drm_dp_dual_mode_helper.c

…

drm_dp_helper.c

drm/dp: Add missing description to parameter

2017-03-07 16:38:16 -05:00

drm_dp_mst_topology.c

drm/dp: Wait up all outstanding tx waiters

2017-05-15 14:04:49 +02:00

drm_drv.c

…

drm_dumb_buffers.c

…

drm_edid_load.c

…

drm_edid.c

drm/edid: Add 10 bpc quirk for LGD 764 panel in HP zBook 17 G2

2017-05-02 10:37:45 +02:00

drm_encoder_slave.c

…

drm_encoder.c

…

drm_fb_cma_helper.c

drm/cma-helper: Return ENOENT for "no such gem obj"

2017-04-18 17:57:37 +02:00

drm_fb_helper.c

drm: Add DRM_MODE_ROTATE_ and DRM_MODE_REFLECT_ to UAPI

2017-05-22 09:49:48 +02:00

drm_file.c

drm: Nerf the preclose callback for modern drivers

2017-05-09 13:22:11 +02:00

drm_flip_work.c

…

drm_fourcc.c

Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux into drm-misc-next

2017-03-23 08:15:55 +01:00

drm_framebuffer.c

drm: extract legacy framebuffer remove

2017-04-06 10:22:43 +02:00

drm_gem_cma_helper.c

Merge tag 'doc-4.11-images' of git://git.lwn.net/linux into drm-misc-next

2017-03-14 15:07:33 +01:00

drm_gem.c

drm: drop drm_[cm]alloc* helpers

2017-05-18 17:22:39 +02:00

drm_global.c

…

drm_hashtab.c

…

drm_info.c

…

drm_internal.h

drm/debugfs: Add kerneldoc

2017-03-24 09:36:06 +01:00

drm_ioc32.c

drm: document drm_ioctl.[hc]

2017-04-04 20:47:54 +02:00

drm_ioctl.c

drm: Pass CRTC ID in userspace vblank events

2017-04-04 20:59:12 +01:00

drm_irq.c

drm/vblank: Lock down vblank->hwmode more

2017-05-10 10:21:37 +02:00

drm_kms_helper_common.c

drm: Remove drmP.h include from drm_kms_helper_common.c

2017-03-09 16:18:02 +01:00

drm_legacy.h

…

drm_lock.c

…

drm_memory.c

…

drm_mipi_dsi.c

…

drm_mm.c

…

drm_mode_config.c

…

drm_mode_object.c

Merge tag 'doc-4.11-images' of git://git.lwn.net/linux into drm-misc-next

2017-03-14 15:07:33 +01:00

drm_modes.c

…

drm_modeset_helper.c

drm: Add mode_config .get_format_info() hook

2017-03-22 19:45:00 +02:00

drm_modeset_lock.c

drm: Remove drm_modeset_legacy_acquire_ctx and crtc->acquire_ctx

2017-04-05 09:26:45 +02:00

drm_of.c

drm: of: introduce drm_of_find_panel_or_bridge

2017-04-06 17:00:27 -04:00

drm_panel.c

…

drm_pci.c

drm: Extract drm_pci.h

2017-03-09 16:18:02 +01:00

drm_plane_helper.c

drm: Add DRM_MODE_ROTATE_ and DRM_MODE_REFLECT_ to UAPI

2017-05-22 09:49:48 +02:00

drm_plane.c

drm: Fix deadlock retry loop in page_flip_ioctl

2017-05-23 09:39:14 +02:00

drm_prime.c

drm/prime: Introduce drm_gem_prime_import_dev

2017-05-08 09:39:13 +02:00

drm_print.c

…

drm_probe_helper.c

drm/atomic: Acquire connection_mutex lock in drm_helper_probe_single_connector_modes, v4.

2017-04-06 21:29:23 +02:00

drm_property.c

drm: Fix get_property logic fumble

2017-04-12 18:11:32 +02:00

drm_rect.c

drm: Add DRM_MODE_ROTATE_ and DRM_MODE_REFLECT_ to UAPI

2017-05-22 09:49:48 +02:00

drm_scatter.c

…

drm_scdc_helper.c

drm/edid: detect SCDC support in HF-VSDB

2017-03-21 10:15:56 +02:00

drm_simple_kms_helper.c

drm: Clarify the role of plane_state argument to drm_simple update().

2017-03-30 12:02:00 -07:00

drm_sysfs.c

drm: Consolidate and document sysfs support

2017-04-04 20:47:54 +02:00

drm_trace_points.c

…

drm_trace.h

drm: Remove drm_pending_event->pid

2017-03-14 14:38:33 +01:00

drm_vm.c

…

drm_vma_manager.c

…

Kconfig

drm/pl111: Initial drm/kms driver for pl111

2017-05-08 12:24:06 -07:00

Makefile

drm/pl111: Initial drm/kms driver for pl111

2017-05-08 12:24:06 -07:00