search for: cur_ctx

...en.c @@ -174,6 +174,25 @@ nv50_screen_destroy(struct pipe_screen *pscreen) FREE(screen); } +static int +nv50_pre_pipebuffer_map(struct pipe_screen *pscreen, struct pipe_buffer *pb, + unsigned usage) +{ + struct nv50_screen *screen = nv50_screen(pscreen); + struct nv50_context *ctx = screen->cur_ctx; + + if (!(pb->usage & PIPE_BUFFER_USAGE_VERTEX)) + return 0; + + /* Our vtxbuf got mapped, it can no longer be considered part of current + * state, mark it as such, to avoid problematic relocs. */ + if (ctx && ctx->state.vtxbuf && so_bo_is_reloc(ctx->state.vtxbuf, +...

...en.c @@ -174,6 +174,28 @@ nv50_screen_destroy(struct pipe_screen *pscreen) FREE(screen); } +static int +nv50_pre_pipebuffer_map(struct pipe_screen *pscreen, struct pipe_buffer *pb, + unsigned usage) +{ + struct nv50_screen *screen = nv50_screen(pscreen); + struct nv50_context *ctx = screen->cur_ctx; + + if (!(pb->usage & PIPE_BUFFER_USAGE_VERTEX)) + return 0; + + /* Our vtxbuf got mapped, it can no longer be considered part of current + * state, remove it to avoid emitting reloc markers. + */ + if (ctx && ctx->state.vtxbuf && so_bo_is_reloc(ctx->state.vtxbuf, +...

...een *screen = push->user_priv; if (screen) { - nouveau_fence_next(&screen->base); - nouveau_fence_update(&screen->base, TRUE); + nouveau_fence_next(&screen->base.fence); + nouveau_fence_update(&screen->base.fence, TRUE); if (screen->cur_ctx) screen->cur_ctx->state.flushed = TRUE; } diff --git a/src/gallium/drivers/nouveau/nv50/nv50_screen.c b/src/gallium/drivers/nouveau/nv50/nv50_screen.c index 015f139..8195650 100644 --- a/src/gallium/drivers/nouveau/nv50/nv50_screen.c +++ b/src/gallium/drivers/nouveau/nv50/nv50_s...

...*screen = push->user_priv; if (screen) { - nouveau_fence_next(&screen->base); - nouveau_fence_update(&screen->base, TRUE); + nouveau_fence_next(&screen->base.fence); + nouveau_fence_update(&screen->base.fence, TRUE); if (screen->cur_ctx) screen->cur_ctx->state.flushed = TRUE; } diff --git a/src/gallium/drivers/nouveau/nv50/nv50_screen.c b/src/gallium/drivers/nouveau/nv50/nv50_screen.c index 015f139..8195650 100644 --- a/src/gallium/drivers/nouveau/nv50/nv50_screen.c +++ b/src/gallium/drivers/nouveau/nv50/nv50...

...233,6 +287,14 @@ nv30_context_create(struct pipe_screen *pscreen, void *priv) if (debug_get_bool_option("NV30_SWTNL", FALSE)) nv30->draw_flags |= NV30_NEW_SWTNL; + nouveau_fence_new(&nv30->base.fence, &nv30->base.fence.current, FALSE); + + if (!screen->cur_ctx) { + nv30_screen_init_hwctx(screen, nv30->base.pushbuf); + screen->cur_ctx = nv30; + } + nouveau_pushbuf_bufctx(nv30->base.pushbuf, nv30->bufctx); + nv30->sample_mask = 0xffff; nv30_vbo_init(pipe); nv30_query_init(pipe); @@ -247,12 +309,14 @@ nv30_context_cr...

...t_create(struct pipe_screen *pscreen, void *priv) > if (debug_get_bool_option("NV30_SWTNL", FALSE)) > nv30->draw_flags |= NV30_NEW_SWTNL; > > + nouveau_fence_new(&nv30->base.fence, &nv30->base.fence.current, FALSE); > + > + if (!screen->cur_ctx) { > + nv30_screen_init_hwctx(screen, nv30->base.pushbuf); > + screen->cur_ctx = nv30; > + } > + nouveau_pushbuf_bufctx(nv30->base.pushbuf, nv30->bufctx); > + > nv30->sample_mask = 0xffff; > nv30_vbo_init(pipe); > nv30_query_init(pipe...

I went through the gallium-nine tree and picked out nouveau patches that are general bug-fixes. The first bunch I'd like to also get into 10.2. I've reviewed all of them and they make sense to me, but sending them out for public review as well in case there are any objections. Unless I hear objections, I'd like to push this by Friday. Christoph Bumiller (11): nv50,nvc0: always pull

...ok, gdb7 works: > (gdb) fr 6 > #6 0x00000008011a3e49 in io_loop_handler_run_internal (ioloop=0x801c214e0) > at ioloop-kqueue.c:131 > 131 i_panic("kevent(): %m"); > (gdb) p errno > $1 = 22 > (gdb) p ret > $2 = -1 > (gdb) p *ioloop > $3 = {prev = 0x801c21080, cur_ctx = 0x0, io_files = 0x801c4f980, > next_io_file = 0x0, timeouts = 0x801c19e60, timeouts_new = {arr = {buffer = > 0x801c5ac80, element_size = 8}, v = 0x801c5ac80, > v_modifiable = 0x801c5ac80}, handler_context = 0x801c19e80, > notify_handler_context = 0x0, max_fd_count = 0, time_moved_...

grrr. /home/mrm $ gdb /usr/local/bin/doveadm GNU gdb 6.1.1 [FreeBSD] Copyright 2004 Free Software Foundation, Inc. GDB is free software, covered by the GNU General Public License, and you are welcome to change it and/or distribute copies of it under certain conditions. Type "show copying" to see the conditions. There is absolutely no warranty for GDB. Type "show warranty" for

..._internal (ioloop=0x801c214e0) > at ioloop-kqueue.c:131 > 131 i_panic("kevent(): %m"); > (gdb) p ts > $1 = {tv_sec = 34389923520, tv_nsec = 140737488345872000} > (gdb) p errno > $2 = 22 > (gdb) p ret > $3 = -1 > (gdb) p *ioloop > $4 = {prev = 0x801c21080, cur_ctx = 0x0, io_files = 0x801c4f980, > next_io_file = 0x0, timeouts = 0x801d17540, timeouts_new = {arr = { > buffer = 0x801cd9700, element_size = 8}, v = 0x801cd9700, > v_modifiable = 0x801cd9700}, handler_context = 0x801d17560, > notify_handler_context = 0x0, max_fd_count = 0,...

Signed-off-by: Ilia Mirkin <imirkin at alum.mit.edu> --- src/gallium/drivers/nouveau/nouveau_buffer.c | 4 +--- src/gallium/drivers/nouveau/nouveau_context.h | 1 - 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/src/gallium/drivers/nouveau/nouveau_buffer.c b/src/gallium/drivers/nouveau/nouveau_buffer.c index e308ff4..904e2cc 100644 ---

...fr 6 #6 0x00000008011a3e49 in io_loop_handler_run_internal (ioloop=0x801c214e0) at ioloop-kqueue.c:131 131 i_panic("kevent(): %m"); (gdb) p ts $1 = {tv_sec = 34389923520, tv_nsec = 140737488345872000} (gdb) p errno $2 = 22 (gdb) p ret $3 = -1 (gdb) p *ioloop $4 = {prev = 0x801c21080, cur_ctx = 0x0, io_files = 0x801c4f980, next_io_file = 0x0, timeouts = 0x801d17540, timeouts_new = {arr = { buffer = 0x801cd9700, element_size = 8}, v = 0x801cd9700, v_modifiable = 0x801cd9700}, handler_context = 0x801d17560, notify_handler_context = 0x0, max_fd_count = 0, time_moved_callbac...

ok, gdb7 works: (gdb) fr 6 #6 0x00000008011a3e49 in io_loop_handler_run_internal (ioloop=0x801c214e0) at ioloop-kqueue.c:131 131 i_panic("kevent(): %m"); (gdb) p errno $1 = 22 (gdb) p ret $2 = -1 (gdb) p *ioloop $3 = {prev = 0x801c21080, cur_ctx = 0x0, io_files = 0x801c4f980, next_io_file = 0x0, timeouts = 0x801c19e60, timeouts_new = {arr = {buffer = 0x801c5ac80, element_size = 8}, v = 0x801c5ac80, v_modifiable = 0x801c5ac80}, handler_context = 0x801c19e80, notify_handler_context = 0x0, max_fd_count = 0, time_moved_callback = 0x800d53b...

Signed-off-by: Ilia Mirkin <imirkin at alum.mit.edu> Cc: "10.2" <mesa-stable at lists.freedesktop.org> --- src/gallium/drivers/nouveau/nv30/nv30_screen.c | 6 ++++++ src/gallium/drivers/nouveau/nv30/nvfx_fragprog.c | 1 + 2 files changed, 7 insertions(+) diff --git a/src/gallium/drivers/nouveau/nv30/nv30_screen.c b/src/gallium/drivers/nouveau/nv30/nv30_screen.c index

...at ioloop-kqueue.c:131 >> 131 i_panic("kevent(): %m"); >> (gdb) p ts >> $1 = {tv_sec = 34389923520, tv_nsec = 140737488345872000} >> (gdb) p errno >> $2 = 22 >> (gdb) p ret >> $3 = -1 >> (gdb) p *ioloop >> $4 = {prev = 0x801c21080, cur_ctx = 0x0, io_files = 0x801c4f980, >> next_io_file = 0x0, timeouts = 0x801d17540, timeouts_new = {arr = { >> buffer = 0x801cd9700, element_size = 8}, v = 0x801cd9700, >> v_modifiable = 0x801cd9700}, handler_context = 0x801d17560, >> notify_handler_context = 0x0, ma...

...gt; 131 i_panic("kevent(): %m"); >>> (gdb) p ts >>> $1 = {tv_sec = 34389923520, tv_nsec = 140737488345872000} >>> (gdb) p errno >>> $2 = 22 >>> (gdb) p ret >>> $3 = -1 >>> (gdb) p *ioloop >>> $4 = {prev = 0x801c21080, cur_ctx = 0x0, io_files = 0x801c4f980, >>> next_io_file = 0x0, timeouts = 0x801d17540, timeouts_new = {arr = { >>> buffer = 0x801cd9700, element_size = 8}, v = 0x801cd9700, >>> v_modifiable = 0x801cd9700}, handler_context = 0x801d17560, >>> notify_handler_c...

...); > >>> (gdb) p ts > >>> $1 = {tv_sec = 34389923520, tv_nsec = 140737488345872000} > >>> (gdb) p errno > >>> $2 = 22 > >>> (gdb) p ret > >>> $3 = -1 > >>> (gdb) p *ioloop > >>> $4 = {prev = 0x801c21080, cur_ctx = 0x0, io_files = 0x801c4f980, > >>> next_io_file = 0x0, timeouts = 0x801d17540, timeouts_new = {arr = { > >>> buffer = 0x801cd9700, element_size = 8}, v = 0x801cd9700, > >>> v_modifiable = 0x801cd9700}, handler_context = 0x801d17560, > >>&gt...

>From the log: Jul 11 13:12:42 mproxy dovecot: imap-login: Login: user=<hildeb>, method=PLAIN, rip=141.42.206.36, lip=141.42.206.11, mpid=27254, TLS, session=<TGwoO1o3id+NKs4k> Jul 11 13:12:44 mproxy dovecot: imap(hildeb)<TGwoO1o3id+NKs4k>: Panic: file imap-client.c: line 854 (client_check_command_hangs): assertion failed: ((io_loop_find_fd_conditions(current_ioloop,

...en.c @@ -189,6 +189,28 @@ nv50_screen_destroy(struct pipe_screen *pscreen) FREE(screen); } +static int +nv50_pre_pipebuffer_map(struct pipe_screen *pscreen, struct pipe_buffer *pb, + unsigned usage) +{ + struct nv50_screen *screen = nv50_screen(pscreen); + struct nv50_context *ctx = screen->cur_ctx; + + if (!(pb->usage & PIPE_BUFFER_USAGE_VERTEX)) + return 0; + + /* Our vtxbuf got mapped, it can no longer be considered part of current + * state, remove it to avoid emitting reloc markers. + */ + if (ctx && ctx->state.vtxbuf && so_bo_is_reloc(ctx->state.vtxbuf, +...

This patch series silences some unknown cap warnings and fixes up coding style (patch 1+4). The most important part of this series are the two patches in the middle. They rework the state_fb code, so that we are able to render to not 64 byte aligned targets, as this is the only real use-case for render temporaries this allows us to drop temp code completely and simplifies a lot