Merge drm/drm-next into drm-intel-gt-next

[linux-block.git] / drivers / gpu / drm / i915 / gt / intel_execlists_submission.c

diff --git a/drivers/gpu/drm/i915/gt/intel_execlists_submission.c b/drivers/gpu/drm/i915/gt/intel_execlists_submission.c
index a61ac592ddff85c15724e0fb081f199793eea2f4..0187bc72310d6f8fa4cb7fa7492dc8b4638ee5d9 100644 (file)
--- a/drivers/gpu/drm/i915/gt/intel_execlists_submission.c
+++ b/drivers/gpu/drm/i915/gt/intel_execlists_submission.c
@@ -1363,7 +1363,7 @@ static void execlists_dequeue(struct intel_engine_cs *engine)
                         * submission. If we don't cancel the timer now,
                         * we will see that the timer has expired and
                         * reschedule the tasklet; continually until the
-                        * next context switch or other preeemption event.
+                        * next context switch or other preemption event.
                         *
                         * Since we have decided to reschedule based on
                         * consumption of this timeslice, if we submit the