[PATCH v5 2/6] drm/exynos: Let core take care of normalizing the zpos

[Inki Dae]

2018년 03월 21일 19:20에 Peter Ujfalusi 이(가) 쓴 글:
> Instead of re-implementing the drm_atomic_helper_check() locally with just
> adding drm_atomic_normalize_zpos() into it, set the
> drm_mode_config->normalize_zpos.
> 
> Signed-off-by: Peter Ujfalusi <peter.ujfalusi at ti.com>
> CC: Inki Dae <inki.dae at samsung.com>
> CC: Joonyoung Shim <jy0922.shim at samsung.com>
> CC: Seung-Woo Kim <sw0312.kim at samsung.com>
> CC: Kyungmin Park <kyungmin.park at samsung.com>
> Acked-by: Daniel Vetter <daniel.vetter at ffwll.ch>

Acked-by: Inki Dae <inki.dae at samsung.com>

Thanks,
Inki Dae

> ---
>  drivers/gpu/drm/exynos/exynos_drm_drv.c | 20 --------------------
>  drivers/gpu/drm/exynos/exynos_drm_drv.h |  1 -
>  drivers/gpu/drm/exynos/exynos_drm_fb.c  |  4 +++-
>  3 files changed, 3 insertions(+), 22 deletions(-)
> 
> diff --git a/drivers/gpu/drm/exynos/exynos_drm_drv.c b/drivers/gpu/drm/exynos/exynos_drm_drv.c
> index a518e9c6d6cc..39284bb7c2c2 100644
> --- a/drivers/gpu/drm/exynos/exynos_drm_drv.c
> +++ b/drivers/gpu/drm/exynos/exynos_drm_drv.c
> @@ -37,26 +37,6 @@
>  #define DRIVER_MAJOR	1
>  #define DRIVER_MINOR	0
>  
> -int exynos_atomic_check(struct drm_device *dev,
> -			struct drm_atomic_state *state)
> -{
> -	int ret;
> -
> -	ret = drm_atomic_helper_check_modeset(dev, state);
> -	if (ret)
> -		return ret;
> -
> -	ret = drm_atomic_normalize_zpos(dev, state);
> -	if (ret)
> -		return ret;
> -
> -	ret = drm_atomic_helper_check_planes(dev, state);
> -	if (ret)
> -		return ret;
> -
> -	return ret;
> -}
> -
>  static int exynos_drm_open(struct drm_device *dev, struct drm_file *file)
>  {
>  	struct drm_exynos_file_private *file_priv;
> diff --git a/drivers/gpu/drm/exynos/exynos_drm_drv.h b/drivers/gpu/drm/exynos/exynos_drm_drv.h
> index df2262f70d91..075957cb6ba1 100644
> --- a/drivers/gpu/drm/exynos/exynos_drm_drv.h
> +++ b/drivers/gpu/drm/exynos/exynos_drm_drv.h
> @@ -275,7 +275,6 @@ static inline int exynos_dpi_bind(struct drm_device *dev,
>  
>  int exynos_atomic_commit(struct drm_device *dev, struct drm_atomic_state *state,
>  			 bool nonblock);
> -int exynos_atomic_check(struct drm_device *dev, struct drm_atomic_state *state);
>  
>  
>  extern struct platform_driver fimd_driver;
> diff --git a/drivers/gpu/drm/exynos/exynos_drm_fb.c b/drivers/gpu/drm/exynos/exynos_drm_fb.c
> index 0faaf829f5bf..2379d732da67 100644
> --- a/drivers/gpu/drm/exynos/exynos_drm_fb.c
> +++ b/drivers/gpu/drm/exynos/exynos_drm_fb.c
> @@ -206,7 +206,7 @@ static struct drm_mode_config_helper_funcs exynos_drm_mode_config_helpers = {
>  static const struct drm_mode_config_funcs exynos_drm_mode_config_funcs = {
>  	.fb_create = exynos_user_fb_create,
>  	.output_poll_changed = drm_fb_helper_output_poll_changed,
> -	.atomic_check = exynos_atomic_check,
> +	.atomic_check = drm_atomic_helper_check,
>  	.atomic_commit = drm_atomic_helper_commit,
>  };
>  
> @@ -227,4 +227,6 @@ void exynos_drm_mode_config_init(struct drm_device *dev)
>  	dev->mode_config.helper_private = &exynos_drm_mode_config_helpers;
>  
>  	dev->mode_config.allow_fb_modifiers = true;
> +
> +	dev->mode_config.normalize_zpos = true;
>  }
>