[Mesa-dev] Mesa (master): radeonsi: enable SDMA on CIK

[Marek Olšák]

Hi,

Does the attached patch fix it?

Marek

On Mon, Aug 29, 2016 at 8:13 AM, Michel Dänzer <michel at daenzer.net> wrote:
> On 26/08/16 10:53 PM, Marek =?UNKNOWN?B?T2zFocOhaw==?= wrote:
>> Module: Mesa
>> Branch: master
>> Commit: 0241d8300f66ee2c6c2c55fe64ac88d76440c591
>> URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=0241d8300f66ee2c6c2c55fe64ac88d76440c591
>>
>> Author: Marek Olšák <marek.olsak at amd.com>
>> Date:   Thu Aug 18 13:03:26 2016 +0200
>>
>> radeonsi: enable SDMA on CIK
>>
>> It passes R600_DEBUG=testdma on Bonaire/radeon.
>
> This broke the piglit test clear-accum on my Kaveri:
>
> clear-accum: ../../../../../src/gallium/drivers/radeon/r600_texture.c:100: r600_prepare_for_dma_blit: Assertion `!(rdst->dirty_level_mask & (1 << dst_level))' failed.
>
> Thread 1 "clear-accum" received signal SIGABRT, Aborted.
> 0x00007ffff56021c8 in __GI_raise (sig=sig at entry=6) at ../sysdeps/unix/sysv/linux/raise.c:54
> 54      ../sysdeps/unix/sysv/linux/raise.c: No such file or directory.
> (gdb) bt
> #0  0x00007ffff56021c8 in __GI_raise (sig=sig at entry=6) at ../sysdeps/unix/sysv/linux/raise.c:54
> #1  0x00007ffff560364a in __GI_abort () at abort.c:89
> #2  0x00007ffff55fb107 in __assert_fail_base (fmt=<optimized out>, assertion=assertion at entry=0x7ffff1008940 "!(rdst->dirty_level_mask & (1 << dst_level))", file=file at entry=0x7ffff1008770 "../../../../../src/gallium/drivers/radeon/r600_texture.c",
>     line=line at entry=100, function=function at entry=0x7ffff1009a30 <__PRETTY_FUNCTION__.11967> "r600_prepare_for_dma_blit") at assert.c:92
> #3  0x00007ffff55fb1b2 in __GI___assert_fail (assertion=assertion at entry=0x7ffff1008940 "!(rdst->dirty_level_mask & (1 << dst_level))", file=file at entry=0x7ffff1008770 "../../../../../src/gallium/drivers/radeon/r600_texture.c", line=line at entry=100,
>     function=function at entry=0x7ffff1009a30 <__PRETTY_FUNCTION__.11967> "r600_prepare_for_dma_blit") at assert.c:101
> #4  0x00007ffff0ec820f in r600_prepare_for_dma_blit (rctx=rctx at entry=0x62d760, rdst=rdst at entry=0x7f44c0, dst_level=dst_level at entry=0, dstx=<optimized out>, dstx at entry=0, dsty=dsty at entry=0, dstz=dstz at entry=0, rsrc=0x8146f0, src_level=0, src_box=0x7fffffffe430)
>     at ../../../../../src/gallium/drivers/radeon/r600_texture.c:100
> #5  0x00007ffff0de69f3 in cik_sdma_copy_texture (src_box=0x7fffffffe430, src_level=0, src=0x8146f0, dstz=0, dsty=0, dstx=0, dst_level=0, dst=0x7f44c0, sctx=0x62d760) at ../../../../../src/gallium/drivers/radeonsi/cik_sdma.c:168
> #6  cik_sdma_copy (ctx=0x62d760, dst=0x7f44c0, dst_level=0, dstx=0, dsty=0, dstz=0, src=0x8146f0, src_level=0, src_box=0x7fffffffe430) at ../../../../../src/gallium/drivers/radeonsi/cik_sdma.c:525
> #7  0x00007ffff0ec6ffe in r600_copy_from_staging_texture (rtransfer=0x813860, ctx=0x62d760) at ../../../../../src/gallium/drivers/radeon/r600_texture.c:175
> #8  r600_texture_transfer_unmap (ctx=0x62d760, transfer=0x813860) at ../../../../../src/gallium/drivers/radeon/r600_texture.c:1622
> #9  0x00007ffff09092c7 in pipe_transfer_unmap (transfer=<optimized out>, context=<optimized out>) at ../../../src/gallium/auxiliary/util/u_inlines.h:455
> #10 st_UnmapRenderbuffer (ctx=<optimized out>, rb=0x7f3940) at ../../../src/mesa/state_tracker/st_cb_fbo.c:832
> #11 0x00007ffff063c7ec in accum_return (height=200, width=400, ypos=0, xpos=0, value=<optimized out>, ctx=<optimized out>) at ../../../src/mesa/main/accum.c:426
> #12 _mesa_accum (ctx=<optimized out>, op=<optimized out>, value=<optimized out>) at ../../../src/mesa/main/accum.c:477
> #13 0x00007ffff7a962e3 in stub_glAccum (op=258, value=1) at tests/util/piglit-dispatch-gen.c:44
> #14 0x0000000000400d06 in piglit_init (argc=1, argv=0x7fffffffe788) at tests/general/clear-accum.c:59
> #15 0x00007ffff7b38b2f in run_test (gl_fw=0x614c20, argc=1, argv=0x7fffffffe788) at tests/util/piglit-framework-gl/piglit_winsys_framework.c:73
> #16 0x00007ffff7b1d647 in piglit_gl_test_run (argc=1, argv=0x7fffffffe788, config=0x7fffffffe650) at tests/util/piglit-framework-gl.c:199
> #17 0x0000000000400c8e in main (argc=1, argv=0x7fffffffe788) at tests/general/clear-accum.c:43
>
>
>
> --
> Earthling Michel Dänzer               |               http://www.amd.com
> Libre software enthusiast             |             Mesa and X developer
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0001-gallium-radeon-clear-dirty_level_mask-when-discardin.patch
Type: text/x-diff
Size: 964 bytes
Desc: not available
URL: <https://lists.freedesktop.org/archives/mesa-dev/attachments/20160829/f32d788d/attachment.patch>