Commit 6211b306 authored by Guido Gunther's avatar Guido Gunther

dcss: Drop support for DRM_FORMAT_MOD_VIVANTE_SUPER_TILED_FC

libdrm and etnaviv know nothing about this yet so no reason to announce
it.
Signed-off-by: Guido Gunther's avatarGuido Günther <guido.gunther@puri.sm>
parent 81e329a3
......@@ -67,7 +67,6 @@ static const u64 dcss_video_format_modifiers[] = {
static const u64 dcss_graphics_format_modifiers[] = {
DRM_FORMAT_MOD_VIVANTE_TILED,
DRM_FORMAT_MOD_VIVANTE_SUPER_TILED,
DRM_FORMAT_MOD_VIVANTE_SUPER_TILED_FC,
DRM_FORMAT_MOD_LINEAR,
DRM_FORMAT_MOD_INVALID,
};
......@@ -138,8 +137,7 @@ static bool dcss_plane_format_mod_supported(struct drm_plane *plane,
case DRM_FORMAT_ARGB2101010:
return modifier == DRM_FORMAT_MOD_LINEAR ||
modifier == DRM_FORMAT_MOD_VIVANTE_TILED ||
modifier == DRM_FORMAT_MOD_VIVANTE_SUPER_TILED ||
modifier == DRM_FORMAT_MOD_VIVANTE_SUPER_TILED_FC;
modifier == DRM_FORMAT_MOD_VIVANTE_SUPER_TILED;
default:
return modifier == DRM_FORMAT_MOD_LINEAR;
}
......@@ -286,11 +284,6 @@ static void dcss_plane_atomic_set_base(struct dcss_plane *dcss_plane)
/* Bypass dec400d */
dcss_dec400d_bypass(dcss_plane->dcss);
return;
case DRM_FORMAT_MOD_VIVANTE_SUPER_TILED_FC:
caddr = cma_obj->paddr + ALIGN(fb->height, 64) * fb->pitches[0];
dcss_dec400d_read_config(dcss_plane->dcss, 0, true);
dcss_dec400d_addr_set(dcss_plane->dcss, p1_ba, caddr);
break;
default:
WARN_ON(1);
return;
......
......@@ -604,7 +604,6 @@ void dcss_dpr_tile_derive(struct dcss_soc *dcss,
ch->tile = TILE_GPU_STANDARD;
break;
case DRM_FORMAT_MOD_VIVANTE_SUPER_TILED:
case DRM_FORMAT_MOD_VIVANTE_SUPER_TILED_FC:
dcss_dpr_tile_set(dcss, ch_num, TILE_GPU_SUPER);
ch->tile = TILE_GPU_SUPER;
break;
......
......@@ -341,15 +341,6 @@ extern "C" {
*/
#define DRM_FORMAT_MOD_VIVANTE_SPLIT_SUPER_TILED fourcc_mod_code(VIVANTE, 4)
/*
* Vivante 64x64 super-tiling with compression layout
*
* This is a tiled layout using 64x64 pixel super-tiles, where each super-tile
* contains 8x4 groups of 2x4 tiles of 4x4 pixels each, all in row-major layout
* with compression.
*/
#define DRM_FORMAT_MOD_VIVANTE_SUPER_TILED_FC fourcc_mod_code(VIVANTE, 5)
/* NVIDIA frame buffer modifiers */
/*
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment