OSDN Git Service

drm/i915/guc: Don't read SOFT_SCRATCH(15) on MMIO error
authorMichal Wajdeczko <michal.wajdeczko@intel.com>
Mon, 28 May 2018 17:16:18 +0000 (17:16 +0000)
committerChris Wilson <chris@chris-wilson.co.uk>
Thu, 31 May 2018 18:22:49 +0000 (19:22 +0100)
commit13295bd887d07a9d904401808f41a8d35946d8c2
treec6f8cd976c0d4001a87c1957944cbc7eb5ad0d19
parentd6cae4aa30ce551dfa2872f793f64d39719da6b7
drm/i915/guc: Don't read SOFT_SCRATCH(15) on MMIO error

SOFT_SCRATCH(15) is used by GuC for sending MMIO GuC events to host and
those events are now handled by intel_guc_to_host_event_handler_mmio().

We should not try to read it on MMIO action error as 1) we may be using
different set of registers for GuC MMIO communication, and 2) GuC may
use CTB mechanism for sending events to host.

While here, upgrade error message to DRM_ERROR.

Signed-off-by: Michal Wajdeczko <michal.wajdeczko@intel.com>
Cc: Michel Thierry <michel.thierry@intel.com>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: https://patchwork.freedesktop.org/patch/msgid/20180528171618.10436-1-michal.wajdeczko@intel.com
drivers/gpu/drm/i915/intel_guc.c