Commit ada4a19e authored by Dmitry Baryshkov's avatar Dmitry Baryshkov
Browse files

drm/msm/dpu: rewrite _dpu_format_populate_plane_sizes_ubwc() 

Drop extra wrapping layer (msm_media_info.h) and inline all VENUS_*()
functions, simplifying the code.

Patchwork: https://patchwork.freedesktop.org/patch/688184/
Link: https://lore.kernel.org/r/20251114-dpu-formats-v3-11-cae312379d49@oss.qualcomm.com


Tested-by: Luca Weiss <luca.weiss@fairphone.com> # qcm6490-fairphone-fp5
Signed-off-by: default avatarDmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
parent d4db3a06

drivers/gpu/drm/msm/disp/dpu1/dpu_formats.c

+57 −64
Original line number Diff line number Diff line
@@ -7,10 +7,19 @@ 
#include <uapi/drm/drm_fourcc.h>

#include <drm/drm_framebuffer.h>



#include "msm_media_info.h"

#include "dpu_kms.h"

#include "dpu_formats.h"



#ifndef MSM_MEDIA_ALIGN

#define MSM_MEDIA_ALIGN(__sz, __align) (((__align) & ((__align) - 1)) ?\

	((((__sz) + (__align) - 1) / (__align)) * (__align)) :\

	(((__sz) + (__align) - 1) & (~((__align) - 1))))

#endif



#ifndef MSM_MEDIA_ROUNDUP

#define MSM_MEDIA_ROUNDUP(__sz, __r) (((__sz) + ((__r) - 1)) / (__r))

#endif



#define DPU_UBWC_PLANE_SIZE_ALIGNMENT	4096



