drm/i915: add render state initialization
Subsystems (2)
PATCH 1/2 drm/i915: add render state initialization
HW guys say that it is not a cool idea to let device go into rc6 without proper 3d pipeline state.
For each new uninitialized context, generate a
valid null render state to be run on context
creation.
This patch introduces a skeleton with empty states.
v2: - No need to vmap (Chris Wilson)
- use .c files for state (Daniel Vetter)
- no need to flush as i915_add_request does it
- remove parameter for batch alloc size
- don't wait for the init (Ben Widawsky)
v3: - move to cpu/gpu (Chris Wilson)
--- drivers/gpu/drm/i915/Makefile | 6 + drivers/gpu/drm/i915/i915_drv.h | 2 + drivers/gpu/drm/i915/i915_gem_context.c | 6 + drivers/gpu/drm/i915/i915_gem_render_state.c | 194 +++++++++++++++++++++++++ drivers/gpu/drm/i915/intel_renderstate.h | 48 ++++++ drivers/gpu/drm/i915/intel_renderstate_gen6.c | 10 ++ drivers/gpu/drm/i915/intel_renderstate_gen7.c | 10 ++ drivers/gpu/drm/i915/intel_renderstate_gen8.c | 10 ++ 8 files changed, 286 insertions(+) create mode 100644 drivers/gpu/drm/i915/i915_gem_render_state.c create mode 100644 drivers/gpu/drm/i915/intel_renderstate.h create mode 100644 drivers/gpu/drm/i915/intel_renderstate_gen6.c create mode 100644 drivers/gpu/drm/i915/intel_renderstate_gen7.c create mode 100644 drivers/gpu/drm/i915/intel_renderstate_gen8.c
drivers/gpu/drm/i915/Makefile +6 -0
@@ -18,6 +18,7 @@ i915-$(CONFIG_DEBUG_FS) += i915_debugfs.o # GEM code i915-y += i915_cmd_parser.o \ i915_gem_context.o \ + i915_gem_render_state.o \ i915_gem_debug.o \ i915_gem_dmabuf.o \ i915_gem_evict.o \
@@ -32,6 +33,11 @@ i915-y += i915_cmd_parser.o \ intel_ringbuffer.o \ intel_uncore.o +# autogenerated null render state +i915-y += intel_renderstate_gen6.o \ + intel_renderstate_gen7.o \ + intel_renderstate_gen8.o + # modesetting core code i915-y += intel_bios.o \ intel_display.o \
drivers/gpu/drm/i915/i915_drv.h +2 -0
@@ -2388,6 +2388,8 @@ int i915_gem_context_create_ioctl(struct drm_device *dev, void *data,int i915_gem_context_destroy_ioctl (struct drm_device *dev,void *data,struct drm_file *file); +/* i915_gem_render_state.c */ +int i915_gem_render_state_init (struct intel_ring_buffer *ring);/* i915_gem_evict.c */ int __must_check i915_gem_evict_something(struct drm_device *dev, struct i915_address_space *vm,
drivers/gpu/drm/i915/i915_gem_context.c +6 -0
@@ -699,6 +699,12 @@ static int do_switch(struct intel_ring_buffer *ring,/* obj is kept alive until the next request by its active ref */ i915_gem_object_ggtt_unpin (from->obj);i915_gem_context_unreference (from); + }else { +if (to->is_initialized == false) { + ret =i915_gem_render_state_init (ring); +if (ret) +DRM_ERROR ("init render state: %d\n" , ret); + } } to->is_initialized = true;
drivers/gpu/drm/i915/i915_gem_render_state.c new file +194 -0
194 lines not on this page · raw message
drivers/gpu/drm/i915/intel_renderstate.h new file +48 -0
48 lines not on this page · raw message
drivers/gpu/drm/i915/intel_renderstate_gen6.c new file +10 -0
@@ -0,0 +1,10 @@ +#include "intel_renderstate.h" + +static const u32 gen6_null_state_relocs[] = { +}; + +static const u32 gen6_null_state_batch[] = { +0x0a <<23 ,/* MI_BATCH_BUFFER_END */ +}; + +RO_RENDERSTATE (6 );
drivers/gpu/drm/i915/intel_renderstate_gen7.c new file +10 -0
@@ -0,0 +1,10 @@ +#include "intel_renderstate.h" + +static const u32 gen7_null_state_relocs[] = { +}; + +static const u32 gen7_null_state_batch[] = { +0x0a <<23 ,/* MI_BATCH_BUFFER_END */ +}; + +RO_RENDERSTATE (7 );
drivers/gpu/drm/i915/intel_renderstate_gen8.c new file +10 -0
@@ -0,0 +1,10 @@ +#include "intel_renderstate.h" + +static const u32 gen8_null_state_relocs[] = { +}; + +static const u32 gen8_null_state_batch[] = { +0x0a <<23 ,/* MI_BATCH_BUFFER_END */ +}; + +RO_RENDERSTATE (8 );
Signature · 6 lines
1.7.9.5 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 2/2 drm/i915: add null render states for gen6, gen7 and gen8
These are generated with intel-gpu-tools/tools/null_state_gen
v2: Don't use header file for states (Daniel Vetter)
v3: Proper URB state size for gen8/GT3 (Damien Lespiau)
--- drivers/gpu/drm/i915/intel_renderstate_gen6.c | 281 ++++++++++++++- drivers/gpu/drm/i915/intel_renderstate_gen7.c | 245 ++++++++++++- drivers/gpu/drm/i915/intel_renderstate_gen8.c | 471 ++++++++++++++++++++++++- 3 files changed, 994 insertions(+), 3 deletions(-)
drivers/gpu/drm/i915/intel_renderstate_gen6.c +280 -1
@@ -1,10 +1,289 @@#include "intel_renderstate.h" static const u32 gen6_null_state_relocs[] = { +0x00000020 , +0x00000024 , +0x0000002c , +0x000001e0 , +0x000001e4 , };static const u32 gen6_null_state_batch[] = { -0x0a <<23 ,/* MI_BATCH_BUFFER_END */ +0x69040000 , +0x790d0001 , +0x00000000 , +0x00000000 , +0x78180000 , +0x00000001 , +0x61010008 , +0x00000000 , +0x00000001 ,/* reloc */ +0x00000001 ,/* reloc */ +0x00000000 , +0x00000001 ,/* reloc */ +0x00000000 , +0x00000001 , +0x00000000 , +0x00000001 , +0x61020000 , +0x00000000 , +0x78050001 , +0x00000018 , +0x00000000 , +0x780d1002 , +0x00000000 , +0x00000000 , +0x00000420 , +0x78150003 , +0x00000000 , +0x00000000 , +0x00000000 , +0x00000000 , +0x78100004 , +0x00000000 , +0x00000000 , +0x00000000 , +0x00000000 , +0x00000000 , +0x78160003 , +0x00000000 , +0x00000000 , +0x00000000 , +0x00000000 , +0x78110005 , +0x00000000 , +0x00000000 , +0x00000000 , +0x00000000 , +0x00000000 , +0x00000000 , +0x78120002 , +0x00000000 , +0x00000000 , +0x00000000 , +0x78170003 , +0x00000000 , +0x00000000 , +0x00000000 , +0x00000000 , +0x79050005 , +0xe0040000 , +0x00000000 , +0x00000000 , +0x00000000 , +0x00000000 , +0x00000000 , +0x79100000 , +0x00000000 , +0x79000002 , +0xffffffff , +0x00000000 , +0x00000000 , +0x780e0002 , +0x00000441 , +0x00000401 , +0x00000401 , +0x78021002 , +0x00000000 , +0x00000000 , +0x00000400 , +0x78130012 , +0x00400810 , +0x00000000 , +0x20000000 , +0x04000000 , +0x00000000 , +0x00000000 , +0x00000000 , +0x00000000 , +0x00000000 , +0x00000000 , +0x00000000 , +0x00000000 , +0x00000000 , +0x00000000 , +0x00000000 , +0x00000000 , +0x00000000 , +0x00000000 , +0x00000000 , +0x78140007 , +0x00000280 , +0x08080000 , +0x00000000 , +0x00060000 , +0x4e080002 , +0x00100400 , +0x00000000 , +0x00000000 , +0x78090005 , +0x02000000 , +0x22220000 , +0x02f60000 , +0x11330000 , +0x02850004 , +0x11220000 , +0x78011002 , +0x00000000 , +0x00000000 , +0x00000200 , +0x78080003 , +0x00002000 , +0x00000448 ,/* reloc */ +0x00000448 ,/* reloc */ +0x00000000 , +0x05000000 ,/* cmds end */ +0x00000000 , +0x00000000 , +0x00000000 , +0x00000000 , +0x00000220 ,/* state start */ +0x00000240 , +0x00000000 , +0x00000000 , +0x00000000 , +0x00000000 , +0x00000000 , +0x00000000 , +0x00000000 , +0x00000000 , +0x00000000 , +0x00000000 , +0x00000000 , +0x00000000 , +0x00000000 , +0x00000000 , +0x00000000 , +0x00000000 , +0x00000000 , +0x00000000 , +0x00000000 , +0x00000000 , +0x00000000 , +0x00000000 , +0x00000000 , +0x00000000 , +0x00000000 , +0x00000000 , +0x00000000 , +0x00000000 , +0x00000000 , +0x00000000 , +0x0060005a , +0x204077be , +0x000000c0 , +0x008d0040 , +0x0060005a , +0x206077be , +0x000000c0 , +0x008d0080 , +0x0060005a , +0x208077be , +0x000000d0 , +0x008d0040 , +0x0060005a , +0x20a077be , +0x000000d0 , +0x008d0080 , +0x00000201 , +0x20080061 , +0x00000000 , +0x00000000 , +0x00600001 , +0x20200022 , +0x008d0000 , +0x00000000 , +0x02800031 , +0x21c01cc9 , +0x00000020 , +0x0a8a0001 , +0x00600001 , +0x204003be , +0x008d01c0 , +0x00000000 , +0x00600001 , +0x206003be , +0x008d01e0 , +0x00000000 , +0x00600001 , +0x208003be , +0x008d0200 , +0x00000000 , +0x00600001 , +0x20a003be , +0x008d0220 , +0x00000000 , +0x00600001 , +0x20c003be , +0x008d0240 , +0x00000000 , +0x00600001 , +0x20e003be , +0x008d0260 , +0x00000000 , +0x00600001 , +0x210003be , +0x008d0280 , +0x00000000 , +0x00600001 , +0x212003be , +0x008d02a0 , +0x00000000 , +0x05800031 , +0x24001cc8 , +0x00000040 , +0x90019000 , +0x0000007e , +0x00000000 , +0x00000000 , +0x00000000 , +0x0000007e , +0x00000000 , +0x00000000 , +0x00000000 , +0x0000007e , +0x00000000 , +0x00000000 , +0x00000000 , +0x0000007e , +0x00000000 , +0x00000000 , +0x00000000 , +0x0000007e , +0x00000000 , +0x00000000 , +0x00000000 , +0x0000007e , +0x00000000 , +0x00000000 , +0x00000000 , +0x0000007e , +0x00000000 , +0x00000000 , +0x00000000 , +0x0000007e , +0x00000000 , +0x00000000 , +0x00000000 , +0x30000000 , +0x00000124 , +0x00000000 , +0x00000000 , +0x00000000 , +0x00000000 , +0x00000000 , +0x00000000 , +0xf99a130c , +0x799a130c , +0x00000000 , +0x00000000 , +0x00000000 , +0x00000000 , +0x00000000 , +0x00000000 , +0x80000031 , +0x00000003 , +0x00000000 ,/* state end */ };RO_RENDERSTATE (6 );
drivers/gpu/drm/i915/intel_renderstate_gen7.c +244 -1
254 lines not on this page · raw message
drivers/gpu/drm/i915/intel_renderstate_gen8.c +470 -1
480 lines not on this page · raw message
Signature · 1 line
1.7.9.5
Quoted 15 lines · Mika Kuoppala
HW guys say that it is not a cool idea to let device go into rc6 without proper 3d pipeline state.
For each new uninitialized context, generate a
valid null render state to be run on context
creation.This patch introduces a skeleton with empty states.
v2: - No need to vmap (Chris Wilson)
- use .c files for state (Daniel Vetter)
- no need to flush asi915_add_requestdoes it
- remove parameter for batch alloc size
- don't wait for the init (Ben Widawsky)
Quoted 5 lines
v3: - move to cpu/gpu (Chris Wilson)
Tested-by Oscar Mateo <[email protected]>Acked-by Damien Lespiau <[email protected]>
This one can be upgraded to a:
Signature · 1 line
Damien
Quoted 18 lines · Damien Lespiau
Quoted 17 lines · Mika Kuoppala
HW guys say that it is not a cool idea to let device go into rc6 without proper 3d pipeline state.
For each new uninitialized context, generate a
valid null render state to be run on context
creation.This patch introduces a skeleton with empty states.
v2: - No need to vmap (Chris Wilson)
- use .c files for state (Daniel Vetter)
- no need to flush asi915_add_requestdoes it
- remove parameter for batch alloc size
- don't wait for the init (Ben Widawsky)v3: - move to cpu/gpu (Chris Wilson)
Quoted 7 lines
Quoted 3 lines
Tested-by Oscar Mateo <[email protected]>Acked-by Damien Lespiau <[email protected]>This one can be upgraded to a:
Reviewed-by Damien Lespiau <[email protected]>
Both patches merged, thanks.
-Daniel
Signature · 3 lines
Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch