Commit 7544f3ee authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'exynos-drm-fixes-for-v5.13-rc3' of... 

Merge tag 'exynos-drm-fixes-for-v5.13-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos

 into drm-fixes

Fixup
- Correct kerneldoc of fimd_shadow_protect_win function.

Cleanup
- Drop redundant error messages.

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

From: Inki Dae <inki.dae@samsung.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210520034747.257687-1-inki.dae@samsung.com
parents d07f6ca9 a470c566

drivers/gpu/drm/exynos/exynos5433_drm_decon.c

+1 −3
Original line number Diff line number Diff line
@@ -815,10 +815,8 @@ static int exynos5433_decon_probe(struct platform_device *pdev) 


	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	ctx->addr = devm_ioremap_resource(dev, res);

	if (IS_ERR(ctx->addr)) {

		dev_err(dev, "ioremap failed\n");

	if (IS_ERR(ctx->addr))

		return PTR_ERR(ctx->addr);

	}



	ret = decon_conf_irq(ctx, "vsync", decon_irq_handler, 0);

	if (ret < 0)

drivers/gpu/drm/exynos/exynos_drm_dsi.c

+1 −3
Original line number Diff line number Diff line
@@ -1786,10 +1786,8 @@ static int exynos_dsi_probe(struct platform_device *pdev) 


	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	dsi->reg_base = devm_ioremap_resource(dev, res);

	if (IS_ERR(dsi->reg_base)) {

		dev_err(dev, "failed to remap io region\n");

	if (IS_ERR(dsi->reg_base))

		return PTR_ERR(dsi->reg_base);

	}



	dsi->phy = devm_phy_get(dev, "dsim");

	if (IS_ERR(dsi->phy)) {

drivers/gpu/drm/exynos/exynos_drm_fimd.c

+1 −1
Original line number Diff line number Diff line
@@ -723,7 +723,7 @@ static void fimd_win_set_colkey(struct fimd_context *ctx, unsigned int win) 
}



/**

 * shadow_protect_win() - disable updating values from shadow registers at vsync

 * fimd_shadow_protect_win() - disable updating values from shadow registers at vsync

 *

 * @ctx: local driver data

 * @win: window to protect registers for