mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-24 17:59:32 +00:00
9e4fa01221
On finishing the reset, the intention is to restart the GPU before we relinquish the forcewake taken to handle the reset - the goal being the GPU reloads a context before it is allowed to sleep. For this purpose, we used tasklet_flush() which although it accomplished the goal of restarting the GPU, carried with it a sting in its tail: it cleared the TASKLET_STATE_SCHED bit. This meant that if another CPU queued a new request to this engine, we would clear the flag and later attempt to requeue the tasklet on the local CPU, breaking the per-cpu softirq lists. Remove the dangerous tasklet_kill() and just run the tasklet func directly as we know it is safe to do so (the tasklets are internally locked to allow mixed usage from direct submission). Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com> Cc: Mika Kuoppala <mika.kuoppala@intel.com> Cc: Michel Thierry <michel.thierry@intel.com> Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com> Reviewed-by: Mika Kuoppala <mika.kuoppala@linux.intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20180828152702.27536-1-chris@chris-wilson.co.uk
90 lines
2.8 KiB
C
90 lines
2.8 KiB
C
/*
|
|
* Copyright © 2016 Intel Corporation
|
|
*
|
|
* Permission is hereby granted, free of charge, to any person obtaining a
|
|
* copy of this software and associated documentation files (the "Software"),
|
|
* to deal in the Software without restriction, including without limitation
|
|
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
|
|
* and/or sell copies of the Software, and to permit persons to whom the
|
|
* Software is furnished to do so, subject to the following conditions:
|
|
*
|
|
* The above copyright notice and this permission notice (including the next
|
|
* paragraph) shall be included in all copies or substantial portions of the
|
|
* Software.
|
|
*
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
|
|
* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
|
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
|
|
* IN THE SOFTWARE.
|
|
*
|
|
*/
|
|
|
|
#ifndef __I915_GEM_H__
|
|
#define __I915_GEM_H__
|
|
|
|
#include <linux/bug.h>
|
|
#include <linux/interrupt.h>
|
|
|
|
struct drm_i915_private;
|
|
|
|
#ifdef CONFIG_DRM_I915_DEBUG_GEM
|
|
|
|
#define GEM_SHOW_DEBUG() (drm_debug & DRM_UT_DRIVER)
|
|
|
|
#define GEM_BUG_ON(condition) do { if (unlikely((condition))) { \
|
|
pr_err("%s:%d GEM_BUG_ON(%s)\n", \
|
|
__func__, __LINE__, __stringify(condition)); \
|
|
GEM_TRACE("%s:%d GEM_BUG_ON(%s)\n", \
|
|
__func__, __LINE__, __stringify(condition)); \
|
|
BUG(); \
|
|
} \
|
|
} while(0)
|
|
#define GEM_WARN_ON(expr) WARN_ON(expr)
|
|
|
|
#define GEM_DEBUG_DECL(var) var
|
|
#define GEM_DEBUG_EXEC(expr) expr
|
|
#define GEM_DEBUG_BUG_ON(expr) GEM_BUG_ON(expr)
|
|
|
|
#else
|
|
|
|
#define GEM_SHOW_DEBUG() (0)
|
|
|
|
#define GEM_BUG_ON(expr) BUILD_BUG_ON_INVALID(expr)
|
|
#define GEM_WARN_ON(expr) (BUILD_BUG_ON_INVALID(expr), 0)
|
|
|
|
#define GEM_DEBUG_DECL(var)
|
|
#define GEM_DEBUG_EXEC(expr) do { } while (0)
|
|
#define GEM_DEBUG_BUG_ON(expr)
|
|
#endif
|
|
|
|
#if IS_ENABLED(CONFIG_DRM_I915_TRACE_GEM)
|
|
#define GEM_TRACE(...) trace_printk(__VA_ARGS__)
|
|
#define GEM_TRACE_DUMP() ftrace_dump(DUMP_ALL)
|
|
#define GEM_TRACE_DUMP_ON(expr) \
|
|
do { if (expr) ftrace_dump(DUMP_ALL); } while (0)
|
|
#else
|
|
#define GEM_TRACE(...) do { } while (0)
|
|
#define GEM_TRACE_DUMP() do { } while (0)
|
|
#define GEM_TRACE_DUMP_ON(expr) BUILD_BUG_ON_INVALID(expr)
|
|
#endif
|
|
|
|
#define I915_NUM_ENGINES 8
|
|
|
|
void i915_gem_park(struct drm_i915_private *i915);
|
|
void i915_gem_unpark(struct drm_i915_private *i915);
|
|
|
|
static inline void __tasklet_disable_sync_once(struct tasklet_struct *t)
|
|
{
|
|
if (atomic_inc_return(&t->count) == 1)
|
|
tasklet_unlock_wait(t);
|
|
}
|
|
|
|
static inline bool __tasklet_is_enabled(const struct tasklet_struct *t)
|
|
{
|
|
return !atomic_read(&t->count);
|
|
}
|
|
|
|
#endif /* __I915_GEM_H__ */
|