diff options
author | Chris Wilson <chris@chris-wilson.co.uk> | 2019-07-04 10:19:25 +0100 |
---|---|---|
committer | Chris Wilson <chris@chris-wilson.co.uk> | 2019-07-04 11:48:22 +0100 |
commit | 2006058e9988421a113e8edc004a8e0eae1a6d3f (patch) | |
tree | 97b4dbf2f803b5237350b9d63f443daab748836e /drivers/gpu/drm/i915/gt/intel_ringbuffer.c | |
parent | 068610895ebd4bd86f496f01eb7b97e56d7269b2 (diff) | |
download | linux-2006058e9988421a113e8edc004a8e0eae1a6d3f.tar.gz linux-2006058e9988421a113e8edc004a8e0eae1a6d3f.tar.bz2 linux-2006058e9988421a113e8edc004a8e0eae1a6d3f.zip |
drm/i915: Move the renderstate setup under gt/
The render state is used to initialise the default RCS context, and only
used during early setup from within the gt code. As such, it makes a
good candidate for placing within gt/, even if it is not yet entirely
clean of our GEM heritage.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Mika Kuoppala <mika.kuoppala@linux.intel.com>
Reviewed-by: Mika Kuoppala <mika.kuoppala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190704091925.7391-1-chris@chris-wilson.co.uk
Diffstat (limited to 'drivers/gpu/drm/i915/gt/intel_ringbuffer.c')
-rw-r--r-- | drivers/gpu/drm/i915/gt/intel_ringbuffer.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/gpu/drm/i915/gt/intel_ringbuffer.c b/drivers/gpu/drm/i915/gt/intel_ringbuffer.c index 81f9b0422e6a..f804ec35037d 100644 --- a/drivers/gpu/drm/i915/gt/intel_ringbuffer.c +++ b/drivers/gpu/drm/i915/gt/intel_ringbuffer.c @@ -33,12 +33,11 @@ #include "gem/i915_gem_context.h" -#include "gt/intel_gt.h" - #include "i915_drv.h" -#include "i915_gem_render_state.h" #include "i915_trace.h" #include "intel_context.h" +#include "intel_gt.h" +#include "intel_renderstate.h" #include "intel_reset.h" #include "intel_workarounds.h" @@ -813,7 +812,7 @@ static int intel_rcs_ctx_init(struct i915_request *rq) if (ret != 0) return ret; - ret = i915_gem_render_state_emit(rq); + ret = intel_renderstate_emit(rq); if (ret) return ret; |