| 12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455 |
- From 466102927ee6a21eb58d0f5f98b85155e7ee8e5b Mon Sep 17 00:00:00 2001
- From: Eric Anholt <eric@anholt.net>
- Date: Thu, 3 Nov 2016 18:53:10 -0700
- Subject: [PATCH] drm/vc4: Add support for rendering with ETC1 textures.
- The validation for it ends up being quite simple, but I hadn't got
- around to it before merging the driver. For backwards compatibility,
- we also need to add a flag so that the userspace GL driver can easily
- tell if the kernel will allow ETC1 textures (on an old kernel, it will
- continue to convert to RGBA8)
- Signed-off-by: Eric Anholt <eric@anholt.net>
- (cherry picked from commit 7154d76fedf549607afbc0d13db9aaf02da5cebf)
- ---
- drivers/gpu/drm/vc4/vc4_drv.c | 1 +
- drivers/gpu/drm/vc4/vc4_validate.c | 7 +++++++
- include/uapi/drm/vc4_drm.h | 1 +
- 3 files changed, 9 insertions(+)
- --- a/drivers/gpu/drm/vc4/vc4_drv.c
- +++ b/drivers/gpu/drm/vc4/vc4_drv.c
- @@ -103,6 +103,7 @@ static int vc4_get_param_ioctl(struct dr
- pm_runtime_put(&vc4->v3d->pdev->dev);
- break;
- case DRM_VC4_PARAM_SUPPORTS_BRANCHES:
- + case DRM_VC4_PARAM_SUPPORTS_ETC1:
- args->value = true;
- break;
- default:
- --- a/drivers/gpu/drm/vc4/vc4_validate.c
- +++ b/drivers/gpu/drm/vc4/vc4_validate.c
- @@ -644,6 +644,13 @@ reloc_tex(struct vc4_exec_info *exec,
- cpp = 1;
- break;
- case VC4_TEXTURE_TYPE_ETC1:
- + /* ETC1 is arranged as 64-bit blocks, where each block is 4x4
- + * pixels.
- + */
- + cpp = 8;
- + width = (width + 3) >> 2;
- + height = (height + 3) >> 2;
- + break;
- case VC4_TEXTURE_TYPE_BW1:
- case VC4_TEXTURE_TYPE_A4:
- case VC4_TEXTURE_TYPE_A1:
- --- a/include/uapi/drm/vc4_drm.h
- +++ b/include/uapi/drm/vc4_drm.h
- @@ -286,6 +286,7 @@ struct drm_vc4_get_hang_state {
- #define DRM_VC4_PARAM_V3D_IDENT1 1
- #define DRM_VC4_PARAM_V3D_IDENT2 2
- #define DRM_VC4_PARAM_SUPPORTS_BRANCHES 3
- +#define DRM_VC4_PARAM_SUPPORTS_ETC1 4
-
- struct drm_vc4_get_param {
- __u32 param;
|
