Attachment 118101 Details for Bug 91881 – possible fix

[patch] possible fix

0001-r600g-fix-bug-91881.patch (text/plain), 3.93 KB, created by Marek Olšák on 2015-09-06 14:41:29 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Marek Olšák

Created: 2015-09-06 14:41:29 UTC

Size: 3.93 KB

patch

obsolete

>From 0afd7a33a7bf8a87e9c68f80a70fecb1ed026e63 Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?Marek=20Ol=C5=A1=C3=A1k?= <marek.olsak@amd.com>
>Date: Sun, 6 Sep 2015 16:40:21 +0200
>Subject: [PATCH] r600g: fix bug 91881
>
>Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=91881
>
>Cc: 11.0 <mesa-stable@lists.freedesktop.org>
>---
> src/gallium/drivers/r600/evergreen_state.c | 4 ++--
> src/gallium/drivers/r600/r600_state.c      | 8 ++++----
> 2 files changed, 6 insertions(+), 6 deletions(-)
>
>diff --git a/src/gallium/drivers/r600/evergreen_state.c b/src/gallium/drivers/r600/evergreen_state.c
>index 6f4cb55..0c54a3f 100644
>--- a/src/gallium/drivers/r600/evergreen_state.c
>+++ b/src/gallium/drivers/r600/evergreen_state.c
>@@ -1864,7 +1864,7 @@ static void evergreen_emit_vertex_buffers(struct r600_context *rctx,
> 		radeon_emit(cs, PKT3(PKT3_SET_RESOURCE, 8, 0) | pkt_flags);
> 		radeon_emit(cs, (resource_offset + buffer_index) * 8);
> 		radeon_emit(cs, va); /* RESOURCEi_WORD0 */
>-		radeon_emit(cs, rbuffer->buf->size - vb->buffer_offset - 1); /* RESOURCEi_WORD1 */
>+		radeon_emit(cs, rbuffer->b.b.width0 - vb->buffer_offset - 1); /* RESOURCEi_WORD1 */
> 		radeon_emit(cs, /* RESOURCEi_WORD2 */
> 				 S_030008_ENDIAN_SWAP(r600_endian_swap(32)) |
> 				 S_030008_STRIDE(vb->stride) |
>@@ -1934,7 +1934,7 @@ static void evergreen_emit_constant_buffers(struct r600_context *rctx,
> 		radeon_emit(cs, PKT3(PKT3_SET_RESOURCE, 8, 0) | pkt_flags);
> 		radeon_emit(cs, (buffer_id_base + buffer_index) * 8);
> 		radeon_emit(cs, va); /* RESOURCEi_WORD0 */
>-		radeon_emit(cs, rbuffer->buf->size - cb->buffer_offset - 1); /* RESOURCEi_WORD1 */
>+		radeon_emit(cs, rbuffer->b.b.width0 - cb->buffer_offset - 1); /* RESOURCEi_WORD1 */
> 		radeon_emit(cs, /* RESOURCEi_WORD2 */
> 			    S_030008_ENDIAN_SWAP(gs_ring_buffer ? ENDIAN_NONE : r600_endian_swap(32)) |
> 			    S_030008_STRIDE(gs_ring_buffer ? 4 : 16) |
>diff --git a/src/gallium/drivers/r600/r600_state.c b/src/gallium/drivers/r600/r600_state.c
>index 93a74f7..3464c38 100644
>--- a/src/gallium/drivers/r600/r600_state.c
>+++ b/src/gallium/drivers/r600/r600_state.c
>@@ -1022,7 +1022,7 @@ static void r600_init_color_surface(struct r600_context *rctx,
> 
> 		/* CMASK. */
> 		if (!rctx->dummy_cmask ||
>-		    rctx->dummy_cmask->buf->size < cmask.size ||
>+		    rctx->dummy_cmask->b.b.width0 < cmask.size ||
> 		    rctx->dummy_cmask->buf->alignment % cmask.alignment != 0) {
> 			struct pipe_transfer *transfer;
> 			void *ptr;
>@@ -1040,7 +1040,7 @@ static void r600_init_color_surface(struct r600_context *rctx,
> 
> 		/* FMASK. */
> 		if (!rctx->dummy_fmask ||
>-		    rctx->dummy_fmask->buf->size < fmask.size ||
>+		    rctx->dummy_fmask->b.b.width0 < fmask.size ||
> 		    rctx->dummy_fmask->buf->alignment % fmask.alignment != 0) {
> 			pipe_resource_reference((struct pipe_resource**)&rctx->dummy_fmask, NULL);
> 			rctx->dummy_fmask = r600_buffer_create_helper(rscreen, fmask.size, fmask.alignment);
>@@ -1709,7 +1709,7 @@ static void r600_emit_vertex_buffers(struct r600_context *rctx, struct r600_atom
> 		radeon_emit(cs, PKT3(PKT3_SET_RESOURCE, 7, 0));
> 		radeon_emit(cs, (320 + buffer_index) * 7);
> 		radeon_emit(cs, offset); /* RESOURCEi_WORD0 */
>-		radeon_emit(cs, rbuffer->buf->size - offset - 1); /* RESOURCEi_WORD1 */
>+		radeon_emit(cs, rbuffer->b.b.width0 - offset - 1); /* RESOURCEi_WORD1 */
> 		radeon_emit(cs, /* RESOURCEi_WORD2 */
> 				 S_038008_ENDIAN_SWAP(r600_endian_swap(32)) |
> 				 S_038008_STRIDE(vb->stride));
>@@ -1758,7 +1758,7 @@ static void r600_emit_constant_buffers(struct r600_context *rctx,
> 		radeon_emit(cs, PKT3(PKT3_SET_RESOURCE, 7, 0));
> 		radeon_emit(cs, (buffer_id_base + buffer_index) * 7);
> 		radeon_emit(cs, offset); /* RESOURCEi_WORD0 */
>-		radeon_emit(cs, rbuffer->buf->size - offset - 1); /* RESOURCEi_WORD1 */
>+		radeon_emit(cs, rbuffer->b.b.width0 - offset - 1); /* RESOURCEi_WORD1 */
> 		radeon_emit(cs, /* RESOURCEi_WORD2 */
> 			    S_038008_ENDIAN_SWAP(gs_ring_buffer ? ENDIAN_NONE : r600_endian_swap(32)) |
> 			    S_038008_STRIDE(gs_ring_buffer ? 4 : 16));
>-- 
>2.1.4
>

Actions: View | Splinter Review

Attachments on bug 91881: 118101

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.