minigbm: msm: Add modifier for tiled buffer allocation
Allow ubwc buffer allocation and calculate its layout
for XBGR8888, ABGR8888 and NV12 formats
BUG=b:120118851
TEST=null_platform_test -f XB24 -m DRM_FORMAT_MOD_QCOM_COMPRESSED
For above test case display might be corrupted if UBWC content is not passed
to input buffer. But using crtc status, modifier information can be verified.
Change-Id: If040754d0cd52200feef56e40e931da0c4d2508d
Signed-off-by: Tanmay Shah <tanmay@codeaurora.org>
Reviewed-on: https://chromium-review.googlesource.com/1363690
Commit-Ready: ChromeOS CL Exonerator Bot <chromiumos-cl-exonerator@appspot.gserviceaccount.com>
Reviewed-by: Kristian H. Kristensen <hoegsberg@chromium.org>
diff --git a/msm.c b/msm.c
index 6bb70b6..085cfb0 100644
--- a/msm.c
+++ b/msm.c
@@ -6,8 +6,11 @@
#ifdef DRV_MSM
+#include <assert.h>
+#include <drm_fourcc.h>
#include <errno.h>
#include <msm_drm.h>
+#include <stdbool.h>
#include <stdio.h>
#include <string.h>
#include <sys/mman.h>
@@ -17,12 +20,19 @@
#include "helpers.h"
#include "util.h"
+/* Alignment values are based on SDM845 Gfx IP */
#define DEFAULT_ALIGNMENT 64
#define BUFFER_SIZE_ALIGN 4096
#define VENUS_STRIDE_ALIGN 128
#define VENUS_SCANLINE_ALIGN 16
#define NV12_LINEAR_PADDING (12 * 1024)
+#define NV12_UBWC_PADDING(y_stride) (MAX(16 * 1024, y_stride * 48))
+#define MACROTILE_WIDTH_ALIGN 64
+#define MACROTILE_HEIGHT_ALIGN 16
+#define PLANE_SIZE_ALIGN 4096
+
+#define MSM_UBWC_TILING 1
static const uint32_t render_target_formats[] = { DRM_FORMAT_ABGR8888, DRM_FORMAT_ARGB8888,
DRM_FORMAT_RGB565, DRM_FORMAT_XBGR8888,
@@ -31,7 +41,30 @@
static const uint32_t texture_source_formats[] = { DRM_FORMAT_NV12, DRM_FORMAT_R8,
DRM_FORMAT_YVU420, DRM_FORMAT_YVU420_ANDROID };
-static void msm_calculate_linear_layout(struct bo *bo)
+/*
+ * Each macrotile consists of m x n (mostly 4 x 4) tiles.
+ * Pixel data pitch/stride is aligned with macrotile width.
+ * Pixel data height is aligned with macrotile height.
+ * Entire pixel data buffer is aligned with 4k(bytes).
+ */
+static uint32_t get_ubwc_meta_size(uint32_t width, uint32_t height, uint32_t tile_width,
+ uint32_t tile_height)
+{
+ uint32_t macrotile_width, macrotile_height;
+
+ macrotile_width = DIV_ROUND_UP(width, tile_width);
+ macrotile_height = DIV_ROUND_UP(height, tile_height);
+
+ // Align meta buffer width to 64 blocks
+ macrotile_width = ALIGN(macrotile_width, MACROTILE_WIDTH_ALIGN);
+
+ // Align meta buffer height to 16 blocks
+ macrotile_height = ALIGN(macrotile_height, MACROTILE_HEIGHT_ALIGN);
+
+ return ALIGN(macrotile_width * macrotile_height, PLANE_SIZE_ALIGN);
+}
+
+static void msm_calculate_layout(struct bo *bo)
{
uint32_t width, height;
@@ -42,7 +75,9 @@
* specific alignments for venus driver
*/
if (bo->format == DRM_FORMAT_NV12) {
- uint32_t y_stride, uv_stride, y_scanline, uv_scanline, y_plane, uv_plane, size;
+ uint32_t y_stride, uv_stride, y_scanline, uv_scanline, y_plane, uv_plane, size,
+ extra_padding;
+
y_stride = ALIGN(width, VENUS_STRIDE_ALIGN);
uv_stride = ALIGN(width, VENUS_STRIDE_ALIGN);
y_scanline = ALIGN(height, VENUS_SCANLINE_ALIGN * 2);
@@ -50,18 +85,25 @@
y_plane = y_stride * y_scanline;
uv_plane = uv_stride * uv_scanline;
+ if (bo->tiling == MSM_UBWC_TILING) {
+ y_plane += get_ubwc_meta_size(width, height, 32, 8);
+ uv_plane += get_ubwc_meta_size(width >> 1, height >> 1, 16, 8);
+ extra_padding = NV12_UBWC_PADDING(y_stride);
+ } else {
+ extra_padding = NV12_LINEAR_PADDING;
+ }
+
bo->strides[0] = y_stride;
bo->sizes[0] = y_plane;
bo->offsets[1] = y_plane;
bo->strides[1] = uv_stride;
- size = y_plane + uv_plane + NV12_LINEAR_PADDING;
+ size = y_plane + uv_plane + extra_padding;
bo->total_size = ALIGN(size, BUFFER_SIZE_ALIGN);
bo->sizes[1] = bo->total_size - bo->sizes[0];
} else {
uint32_t stride, alignw, alignh;
alignw = ALIGN(width, DEFAULT_ALIGNMENT);
-
/* HAL_PIXEL_FORMAT_YV12 requires that the buffer's height not be aligned. */
if (bo->format == DRM_FORMAT_YVU420_ANDROID) {
alignh = height;
@@ -73,32 +115,87 @@
/* Calculate size and assign stride, size, offset to each plane based on format */
drv_bo_from_format(bo, stride, alignh, bo->format);
+
+ /* For all RGB UBWC formats */
+ if (bo->tiling == MSM_UBWC_TILING) {
+ bo->sizes[0] += get_ubwc_meta_size(width, height, 16, 4);
+ bo->total_size = bo->sizes[0];
+ assert(IS_ALIGNED(bo->total_size, BUFFER_SIZE_ALIGN));
+ }
+ }
+}
+
+static bool is_ubwc_fmt(uint32_t format)
+{
+ switch (format) {
+ case DRM_FORMAT_XBGR8888:
+ case DRM_FORMAT_ABGR8888:
+ case DRM_FORMAT_NV12:
+ return 1;
+ default:
+ return 0;
+ }
+}
+
+static void msm_add_ubwc_combinations(struct driver *drv, const uint32_t *formats,
+ uint32_t num_formats, struct format_metadata *metadata,
+ uint64_t use_flags)
+{
+ for (uint32_t i = 0; i < num_formats; i++) {
+ if (is_ubwc_fmt(formats[i])) {
+ struct combination combo = { .format = formats[i],
+ .metadata = *metadata,
+ .use_flags = use_flags };
+ drv_array_append(drv->combos, &combo);
+ }
}
}
static int msm_init(struct driver *drv)
{
+ struct format_metadata metadata;
+ uint64_t render_use_flags = BO_USE_RENDER_MASK;
+ uint64_t texture_use_flags = BO_USE_TEXTURE_MASK | BO_USE_HW_VIDEO_DECODER;
+ uint64_t sw_flags = (BO_USE_RENDERSCRIPT | BO_USE_SW_WRITE_OFTEN | BO_USE_SW_READ_OFTEN |
+ BO_USE_LINEAR | BO_USE_PROTECTED);
+
drv_add_combinations(drv, render_target_formats, ARRAY_SIZE(render_target_formats),
- &LINEAR_METADATA, BO_USE_RENDER_MASK);
+ &LINEAR_METADATA, render_use_flags);
drv_add_combinations(drv, texture_source_formats, ARRAY_SIZE(texture_source_formats),
- &LINEAR_METADATA, BO_USE_TEXTURE_MASK | BO_USE_HW_VIDEO_DECODER);
+ &LINEAR_METADATA, texture_use_flags);
/* Android CTS tests require this. */
drv_add_combination(drv, DRM_FORMAT_BGR888, &LINEAR_METADATA, BO_USE_SW_MASK);
- return drv_modify_linear_combinations(drv);
+ drv_modify_linear_combinations(drv);
+
+ metadata.tiling = MSM_UBWC_TILING;
+ metadata.priority = 2;
+ metadata.modifier = DRM_FORMAT_MOD_QCOM_COMPRESSED;
+
+ render_use_flags &= ~sw_flags;
+ texture_use_flags &= ~sw_flags;
+
+ msm_add_ubwc_combinations(drv, render_target_formats, ARRAY_SIZE(render_target_formats),
+ &metadata, render_use_flags);
+
+ msm_add_ubwc_combinations(drv, texture_source_formats, ARRAY_SIZE(texture_source_formats),
+ &metadata, texture_use_flags);
+
+ return 0;
}
-/* msm_bo_create will create linear buffers for now */
-static int msm_bo_create(struct bo *bo, uint32_t width, uint32_t height, uint32_t format,
- uint64_t flags)
+static int msm_bo_create_for_modifier(struct bo *bo, uint32_t width, uint32_t height,
+ uint32_t format, const uint64_t modifier)
{
struct drm_msm_gem_new req;
int ret;
size_t i;
- msm_calculate_linear_layout(bo);
+ bo->tiling = (modifier == DRM_FORMAT_MOD_QCOM_COMPRESSED) ? MSM_UBWC_TILING : 0;
+
+ msm_calculate_layout(bo);
memset(&req, 0, sizeof(req));
req.flags = MSM_BO_WC | MSM_BO_SCANOUT;
@@ -116,11 +213,40 @@
*/
for (i = 0; i < bo->num_planes; i++) {
bo->handles[i].u32 = req.handle;
+ bo->format_modifiers[i] = modifier;
}
return 0;
}
+static int msm_bo_create_with_modifiers(struct bo *bo, uint32_t width, uint32_t height,
+ uint32_t format, const uint64_t *modifiers, uint32_t count)
+{
+ static const uint64_t modifier_order[] = {
+ DRM_FORMAT_MOD_QCOM_COMPRESSED,
+ DRM_FORMAT_MOD_LINEAR,
+ };
+
+ uint64_t modifier =
+ drv_pick_modifier(modifiers, count, modifier_order, ARRAY_SIZE(modifier_order));
+
+ return msm_bo_create_for_modifier(bo, width, height, format, modifier);
+}
+
+/* msm_bo_create will create linear buffers for now */
+static int msm_bo_create(struct bo *bo, uint32_t width, uint32_t height, uint32_t format,
+ uint64_t flags)
+{
+ struct combination *combo = drv_get_combination(bo->drv, format, flags);
+
+ if (!combo) {
+ drv_log("invalid format = %d, flags = %llx combination\n", format, flags);
+ return -EINVAL;
+ }
+
+ return msm_bo_create_for_modifier(bo, width, height, format, combo->metadata.modifier);
+}
+
static void *msm_bo_map(struct bo *bo, struct vma *vma, size_t plane, uint32_t map_flags)
{
int ret;
@@ -144,6 +270,7 @@
.name = "msm",
.init = msm_init,
.bo_create = msm_bo_create,
+ .bo_create_with_modifiers = msm_bo_create_with_modifiers,
.bo_destroy = drv_gem_bo_destroy,
.bo_import = drv_prime_bo_import,
.bo_map = msm_bo_map,
