Merge drm/drm-next into drm-intel-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 42bfbafad32a0030f22699ce0520612b77cd3844..1c602d4ae2974c2558164b27e25790f1bbbee8cc 100644 (file)
--- a/drivers/gpu/drm/i915/gt/intel_execlists_submission.c
+++ b/drivers/gpu/drm/i915/gt/intel_execlists_submission.c
@@ -666,9 +666,13 @@ static inline void execlists_schedule_out(struct i915_request *rq)
 static u64 execlists_update_context(struct i915_request *rq)
 {
        struct intel_context *ce = rq->context;
-       u64 desc = ce->lrc.desc;
+       u64 desc;
        u32 tail, prev;
 
+       desc = ce->lrc.desc;
+       if (rq->engine->flags & I915_ENGINE_HAS_EU_PRIORITY)
+               desc |= lrc_desc_priority(rq_prio(rq));
+
        /*
         * WaIdleLiteRestore:bdw,skl
         *
@@ -2908,6 +2912,9 @@ static int execlists_resume(struct intel_engine_cs *engine)
 
        enable_execlists(engine);
 
+       if (engine->class == RENDER_CLASS)
+               xehp_enable_ccs_engines(engine);
+
        return 0;
 }
 
@@ -3481,7 +3488,7 @@ int intel_execlists_submission_setup(struct intel_engine_cs *engine)
        logical_ring_default_vfuncs(engine);
        logical_ring_default_irqs(engine);
 
-       if (engine->class == RENDER_CLASS)
+       if (engine->flags & I915_ENGINE_HAS_RCS_REG_STATE)
                rcs_submission_override(engine);
 
        lrc_init_wa_ctx(engine);