]> git.baikalelectronics.ru Git - kernel.git/commit
drm/i915/guc: Extract guc_init from guc_init_hw
authorMichał Winiarski <michal.winiarski@intel.com>
Wed, 13 Dec 2017 22:13:48 +0000 (23:13 +0100)
committerChris Wilson <chris@chris-wilson.co.uk>
Thu, 14 Dec 2017 08:06:56 +0000 (08:06 +0000)
commit261107b618481aedb827ea5c5092894a5cdbd7e5
treefc0a3a50a3a821953c4fcfc397f2bd5cd7976baa
parentcf6d69563f191c7179b6d069465ee2b1f118823f
drm/i915/guc: Extract guc_init from guc_init_hw

After GPU reset, GuC HW needs to be reinitialized (with FW reload).
Unfortunately, we're doing some extra work there (mostly allocating stuff),
work that can be moved to guc_init and called once at driver load time.

As a side effect we're no longer hitting an assert in
i915_ggtt_enable_guc on suspend/resume.

v2: Do not duplicate disable_communication / reset_guc_interrupts
v3: Add proper teardown after rebase

References: 2b59f5c10257 ("drm/i915/guc: Assert that we switch between known ggtt->invalidate functions")
Signed-off-by: Michał Winiarski <michal.winiarski@intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Cc: Michal Wajdeczko <michal.wajdeczko@intel.com>
Cc: Sagar Arun Kamble <sagar.a.kamble@intel.com>
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/20171213221352.7173-3-michal.winiarski@intel.com
drivers/gpu/drm/i915/i915_drv.c
drivers/gpu/drm/i915/i915_gem.c
drivers/gpu/drm/i915/intel_uc.c
drivers/gpu/drm/i915/intel_uc.h