]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commit
drm/i915: Squash GEM load failure message (again)
authorChris Wilson <chris@chris-wilson.co.uk>
Sat, 9 Jun 2018 11:10:58 +0000 (12:10 +0100)
committerChris Wilson <chris@chris-wilson.co.uk>
Mon, 11 Jun 2018 09:01:03 +0000 (10:01 +0100)
commit51c18bf7fdbe3c0546e86cb0fa5866fee07c5261
tree3c7b33f1f3d887c62e85bc192d6896f2fefcd401
parent07ba0a82536e4955682b3b9077957ae1421d94bf
drm/i915: Squash GEM load failure message (again)

Due to a silent conflict (silent because we are trying to fix the CI
test that is meant to exercising these failures!) between commit
51e645b6652c ("drm/i915: Mark the GPU as wedged without error on fault
injection") and commit 8571a05a9dd0 ("drm/i915: Use GEM suspend when
aborting initialisation"), we failed to actually squash the error
message after injecting the load failure.

Rearrange the code to export i915_load_failure() for better logging of
real errors (and quiet logging of injected errors).

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Michał Winiarski <michal.winiarski@intel.com>
Reviewed-by: Michał Winiarski <michal.winiarski@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180609111058.2660-1-chris@chris-wilson.co.uk
drivers/gpu/drm/i915/i915_drv.c
drivers/gpu/drm/i915/i915_drv.h
drivers/gpu/drm/i915/i915_gem.c