9cf3a1c128
[ Upstream commit 3e42cc61275f95fd7f022b6380b95428efe134d3 ] Pinned contexts, like the migrate contexts need reset after resume since their context image may have been lost. Also the GuC needs to register pinned contexts. Add a list to struct intel_engine_cs where we add all pinned contexts on creation, and traverse that list at resume time to reset the pinned contexts. This fixes the kms_pipe_crc_basic@suspend-read-crc-pipe-a selftest for now, but proper LMEM backup / restore is needed for full suspend functionality. However, note that even with full LMEM backup / restore it may be desirable to keep the reset since backing up the migrate context images must happen using memcpy() after the migrate context has become inactive, and for performance- and other reasons we want to avoid memcpy() from LMEM. Also traverse the list at guc_init_lrc_mapping() calling guc_kernel_context_pin() for the pinned contexts, like is already done for the kernel context. v2: - Don't reset the contexts on each __engine_unpark() but rather at resume time (Chris Wilson). v3: - Reset contexts in the engine sanitize callback. (Chris Wilson) Cc: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com> Cc: Matthew Auld <matthew.auld@intel.com> Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Cc: Brost Matthew <matthew.brost@intel.com> Cc: Chris Wilson <chris@chris-wilson.co.uk> Signed-off-by: Thomas Hellström <thomas.hellstrom@linux.intel.com> Reviewed-by: Matthew Auld <matthew.auld@intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20210922062527.865433-6-thomas.hellstrom@linux.intel.com Signed-off-by: Sasha Levin <sashal@kernel.org>
75 lines
1.9 KiB
C
75 lines
1.9 KiB
C
/* SPDX-License-Identifier: MIT */
|
|
/*
|
|
* Copyright © 2019 Intel Corporation
|
|
*/
|
|
|
|
#ifndef INTEL_ENGINE_PM_H
|
|
#define INTEL_ENGINE_PM_H
|
|
|
|
#include "i915_request.h"
|
|
#include "intel_engine_types.h"
|
|
#include "intel_wakeref.h"
|
|
|
|
static inline bool
|
|
intel_engine_pm_is_awake(const struct intel_engine_cs *engine)
|
|
{
|
|
return intel_wakeref_is_active(&engine->wakeref);
|
|
}
|
|
|
|
static inline void intel_engine_pm_get(struct intel_engine_cs *engine)
|
|
{
|
|
intel_wakeref_get(&engine->wakeref);
|
|
}
|
|
|
|
static inline bool intel_engine_pm_get_if_awake(struct intel_engine_cs *engine)
|
|
{
|
|
return intel_wakeref_get_if_active(&engine->wakeref);
|
|
}
|
|
|
|
static inline void intel_engine_pm_put(struct intel_engine_cs *engine)
|
|
{
|
|
intel_wakeref_put(&engine->wakeref);
|
|
}
|
|
|
|
static inline void intel_engine_pm_put_async(struct intel_engine_cs *engine)
|
|
{
|
|
intel_wakeref_put_async(&engine->wakeref);
|
|
}
|
|
|
|
static inline void intel_engine_pm_put_delay(struct intel_engine_cs *engine,
|
|
unsigned long delay)
|
|
{
|
|
intel_wakeref_put_delay(&engine->wakeref, delay);
|
|
}
|
|
|
|
static inline void intel_engine_pm_flush(struct intel_engine_cs *engine)
|
|
{
|
|
intel_wakeref_unlock_wait(&engine->wakeref);
|
|
}
|
|
|
|
static inline struct i915_request *
|
|
intel_engine_create_kernel_request(struct intel_engine_cs *engine)
|
|
{
|
|
struct i915_request *rq;
|
|
|
|
/*
|
|
* The engine->kernel_context is special as it is used inside
|
|
* the engine-pm barrier (see __engine_park()), circumventing
|
|
* the usual mutexes and relying on the engine-pm barrier
|
|
* instead. So whenever we use the engine->kernel_context
|
|
* outside of the barrier, we must manually handle the
|
|
* engine wakeref to serialise with the use inside.
|
|
*/
|
|
intel_engine_pm_get(engine);
|
|
rq = i915_request_create(engine->kernel_context);
|
|
intel_engine_pm_put(engine);
|
|
|
|
return rq;
|
|
}
|
|
|
|
void intel_engine_init__pm(struct intel_engine_cs *engine);
|
|
|
|
void intel_engine_reset_pinned_contexts(struct intel_engine_cs *engine);
|
|
|
|
#endif /* INTEL_ENGINE_PM_H */
|