OSDN Git Service
Dave Airlie [Thu, 8 Nov 2018 07:46:22 +0000 (17:46 +1000)]
iris: add fs invocations query workaround for broadwell
Dave Airlie [Thu, 8 Nov 2018 00:38:48 +0000 (10:38 +1000)]
iris: setup gen8 caps
Dave Airlie [Thu, 8 Nov 2018 00:20:54 +0000 (10:20 +1000)]
iris: limit gen8 to 8 samples
Dave Airlie [Wed, 7 Nov 2018 04:23:27 +0000 (14:23 +1000)]
iris/WIP: add broadwell support
This adds all the state changes, MOCS changes,
Kenneth Graunke [Sun, 23 Dec 2018 07:09:16 +0000 (23:09 -0800)]
iris: Delete bogus comment about cube array counting.
Both 'z' and 'depth' are counted in slices, according to the Gallium
docs (context.rst). In our temporary memory, we allocate `box.depth`
slices, so we need to rebase the starting slice (box.z) down to 0,
and back again when writing on unmap.
There's nothing strange about cubes here.
Kenneth Graunke [Fri, 21 Dec 2018 09:00:34 +0000 (01:00 -0800)]
iris: Fix compute scratch pinning
Thanks to Eero Tamminen for helping catch this.
Kenneth Graunke [Fri, 14 Dec 2018 08:51:00 +0000 (00:51 -0800)]
iris: Add a more long term TODO about timebase scaling
Kenneth Graunke [Thu, 20 Dec 2018 04:34:55 +0000 (20:34 -0800)]
iris: Only resolve inputs for actual shader stages
We don't need to consider compute at render time, and don't need to
consider disabled stages. 4% on drawoverhead.
Rhys Kidd [Mon, 17 Dec 2018 06:25:11 +0000 (01:25 -0500)]
iris: Fix assertion in iris_resource_from_handle() tiling usage
Assertion error:
iris_resource_from_handle: Assertion `res->bo->tiling_mode ==
isl_tiling_to_i915_tiling(res->surf.tiling)' failed.
This patch fixes 16 piglit tests on KBL:
glx/glx-multithread-texture
glx/glx-query-drawable-glx_fbconfig_id-glxpbuffer
glx/glx-query-drawable-glx_fbconfig_id-glxpixmap
glx/glx-query-drawable-glx_preserved_contents
glx/glx-query-drawable-glxpbuffer-glx_height
glx/glx-query-drawable-glxpbuffer-glx_width
glx/glx-query-drawable-glxpixmap-glx_height
glx/glx-query-drawable-glxpixmap-glx_width
glx/glx-swap-pixmap
glx/glx-swap-pixmap-bad
glx/glx-tfp
glx/glx-visuals-depth -pixmap
glx/glx-visuals-stencil -pixmap
spec/egl 1.4/eglcreatepbuffersurface and then glclear
spec/egl 1.4/largest possible eglcreatepbuffersurface and then glclear
spec/egl_nok_texture_from_pixmap/basic
Cc: Kenneth Graunke <kenneth@whitecape.org>
Cc: Jason Ekstrand <jason.ekstrand@intel.com>
Signed-off-by: Rhys Kidd <rhyskidd@gmail.com>
Kenneth Graunke [Fri, 14 Dec 2018 23:48:07 +0000 (15:48 -0800)]
iris: Fix scratch space allocation on Icelake.
Gen9-10 have fewer than 4 subslices per slice, so they need this to be
rounded up. Gen11 isn't documented as needing this hack, and it can
also have more than 4 subslices, so the hack actually can break things.
Fixes tests/spec/arb_enhanced_layouts/execution/component-layout/
sso-vs-gs-fs-array-interleave
Kenneth Graunke [Wed, 12 Dec 2018 08:02:25 +0000 (00:02 -0800)]
iris: better MOCS
Dave Airlie [Fri, 14 Dec 2018 04:05:27 +0000 (14:05 +1000)]
iris: fix gpu calcs for timestamp queries
Kenneth Graunke [Wed, 12 Dec 2018 10:03:57 +0000 (02:03 -0800)]
iris: only mark depth/stencil as writable if writes are actually enabled
Kenneth Graunke [Wed, 12 Dec 2018 09:52:23 +0000 (01:52 -0800)]
iris: more dead comments
Kenneth Graunke [Wed, 12 Dec 2018 09:41:39 +0000 (01:41 -0800)]
iris: pin and re-pin the scratch BO
Kenneth Graunke [Wed, 12 Dec 2018 06:51:15 +0000 (22:51 -0800)]
iris: delete finished comments
Kenneth Graunke [Wed, 12 Dec 2018 06:46:40 +0000 (22:46 -0800)]
iris: always pin the binder...in the compute context, too.
not sure why this hasn't tripped things up
Kenneth Graunke [Tue, 11 Dec 2018 07:22:54 +0000 (23:22 -0800)]
iris: Track blend enables, save outbound for resolve code
Kenneth Graunke [Mon, 10 Dec 2018 08:49:35 +0000 (00:49 -0800)]
iris: whitespace fixes
Kenneth Graunke [Fri, 7 Dec 2018 19:20:39 +0000 (11:20 -0800)]
iris: Make a alloc_surface_state helper
This does the gtt_offset addition for us
Kenneth Graunke [Fri, 7 Dec 2018 07:29:20 +0000 (23:29 -0800)]
iris: Use a surface state fill helper
This will check aux_usage eventually
Kenneth Graunke [Sat, 8 Dec 2018 19:21:48 +0000 (11:21 -0800)]
iris: don't print the pointer in INTEL_DEBUG=submit
lots of noise in diff, hope was it would be useful for gdb, but the
the GEM handle is good enough
Kenneth Graunke [Fri, 7 Dec 2018 07:05:14 +0000 (23:05 -0800)]
iris: Fix the prototype for iris_bo_alloc_tiled
This now matches the actual function in iris_bufmgr.c, as well as the
equivalent brw_bufmgr.c function...
Kenneth Graunke [Wed, 5 Dec 2018 11:30:42 +0000 (03:30 -0800)]
iris: Fix for PIPE_CAP_SIGNED_VERTEX_BUFFER_OFFSET
This fixes ext_transform_feedback-builtin-varyings gl_Position after the
combination of my transform feedback reworks and my vertex buffer
reworks (?)
Kenneth Graunke [Wed, 5 Dec 2018 11:16:54 +0000 (03:16 -0800)]
iris: drop unnecessary genx->streamout field
Kenneth Graunke [Wed, 5 Dec 2018 06:19:33 +0000 (22:19 -0800)]
iris: Implement DrawTransformFeedback()
We get the count by dividing the offset by the stride.
Jason Ekstrand [Wed, 5 Dec 2018 06:00:33 +0000 (22:00 -0800)]
iris: Copy anv's MI_MATH helpers for multiplication and division
(import done by Ken but with author set to Jason because it's his
code that's being imported, so he deserves the credit)
Kenneth Graunke [Wed, 5 Dec 2018 09:16:23 +0000 (01:16 -0800)]
iris: only get space for one offset in stream output targets
Target corresponds to a buffer, buffer only records one offset, not
multiple.
Kenneth Graunke [Wed, 5 Dec 2018 08:57:07 +0000 (00:57 -0800)]
iris: Move iris_stream_output_target def to iris_context.h
now that it doesn't have genxml
Kenneth Graunke [Wed, 5 Dec 2018 08:55:45 +0000 (00:55 -0800)]
iris: Don't bother packing 3DSTATE_SO_BUFFER at create time
We have to do half the packet late anyway, we may as well just do it
all at set time. This also lets us move the struct def out of genxml
Kenneth Graunke [Wed, 5 Dec 2018 06:04:16 +0000 (22:04 -0800)]
iris: Add _MI_ALU helpers that don't paste
This lets you pass arguments as function parameters
Kenneth Graunke [Wed, 5 Dec 2018 06:02:50 +0000 (22:02 -0800)]
iris: Reorder LRR parameters to have dst first.
LRI and LRM both put dst first, be consistent.
Kenneth Graunke [Wed, 5 Dec 2018 00:38:14 +0000 (16:38 -0800)]
iris: rewrite set_vertex_buffer and VB handling
I was using the Gallium API wrong. set_* functions with start_slot
and count parameters are supposed to update a subrange of the items.
I had been trashing all bound vertex buffers and starting over.
This should hopefully also make it easier to slot in additional
VERTEX_BUFFER_STATEs at draw time, say, for shader draw parameters.
Kenneth Graunke [Tue, 4 Dec 2018 22:11:51 +0000 (14:11 -0800)]
iris: handle PatchVerticesIn as a system value.
Tapani Pälli [Mon, 3 Dec 2018 12:15:13 +0000 (14:15 +0200)]
iris: add Android build
Note that at least following additional libs/components require changes
since they refer to BOARD_GPU_DRIVERS variable which is used to select
the driver:
- mixins
- minigbm
- libdrm
- drm_gralloc
v2: (feedback by Gustaw Smolarczyk) Fix trailing \ in a few cases
Signed-off-by: Tapani Pälli <tapani.palli@intel.com>
Kenneth Graunke [Tue, 4 Dec 2018 08:18:41 +0000 (00:18 -0800)]
iris: override alpha to one src1 blend factors
No idea why this used to pass and doesn't after updating...seems like
we should have been handling it all along...
Kenneth Graunke [Mon, 3 Dec 2018 10:59:08 +0000 (02:59 -0800)]
iris: Always do rasterizer discard in clipper
but continue doing it in SOL if possible because it's faster
Fixes ./bin/ext_transform_feedback-discard-drawarrays - simpler too
Kenneth Graunke [Mon, 3 Dec 2018 10:59:08 +0000 (02:59 -0800)]
iris: Fix primitive generated query active flag
Kenneth Graunke [Mon, 3 Dec 2018 10:08:23 +0000 (02:08 -0800)]
iris: Enable guardband clipping
Kenneth Graunke [Mon, 3 Dec 2018 10:02:49 +0000 (02:02 -0800)]
iris: Clamp viewport extents to the framebuffer dimensions
Fixes arb_framebuffer_no_attachments-query's resize subtest.
Kenneth Graunke [Mon, 3 Dec 2018 09:03:17 +0000 (01:03 -0800)]
iris: Fix clear dimensions
Fixes depthstencil-render-miplevels 1024 s=z24_s8
Kenneth Graunke [Mon, 3 Dec 2018 07:30:09 +0000 (23:30 -0800)]
iris: Drop continues in resolve
Now that we u_bit_scan we know it exists
Kenneth Graunke [Mon, 3 Dec 2018 07:17:44 +0000 (23:17 -0800)]
iris: Replace num_textures etc with a bitmask we can scan
More accurate bounds, plus can skip dead ones
Kenneth Graunke [Mon, 3 Dec 2018 07:15:41 +0000 (23:15 -0800)]
iris: Fix set_sampler_views with start > 0
Kenneth Graunke [Mon, 3 Dec 2018 07:07:27 +0000 (23:07 -0800)]
iris: fix set_sampler_views to not unbind, be better about bounds
Kenneth Graunke [Mon, 3 Dec 2018 07:03:08 +0000 (23:03 -0800)]
iris: fix overhead regression from flushing for storage images
st calls us with count = 32 but a NULL pointer...we only really care
about the highest non-NULL image...
Kenneth Graunke [Mon, 3 Dec 2018 06:30:07 +0000 (22:30 -0800)]
iris: Fix NOS mechanism
Set bits, not values
Kenneth Graunke [Mon, 3 Dec 2018 00:06:01 +0000 (16:06 -0800)]
iris: re-pin inherited streamout buffers
Kenneth Graunke [Sun, 2 Dec 2018 23:52:46 +0000 (15:52 -0800)]
iris: reemit SBE when sprite coord origin changes
fixes arb_point_sprite-checkerboard
Kenneth Graunke [Sun, 2 Dec 2018 23:41:13 +0000 (15:41 -0800)]
iris: omask can kill
Kenneth Graunke [Sun, 2 Dec 2018 22:51:52 +0000 (14:51 -0800)]
iris: reject all clipping when we can't use streamout render disabled
Kenneth Graunke [Sun, 2 Dec 2018 22:39:29 +0000 (14:39 -0800)]
iris: make clipper statistics dynamic
Kenneth Graunke [Sun, 2 Dec 2018 22:16:08 +0000 (14:16 -0800)]
iris: CS stall for stream out -> VB
i965 doesn't do this, but I suspect it just stalls a lot and doesn't hit
this. Fixes ext_transform_feedback-position render among others.
Kenneth Graunke [Sun, 2 Dec 2018 21:37:55 +0000 (13:37 -0800)]
iris: fix dma buf import strides
Kenneth Graunke [Sun, 2 Dec 2018 01:07:09 +0000 (17:07 -0800)]
iris: fix alpha channel for RGB BC1 formats
Jason Ekstrand [Thu, 25 Oct 2018 22:02:56 +0000 (17:02 -0500)]
iris: Allocate buffer resources separately
(cleaned up by Ken - make sure a bunch of things were more obviously
not using res->surf, do allow checking res->surf.tiling == LINEAR,
drop format cpp checks that aren't needed, drop memzone handling for
images, assume buffers / non-buffers in a few places...)
Kenneth Graunke [Fri, 30 Nov 2018 07:03:20 +0000 (23:03 -0800)]
iris: Don't bother considering if the underlying surface is a cube
Dave fixed it to consider whether the sampler view is a cube.
With that, there's no point (possibly harm) in looking if the original
resource was a cube...if it's an array view, we don't want to treat it
as a cube anymore...
Kenneth Graunke [Fri, 30 Nov 2018 06:23:34 +0000 (22:23 -0800)]
iris: move some non-buffer case code in a bit
Kenneth Graunke [Thu, 29 Nov 2018 00:43:21 +0000 (16:43 -0800)]
iris: Stop leaking iris_uncompiled_shaders like mad
Now shader-db actually executes. We still need a plan for culling
dead iris_compiled_shaders...
Kenneth Graunke [Wed, 28 Nov 2018 23:23:13 +0000 (15:23 -0800)]
iris: Destroy the bufmgr
Plugs a 12360 byte leak
Kenneth Graunke [Wed, 28 Nov 2018 23:29:38 +0000 (15:29 -0800)]
iris: Fix IRIS_MEMZONE_COUNT to exclude the border color pool
This is supposed to exclude single address zones. We were getting
too many VMA allocators but failing to set them up, which worked out
because we also forgot to destroy them...
Kenneth Graunke [Wed, 28 Nov 2018 23:22:07 +0000 (15:22 -0800)]
iris: Unref unbound_tex resource
Plugs a 12536 byte leak
Kenneth Graunke [Wed, 28 Nov 2018 23:15:21 +0000 (15:15 -0800)]
iris: Destroy the border color pool
This plugs a 12224 byte leak
Kenneth Graunke [Wed, 28 Nov 2018 23:10:07 +0000 (15:10 -0800)]
iris: Destroy transfer helper on screen teardown
Plugs a 16 byte leak
Kenneth Graunke [Wed, 28 Nov 2018 23:06:00 +0000 (15:06 -0800)]
iris: Fix failed to compile TCS message
Kenneth Graunke [Wed, 28 Nov 2018 10:30:42 +0000 (02:30 -0800)]
iris: Rework tiling/modifiers handling
We were being very picky about things being Y tiled. But, not
everything can be - for example, > 16382 surfaces on SKL GT1-3
have to fall back to linear.
Instead, give ISL options and let it pick.
Kenneth Graunke [Tue, 27 Nov 2018 23:30:16 +0000 (15:30 -0800)]
iris: fix conditional compute, don't stomp predicate for pipelined queries
Kenneth Graunke [Tue, 27 Nov 2018 22:20:48 +0000 (14:20 -0800)]
iris: check query first
this lets us avoid the predicate bit in more cases, which is nice
Kenneth Graunke [Tue, 27 Nov 2018 04:55:59 +0000 (20:55 -0800)]
iris: for BLORP, only use the predicate enable bit when USE_BIT
Dave Airlie [Mon, 26 Nov 2018 23:03:16 +0000 (09:03 +1000)]
iris: add conditional render support
Kenneth Graunke [Tue, 27 Nov 2018 23:35:48 +0000 (15:35 -0800)]
iris: drop key_size_for_cache
dead since my program cache API rework. we could still use it for one
function, but it's so trivial to pass the size, that it's probably not
worth the extra code
Dave Airlie [Fri, 9 Nov 2018 02:13:17 +0000 (12:13 +1000)]
iris: iris add load register reg32/64
These will be needed for broadwell and conditional render
Dave Airlie [Tue, 27 Nov 2018 03:42:58 +0000 (13:42 +1000)]
iris: execute compute related query on compute batch.
This only happens for the compute invocations query.
Dave Airlie [Tue, 27 Nov 2018 03:02:03 +0000 (13:02 +1000)]
iris: fix cube texture view
Kenneth Graunke [Mon, 26 Nov 2018 22:59:17 +0000 (14:59 -0800)]
iris: fix some SO overflow query bugs and tidy the code a bit
Dave Airlie [Mon, 26 Nov 2018 05:22:48 +0000 (15:22 +1000)]
iris: add initial transform feedback overflow query paths (V3)
v2: fix cpu overflow calc
v3: use a struct
Kenneth Graunke [Mon, 26 Nov 2018 03:03:43 +0000 (19:03 -0800)]
iris: actually flush for storage images
Kenneth Graunke [Sat, 24 Nov 2018 10:55:40 +0000 (02:55 -0800)]
iris: add an extra BT assert from Chris Wilson
Kenneth Graunke [Sat, 24 Nov 2018 03:12:36 +0000 (19:12 -0800)]
iris: add assertions about binding table starts
Kenneth Graunke [Fri, 23 Nov 2018 21:01:47 +0000 (13:01 -0800)]
iris: drop pull constant binding table entry
nothing uses this
Kenneth Graunke [Fri, 23 Nov 2018 19:47:55 +0000 (11:47 -0800)]
iris: Use program's num textures not the state tracker's bound
the state tracker might bind more textures than the program is using.
Kenneth Graunke [Thu, 22 Nov 2018 10:55:27 +0000 (02:55 -0800)]
iris: Enable precompiles
Kenneth Graunke [Thu, 22 Nov 2018 02:15:28 +0000 (18:15 -0800)]
iris: rework program cache interface
This exposes iris_upload_shader() without having to bind it, which will
be useful for precompiles. It also lets us examine the old programs and
flag dirty bits at a higher level, rather than cramming all that
knowledge into the cache layer.
Kenneth Graunke [Thu, 22 Nov 2018 01:02:02 +0000 (17:02 -0800)]
iris: Use wrappers for create_xs_state rather than a switch statement
Kenneth Graunke [Thu, 22 Nov 2018 00:53:09 +0000 (16:53 -0800)]
iris: fix comment location
Kenneth Graunke [Thu, 22 Nov 2018 00:45:14 +0000 (16:45 -0800)]
iris: export iris_upload_shader
Kenneth Graunke [Thu, 22 Nov 2018 00:45:35 +0000 (16:45 -0800)]
iris: fix prototype warning
Kenneth Graunke [Wed, 21 Nov 2018 19:54:37 +0000 (11:54 -0800)]
iris: Re-pin even if nothing is dirty
Kenneth Graunke [Wed, 21 Nov 2018 09:03:48 +0000 (01:03 -0800)]
iris: Flush for history at various moments
When we blit, transfer, or copy_resource to a buffer, we need to flush
to ensure any stale data for that buffer is invalidated in the caches.
bind_history will inform us which caches need to be flushed.
Also, for any push constant buffers, we need to flag those dirty so
that we re-emit 3DSTATE_CONSTANT_*, causing the data to be re-pushed.
Kenneth Graunke [Wed, 21 Nov 2018 08:52:25 +0000 (00:52 -0800)]
iris: add iris_flush_and_dirty_for_history
Kenneth Graunke [Wed, 21 Nov 2018 08:38:49 +0000 (00:38 -0800)]
iris: Track a binding history for buffer resources
This will let us know what caches to flush / state to dirty when
altering the contents of a buffer.
Kenneth Graunke [Wed, 21 Nov 2018 19:37:12 +0000 (11:37 -0800)]
iris: drop long dead XXX comment
Kenneth Graunke [Wed, 21 Nov 2018 08:06:46 +0000 (00:06 -0800)]
iris: Do the 48-bit vertex buffer address invalidation workaround
Kenneth Graunke [Wed, 21 Nov 2018 07:03:16 +0000 (23:03 -0800)]
iris: Fix VIEWPORT/LAYER in stream output info
Fixes glsl-1.50-transform-feedback-builtins and
ext_transform_feedback-builtin-varyings gl_PointSize
Kenneth Graunke [Wed, 21 Nov 2018 06:51:26 +0000 (22:51 -0800)]
iris: Fix buffer -> buffer copy_region
Size can be too large for a surf, blorp_buffer_copy chops things up
into segments we can actually handle
Fixes map_buffer_range_test and copy_buffer_coherency
Kenneth Graunke [Wed, 21 Nov 2018 02:16:02 +0000 (18:16 -0800)]
iris: Lie about indirects
fixes interpolateAt tests
Kenneth Graunke [Tue, 20 Nov 2018 21:42:31 +0000 (13:42 -0800)]
iris: Enable ctx->Const.UseSTD430AsDefaultPacking
hooray for obscurely named pipe caps with bizarre descriptions!
Kenneth Graunke [Tue, 20 Nov 2018 19:25:13 +0000 (11:25 -0800)]
iris: update comment
Kenneth Graunke [Tue, 20 Nov 2018 19:20:27 +0000 (11:20 -0800)]
iris: RT flush for memorybarrier with texture bit
PIXEL_BUFFER_BARRIER_BIT turns into PIPE_BARRIER_TEXTURE and it ought
to trigger an RT flush, according to brw_memory_barrier
Kenneth Graunke [Tue, 20 Nov 2018 17:12:54 +0000 (09:12 -0800)]
iris: PIPE_CONTROL workarounds for GPGPU mode