From: Hsiao Chien Sung Date: Fri, 22 Mar 2024 09:12:28 +0000 (+0800) Subject: drm/mediatek: Rename files "mtk_drm_plane.h" to "mtk_plane.h" X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=9f2997ab49916d7edeae476a68d31b41dddce606;p=linux.git drm/mediatek: Rename files "mtk_drm_plane.h" to "mtk_plane.h" Rename files mtk_drm_plane.h to mtk_plane.h. Reviewed-by: AngeloGioacchino Del Regno Reviewed-by: CK Hu Signed-off-by: Hsiao Chien Sung Link: https://patchwork.kernel.org/project/dri-devel/patch/20240322091232.26387-11-shawn.sung@mediatek.com/ Signed-off-by: Chun-Kuang Hu --- diff --git a/drivers/gpu/drm/mediatek/mtk_crtc.c b/drivers/gpu/drm/mediatek/mtk_crtc.c index a34682c3de4a1..9bfaa683aab34 100644 --- a/drivers/gpu/drm/mediatek/mtk_crtc.c +++ b/drivers/gpu/drm/mediatek/mtk_crtc.c @@ -23,7 +23,7 @@ #include "mtk_ddp_comp.h" #include "mtk_drm_drv.h" #include "mtk_drm_gem.h" -#include "mtk_drm_plane.h" +#include "mtk_plane.h" /* * struct mtk_crtc - MediaTek specific crtc structure. diff --git a/drivers/gpu/drm/mediatek/mtk_crtc.h b/drivers/gpu/drm/mediatek/mtk_crtc.h index fd6c006f0c169..388e900b6f4de 100644 --- a/drivers/gpu/drm/mediatek/mtk_crtc.h +++ b/drivers/gpu/drm/mediatek/mtk_crtc.h @@ -9,7 +9,7 @@ #include #include "mtk_ddp_comp.h" #include "mtk_drm_drv.h" -#include "mtk_drm_plane.h" +#include "mtk_plane.h" #define MTK_MAX_BPC 10 #define MTK_MIN_BPC 3 diff --git a/drivers/gpu/drm/mediatek/mtk_ddp_comp.c b/drivers/gpu/drm/mediatek/mtk_ddp_comp.c index ab96b1001de3e..c3441508f452f 100644 --- a/drivers/gpu/drm/mediatek/mtk_ddp_comp.c +++ b/drivers/gpu/drm/mediatek/mtk_ddp_comp.c @@ -18,7 +18,7 @@ #include "mtk_ddp_comp.h" #include "mtk_disp_drv.h" #include "mtk_drm_drv.h" -#include "mtk_drm_plane.h" +#include "mtk_plane.h" #define DISP_REG_DITHER_EN 0x0000 diff --git a/drivers/gpu/drm/mediatek/mtk_disp_drv.h b/drivers/gpu/drm/mediatek/mtk_disp_drv.h index 90e64467ea8f8..082ac18fe04aa 100644 --- a/drivers/gpu/drm/mediatek/mtk_disp_drv.h +++ b/drivers/gpu/drm/mediatek/mtk_disp_drv.h @@ -9,8 +9,8 @@ #include #include #include -#include "mtk_drm_plane.h" #include "mtk_mdp_rdma.h" +#include "mtk_plane.h" int mtk_aal_clk_enable(struct device *dev); void mtk_aal_clk_disable(struct device *dev); diff --git a/drivers/gpu/drm/mediatek/mtk_drm_plane.c b/drivers/gpu/drm/mediatek/mtk_drm_plane.c index 63a7a24468c13..95a4328a9b0b6 100644 --- a/drivers/gpu/drm/mediatek/mtk_drm_plane.c +++ b/drivers/gpu/drm/mediatek/mtk_drm_plane.c @@ -17,7 +17,7 @@ #include "mtk_ddp_comp.h" #include "mtk_drm_drv.h" #include "mtk_drm_gem.h" -#include "mtk_drm_plane.h" +#include "mtk_plane.h" static const u64 modifiers[] = { DRM_FORMAT_MOD_LINEAR, diff --git a/drivers/gpu/drm/mediatek/mtk_drm_plane.h b/drivers/gpu/drm/mediatek/mtk_drm_plane.h deleted file mode 100644 index 231bb7aac9473..0000000000000 --- a/drivers/gpu/drm/mediatek/mtk_drm_plane.h +++ /dev/null @@ -1,54 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ -/* - * Copyright (c) 2015 MediaTek Inc. - * Author: CK Hu - */ - -#ifndef _MTK_PLANE_H_ -#define _MTK_PLANE_H_ - -#include -#include - -#define AFBC_DATA_BLOCK_WIDTH 32 -#define AFBC_DATA_BLOCK_HEIGHT 8 -#define AFBC_HEADER_BLOCK_SIZE 16 -#define AFBC_HEADER_ALIGNMENT 1024 - -struct mtk_plane_pending_state { - bool config; - bool enable; - dma_addr_t addr; - dma_addr_t hdr_addr; - unsigned int pitch; - unsigned int hdr_pitch; - unsigned int format; - unsigned long long modifier; - unsigned int x; - unsigned int y; - unsigned int width; - unsigned int height; - unsigned int rotation; - bool dirty; - bool async_dirty; - bool async_config; - enum drm_color_encoding color_encoding; -}; - -struct mtk_plane_state { - struct drm_plane_state base; - struct mtk_plane_pending_state pending; -}; - -static inline struct mtk_plane_state * -to_mtk_plane_state(struct drm_plane_state *state) -{ - return container_of(state, struct mtk_plane_state, base); -} - -int mtk_plane_init(struct drm_device *dev, struct drm_plane *plane, - unsigned long possible_crtcs, enum drm_plane_type type, - unsigned int supported_rotations, const u32 *formats, - size_t num_formats); - -#endif diff --git a/drivers/gpu/drm/mediatek/mtk_plane.h b/drivers/gpu/drm/mediatek/mtk_plane.h new file mode 100644 index 0000000000000..231bb7aac9473 --- /dev/null +++ b/drivers/gpu/drm/mediatek/mtk_plane.h @@ -0,0 +1,54 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* + * Copyright (c) 2015 MediaTek Inc. + * Author: CK Hu + */ + +#ifndef _MTK_PLANE_H_ +#define _MTK_PLANE_H_ + +#include +#include + +#define AFBC_DATA_BLOCK_WIDTH 32 +#define AFBC_DATA_BLOCK_HEIGHT 8 +#define AFBC_HEADER_BLOCK_SIZE 16 +#define AFBC_HEADER_ALIGNMENT 1024 + +struct mtk_plane_pending_state { + bool config; + bool enable; + dma_addr_t addr; + dma_addr_t hdr_addr; + unsigned int pitch; + unsigned int hdr_pitch; + unsigned int format; + unsigned long long modifier; + unsigned int x; + unsigned int y; + unsigned int width; + unsigned int height; + unsigned int rotation; + bool dirty; + bool async_dirty; + bool async_config; + enum drm_color_encoding color_encoding; +}; + +struct mtk_plane_state { + struct drm_plane_state base; + struct mtk_plane_pending_state pending; +}; + +static inline struct mtk_plane_state * +to_mtk_plane_state(struct drm_plane_state *state) +{ + return container_of(state, struct mtk_plane_state, base); +} + +int mtk_plane_init(struct drm_device *dev, struct drm_plane *plane, + unsigned long possible_crtcs, enum drm_plane_type type, + unsigned int supported_rotations, const u32 *formats, + size_t num_formats); + +#endif