Attachment 105560 Details for Bug 82255 – Ilia's earlier patch

[patch] Ilia's earlier patch

118684.patch (text/plain), 4.83 KB, created by Emil Velikov on 2014-09-01 13:08:30 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Emil Velikov

Created: 2014-09-01 13:08:30 UTC

Size: 4.83 KB

patch

obsolete

>diff --git a/src/gallium/drivers/nouveau/nv50/nv50_state_validate.c b/src/gallium/drivers/nouveau/nv50/nv50_state_validate.c
>index 1dcb961..519de15 100644
>--- a/src/gallium/drivers/nouveau/nv50/nv50_state_validate.c
>+++ b/src/gallium/drivers/nouveau/nv50/nv50_state_validate.c
>@@ -54,8 +54,8 @@ nv50_validate_fb(struct nv50_context *nv50)
>       assert(mt->layout_3d || !array_mode || array_size == 1);
> 
>       BEGIN_NV04(push, NV50_3D(RT_ADDRESS_HIGH(i)), 5);
>-      PUSH_DATAh(push, bo->offset + sf->offset);
>-      PUSH_DATA (push, bo->offset + sf->offset);
>+      PUSH_DATAh(push, mt->base.address + sf->offset);
>+      PUSH_DATA (push, mt->base.address + sf->offset);
>       PUSH_DATA (push, nv50_format_table[sf->base.format].rt);
>       if (likely(nouveau_bo_memtype(bo))) {
>          PUSH_DATA (push, mt->level[sf->base.u.tex.level].tile_mode);
>diff --git a/src/gallium/drivers/nouveau/nv50/nv50_surface.c b/src/gallium/drivers/nouveau/nv50/nv50_surface.c
>index 600f4f9..8ec4a5f 100644
>--- a/src/gallium/drivers/nouveau/nv50/nv50_surface.c
>+++ b/src/gallium/drivers/nouveau/nv50/nv50_surface.c
>@@ -114,8 +114,8 @@ nv50_2d_texture_set(struct nouveau_pushbuf *push, int dst,
>       PUSH_DATA (push, mt->level[level].pitch);
>       PUSH_DATA (push, width);
>       PUSH_DATA (push, height);
>-      PUSH_DATAh(push, bo->offset + offset);
>-      PUSH_DATA (push, bo->offset + offset);
>+      PUSH_DATAh(push, mt->base.address + offset);
>+      PUSH_DATA (push, mt->base.address + offset);
>    } else {
>       BEGIN_NV04(push, SUBC_2D(mthd), 5);
>       PUSH_DATA (push, format);
>@@ -126,8 +126,8 @@ nv50_2d_texture_set(struct nouveau_pushbuf *push, int dst,
>       BEGIN_NV04(push, SUBC_2D(mthd + 0x18), 4);
>       PUSH_DATA (push, width);
>       PUSH_DATA (push, height);
>-      PUSH_DATAh(push, bo->offset + offset);
>-      PUSH_DATA (push, bo->offset + offset);
>+      PUSH_DATAh(push, mt->base.address + offset);
>+      PUSH_DATA (push, mt->base.address + offset);
>    }
> 
> #if 0
>@@ -299,8 +299,8 @@ nv50_clear_render_target(struct pipe_context *pipe,
>    BEGIN_NV04(push, NV50_3D(RT_CONTROL), 1);
>    PUSH_DATA (push, 1);
>    BEGIN_NV04(push, NV50_3D(RT_ADDRESS_HIGH(0)), 5);
>-   PUSH_DATAh(push, bo->offset + sf->offset);
>-   PUSH_DATA (push, bo->offset + sf->offset);
>+   PUSH_DATAh(push, mt->base.address + sf->offset);
>+   PUSH_DATA (push, mt->base.address + sf->offset);
>    PUSH_DATA (push, nv50_format_table[dst->format].rt);
>    PUSH_DATA (push, mt->level[sf->base.u.tex.level].tile_mode);
>    PUSH_DATA (push, mt->layer_stride >> 2);
>@@ -381,8 +381,8 @@ nv50_clear_depth_stencil(struct pipe_context *pipe,
>    nv50->scissors_dirty |= 1;
> 
>    BEGIN_NV04(push, NV50_3D(ZETA_ADDRESS_HIGH), 5);
>-   PUSH_DATAh(push, bo->offset + sf->offset);
>-   PUSH_DATA (push, bo->offset + sf->offset);
>+   PUSH_DATAh(push, mt->base.address + sf->offset);
>+   PUSH_DATA (push, mt->base.address + sf->offset);
>    PUSH_DATA (push, nv50_format_table[dst->format].rt);
>    PUSH_DATA (push, mt->level[sf->base.u.tex.level].tile_mode);
>    PUSH_DATA (push, mt->layer_stride >> 2);
>diff --git a/src/gallium/drivers/nouveau/nv50/nv50_transfer.c b/src/gallium/drivers/nouveau/nv50/nv50_transfer.c
>index f716052..fc6b24a 100644
>--- a/src/gallium/drivers/nouveau/nv50/nv50_transfer.c
>+++ b/src/gallium/drivers/nouveau/nv50/nv50_transfer.c
>@@ -24,6 +24,8 @@ nv50_m2mf_rect_setup(struct nv50_m2mf_rect *rect,
>    rect->bo = mt->base.bo;
>    rect->domain = mt->base.domain;
>    rect->base = mt->level[l].offset;
>+   if (mt->base.bo->offset != mt->base.address)
>+      rect->base += mt->base.address - mt->base.bo->offset;
>    rect->pitch = mt->level[l].pitch;
>    if (util_format_is_plain(res->format)) {
>       rect->width = w << mt->ms_x;
>diff --git a/src/gallium/drivers/nouveau/nv50/nv84_video.c b/src/gallium/drivers/nouveau/nv50/nv84_video.c
>index a39f572..e1caeec 100644
>--- a/src/gallium/drivers/nouveau/nv50/nv84_video.c
>+++ b/src/gallium/drivers/nouveau/nv50/nv84_video.c
>@@ -683,17 +683,14 @@ nv84_video_buffer_create(struct pipe_context *pipe,
>                       bo_size, &cfg, &buffer->full))
>       goto error;
> 
>-   mt0->base.bo = buffer->interlaced;
>+   nouveau_bo_ref(buffer->interlaced, &mt0->base.bo);
>    mt0->base.domain = NOUVEAU_BO_VRAM;
>-   mt0->base.offset = 0;
>-   mt0->base.address = buffer->interlaced->offset + mt0->base.offset;
>-   nouveau_bo_ref(buffer->interlaced, &empty);
>+   mt0->base.address = buffer->interlaced->offset;
> 
>-   mt1->base.bo = buffer->interlaced;
>+   nouveau_bo_ref(buffer->interlaced, &mt1->base.bo);
>    mt1->base.domain = NOUVEAU_BO_VRAM;
>-   mt1->base.offset = mt0->layer_stride * 2;
>-   mt1->base.address = buffer->interlaced->offset + mt1->base.offset;
>-   nouveau_bo_ref(buffer->interlaced, &empty);
>+   mt1->base.offset = mt0->total_size;
>+   mt1->base.address = buffer->interlaced->offset + mt0->total_size;
> 
>    memset(&sv_templ, 0, sizeof(sv_templ));
>    for (component = 0, i = 0; i < 2; ++i ) {

Actions: View | Splinter Review

Attachments on bug 82255: 104158 | 104384 | 104385 | 104386 | 104387 | 104388 | 104390 | 105558 | 105560

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.