From 7029ec05e2c7cb9f9fe34070161be7d190a7581e Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Mon, 8 May 2017 15:57:21 -0700 Subject: gallium: Add renderonly-based support for pl111+vc4. This follows the model of imx (display) and etnaviv (render): pl111 is a display-only device, so when asked to do GL for it, we see if we have a vc4 renderer, make the vc4 screen, and have vc4 call back to pl111 to do scanout allocations. The difference from etnaviv is that we share the same BO between vc4 and pl111, rather than having a vc4 bo and a pl11 bo and copies between the two. The only mismatch between their requirements is that vc4 requires 4-pixel (at 32bpp) stride alignment, while pl111 requires that stride match width. The kernel will reject any modesets to an incorrect stride, so the 3D driver doesn't need to worry about that. v2: Rebase on Android rework, drop unused include. v3: Fix another Android bug, from Rob Herring's build-testing. Reviewed-by: Christian Gmeiner --- src/gallium/drivers/vc4/vc4_resource.h | 1 + 1 file changed, 1 insertion(+) (limited to 'src/gallium/drivers/vc4/vc4_resource.h') diff --git a/src/gallium/drivers/vc4/vc4_resource.h b/src/gallium/drivers/vc4/vc4_resource.h index 877db513ace..32e73dddb34 100644 --- a/src/gallium/drivers/vc4/vc4_resource.h +++ b/src/gallium/drivers/vc4/vc4_resource.h @@ -54,6 +54,7 @@ struct vc4_surface { struct vc4_resource { struct pipe_resource base; struct vc4_bo *bo; + struct renderonly_scanout *scanout; struct vc4_resource_slice slices[VC4_MAX_MIP_LEVELS]; uint32_t cube_map_stride; int cpp; -- cgit v1.2.3