Commit e1f9c849 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'mediatek-drm-next-6.6' of... 

Merge tag 'mediatek-drm-next-6.6' of https://git.kernel.org/pub/scm/linux/kernel/git/chunkuang.hu/linux

 into drm-next

Mediatek DRM Next for Linux 6.6

1. Small mtk-dpi cleanups
2. DisplayPort: support eDP and aux-bus
3. Fix uninitialized symbol
4. Do not check for 0 return after calling platform_get_irq()
5. Convert to platform remove callback returning void
6. Fix coverity issues
7. Fix potential memory leak if vmap() fail
8. Fix void-pointer-to-enum-cast warning
9. Rid W=1 warnings from GPU

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>

From: Chun-Kuang Hu <chunkuang.hu@kernel.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20230813152726.14802-1-chunkuang.hu@kernel.org
parents 57bca71d fb7e600d

drivers/gpu/drm/mediatek/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ config DRM_MEDIATEK_DP 
	select PHY_MTK_DP

	select DRM_DISPLAY_HELPER

	select DRM_DISPLAY_DP_HELPER

	select DRM_DP_AUX_BUS

	help

	  DRM/KMS Display Port driver for MediaTek SoCs.

drivers/gpu/drm/mediatek/mtk_cec.c

+2 −3
Original line number Diff line number Diff line
@@ -235,13 +235,12 @@ static int mtk_cec_probe(struct platform_device *pdev) 
	return 0;

}



static int mtk_cec_remove(struct platform_device *pdev)

static void mtk_cec_remove(struct platform_device *pdev)

{

	struct mtk_cec *cec = platform_get_drvdata(pdev);



	mtk_cec_htplg_irq_disable(cec);

	clk_disable_unprepare(cec->clk);

	return 0;

}



static const struct of_device_id mtk_cec_of_ids[] = {
@@ -252,7 +251,7 @@ MODULE_DEVICE_TABLE(of, mtk_cec_of_ids); 


struct platform_driver mtk_cec_driver = {

	.probe = mtk_cec_probe,

	.remove = mtk_cec_remove,

	.remove_new = mtk_cec_remove,

	.driver = {

		.name = "mediatek-cec",

		.of_match_table = mtk_cec_of_ids,

drivers/gpu/drm/mediatek/mtk_disp_aal.c

+2 −9
Original line number Diff line number Diff line
@@ -25,11 +25,6 @@ struct mtk_disp_aal_data { 
	bool has_gamma;

};



/**

 * struct mtk_disp_aal - DISP_AAL driver structure

 * @ddp_comp - structure containing type enum and hardware resources

 * @crtc - associated crtc to report irq events to

 */

struct mtk_disp_aal {

	struct clk *clk;

	void __iomem *regs;
@@ -139,11 +134,9 @@ static int mtk_disp_aal_probe(struct platform_device *pdev) 
	return ret;

}



static int mtk_disp_aal_remove(struct platform_device *pdev)

static void mtk_disp_aal_remove(struct platform_device *pdev)

{

	component_del(&pdev->dev, &mtk_disp_aal_component_ops);



	return 0;

}



static const struct mtk_disp_aal_data mt8173_aal_driver_data = {
@@ -160,7 +153,7 @@ MODULE_DEVICE_TABLE(of, mtk_disp_aal_driver_dt_match); 


struct platform_driver mtk_disp_aal_driver = {

	.probe		= mtk_disp_aal_probe,

	.remove		= mtk_disp_aal_remove,

	.remove_new	= mtk_disp_aal_remove,

	.driver		= {

		.name	= "mediatek-disp-aal",

		.owner	= THIS_MODULE,

drivers/gpu/drm/mediatek/mtk_disp_ccorr.c

+2 −9
Original line number Diff line number Diff line
@@ -33,11 +33,6 @@ struct mtk_disp_ccorr_data { 
	u32 matrix_bits;

};



/**

 * struct mtk_disp_ccorr - DISP_CCORR driver structure

 * @ddp_comp - structure containing type enum and hardware resources

 * @crtc - associated crtc to report irq events to

 */

struct mtk_disp_ccorr {

	struct clk *clk;

	void __iomem *regs;
@@ -194,11 +189,9 @@ static int mtk_disp_ccorr_probe(struct platform_device *pdev) 
	return ret;

}



static int mtk_disp_ccorr_remove(struct platform_device *pdev)

static void mtk_disp_ccorr_remove(struct platform_device *pdev)

{

	component_del(&pdev->dev, &mtk_disp_ccorr_component_ops);



	return 0;

}



static const struct mtk_disp_ccorr_data mt8183_ccorr_driver_data = {
@@ -220,7 +213,7 @@ MODULE_DEVICE_TABLE(of, mtk_disp_ccorr_driver_dt_match); 


struct platform_driver mtk_disp_ccorr_driver = {

	.probe		= mtk_disp_ccorr_probe,

	.remove		= mtk_disp_ccorr_remove,

	.remove_new	= mtk_disp_ccorr_remove,

	.driver		= {

		.name	= "mediatek-disp-ccorr",

		.owner	= THIS_MODULE,

drivers/gpu/drm/mediatek/mtk_disp_color.c

+2 −4
Original line number Diff line number Diff line
@@ -131,11 +131,9 @@ static int mtk_disp_color_probe(struct platform_device *pdev) 
	return ret;

}



static int mtk_disp_color_remove(struct platform_device *pdev)

static void mtk_disp_color_remove(struct platform_device *pdev)

{

	component_del(&pdev->dev, &mtk_disp_color_component_ops);



	return 0;

}



static const struct mtk_disp_color_data mt2701_color_driver_data = {
@@ -163,7 +161,7 @@ MODULE_DEVICE_TABLE(of, mtk_disp_color_driver_dt_match); 


struct platform_driver mtk_disp_color_driver = {

	.probe		= mtk_disp_color_probe,

	.remove		= mtk_disp_color_remove,

	.remove_new	= mtk_disp_color_remove,

	.driver		= {

		.name	= "mediatek-disp-color",

		.owner	= THIS_MODULE,