diff mbox

drm/exynos: fimd: check whether exynos_drm_crtc_create succeed or not

Message ID 1427861696-4961-1-git-send-email-human.hwang@samsung.com (mailing list archive)
State New, archived
Headers show

Commit Message

Hyungwon Hwang April 1, 2015, 4:14 a.m. UTC
From the commit "drm/exynos: fix the execution order in FIMD
initialization" (598285bfdce46d7c47632a2ba4b980f60be4a677), the error
checking code is removed improperly. This patch fix the regression.

Signed-off-by: Hyungwon Hwang <human.hwang@samsung.com>
---
 drivers/gpu/drm/exynos/exynos_drm_fimd.c | 2 ++
 1 file changed, 2 insertions(+)

Comments

Gustavo Padovan April 1, 2015, 3:31 p.m. UTC | #1
Hi Hyungwon,

2015-04-01 Hyungwon Hwang <human.hwang@samsung.com>:

> From the commit "drm/exynos: fix the execution order in FIMD
> initialization" (598285bfdce46d7c47632a2ba4b980f60be4a677), the error
> checking code is removed improperly. This patch fix the regression.
> 
> Signed-off-by: Hyungwon Hwang <human.hwang@samsung.com>
> ---
>  drivers/gpu/drm/exynos/exynos_drm_fimd.c | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/drivers/gpu/drm/exynos/exynos_drm_fimd.c b/drivers/gpu/drm/exynos/exynos_drm_fimd.c
> index 31dfa80..15cee94 100644
> --- a/drivers/gpu/drm/exynos/exynos_drm_fimd.c
> +++ b/drivers/gpu/drm/exynos/exynos_drm_fimd.c
> @@ -1060,6 +1060,8 @@ static int fimd_bind(struct device *dev, struct device *master, void *data)
>  	ctx->crtc = exynos_drm_crtc_create(drm_dev, ctx->pipe,
>  					   EXYNOS_DISPLAY_TYPE_LCD,
>  					   &fimd_crtc_ops, ctx);
> +	if (IS_ERR(ctx->crtc))
> +		return PTR_ERR(ctx->crtc);

My current clean up patch set fixes this and I hope it will be merged soon.
It is part of "drm/exynos: remove struct *_win_data abstraction on planes"
patch.

	Gustavo
Inki Dae April 7, 2015, 1:32 p.m. UTC | #2
On 2015? 04? 01? 13:14, Hyungwon Hwang wrote:
>>From the commit "drm/exynos: fix the execution order in FIMD
> initialization" (598285bfdce46d7c47632a2ba4b980f60be4a677), the error
> checking code is removed improperly. This patch fix the regression.

Applied.

Thanks,
Inki Dae

> 
> Signed-off-by: Hyungwon Hwang <human.hwang@samsung.com>
> ---
>  drivers/gpu/drm/exynos/exynos_drm_fimd.c | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/drivers/gpu/drm/exynos/exynos_drm_fimd.c b/drivers/gpu/drm/exynos/exynos_drm_fimd.c
> index 31dfa80..15cee94 100644
> --- a/drivers/gpu/drm/exynos/exynos_drm_fimd.c
> +++ b/drivers/gpu/drm/exynos/exynos_drm_fimd.c
> @@ -1060,6 +1060,8 @@ static int fimd_bind(struct device *dev, struct device *master, void *data)
>  	ctx->crtc = exynos_drm_crtc_create(drm_dev, ctx->pipe,
>  					   EXYNOS_DISPLAY_TYPE_LCD,
>  					   &fimd_crtc_ops, ctx);
> +	if (IS_ERR(ctx->crtc))
> +		return PTR_ERR(ctx->crtc);
>  
>  	if (ctx->display)
>  		exynos_drm_create_enc_conn(drm_dev, ctx->display);
>
diff mbox

Patch

diff --git a/drivers/gpu/drm/exynos/exynos_drm_fimd.c b/drivers/gpu/drm/exynos/exynos_drm_fimd.c
index 31dfa80..15cee94 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_fimd.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_fimd.c
@@ -1060,6 +1060,8 @@  static int fimd_bind(struct device *dev, struct device *master, void *data)
 	ctx->crtc = exynos_drm_crtc_create(drm_dev, ctx->pipe,
 					   EXYNOS_DISPLAY_TYPE_LCD,
 					   &fimd_crtc_ops, ctx);
+	if (IS_ERR(ctx->crtc))
+		return PTR_ERR(ctx->crtc);
 
 	if (ctx->display)
 		exynos_drm_create_enc_conn(drm_dev, ctx->display);