Share mtk mutex driver for both DRM and MDP
Subsystems (3)
Chun-Kuang Hu
maintainerv2 cover Share mtk mutex driver for both DRM and MDP
mtk mutex is a driver used by DRM and MDP [1], so this series move mtk mutex driver from DRM folder to soc folder, so it could be used by DRM and MDP.
Changes in v2:
1. Rebase onto mediatek-drm-next [2].
2. Export symbol for mtk-mutex API.
[1] https://patchwork.kernel.org/patch/11140751/
[2] https://git.kernel.org/pub/scm/linux/kernel/git/chunkuang.hu/linux.git/log/?h=mediatek-drm-next
CK Hu (5):
drm/mediatek: Remove redundant file including drm/mediatek: Rename file mtk_drm_ddp to mtk_mutex drm/mediatek: Change disp/ddp term to mutex in mtk mutex driver drm/mediatek: Automatically search unclaimed mtk mutex in
mtk_mutex_get()
soc / drm: mediatek: Move mtk mutex driver to soc folder
drivers/gpu/drm/mediatek/Makefile | 1 -
drivers/gpu/drm/mediatek/mtk_drm_crtc.c | 32 +-
drivers/gpu/drm/mediatek/mtk_drm_ddp.h | 28 --
drivers/gpu/drm/mediatek/mtk_drm_drv.c | 3 -
drivers/gpu/drm/mediatek/mtk_drm_drv.h | 1 -
drivers/soc/mediatek/Makefile | 1 +
.../mediatek/mtk-mutex.c} | 328 +++++++++---------
include/linux/soc/mediatek/mtk-mutex.h | 26 ++
8 files changed, 212 insertions(+), 208 deletions(-)
delete mode 100644 drivers/gpu/drm/mediatek/mtk_drm_ddp.h
rename drivers/{gpu/drm/mediatek/mtk_drm_ddp.c => soc/mediatek/mtk-mutex.c} (53%)
create mode 100644 include/linux/soc/mediatek/mtk-mutex.hSignature · 6 lines
2.17.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Chun-Kuang Hu
maintainerPATCH v2 1/5 drm/mediatek: Remove redundant file including
From: CK Hu <[email protected]>
Those file includings are useless, so remove them.
--- drivers/gpu/drm/mediatek/mtk_drm_ddp.h | 2 -- drivers/gpu/drm/mediatek/mtk_drm_drv.c | 2 -- 2 files changed, 4 deletions(-)
drivers/gpu/drm/mediatek/mtk_drm_ddp.h +0 -2
@@ -6,8 +6,6 @@#ifndef MTK_DRM_DDP_H #define MTK_DRM_DDP_H -#include "mtk_drm_ddp_comp.h" -struct regmap ;struct device ;struct mtk_disp_mutex ;
drivers/gpu/drm/mediatek/mtk_drm_drv.c +0 -2
@@ -10,7 +10,6 @@#include <linux/of_address.h> #include <linux/of_platform.h> #include <linux/pm_runtime.h> -#include <linux/soc/mediatek/mtk-mmsys.h> #include <linux/dma-mapping.h> #include <drm/drm_atomic.h>
@@ -26,7 +25,6 @@#include <drm/drm_vblank.h> #include "mtk_drm_crtc.h" -#include "mtk_drm_ddp.h" #include "mtk_drm_ddp_comp.h" #include "mtk_drm_drv.h" #include "mtk_drm_gem.h"
Signature · 6 lines
2.17.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Chun-Kuang Hu
maintainerPATCH v2 2/5 drm/mediatek: Rename file mtk_drm_ddp to mtk_mutex
In reply to Chun-Kuang HuFrom: CK Hu <[email protected]>
After mmsys routing function is moved out of mtk_drm_ddp.c, mtk_drm_ddp.c has only mtk mutex function, so rename it to match the function in it.
---
drivers/gpu/drm/mediatek/Makefile | 4 ++--
drivers/gpu/drm/mediatek/mtk_drm_crtc.c | 2 +-
drivers/gpu/drm/mediatek/{mtk_drm_ddp.c => mtk_mutex.c} | 2 +-
drivers/gpu/drm/mediatek/{mtk_drm_ddp.h => mtk_mutex.h} | 6 +++---
4 files changed, 7 insertions(+), 7 deletions(-)
rename drivers/gpu/drm/mediatek/{mtk_drm_ddp.c => mtk_mutex.c} (99%)
rename drivers/gpu/drm/mediatek/{mtk_drm_ddp.h => mtk_mutex.h} (92%)drivers/gpu/drm/mediatek/Makefile +2 -2
@@ -4,13 +4,13 @@ mediatek-drm-y := mtk_disp_color.o \ mtk_disp_ovl.o \ mtk_disp_rdma.o \ mtk_drm_crtc.o \ - mtk_drm_ddp.o \ mtk_drm_ddp_comp.o \ mtk_drm_drv.o \ mtk_drm_gem.o \ mtk_drm_plane.o \ mtk_dsi.o \ - mtk_dpi.o + mtk_dpi.o \ + mtk_mutex.o obj-$(CONFIG_DRM_MEDIATEK) += mediatek-drm.o
drivers/gpu/drm/mediatek/mtk_drm_crtc.c +1 -1
@@ -19,10 +19,10 @@#include "mtk_drm_drv.h" #include "mtk_drm_crtc.h" -#include "mtk_drm_ddp.h" #include "mtk_drm_ddp_comp.h" #include "mtk_drm_gem.h" #include "mtk_drm_plane.h" +#include "mtk_mutex.h" /* * struct mtk_drm_crtc - MediaTek specific crtc structure.
drivers/gpu/drm/mediatek/mtk_mutex.c renamed from drivers/gpu/drm/mediatek/mtk_drm_ddp.c +1 -1
@@ -10,8 +10,8 @@#include <linux/platform_device.h> #include <linux/regmap.h> -#include "mtk_drm_ddp.h" #include "mtk_drm_ddp_comp.h" +#include "mtk_mutex.h" #define MT2701_DISP_MUTEX0_MOD0 0x2c#define MT2701_DISP_MUTEX0_SOF0 0x30
drivers/gpu/drm/mediatek/mtk_mutex.h renamed from drivers/gpu/drm/mediatek/mtk_drm_ddp.h +3 -3
@@ -3,8 +3,8 @@* Copyright (c) 2015 MediaTek Inc. */ -#ifndef MTK_DRM_DDP_H -#define MTK_DRM_DDP_H +#ifndef MTK_MUTEX_H +#define MTK_MUTEX_H struct regmap ;struct device ;
@@ -23,4 +23,4 @@ void mtk_disp_mutex_put(struct mtk_disp_mutex *mutex);void mtk_disp_mutex_acquire (struct mtk_disp_mutex *mutex);void mtk_disp_mutex_release (struct mtk_disp_mutex *mutex); -#endif /* MTK_DRM_DDP_H */ +#endif /* MTK_MUTEX_H */
Signature · 6 lines
2.17.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Chun-Kuang Hu
maintainerPATCH v2 3/5 drm/mediatek: Change disp/ddp term to mutex in mtk mutex driver
In reply to Chun-Kuang HuFrom: CK Hu <[email protected]>
mtk mutex is used by both drm and mdp driver, so change disp/ddp term to mutex to show that it's a common driver for drm and mdp.
--- drivers/gpu/drm/mediatek/mtk_drm_crtc.c | 30 +-- drivers/gpu/drm/mediatek/mtk_drm_drv.c | 2 +- drivers/gpu/drm/mediatek/mtk_drm_drv.h | 2 +- drivers/gpu/drm/mediatek/mtk_mutex.c | 305 ++++++++++++------------ drivers/gpu/drm/mediatek/mtk_mutex.h | 26 +- 5 files changed, 182 insertions(+), 183 deletions(-)
drivers/gpu/drm/mediatek/mtk_drm_crtc.c +15 -15
@@ -55,7 +55,7 @@ struct mtk_drm_crtc {#endif struct device *mmsys_dev; -struct mtk_disp_mutex *mutex; +struct mtk_mutex *mutex;unsigned int ddp_comp_nr;struct mtk_ddp_comp **ddp_comp;
@@ -107,7 +107,7 @@ static void mtk_drm_crtc_destroy(struct drm_crtc *crtc) {struct mtk_drm_crtc *mtk_crtc =to_mtk_crtc (crtc); -mtk_disp_mutex_put (mtk_crtc->mutex); +mtk_mutex_put (mtk_crtc->mutex);drm_crtc_cleanup (crtc); }
@@ -265,7 +265,7 @@ static int mtk_crtc_ddp_hw_init(struct mtk_drm_crtc *mtk_crtc)return ret; } - ret =mtk_disp_mutex_prepare (mtk_crtc->mutex); + ret =mtk_mutex_prepare (mtk_crtc->mutex);if (ret <0 ) {DRM_ERROR ("Failed to enable mutex clock: %d\n" , ret); goto err_pm_runtime_put;
@@ -281,11 +281,11 @@ static int mtk_crtc_ddp_hw_init(struct mtk_drm_crtc *mtk_crtc)mtk_mmsys_ddp_connect (mtk_crtc->mmsys_dev, mtk_crtc->ddp_comp[i]->id, mtk_crtc->ddp_comp[i +1 ]->id); -mtk_disp_mutex_add_comp (mtk_crtc->mutex, +mtk_mutex_add_comp (mtk_crtc->mutex, mtk_crtc->ddp_comp[i]->id); } -mtk_disp_mutex_add_comp (mtk_crtc->mutex, mtk_crtc->ddp_comp[i]->id); -mtk_disp_mutex_enable (mtk_crtc->mutex); +mtk_mutex_add_comp (mtk_crtc->mutex, mtk_crtc->ddp_comp[i]->id); +mtk_mutex_enable (mtk_crtc->mutex);for (i =0 ; i < mtk_crtc->ddp_comp_nr; i++) {struct mtk_ddp_comp *comp = mtk_crtc->ddp_comp[i];
@@ -314,7 +314,7 @@ static int mtk_crtc_ddp_hw_init(struct mtk_drm_crtc *mtk_crtc)return 0 ; err_mutex_unprepare: -mtk_disp_mutex_unprepare (mtk_crtc->mutex); +mtk_mutex_unprepare (mtk_crtc->mutex); err_pm_runtime_put:pm_runtime_put (crtc->dev->dev);return ret;
@@ -333,19 +333,19 @@ static void mtk_crtc_ddp_hw_fini(struct mtk_drm_crtc *mtk_crtc) }for (i =0 ; i < mtk_crtc->ddp_comp_nr; i++) -mtk_disp_mutex_remove_comp (mtk_crtc->mutex, +mtk_mutex_remove_comp (mtk_crtc->mutex, mtk_crtc->ddp_comp[i]->id); -mtk_disp_mutex_disable (mtk_crtc->mutex); +mtk_mutex_disable (mtk_crtc->mutex);for (i =0 ; i < mtk_crtc->ddp_comp_nr -1 ; i++) {mtk_mmsys_ddp_disconnect (mtk_crtc->mmsys_dev, mtk_crtc->ddp_comp[i]->id, mtk_crtc->ddp_comp[i +1 ]->id); -mtk_disp_mutex_remove_comp (mtk_crtc->mutex, +mtk_mutex_remove_comp (mtk_crtc->mutex, mtk_crtc->ddp_comp[i]->id); } -mtk_disp_mutex_remove_comp (mtk_crtc->mutex, mtk_crtc->ddp_comp[i]->id); +mtk_mutex_remove_comp (mtk_crtc->mutex, mtk_crtc->ddp_comp[i]->id);mtk_crtc_ddp_clk_disable (mtk_crtc); -mtk_disp_mutex_unprepare (mtk_crtc->mutex); +mtk_mutex_unprepare (mtk_crtc->mutex);pm_runtime_put (drm->dev);
@@ -457,9 +457,9 @@ static void mtk_drm_crtc_hw_config(struct mtk_drm_crtc *mtk_crtc) mtk_crtc->pending_async_planes = true;if (priv->data->shadow_register) { -mtk_disp_mutex_acquire (mtk_crtc->mutex); +mtk_mutex_acquire (mtk_crtc->mutex);mtk_crtc_ddp_config (crtc,NULL ); -mtk_disp_mutex_release (mtk_crtc->mutex); +mtk_mutex_release (mtk_crtc->mutex); }#if IS_REACHABLE (CONFIG_MTK_CMDQ )if (mtk_crtc->cmdq_client) {
@@ -773,7 +773,7 @@ int mtk_drm_crtc_create(struct drm_device *drm_dev,if (!mtk_crtc->ddp_comp)return -ENOMEM ; - mtk_crtc->mutex =mtk_disp_mutex_get (priv->mutex_dev, pipe); + mtk_crtc->mutex =mtk_mutex_get (priv->mutex_dev, pipe);if (IS_ERR (mtk_crtc->mutex)) { ret =PTR_ERR (mtk_crtc->mutex);dev_err (dev,"Failed to get mutex: %d\n" , ret);
drivers/gpu/drm/mediatek/mtk_drm_drv.c +1 -1
@@ -588,7 +588,7 @@ static struct platform_driver mtk_drm_platform_driver = { };static struct platform_driver *const mtk_drm_drivers[] = { - &mtk_ddp_driver, + &mtk_mutex_driver, &mtk_disp_color_driver, &mtk_disp_ovl_driver, &mtk_disp_rdma_driver,
drivers/gpu/drm/mediatek/mtk_drm_drv.h +1 -1
@@ -46,7 +46,7 @@ struct mtk_drm_private {struct drm_atomic_state *suspend_state; }; -extern struct platform_driver mtk_ddp_driver; +extern struct platform_driver mtk_mutex_driver;extern struct platform_driver mtk_disp_color_driver;extern struct platform_driver mtk_disp_ovl_driver;extern struct platform_driver mtk_disp_rdma_driver;
drivers/gpu/drm/mediatek/mtk_mutex.c +152 -153
488 lines not on this page · raw message
drivers/gpu/drm/mediatek/mtk_mutex.h +13 -13
@@ -8,19 +8,19 @@struct regmap ;struct device ; -struct mtk_disp_mutex ; +struct mtk_mutex ; -struct mtk_disp_mutex *mtk_disp_mutex_get (struct device *dev,unsigned int id); -int mtk_disp_mutex_prepare (struct mtk_disp_mutex *mutex); -void mtk_disp_mutex_add_comp (struct mtk_disp_mutex *mutex, -enum mtk_ddp_comp_id id); -void mtk_disp_mutex_enable (struct mtk_disp_mutex *mutex); -void mtk_disp_mutex_disable (struct mtk_disp_mutex *mutex); -void mtk_disp_mutex_remove_comp (struct mtk_disp_mutex *mutex, -enum mtk_ddp_comp_id id); -void mtk_disp_mutex_unprepare (struct mtk_disp_mutex *mutex); -void mtk_disp_mutex_put (struct mtk_disp_mutex *mutex); -void mtk_disp_mutex_acquire (struct mtk_disp_mutex *mutex); -void mtk_disp_mutex_release (struct mtk_disp_mutex *mutex); +struct mtk_mutex *mtk_mutex_get (struct device *dev,unsigned int id); +int mtk_mutex_prepare (struct mtk_mutex *mutex); +void mtk_mutex_add_comp (struct mtk_mutex *mutex, +enum mtk_ddp_comp_id id); +void mtk_mutex_enable (struct mtk_mutex *mutex); +void mtk_mutex_disable (struct mtk_mutex *mutex); +void mtk_mutex_remove_comp (struct mtk_mutex *mutex, +enum mtk_ddp_comp_id id); +void mtk_mutex_unprepare (struct mtk_mutex *mutex); +void mtk_mutex_put (struct mtk_mutex *mutex); +void mtk_mutex_acquire (struct mtk_mutex *mutex); +void mtk_mutex_release (struct mtk_mutex *mutex);#endif /* MTK_MUTEX_H */
Signature · 6 lines
2.17.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH v2 3/5] drm/mediatek: Change disp/ddp term to mutex in mtk mutex driver
Quoted 15 lines · Chun-Kuang Hu
From: CK Hu <[email protected]>
mtk mutex is used by both drm and mdp driver, so change disp/ddp term to mutex to show that it's a common driver for drm and mdp.
Signed-off-by CK Hu <[email protected]>Signed-off-by Chun-Kuang Hu <[email protected]>--- drivers/gpu/drm/mediatek/mtk_drm_crtc.c | 30 +-- drivers/gpu/drm/mediatek/mtk_drm_drv.c | 2 +- drivers/gpu/drm/mediatek/mtk_drm_drv.h | 2 +- drivers/gpu/drm/mediatek/mtk_mutex.c | 305 ++++++++++++------------ drivers/gpu/drm/mediatek/mtk_mutex.h | 26 +- 5 files changed, 182 insertions(+), 183 deletions(-)
[...]
Quoted 4 lines
drivers/gpu/drm/mediatek/mtk_mutex.c +0
-0
[...]
Quoted 9 lines
drivers/gpu/drm/mediatek/mtk_mutex.c +3
-3-static const struct of_device_id ddp_driver_dt_match[] = { +static const struct of_device_id mutex_driver_dt_match[] = { { .compatible ="mediatek,mt2701-disp-mutex" , - .data = &mt2701_ddp_driver_data}, + .data = &mt2701_mutex_driver_data}, { .compatible ="mediatek,mt2712-disp-mutex" , - .data = &mt2712_ddp_driver_data}, + .data = &mt2712_mutex_driver_data},
drivers/gpu/drm/mediatek/mtk_mutex.c void mtk_disp_mutex_remove_comp(struct mtk_disp_mutex *mutex, · line 453
Quoted 10 lines
drivers/gpu/drm/mediatek/mtk_mutex.c +3
-3{ .compatible = "mediatek,mt8167-disp-mutex", - .data = &mt8167_ddp_driver_data}, + .data = &mt8167_mutex_driver_data}, { .compatible = "mediatek,mt8173-disp-mutex", - .data = &mt8173_ddp_driver_data}, + .data = &mt8173_mutex_driver_data}, {}, }; -MODULE_DEVICE_TABLE (of, ddp_driver_dt_match); +MODULE_DEVICE_TABLE (of, mutex_driver_dt_match);
I think it would make sense in a follow-up patch to update the binding to use "mediatek,mt2701-mutex" to reflect that mutex is used for drm and mdp driver. Make sense?
Regards,
Matthias
_______________________________________________
Linux-mediatek mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-mediatek
Chun-Kuang Hu
maintainerRe: [PATCH v2 3/5] drm/mediatek: Change disp/ddp term to mutex in mtk mutex driver
Hi, Matthias:
Matthias Brugger <[email protected]> 於 2021年1月21日 週四 上午2:27寫道:
Quoted 38 lines · Chun-Kuang Hu
Quoted 15 lines
From: CK Hu <[email protected]>
mtk mutex is used by both drm and mdp driver, so change disp/ddp term to mutex to show that it's a common driver for drm and mdp.
Signed-off-by CK Hu <[email protected]>Signed-off-by Chun-Kuang Hu <[email protected]>--- drivers/gpu/drm/mediatek/mtk_drm_crtc.c | 30 +-- drivers/gpu/drm/mediatek/mtk_drm_drv.c | 2 +- drivers/gpu/drm/mediatek/mtk_drm_drv.h | 2 +- drivers/gpu/drm/mediatek/mtk_mutex.c | 305 ++++++++++++------------ drivers/gpu/drm/mediatek/mtk_mutex.h | 26 +- 5 files changed, 182 insertions(+), 183 deletions(-)[...]
Quoted 4 lines
drivers/gpu/drm/mediatek/mtk_mutex.c +0
-0[...]
Quoted 15 lines
drivers/gpu/drm/mediatek/mtk_mutex.c +5
-5-static const struct of_device_id ddp_driver_dt_match[] = { +static const struct of_device_id mutex_driver_dt_match[] = { { .compatible ="mediatek,mt2701-disp-mutex" , - .data = &mt2701_ddp_driver_data}, + .data = &mt2701_mutex_driver_data}, { .compatible ="mediatek,mt2712-disp-mutex" , - .data = &mt2712_ddp_driver_data}, + .data = &mt2712_mutex_driver_data}, { .compatible ="mediatek,mt8167-disp-mutex" , - .data = &mt8167_ddp_driver_data}, + .data = &mt8167_mutex_driver_data}, { .compatible ="mediatek,mt8173-disp-mutex" , - .data = &mt8173_ddp_driver_data}, + .data = &mt8173_mutex_driver_data},
Quoted 8 lines
drivers/gpu/drm/mediatek/mtk_mutex.c void mtk_disp_mutex_remove_comp(struct mtk_disp_mutex *mutex, · line 453
Quoted 4 lines
{},};
drivers/gpu/drm/mediatek/mtk_mutex.c +1
-1-MODULE_DEVICE_TABLE (of, ddp_driver_dt_match); +MODULE_DEVICE_TABLE (of, mutex_driver_dt_match);I think it would make sense in a follow-up patch to update the binding to use "mediatek,mt2701-mutex" to reflect that mutex is used for drm and mdp driver. Make sense?
Yes, it make sense. I would try to update the binding, but I wonder device tree should be backward compatible? Let's discuss in that follow-up patches.
Regards,
Chun-Kuang.
Quoted 3 lines
Regards,
Matthias
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH v2 3/5] drm/mediatek: Change disp/ddp term to mutex in mtk mutex driver
Quoted 50 lines · Chun-Kuang Hu
Hi, Matthias:
Matthias Brugger <[email protected]> 於 2021年1月21日 週四 上午2:27寫道:
Quoted 38 lines · Chun-Kuang Hu
Quoted 15 lines
From: CK Hu <[email protected]>
mtk mutex is used by both drm and mdp driver, so change disp/ddp term to mutex to show that it's a common driver for drm and mdp.
Signed-off-by CK Hu <[email protected]>Signed-off-by Chun-Kuang Hu <[email protected]>--- drivers/gpu/drm/mediatek/mtk_drm_crtc.c | 30 +-- drivers/gpu/drm/mediatek/mtk_drm_drv.c | 2 +- drivers/gpu/drm/mediatek/mtk_drm_drv.h | 2 +- drivers/gpu/drm/mediatek/mtk_mutex.c | 305 ++++++++++++------------ drivers/gpu/drm/mediatek/mtk_mutex.h | 26 +- 5 files changed, 182 insertions(+), 183 deletions(-)[...]
Quoted 4 lines
drivers/gpu/drm/mediatek/mtk_mutex.c +0
-0[...]
Quoted 15 lines
drivers/gpu/drm/mediatek/mtk_mutex.c +5
-5-static const struct of_device_id ddp_driver_dt_match[] = { +static const struct of_device_id mutex_driver_dt_match[] = { { .compatible ="mediatek,mt2701-disp-mutex" , - .data = &mt2701_ddp_driver_data}, + .data = &mt2701_mutex_driver_data}, { .compatible ="mediatek,mt2712-disp-mutex" , - .data = &mt2712_ddp_driver_data}, + .data = &mt2712_mutex_driver_data}, { .compatible ="mediatek,mt8167-disp-mutex" , - .data = &mt8167_ddp_driver_data}, + .data = &mt8167_mutex_driver_data}, { .compatible ="mediatek,mt8173-disp-mutex" , - .data = &mt8173_ddp_driver_data}, + .data = &mt8173_mutex_driver_data},Quoted 8 lines
drivers/gpu/drm/mediatek/mtk_mutex.c void mtk_disp_mutex_remove_comp(struct mtk_disp_mutex *mutex, · line 453
Quoted 4 lines
{},};
drivers/gpu/drm/mediatek/mtk_mutex.c +1
-1-MODULE_DEVICE_TABLE (of, ddp_driver_dt_match); +MODULE_DEVICE_TABLE (of, mutex_driver_dt_match);I think it would make sense in a follow-up patch to update the binding to use "mediatek,mt2701-mutex" to reflect that mutex is used for drm and mdp driver. Make sense?
Quoted 4 lines
Yes, it make sense. I would try to update the binding, but I wonder device tree should be backward compatible? Let's discuss in that follow-up patches.
From my understanding, we will need to keep the of_device_id entries for the old binding in the driver (so that old DTs still work) while we should enforce the new binding. I'm not sure if the yaml has a option for out-of-date compatibles.
Regards,
Matthias
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Chun-Kuang Hu
maintainerRe: [PATCH v2 3/5] drm/mediatek: Change disp/ddp term to mutex in mtk mutex driver
Matthias Brugger <[email protected]> 於 2021年1月21日 週四 下午4:19寫道:
Quoted 57 lines · Chun-Kuang Hu
Quoted 50 lines
Hi, Matthias:
Matthias Brugger <[email protected]> 於 2021年1月21日 週四 上午2:27寫道:
Quoted 38 lines · Chun-Kuang Hu
Quoted 15 lines
From: CK Hu <[email protected]>
mtk mutex is used by both drm and mdp driver, so change disp/ddp term to mutex to show that it's a common driver for drm and mdp.
Signed-off-by CK Hu <[email protected]>Signed-off-by Chun-Kuang Hu <[email protected]>--- drivers/gpu/drm/mediatek/mtk_drm_crtc.c | 30 +-- drivers/gpu/drm/mediatek/mtk_drm_drv.c | 2 +- drivers/gpu/drm/mediatek/mtk_drm_drv.h | 2 +- drivers/gpu/drm/mediatek/mtk_mutex.c | 305 ++++++++++++------------ drivers/gpu/drm/mediatek/mtk_mutex.h | 26 +- 5 files changed, 182 insertions(+), 183 deletions(-)[...]
Quoted 4 lines
drivers/gpu/drm/mediatek/mtk_mutex.c +0
-0[...]
Quoted 15 lines
drivers/gpu/drm/mediatek/mtk_mutex.c +5
-5-static const struct of_device_id ddp_driver_dt_match[] = { +static const struct of_device_id mutex_driver_dt_match[] = { { .compatible ="mediatek,mt2701-disp-mutex" , - .data = &mt2701_ddp_driver_data}, + .data = &mt2701_mutex_driver_data}, { .compatible ="mediatek,mt2712-disp-mutex" , - .data = &mt2712_ddp_driver_data}, + .data = &mt2712_mutex_driver_data}, { .compatible ="mediatek,mt8167-disp-mutex" , - .data = &mt8167_ddp_driver_data}, + .data = &mt8167_mutex_driver_data}, { .compatible ="mediatek,mt8173-disp-mutex" , - .data = &mt8173_ddp_driver_data}, + .data = &mt8173_mutex_driver_data},Quoted 8 lines
drivers/gpu/drm/mediatek/mtk_mutex.c void mtk_disp_mutex_remove_comp(struct mtk_disp_mutex *mutex, · line 453
Quoted 4 lines
{},};
drivers/gpu/drm/mediatek/mtk_mutex.c +1
-1-MODULE_DEVICE_TABLE (of, ddp_driver_dt_match); +MODULE_DEVICE_TABLE (of, mutex_driver_dt_match);I think it would make sense in a follow-up patch to update the binding to use "mediatek,mt2701-mutex" to reflect that mutex is used for drm and mdp driver. Make sense?
Quoted 4 lines
Yes, it make sense. I would try to update the binding, but I wonder device tree should be backward compatible? Let's discuss in that follow-up patches.
Quoted 4 lines
From my understanding, we will need to keep the
of_device_identries for the old binding in the driver (so that old DTs still work) while we should enforce the new binding. I'm not sure if the yaml has a option for out-of-date compatibles.
OK, I would do it so and remove out-f-date compatibles in yaml at first to see any feedback.
Regards,
Chun-Kuang.
Quoted 3 lines
Regards,
Matthias
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Chun-Kuang Hu
maintainerPATCH v2 4/5 drm/mediatek: Automatically search unclaimed mtk mutex in mtk_mutex_get()
In reply to Chun-Kuang HuFrom: CK Hu <[email protected]>
Moving mutex resource management from client driver to mutex driver could prevent client drivers negotiating for resource management.
--- drivers/gpu/drm/mediatek/mtk_drm_crtc.c | 2 +- drivers/gpu/drm/mediatek/mtk_mutex.c | 16 ++++++++-------- drivers/gpu/drm/mediatek/mtk_mutex.h | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-)
drivers/gpu/drm/mediatek/mtk_drm_crtc.c +1 -1
@@ -773,7 +773,7 @@ int mtk_drm_crtc_create(struct drm_device *drm_dev,if (!mtk_crtc->ddp_comp)return -ENOMEM ; - mtk_crtc->mutex =mtk_mutex_get (priv->mutex_dev, pipe); + mtk_crtc->mutex =mtk_mutex_get (priv->mutex_dev);if (IS_ERR (mtk_crtc->mutex)) { ret =PTR_ERR (mtk_crtc->mutex);dev_err (dev,"Failed to get mutex: %d\n" , ret);
drivers/gpu/drm/mediatek/mtk_mutex.c +8 -8
@@ -228,18 +228,18 @@ static const struct mtk_mutex_data mt8173_mutex_driver_data = { .mutex_sof_reg = MT2701_MUTEX0_SOF0, }; -struct mtk_mutex *mtk_mutex_get (struct device *dev,unsigned int id) +struct mtk_mutex *mtk_mutex_get (struct device *dev) {struct mtk_mutex_ctx *mtx =dev_get_drvdata (dev); +int i; -if (id >=10 ) -return ERR_PTR (-EINVAL ); -if (mtx->mutex[id].claimed) -return ERR_PTR (-EBUSY ); - - mtx->mutex[id].claimed = true; +for (i =0 ; i <10 ; i++) +if (!mtx->mutex[i].claimed) { + mtx->mutex[i].claimed = true; +return &mtx->mutex[i]; + } -return &mtx->mutex[id]; +return ERR_PTR (-EBUSY ); }void mtk_mutex_put (struct mtk_mutex *mutex)
drivers/gpu/drm/mediatek/mtk_mutex.h +1 -1
@@ -10,7 +10,7 @@ struct regmap;struct device ;struct mtk_mutex ; -struct mtk_mutex *mtk_mutex_get (struct device *dev,unsigned int id); +struct mtk_mutex *mtk_mutex_get (struct device *dev);int mtk_mutex_prepare (struct mtk_mutex *mutex);void mtk_mutex_add_comp (struct mtk_mutex *mutex,enum mtk_ddp_comp_id id);
Signature · 6 lines
2.17.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Chun-Kuang Hu
maintainerPATCH v2 5/5 soc / drm: mediatek: Move mtk mutex driver to soc folder
In reply to Chun-Kuang HuFrom: CK Hu <[email protected]>
mtk mutex is used by DRM and MDP driver, and its function is SoC-specific, so move it to soc folder.
---
drivers/gpu/drm/mediatek/Makefile | 3 +--
drivers/gpu/drm/mediatek/mtk_drm_crtc.c | 2 +-
drivers/gpu/drm/mediatek/mtk_drm_drv.c | 1 -
drivers/gpu/drm/mediatek/mtk_drm_drv.h | 1 -
drivers/soc/mediatek/Makefile | 1 +
.../mtk_mutex.c => soc/mediatek/mtk-mutex.c} | 15 +++++++++++++--
.../linux/soc/mediatek/mtk-mutex.h | 0
7 files changed, 16 insertions(+), 7 deletions(-)
rename drivers/{gpu/drm/mediatek/mtk_mutex.c => soc/mediatek/mtk-mutex.c} (96%)
rename drivers/gpu/drm/mediatek/mtk_mutex.h => include/linux/soc/mediatek/mtk-mutex.h (100%)drivers/gpu/drm/mediatek/Makefile +1 -2
@@ -9,8 +9,7 @@ mediatek-drm-y := mtk_disp_color.o \ mtk_drm_gem.o \ mtk_drm_plane.o \ mtk_dsi.o \ - mtk_dpi.o \ - mtk_mutex.o + mtk_dpi.o obj-$(CONFIG_DRM_MEDIATEK) += mediatek-drm.o
drivers/gpu/drm/mediatek/mtk_drm_crtc.c +1 -1
@@ -7,6 +7,7 @@#include <linux/pm_runtime.h> #include <linux/soc/mediatek/mtk-cmdq.h> #include <linux/soc/mediatek/mtk-mmsys.h> +#include <linux/soc/mediatek/mtk-mutex.h> #include <asm/barrier.h> #include <soc/mediatek/smi.h>
@@ -22,7 +23,6 @@#include "mtk_drm_ddp_comp.h" #include "mtk_drm_gem.h" #include "mtk_drm_plane.h" -#include "mtk_mutex.h" /* * struct mtk_drm_crtc - MediaTek specific crtc structure.
drivers/gpu/drm/mediatek/mtk_drm_drv.c +0 -1
@@ -588,7 +588,6 @@ static struct platform_driver mtk_drm_platform_driver = { };static struct platform_driver *const mtk_drm_drivers[] = { - &mtk_mutex_driver, &mtk_disp_color_driver, &mtk_disp_ovl_driver, &mtk_disp_rdma_driver,
drivers/gpu/drm/mediatek/mtk_drm_drv.h +0 -1
@@ -46,7 +46,6 @@ struct mtk_drm_private {struct drm_atomic_state *suspend_state; }; -extern struct platform_driver mtk_mutex_driver;extern struct platform_driver mtk_disp_color_driver;extern struct platform_driver mtk_disp_ovl_driver;extern struct platform_driver mtk_disp_rdma_driver;
drivers/soc/mediatek/Makefile +1 -0
@@ -6,3 +6,4 @@ obj-$(CONFIG_MTK_PMIC_WRAP) += mtk-pmic-wrap.o obj-$(CONFIG_MTK_SCPSYS) += mtk-scpsys.o obj-$(CONFIG_MTK_SCPSYS_PM_DOMAINS) += mtk-pm-domains.o obj-$(CONFIG_MTK_MMSYS) += mtk-mmsys.o +obj-$(CONFIG_MTK_MMSYS) += mtk-mutex.o
drivers/soc/mediatek/mtk-mutex.c renamed from drivers/gpu/drm/mediatek/mtk_mutex.c +13 -2
@@ -10,8 +10,7 @@#include <linux/platform_device.h> #include <linux/regmap.h> #include <linux/soc/mediatek/mtk-mmsys.h> - -#include "mtk_mutex.h" +#include <linux/soc/mediatek/mtk-mutex.h> #define MT2701_MUTEX0_MOD0 0x2c#define MT2701_MUTEX0_SOF0 0x30
@@ -241,6 +240,7 @@ struct mtk_mutex *mtk_mutex_get(struct device *dev)return ERR_PTR (-EBUSY ); } +EXPORT_SYMBOL_GPL (mtk_mutex_get);void mtk_mutex_put (struct mtk_mutex *mutex) {
@@ -251,6 +251,7 @@ void mtk_mutex_put(struct mtk_mutex *mutex) mutex->claimed = false; } +EXPORT_SYMBOL_GPL (mtk_mutex_put);int mtk_mutex_prepare (struct mtk_mutex *mutex) {
@@ -258,6 +259,7 @@ int mtk_mutex_prepare(struct mtk_mutex *mutex) mutex[mutex->id]);return clk_prepare_enable (mtx->clk); } +EXPORT_SYMBOL_GPL (mtk_mutex_prepare);void mtk_mutex_unprepare (struct mtk_mutex *mutex) {
@@ -265,6 +267,7 @@ void mtk_mutex_unprepare(struct mtk_mutex *mutex) mutex[mutex->id]);clk_disable_unprepare (mtx->clk); } +EXPORT_SYMBOL_GPL (mtk_mutex_unprepare);void mtk_mutex_add_comp (struct mtk_mutex *mutex,enum mtk_ddp_comp_id id)
@@ -316,6 +319,7 @@ void mtk_mutex_add_comp(struct mtk_mutex *mutex, mtx->regs + DISP_REG_MUTEX_SOF(mtx->data->mutex_sof_reg, mutex->id)); } +EXPORT_SYMBOL_GPL (mtk_mutex_add_comp);void mtk_mutex_remove_comp (struct mtk_mutex *mutex,enum mtk_ddp_comp_id id)
@@ -355,6 +359,7 @@ void mtk_mutex_remove_comp(struct mtk_mutex *mutex,break ; } } +EXPORT_SYMBOL_GPL (mtk_mutex_remove_comp);void mtk_mutex_enable (struct mtk_mutex *mutex) {
@@ -365,6 +370,7 @@ void mtk_mutex_enable(struct mtk_mutex *mutex)writel (1 , mtx->regs +DISP_REG_MUTEX_EN (mutex->id)); } +EXPORT_SYMBOL_GPL (mtk_mutex_enable);void mtk_mutex_disable (struct mtk_mutex *mutex) {
@@ -375,6 +381,7 @@ void mtk_mutex_disable(struct mtk_mutex *mutex)writel (0 , mtx->regs +DISP_REG_MUTEX_EN (mutex->id)); } +EXPORT_SYMBOL_GPL (mtk_mutex_disable);void mtk_mutex_acquire (struct mtk_mutex *mutex) {
@@ -388,6 +395,7 @@ void mtk_mutex_acquire(struct mtk_mutex *mutex) tmp, tmp & INT_MUTEX, 1, 10000))pr_err ("could not acquire mutex %d\n" , mutex->id); } +EXPORT_SYMBOL_GPL (mtk_mutex_acquire);void mtk_mutex_release (struct mtk_mutex *mutex) {
@@ -396,6 +404,7 @@ void mtk_mutex_release(struct mtk_mutex *mutex)writel (0 , mtx->regs +DISP_REG_MUTEX (mutex->id)); } +EXPORT_SYMBOL_GPL (mtk_mutex_release);static int mtk_mutex_probe (struct platform_device *pdev) {
@@ -461,3 +470,5 @@ struct platform_driver mtk_mutex_driver = { .of_match_table = mutex_driver_dt_match, }, }; + +builtin_platform_driver (mtk_mutex_driver);
include/linux/soc/mediatek/mtk-mutex.h renamed from drivers/gpu/drm/mediatek/mtk_mutex.h +0 -0
Signature · 6 lines
2.17.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH v2 5/5] soc / drm: mediatek: Move mtk mutex driver to soc folder
Quoted 7 lines · Chun-Kuang Hu
From: CK Hu <[email protected]>
mtk mutex is used by DRM and MDP driver, and its function is SoC-specific, so move it to soc folder.
Signed-off-by CK Hu <[email protected]>Signed-off-by Chun-Kuang Hu <[email protected]>
Please take the patch through your tree. Thanks!
Quoted 194 lines
--- drivers/gpu/drm/mediatek/Makefile | 3 +-- drivers/gpu/drm/mediatek/mtk_drm_crtc.c | 2 +- drivers/gpu/drm/mediatek/mtk_drm_drv.c | 1 - drivers/gpu/drm/mediatek/mtk_drm_drv.h | 1 - drivers/soc/mediatek/Makefile | 1 + .../mtk_mutex.c => soc/mediatek/mtk-mutex.c} | 15 +++++++++++++-- .../linux/soc/mediatek/mtk-mutex.h | 0 7 files changed, 16 insertions(+), 7 deletions(-) rename drivers/{gpu/drm/mediatek/mtk_mutex.c => soc/mediatek/mtk-mutex.c} (96%) rename drivers/gpu/drm/mediatek/mtk_mutex.h => include/linux/soc/mediatek/mtk-mutex.h (100%)drivers/gpu/drm/mediatek/Makefile +1
-2@@ -9,8 +9,7 @@ mediatek-drm-y := mtk_disp_color.o \ mtk_drm_gem.o \ mtk_drm_plane.o \ mtk_dsi.o \ - mtk_dpi.o \ - mtk_mutex.o + mtk_dpi.o obj-$(CONFIG_DRM_MEDIATEK) += mediatek-drm.odrivers/gpu/drm/mediatek/mtk_drm_crtc.c +1
-1@@ -7,6 +7,7 @@#include <linux/pm_runtime.h> #include <linux/soc/mediatek/mtk-cmdq.h> #include <linux/soc/mediatek/mtk-mmsys.h> +#include <linux/soc/mediatek/mtk-mutex.h> #include <asm/barrier.h> #include <soc/mediatek/smi.h> @@ -22,7 +23,6 @@#include "mtk_drm_ddp_comp.h" #include "mtk_drm_gem.h" #include "mtk_drm_plane.h" -#include "mtk_mutex.h" /* * struct mtk_drm_crtc - MediaTek specific crtc structure. drivers/gpu/drm/mediatek/mtk_drm_drv.c +0
-1@@ -588,7 +588,6 @@ static struct platform_driver mtk_drm_platform_driver = { };static struct platform_driver *const mtk_drm_drivers[] = { - &mtk_mutex_driver, &mtk_disp_color_driver, &mtk_disp_ovl_driver, &mtk_disp_rdma_driver,drivers/gpu/drm/mediatek/mtk_drm_drv.h +0
-1@@ -46,7 +46,6 @@ struct mtk_drm_private {struct drm_atomic_state *suspend_state; }; -extern struct platform_driver mtk_mutex_driver;extern struct platform_driver mtk_disp_color_driver;extern struct platform_driver mtk_disp_ovl_driver;extern struct platform_driver mtk_disp_rdma_driver;drivers/soc/mediatek/Makefile +1
-0@@ -6,3 +6,4 @@ obj-$(CONFIG_MTK_PMIC_WRAP) += mtk-pmic-wrap.o obj-$(CONFIG_MTK_SCPSYS) += mtk-scpsys.o obj-$(CONFIG_MTK_SCPSYS_PM_DOMAINS) += mtk-pm-domains.o obj-$(CONFIG_MTK_MMSYS) += mtk-mmsys.o +obj-$(CONFIG_MTK_MMSYS) += mtk-mutex.odrivers/soc/mediatek/mtk-mutex.c renamed from drivers/gpu/drm/mediatek/mtk_mutex.c +13
-2@@ -10,8 +10,7 @@#include <linux/platform_device.h> #include <linux/regmap.h> #include <linux/soc/mediatek/mtk-mmsys.h> - -#include "mtk_mutex.h" +#include <linux/soc/mediatek/mtk-mutex.h> #define MT2701_MUTEX0_MOD0 0x2c#define MT2701_MUTEX0_SOF0 0x30@@ -241,6 +240,7 @@ struct mtk_mutex *mtk_mutex_get(struct device *dev)return ERR_PTR (-EBUSY ); } +EXPORT_SYMBOL_GPL (mtk_mutex_get);void mtk_mutex_put (struct mtk_mutex *mutex) {@@ -251,6 +251,7 @@ void mtk_mutex_put(struct mtk_mutex *mutex) mutex->claimed = false; } +EXPORT_SYMBOL_GPL (mtk_mutex_put);int mtk_mutex_prepare (struct mtk_mutex *mutex) {@@ -258,6 +259,7 @@ int mtk_mutex_prepare(struct mtk_mutex *mutex) mutex[mutex->id]);return clk_prepare_enable (mtx->clk); } +EXPORT_SYMBOL_GPL (mtk_mutex_prepare);void mtk_mutex_unprepare (struct mtk_mutex *mutex) {@@ -265,6 +267,7 @@ void mtk_mutex_unprepare(struct mtk_mutex *mutex) mutex[mutex->id]);clk_disable_unprepare (mtx->clk); } +EXPORT_SYMBOL_GPL (mtk_mutex_unprepare);void mtk_mutex_add_comp (struct mtk_mutex *mutex,enum mtk_ddp_comp_id id)@@ -316,6 +319,7 @@ void mtk_mutex_add_comp(struct mtk_mutex *mutex, mtx->regs + DISP_REG_MUTEX_SOF(mtx->data->mutex_sof_reg, mutex->id)); } +EXPORT_SYMBOL_GPL (mtk_mutex_add_comp);void mtk_mutex_remove_comp (struct mtk_mutex *mutex,enum mtk_ddp_comp_id id)@@ -355,6 +359,7 @@ void mtk_mutex_remove_comp(struct mtk_mutex *mutex,break ; } } +EXPORT_SYMBOL_GPL (mtk_mutex_remove_comp);void mtk_mutex_enable (struct mtk_mutex *mutex) {@@ -365,6 +370,7 @@ void mtk_mutex_enable(struct mtk_mutex *mutex)writel (1 , mtx->regs +DISP_REG_MUTEX_EN (mutex->id)); } +EXPORT_SYMBOL_GPL (mtk_mutex_enable);void mtk_mutex_disable (struct mtk_mutex *mutex) {@@ -375,6 +381,7 @@ void mtk_mutex_disable(struct mtk_mutex *mutex)writel (0 , mtx->regs +DISP_REG_MUTEX_EN (mutex->id)); } +EXPORT_SYMBOL_GPL (mtk_mutex_disable);void mtk_mutex_acquire (struct mtk_mutex *mutex) {@@ -388,6 +395,7 @@ void mtk_mutex_acquire(struct mtk_mutex *mutex) tmp, tmp & INT_MUTEX, 1, 10000))pr_err ("could not acquire mutex %d\n" , mutex->id); } +EXPORT_SYMBOL_GPL (mtk_mutex_acquire);void mtk_mutex_release (struct mtk_mutex *mutex) {@@ -396,6 +404,7 @@ void mtk_mutex_release(struct mtk_mutex *mutex)writel (0 , mtx->regs +DISP_REG_MUTEX (mutex->id)); } +EXPORT_SYMBOL_GPL (mtk_mutex_release);static int mtk_mutex_probe (struct platform_device *pdev) {@@ -461,3 +470,5 @@ struct platform_driver mtk_mutex_driver = { .of_match_table = mutex_driver_dt_match, }, }; + +builtin_platform_driver (mtk_mutex_driver);include/linux/soc/mediatek/mtk-mutex.h renamed from drivers/gpu/drm/mediatek/mtk_mutex.h +0
-0Signature · 7 lines
2.17.1 _______________________________________________ Linux-mediatek mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-mediatek
_______________________________________________
Linux-mediatek mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-mediatek
Re: [PATCH v2 5/5] soc / drm: mediatek: Move mtk mutex driver to soc folder
Hi, Matthias:
Matthias Brugger <[email protected]> 於 2021年1月21日 週四 上午2:33寫道:
Quoted 7 lines · Chun-Kuang Hu
Quoted 5 lines
From: CK Hu <[email protected]>
mtk mutex is used by DRM and MDP driver, and its function is SoC-specific, so move it to soc folder.
Quoted 6 lines
Quoted 2 lines
Signed-off-by CK Hu <[email protected]>Signed-off-by Chun-Kuang Hu <[email protected]>Acked-by Matthias Brugger <[email protected]>Please take the patch through your tree. Thanks!
Applied, thanks.
Regards,
Chun-Kuang.
Quoted 191 lines
Quoted 191 lines
--- drivers/gpu/drm/mediatek/Makefile | 3 +-- drivers/gpu/drm/mediatek/mtk_drm_crtc.c | 2 +- drivers/gpu/drm/mediatek/mtk_drm_drv.c | 1 - drivers/gpu/drm/mediatek/mtk_drm_drv.h | 1 - drivers/soc/mediatek/Makefile | 1 + .../mtk_mutex.c => soc/mediatek/mtk-mutex.c} | 15 +++++++++++++-- .../linux/soc/mediatek/mtk-mutex.h | 0 7 files changed, 16 insertions(+), 7 deletions(-) rename drivers/{gpu/drm/mediatek/mtk_mutex.c => soc/mediatek/mtk-mutex.c} (96%) rename drivers/gpu/drm/mediatek/mtk_mutex.h => include/linux/soc/mediatek/mtk-mutex.h (100%)drivers/gpu/drm/mediatek/Makefile +1
-2@@ -9,8 +9,7 @@ mediatek-drm-y := mtk_disp_color.o \ mtk_drm_gem.o \ mtk_drm_plane.o \ mtk_dsi.o \ - mtk_dpi.o \ - mtk_mutex.o + mtk_dpi.o obj-$(CONFIG_DRM_MEDIATEK) += mediatek-drm.odrivers/gpu/drm/mediatek/mtk_drm_crtc.c +1
-1@@ -7,6 +7,7 @@#include <linux/pm_runtime.h> #include <linux/soc/mediatek/mtk-cmdq.h> #include <linux/soc/mediatek/mtk-mmsys.h> +#include <linux/soc/mediatek/mtk-mutex.h> #include <asm/barrier.h> #include <soc/mediatek/smi.h> @@ -22,7 +23,6 @@#include "mtk_drm_ddp_comp.h" #include "mtk_drm_gem.h" #include "mtk_drm_plane.h" -#include "mtk_mutex.h" /* * struct mtk_drm_crtc - MediaTek specific crtc structure. drivers/gpu/drm/mediatek/mtk_drm_drv.c +0
-1@@ -588,7 +588,6 @@ static struct platform_driver mtk_drm_platform_driver = { };static struct platform_driver *const mtk_drm_drivers[] = { - &mtk_mutex_driver, &mtk_disp_color_driver, &mtk_disp_ovl_driver, &mtk_disp_rdma_driver,drivers/gpu/drm/mediatek/mtk_drm_drv.h +0
-1@@ -46,7 +46,6 @@ struct mtk_drm_private {struct drm_atomic_state *suspend_state; }; -extern struct platform_driver mtk_mutex_driver;extern struct platform_driver mtk_disp_color_driver;extern struct platform_driver mtk_disp_ovl_driver;extern struct platform_driver mtk_disp_rdma_driver;drivers/soc/mediatek/Makefile +1
-0@@ -6,3 +6,4 @@ obj-$(CONFIG_MTK_PMIC_WRAP) += mtk-pmic-wrap.o obj-$(CONFIG_MTK_SCPSYS) += mtk-scpsys.o obj-$(CONFIG_MTK_SCPSYS_PM_DOMAINS) += mtk-pm-domains.o obj-$(CONFIG_MTK_MMSYS) += mtk-mmsys.o +obj-$(CONFIG_MTK_MMSYS) += mtk-mutex.odrivers/soc/mediatek/mtk-mutex.c renamed from drivers/gpu/drm/mediatek/mtk_mutex.c +13
-2@@ -10,8 +10,7 @@#include <linux/platform_device.h> #include <linux/regmap.h> #include <linux/soc/mediatek/mtk-mmsys.h> - -#include "mtk_mutex.h" +#include <linux/soc/mediatek/mtk-mutex.h> #define MT2701_MUTEX0_MOD0 0x2c#define MT2701_MUTEX0_SOF0 0x30@@ -241,6 +240,7 @@ struct mtk_mutex *mtk_mutex_get(struct device *dev)return ERR_PTR (-EBUSY ); } +EXPORT_SYMBOL_GPL (mtk_mutex_get);void mtk_mutex_put (struct mtk_mutex *mutex) {@@ -251,6 +251,7 @@ void mtk_mutex_put(struct mtk_mutex *mutex) mutex->claimed = false; } +EXPORT_SYMBOL_GPL (mtk_mutex_put);int mtk_mutex_prepare (struct mtk_mutex *mutex) {@@ -258,6 +259,7 @@ int mtk_mutex_prepare(struct mtk_mutex *mutex) mutex[mutex->id]);return clk_prepare_enable (mtx->clk); } +EXPORT_SYMBOL_GPL (mtk_mutex_prepare);void mtk_mutex_unprepare (struct mtk_mutex *mutex) {@@ -265,6 +267,7 @@ void mtk_mutex_unprepare(struct mtk_mutex *mutex) mutex[mutex->id]);clk_disable_unprepare (mtx->clk); } +EXPORT_SYMBOL_GPL (mtk_mutex_unprepare);void mtk_mutex_add_comp (struct mtk_mutex *mutex,enum mtk_ddp_comp_id id)@@ -316,6 +319,7 @@ void mtk_mutex_add_comp(struct mtk_mutex *mutex, mtx->regs + DISP_REG_MUTEX_SOF(mtx->data->mutex_sof_reg, mutex->id)); } +EXPORT_SYMBOL_GPL (mtk_mutex_add_comp);void mtk_mutex_remove_comp (struct mtk_mutex *mutex,enum mtk_ddp_comp_id id)@@ -355,6 +359,7 @@ void mtk_mutex_remove_comp(struct mtk_mutex *mutex,break ; } } +EXPORT_SYMBOL_GPL (mtk_mutex_remove_comp);void mtk_mutex_enable (struct mtk_mutex *mutex) {@@ -365,6 +370,7 @@ void mtk_mutex_enable(struct mtk_mutex *mutex)writel (1 , mtx->regs +DISP_REG_MUTEX_EN (mutex->id)); } +EXPORT_SYMBOL_GPL (mtk_mutex_enable);void mtk_mutex_disable (struct mtk_mutex *mutex) {@@ -375,6 +381,7 @@ void mtk_mutex_disable(struct mtk_mutex *mutex)writel (0 , mtx->regs +DISP_REG_MUTEX_EN (mutex->id)); } +EXPORT_SYMBOL_GPL (mtk_mutex_disable);void mtk_mutex_acquire (struct mtk_mutex *mutex) {@@ -388,6 +395,7 @@ void mtk_mutex_acquire(struct mtk_mutex *mutex) tmp, tmp & INT_MUTEX, 1, 10000))pr_err ("could not acquire mutex %d\n" , mutex->id); } +EXPORT_SYMBOL_GPL (mtk_mutex_acquire);void mtk_mutex_release (struct mtk_mutex *mutex) {@@ -396,6 +404,7 @@ void mtk_mutex_release(struct mtk_mutex *mutex)writel (0 , mtx->regs +DISP_REG_MUTEX (mutex->id)); } +EXPORT_SYMBOL_GPL (mtk_mutex_release);static int mtk_mutex_probe (struct platform_device *pdev) {@@ -461,3 +470,5 @@ struct platform_driver mtk_mutex_driver = { .of_match_table = mutex_driver_dt_match, }, }; + +builtin_platform_driver (mtk_mutex_driver);include/linux/soc/mediatek/mtk-mutex.h renamed from drivers/gpu/drm/mediatek/mtk_mutex.h +0
-1--2.17.1
Quoted 4 lines
Quoted 4 lines
_______________________________________________
Linux-mediatek mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-mediatek
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Chun-Kuang Hu
maintainerChun-Kuang Hu <[email protected]> 於 2021年1月7日 週四 上午7:17寫道:
Quoted 4 lines
mtk mutex is a driver used by DRM and MDP [1], so this series move mtk mutex driver from DRM folder to soc folder, so it could be used by DRM and MDP.
Applied [1/5] ~ [4/5] to mediatek-drm-next [1].
[1] https://git.kernel.org/pub/scm/linux/kernel/git/chunkuang.hu/linux.git/log/?h=mediatek-drm-next
Regards,
Chun-Kuang.
Quoted 29 lines
Changes in v2:
1. Rebase onto mediatek-drm-next [2].
2. Export symbol for mtk-mutex API.[1] https://patchwork.kernel.org/patch/11140751/
[2] https://git.kernel.org/pub/scm/linux/kernel/git/chunkuang.hu/linux.git/log/?h=mediatek-drm-nextCK Hu (5):
drm/mediatek: Remove redundant file including drm/mediatek: Rename filemtk_drm_ddptomtk_mutexdrm/mediatek: Change disp/ddp term to mutex in mtk mutex driver drm/mediatek: Automatically search unclaimed mtk mutex inmtk_mutex_get()soc / drm: mediatek: Move mtk mutex driver to soc folder
drivers/gpu/drm/mediatek/Makefile | 1 - drivers/gpu/drm/mediatek/mtk_drm_crtc.c | 32 +- drivers/gpu/drm/mediatek/mtk_drm_ddp.h | 28 -- drivers/gpu/drm/mediatek/mtk_drm_drv.c | 3 - drivers/gpu/drm/mediatek/mtk_drm_drv.h | 1 - drivers/soc/mediatek/Makefile | 1 + .../mediatek/mtk-mutex.c} | 328 +++++++++--------- include/linux/soc/mediatek/mtk-mutex.h | 26 ++ 8 files changed, 212 insertions(+), 208 deletions(-) delete mode 100644 drivers/gpu/drm/mediatek/mtk_drm_ddp.h rename drivers/{gpu/drm/mediatek/mtk_drm_ddp.c => soc/mediatek/mtk-mutex.c} (53%) create mode 100644 include/linux/soc/mediatek/mtk-mutex.h
Quoted 3 lines
--
2.17.1
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel