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

Merge tag 'mediatek-drm-fixes-5.14-2' of... 

Merge tag 'mediatek-drm-fixes-5.14-2' of https://git.kernel.org/pub/scm/linux/kernel/git/chunkuang.hu/linux

 into drm-fixes

Mediatek DRM Fixes for Linux 5.14-2

1. Fix AAL output size setting.
2. Delete component in remove function.

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

From: Chun-Kuang Hu <chunkuang.hu@kernel.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20210819001635.14803-1-chunkuang.hu@kernel.org
parents 5ce5cef0 da4d4517

drivers/gpu/drm/mediatek/mtk_disp_color.c

+2 −0
Original line number Diff line number Diff line
@@ -133,6 +133,8 @@ static int mtk_disp_color_probe(struct platform_device *pdev) 


static int mtk_disp_color_remove(struct platform_device *pdev)

{

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



	return 0;

}

drivers/gpu/drm/mediatek/mtk_disp_ovl.c

+2 −0
Original line number Diff line number Diff line
@@ -423,6 +423,8 @@ static int mtk_disp_ovl_probe(struct platform_device *pdev) 


static int mtk_disp_ovl_remove(struct platform_device *pdev)

{

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



	return 0;

}

drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c

+2 −0
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ 


#define DISP_AAL_EN				0x0000

#define DISP_AAL_SIZE				0x0030

#define DISP_AAL_OUTPUT_SIZE			0x04d8



#define DISP_DITHER_EN				0x0000

#define DITHER_EN				BIT(0)
@@ -197,6 +198,7 @@ static void mtk_aal_config(struct device *dev, unsigned int w, 
	struct mtk_ddp_comp_dev *priv = dev_get_drvdata(dev);



	mtk_ddp_write(cmdq_pkt, w << 16 | h, &priv->cmdq_reg, priv->regs, DISP_AAL_SIZE);

	mtk_ddp_write(cmdq_pkt, w << 16 | h, &priv->cmdq_reg, priv->regs, DISP_AAL_OUTPUT_SIZE);

}



static void mtk_aal_gamma_set(struct device *dev, struct drm_crtc_state *state)