/*
@@ -54,90 +63,70 @@ static void _dpu_get_v_h_subsample_rate( 
	}

}



static int _dpu_format_get_media_color_ubwc(const struct msm_format *fmt)

{

	static const struct dpu_media_color_map dpu_media_ubwc_map[] = {

		{DRM_FORMAT_ABGR8888, COLOR_FMT_RGBA8888_UBWC},

		{DRM_FORMAT_ARGB8888, COLOR_FMT_RGBA8888_UBWC},

		{DRM_FORMAT_XBGR8888, COLOR_FMT_RGBA8888_UBWC},

		{DRM_FORMAT_XRGB8888, COLOR_FMT_RGBA8888_UBWC},

		{DRM_FORMAT_ABGR2101010, COLOR_FMT_RGBA1010102_UBWC},

		{DRM_FORMAT_ARGB2101010, COLOR_FMT_RGBA1010102_UBWC},

		{DRM_FORMAT_XRGB2101010, COLOR_FMT_RGBA1010102_UBWC},

		{DRM_FORMAT_XBGR2101010, COLOR_FMT_RGBA1010102_UBWC},

		{DRM_FORMAT_BGR565, COLOR_FMT_RGB565_UBWC},

	};

	int color_fmt = -1;

	int i;



	if (fmt->pixel_format == DRM_FORMAT_NV12 ||

	    fmt->pixel_format == DRM_FORMAT_P010) {

		if (MSM_FORMAT_IS_DX(fmt)) {

			if (fmt->flags & MSM_FORMAT_FLAG_UNPACK_TIGHT)

				color_fmt = COLOR_FMT_NV12_BPP10_UBWC;

			else

				color_fmt = COLOR_FMT_P010_UBWC;

		} else

			color_fmt = COLOR_FMT_NV12_UBWC;

		return color_fmt;

	}



	for (i = 0; i < ARRAY_SIZE(dpu_media_ubwc_map); ++i)

		if (fmt->pixel_format == dpu_media_ubwc_map[i].format) {

			color_fmt = dpu_media_ubwc_map[i].color;

			break;

		}

	return color_fmt;

}



static int _dpu_format_populate_plane_sizes_ubwc(

		const struct msm_format *fmt,

		struct drm_framebuffer *fb,

		struct dpu_hw_fmt_layout *layout)

{

	int color;

	bool meta = MSM_FORMAT_IS_UBWC(fmt);



	color = _dpu_format_get_media_color_ubwc(fmt);

	if (color < 0) {

		DRM_ERROR("UBWC format not supported for fmt: %p4cc\n",

			  &fmt->pixel_format);

		return -EINVAL;

	if (MSM_FORMAT_IS_YUV(fmt)) {

		unsigned int stride, sclines;

		unsigned int y_tile_width, y_tile_height;

		unsigned int y_meta_stride, y_meta_scanlines;

		unsigned int uv_meta_stride, uv_meta_scanlines;



		if (MSM_FORMAT_IS_DX(fmt)) {

			if (fmt->flags & MSM_FORMAT_FLAG_UNPACK_TIGHT) {

				stride = MSM_MEDIA_ALIGN(fb->width, 192);

				stride = MSM_MEDIA_ALIGN(stride * 4 / 3, 256);

				y_tile_width = 48;

			} else {

				stride = MSM_MEDIA_ALIGN(fb->width * 2, 256);

				y_tile_width = 32;

			}



	if (MSM_FORMAT_IS_YUV(fmt)) {

		uint32_t y_sclines, uv_sclines;

		uint32_t y_meta_scanlines = 0;

		uint32_t uv_meta_scanlines = 0;

			sclines = MSM_MEDIA_ALIGN(fb->height, 16);

			y_tile_height = 4;

		} else {

			stride = MSM_MEDIA_ALIGN(fb->width, 128);

			y_tile_width = 32;



		layout->plane_pitch[0] = VENUS_Y_STRIDE(color, fb->width);

		y_sclines = VENUS_Y_SCANLINES(color, fb->height);

			sclines = MSM_MEDIA_ALIGN(fb->height, 32);

			y_tile_height = 8;

		}



		layout->plane_pitch[0] = stride;

		layout->plane_size[0] = MSM_MEDIA_ALIGN(layout->plane_pitch[0] *

			y_sclines, DPU_UBWC_PLANE_SIZE_ALIGNMENT);

			sclines, DPU_UBWC_PLANE_SIZE_ALIGNMENT);



		layout->plane_pitch[1] = VENUS_UV_STRIDE(color, fb->width);

		uv_sclines = VENUS_UV_SCANLINES(color, fb->height);

		layout->plane_pitch[1] = stride;

		layout->plane_size[1] = MSM_MEDIA_ALIGN(layout->plane_pitch[1] *

			uv_sclines, DPU_UBWC_PLANE_SIZE_ALIGNMENT);

			sclines, DPU_UBWC_PLANE_SIZE_ALIGNMENT);



		if (!meta)

			return 0;



		layout->plane_pitch[2] = VENUS_Y_META_STRIDE(color, fb->width);

		y_meta_scanlines = VENUS_Y_META_SCANLINES(color, fb->height);

		y_meta_stride = MSM_MEDIA_ROUNDUP(fb->width, y_tile_width);

		layout->plane_pitch[2] = MSM_MEDIA_ALIGN(y_meta_stride, 64);



		y_meta_scanlines = MSM_MEDIA_ROUNDUP(fb->height, y_tile_height);

		y_meta_scanlines = MSM_MEDIA_ALIGN(y_meta_scanlines, 16);

		layout->plane_size[2] = MSM_MEDIA_ALIGN(layout->plane_pitch[2] *

			y_meta_scanlines, DPU_UBWC_PLANE_SIZE_ALIGNMENT);



		layout->plane_pitch[3] = VENUS_UV_META_STRIDE(color, fb->width);

		uv_meta_scanlines = VENUS_UV_META_SCANLINES(color, fb->height);

		uv_meta_stride = MSM_MEDIA_ROUNDUP((fb->width+1)>>1, y_tile_width / 2);

		layout->plane_pitch[3] = MSM_MEDIA_ALIGN(uv_meta_stride, 64);



		uv_meta_scanlines = MSM_MEDIA_ROUNDUP((fb->height+1)>>1, y_tile_height);

		uv_meta_scanlines = MSM_MEDIA_ALIGN(uv_meta_scanlines, 16);

		layout->plane_size[3] = MSM_MEDIA_ALIGN(layout->plane_pitch[3] *

			uv_meta_scanlines, DPU_UBWC_PLANE_SIZE_ALIGNMENT);



	} else {

		uint32_t rgb_scanlines, rgb_meta_scanlines;

		unsigned int rgb_scanlines, rgb_meta_scanlines, rgb_meta_stride;



		layout->plane_pitch[0] = VENUS_RGB_STRIDE(color, fb->width);

		rgb_scanlines = VENUS_RGB_SCANLINES(color, fb->height);

		layout->plane_pitch[0] = MSM_MEDIA_ALIGN(fb->width * fmt->bpp, 256);

		rgb_scanlines = MSM_MEDIA_ALIGN(fb->height, 16);

		layout->plane_size[0] = MSM_MEDIA_ALIGN(layout->plane_pitch[0] *

			rgb_scanlines, DPU_UBWC_PLANE_SIZE_ALIGNMENT);
@@ -147,8 +136,12 @@ static int _dpu_format_populate_plane_sizes_ubwc( 
		/* uAPI leaves plane[1] empty and plane[2] as meta */

		layout->num_planes += 1;



		layout->plane_pitch[2] = VENUS_RGB_META_STRIDE(color, fb->width);

		rgb_meta_scanlines = VENUS_RGB_META_SCANLINES(color, fb->height);

		rgb_meta_stride = MSM_MEDIA_ROUNDUP(fb->width, 16);

		layout->plane_pitch[2] = MSM_MEDIA_ALIGN(rgb_meta_stride, 64);



		rgb_meta_scanlines = MSM_MEDIA_ROUNDUP(fb->height, 4);

		rgb_meta_scanlines = MSM_MEDIA_ALIGN(rgb_meta_scanlines, 16);



		layout->plane_size[2] = MSM_MEDIA_ALIGN(layout->plane_pitch[2] *

			rgb_meta_scanlines, DPU_UBWC_PLANE_SIZE_ALIGNMENT);

	}

drivers/gpu/drm/msm/disp/dpu1/msm_media_info.h

deleted100644 → 0
+0 −1155

File deleted.

Preview size limit exceeded, changes collapsed.