mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2026-04-29 11:44:39 -04:00
drm/i915/gt: Use memset_p to clear the ports
Put memset_p to use to clear the array of pointers used for tracking the ELSP. Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> Reviewed-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20200106114234.2529613-6-chris@chris-wilson.co.uk
This commit is contained in:
@@ -1744,6 +1744,11 @@ static void set_preempt_timeout(struct intel_engine_cs *engine)
|
||||
active_preempt_timeout(engine));
|
||||
}
|
||||
|
||||
static inline void clear_ports(struct i915_request **ports, int count)
|
||||
{
|
||||
memset_p((void **)ports, NULL, count);
|
||||
}
|
||||
|
||||
static void execlists_dequeue(struct intel_engine_cs *engine)
|
||||
{
|
||||
struct intel_engine_execlists * const execlists = &engine->execlists;
|
||||
@@ -2104,10 +2109,9 @@ static void execlists_dequeue(struct intel_engine_cs *engine)
|
||||
|
||||
goto skip_submit;
|
||||
}
|
||||
clear_ports(port + 1, last_port - port);
|
||||
|
||||
memset(port + 1, 0, (last_port - port) * sizeof(*port));
|
||||
execlists_submit_ports(engine);
|
||||
|
||||
set_preempt_timeout(engine);
|
||||
} else {
|
||||
skip_submit:
|
||||
@@ -2122,13 +2126,14 @@ cancel_port_requests(struct intel_engine_execlists * const execlists)
|
||||
|
||||
for (port = execlists->pending; *port; port++)
|
||||
execlists_schedule_out(*port);
|
||||
memset(execlists->pending, 0, sizeof(execlists->pending));
|
||||
clear_ports(execlists->pending, ARRAY_SIZE(execlists->pending));
|
||||
|
||||
/* Mark the end of active before we overwrite *active */
|
||||
for (port = xchg(&execlists->active, execlists->pending); *port; port++)
|
||||
execlists_schedule_out(*port);
|
||||
WRITE_ONCE(execlists->active,
|
||||
memset(execlists->inflight, 0, sizeof(execlists->inflight)));
|
||||
clear_ports(execlists->inflight, ARRAY_SIZE(execlists->inflight));
|
||||
|
||||
WRITE_ONCE(execlists->active, execlists->inflight);
|
||||
}
|
||||
|
||||
static inline void
|
||||
|
||||
Reference in New Issue
Block a user