nvfx: fb->nr_cbufs <= 1 on nv30
PATCH 1/2 nvfx: fb->nr_cbufs <= 1 on nv30
7e1bf946316ff99feaa3f2e85f70b45bd9a77ade changedPIPE_CAP_MAX_RENDER_TARGETS to 1 on nv30.
--- src/gallium/drivers/nvfx/nvfx_state_fb.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
src/gallium/drivers/nvfx/nvfx_state_fb.c +1 -1
@@ -54,7 +54,7 @@ nvfx_framebuffer_prepare(struct nvfx_context *nvfx)int all_swizzled =1 ;if (!nvfx->is_nv4x) -assert (fb->nr_cbufs <=2 ); +assert (fb->nr_cbufs <=1 );else assert (fb->nr_cbufs <=4 );
Signature · 1 line
1.7.3.2
A message that is not in the archive (sent off-list or not yet received): 1290631836-21180-1-git-send-email-chantry.xavier-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org
PATCH 2/2 nvfx: reset nvfx->hw_zeta
If nvfx_framebuffer prepare and validate were called successively with fb->zsbuf not NULL and then NULL, nvfx->hw_zeta would contain garbage and this would cause failures in nvfx_framebuffer_relocate/OUT_RELOC(hw_zeta).
This was triggered by piglit/texwrap 2D GL_DEPTH_COMPONENT24 and caused first a 'write to user buffer!!' error in libdrm and then worse things.
--- src/gallium/drivers/nvfx/nvfx_state_fb.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-)
src/gallium/drivers/nvfx/nvfx_state_fb.c +3 -1
@@ -113,7 +113,9 @@ nvfx_framebuffer_validate(struct nvfx_context *nvfx, unsigned prepare_result) nvfx->state.render_temps |=nvfx_surface_get_render_target (fb->cbufs[i], prepare_result, &nvfx->hw_rt[i]) << i;for (; i <4 ; ++i) - nvfx->hw_rt[i].bo =0 ; + nvfx->hw_rt[i].bo =NULL ; + + nvfx->hw_zeta.bo =NULL ;if (fb->zsbuf) { nvfx->state.render_temps |=nvfx_surface_get_render_target (fb->zsbuf, prepare_result, &nvfx->hw_zeta) <<7 ;
Signature · 1 line
1.7.3.2
A message that is not in the archive (sent off-list or not yet received): 1290631836-21180-2-git-send-email-chantry.xavier-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org
Re: [PATCH 2/2] nvfx: reset nvfx->hw_zeta
Quoted 8 lines · Xavier Chantry
If
nvfx_framebufferprepare and validate were called successively withfb->zsbufnot NULL and then NULL,nvfx->hw_zetawould contain garbage and this would cause failures in nvfx_framebuffer_relocate/OUT_RELOC(hw_zeta).This was triggered by piglit/texwrap 2D
GL_DEPTH_COMPONENT24and caused first a 'write to user buffer!!' error in libdrm and then worse things.Signed-off-by Xavier Chantry <[email protected]>
Thanks, both patches pushed.
Quoted 9 lines
--- src/gallium/drivers/nvfx/nvfx_state_fb.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-)src/gallium/drivers/nvfx/nvfx_state_fb.c +0
-0
src/gallium/drivers/nvfx/nvfx_state_fb.c nvfx_framebuffer_validate(struct nvfx_context *nvfx, unsigned prepare_result) · line 121
Quoted 10 lines
src/gallium/drivers/nvfx/nvfx_state_fb.c +3
-1@@ -113,7 +113,9 @@ nvfx_framebuffer_validate(struct nvfx_context *nvfx, unsigned prepare_result) nvfx->state.render_temps |=nvfx_surface_get_render_target (fb->cbufs[i], prepare_result, &nvfx->hw_rt[i]) << i;for (; i <4 ; ++i) - nvfx->hw_rt[i].bo =0 ; + nvfx->hw_rt[i].bo =NULL ; + + nvfx->hw_zeta.bo =NULL ;if (fb->zsbuf) { nvfx->state.render_temps |=nvfx_surface_get_render_target (fb->zsbuf, prepare_result, &nvfx->hw_zeta) <<7 ;
_______________________________________________
Nouveau mailing list [email protected]
http://lists.freedesktop.org/mailman/listinfo/nouveau