diff options
author | Álvaro Fernández Rojas <noltari@gmail.com> | 2017-02-07 22:30:59 +0100 |
---|---|---|
committer | Álvaro Fernández Rojas <noltari@gmail.com> | 2017-02-07 23:00:21 +0100 |
commit | d9d090e52082635a24aeaefdc6bfe61ab97f38bb (patch) | |
tree | 6e725a11b5c44ee1a7ce95a0b2bcba4cae1e6f5c /target/linux/brcm2708/patches-4.4/0538-drm-vc4-Add-support-for-rendering-with-ETC1-textures.patch | |
parent | ada91d8a245690b3bc8d2a62b391d2725aea5c8e (diff) | |
download | upstream-d9d090e52082635a24aeaefdc6bfe61ab97f38bb.tar.gz upstream-d9d090e52082635a24aeaefdc6bfe61ab97f38bb.tar.bz2 upstream-d9d090e52082635a24aeaefdc6bfe61ab97f38bb.zip |
brcm2708: remove linux 4.4 support
Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
Diffstat (limited to 'target/linux/brcm2708/patches-4.4/0538-drm-vc4-Add-support-for-rendering-with-ETC1-textures.patch')
-rw-r--r-- | target/linux/brcm2708/patches-4.4/0538-drm-vc4-Add-support-for-rendering-with-ETC1-textures.patch | 55 |
1 files changed, 0 insertions, 55 deletions
diff --git a/target/linux/brcm2708/patches-4.4/0538-drm-vc4-Add-support-for-rendering-with-ETC1-textures.patch b/target/linux/brcm2708/patches-4.4/0538-drm-vc4-Add-support-for-rendering-with-ETC1-textures.patch deleted file mode 100644 index ecc77ee06e..0000000000 --- a/target/linux/brcm2708/patches-4.4/0538-drm-vc4-Add-support-for-rendering-with-ETC1-textures.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 19682684277e2e1c1eb60956891987790d5dc865 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; |