diff options
| author | Christian Gmeiner <christian.gmeiner@gmail.com> | 2014-02-06 18:37:17 +0000 |
|---|---|---|
| committer | Christian Gmeiner <christian.gmeiner@gmail.com> | 2014-02-08 09:30:31 +0000 |
| commit | c0ad08414527ae370c2832813d25de97e012d116 (patch) | |
| tree | 6df80690c5ac688d97aa184605f988a64be33942 | |
| parent | a7845b56a927a6cfe2432134c161633b4248973f (diff) | |
pe: make us of calculated addresses
With this commit the PE pipe addresses and the
RS pipe addresses are the same --> on a GC2000
the image is combined correctly.
Signed-off-by: Christian Gmeiner <christian.gmeiner@gmail.com>
| -rw-r--r-- | src/driver/etna_pipe.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/driver/etna_pipe.c b/src/driver/etna_pipe.c index 5d94ee6..54b4632 100644 --- a/src/driver/etna_pipe.c +++ b/src/driver/etna_pipe.c @@ -978,15 +978,15 @@ static void etna_pipe_set_framebuffer_state(struct pipe_context *pipe, cbuf->surf.offset, cbuf->surf.stride*4); } - struct etna_bo *bo = etna_resource(cbuf->base.texture)->bo; + struct etna_resource *res = etna_resource(cbuf->base.texture); if (priv->ctx->conn->chip.pixel_pipes == 1) { - cs->PE_COLOR_ADDR = etna_bo_gpu_address(bo) + cbuf->surf.offset; + cs->PE_COLOR_ADDR = res->pipe_addr[0]; } else if (priv->ctx->conn->chip.pixel_pipes == 2) { - cs->PE_PIPE_COLOR_ADDR[0] = etna_bo_gpu_address(bo) + cbuf->surf.offset; - cs->PE_PIPE_COLOR_ADDR[1] = etna_bo_gpu_address(bo) + cbuf->surf.offset + (cbuf->surf.size / 2); + cs->PE_PIPE_COLOR_ADDR[0] = res->pipe_addr[0]; + cs->PE_PIPE_COLOR_ADDR[1] = res->pipe_addr[1]; } cs->PE_COLOR_STRIDE = cbuf->surf.stride; if(cbuf->surf.ts_size) |