From 404166d900a912fe58595b744b47e2a3e2086177 Mon Sep 17 00:00:00 2001 From: Christian Gmeiner Date: Fri, 21 Feb 2014 21:10:09 +0000 Subject: driver: do not upgrade textures (sampler views) to MULTI tiled Signed-off-by: Christian Gmeiner --- src/driver/etna_resource.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/driver/etna_resource.c b/src/driver/etna_resource.c index 4389a2f..1cee86f 100644 --- a/src/driver/etna_resource.c +++ b/src/driver/etna_resource.c @@ -148,7 +148,7 @@ static struct pipe_resource * etna_screen_resource_create(struct pipe_screen *sc } /* multi tiled formats */ - if (priv->dev->chip.pixel_pipes > 1) + if ((priv->dev->chip.pixel_pipes > 1) && !(templat->bind & PIPE_BIND_SAMPLER_VIEW)) { if (layout == ETNA_LAYOUT_TILED) layout = ETNA_LAYOUT_MULTI_TILED; -- cgit v1.2.3 From d6716b9379fda8823ad1c81436c7bce815b86fcb Mon Sep 17 00:00:00 2001 From: Christian Gmeiner Date: Fri, 21 Feb 2014 21:17:04 +0000 Subject: fix compile warnings Signed-off-by: Christian Gmeiner --- src/driver/etna_clear_blit.c | 2 +- src/lib/fbdemos.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/driver/etna_clear_blit.c b/src/driver/etna_clear_blit.c index 1b3b8f8..3e28c60 100644 --- a/src/driver/etna_clear_blit.c +++ b/src/driver/etna_clear_blit.c @@ -81,7 +81,7 @@ void etna_rs_gen_clear_surface(struct etna_ctx *ctx, struct compiled_rs_state *r etna_compile_rs_state(ctx, rs_state, &(struct rs_state){ .source_format = format, .dest_format = format, - .dest_addr = etna_bo_gpu_address(dest_bo) + surf->surf.offset, + .dest_addr[0] = etna_bo_gpu_address(dest_bo) + surf->surf.offset, .dest_stride = surf->surf.stride, .dest_tiling = tiled_clear ? surf->layout : ETNA_LAYOUT_LINEAR, .dither = {0xffffffff, 0xffffffff}, diff --git a/src/lib/fbdemos.c b/src/lib/fbdemos.c index c8a9128..1c25c9d 100644 --- a/src/lib/fbdemos.c +++ b/src/lib/fbdemos.c @@ -297,7 +297,7 @@ int etna_fb_bind_resource(struct fbdemos_scaffold *fbs, struct pipe_resource *rt .source_stride = rt_resource->levels[0].stride, .dest_format = fb->rs_format, .dest_tiling = ETNA_LAYOUT_LINEAR, - .dest_addr = etna_bo_gpu_address(fb->buffer[bi]), + .dest_addr[0] = etna_bo_gpu_address(fb->buffer[bi]), .dest_stride = fb->fb_fix.line_length, .downsample_x = msaa_xscale > 1, .downsample_y = msaa_yscale > 1, -- cgit v1.2.3