dri-devel Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Seung-Woo Kim <sw0312.kim@samsung.com>
To: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: DRI Development <dri-devel@lists.freedesktop.org>,
	Seung-Woo Kim <sw0312.kim@samsung.com>,
	Kyungmin Park <kyungmin.park@samsung.com>,
	Rob Clark <robclark@freedesktop.org>,
	Daniel Vetter <daniel.vetter@intel.com>
Subject: Re: [PATCH] drm: remove DRM_FORMAT_NV12MT
Date: Wed, 04 Feb 2015 13:55:50 +0900	[thread overview]
Message-ID: <54D1A656.2090008@samsung.com> (raw)
In-Reply-To: <1422978525-13442-1-git-send-email-daniel.vetter@ffwll.ch>

Hello Daniel,

On 2015년 02월 04일 00:48, Daniel Vetter wrote:
> So this has been merged originally in
> 
> commit 83052d4d5cd518332440bb4ee63d68bb5f744e0f
> Author: Seung-Woo Kim <sw0312.kim@samsung.com>
> Date:   Thu Dec 15 15:40:55 2011 +0900
> 
>     drm: Add multi buffer plane pixel formats
> 
> which hasn't seen a lot of review really. The problem is that it's not
> a real pixel format, but just a different way to lay out NV12 pixels
> in macroblocks, i.e. a tiling format.
> 
> The new way of doing this is with the soon-to-be-merge fb modifiers.
> 
> This was brough up in some long irc discussion around the entire
> topic, as an example of where things have gone wrong. Luckily we can
> correct the mistake:
> - The kms side support for NV12MT is all dead code because
>   format_check in drm_crtc.c never accepted NV12MT.

Yes, you are right. I sent patch to add the format to check function,
but it was not accepted. Anyway fb_modifier patch supports tiled option,
so kms with NV12MT can be change with some fix with fb_modifier.

> - The gem side for the gsc support doesn't look better: The code
>   forgets to set the pixel format and makes a big mess with the tiling
>   mode bits, inadvertedly setting them all.

Case of NV12MT in fimc is worked because it just passes fourcc format
with set_property instead fb. So it cannot be directly replaced with
fb_modifier way, but property to set tiled flag can be added to handle
tiled format.

So I agree about the remove of the internal format.

> 
> Conclusion: This never really worked (at least not in upstream) and
> hence we can savely correct our mistake here.
> 
> Cc: Seung-Woo Kim <sw0312.kim@samsung.com>
> Cc: Inki Dae <inki.dae@samsung.com>
> Cc: Kyungmin Park <kyungmin.park@samsung.com>
> Cc: Rob Clark <robclark@freedesktop.org>
> Cc: Daniel Stone <daniel@fooishbar.org>
> Cc: Damien Lespiau <damien.lespiau@intel.com>
> Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>

Acked-by: Seung-Woo Kim <sw0312.kim@samsung.com>

> ---
>  drivers/gpu/drm/exynos/exynos_drm_fimc.c  | 14 ++------------
>  drivers/gpu/drm/exynos/exynos_drm_gsc.c   |  6 ------
>  drivers/gpu/drm/exynos/exynos_drm_plane.c |  1 -
>  drivers/gpu/drm/exynos/exynos_mixer.c     |  2 --
>  include/uapi/drm/drm_fourcc.h             |  3 ---
>  5 files changed, 2 insertions(+), 24 deletions(-)
> 
> diff --git a/drivers/gpu/drm/exynos/exynos_drm_fimc.c b/drivers/gpu/drm/exynos/exynos_drm_fimc.c
> index 835b6af00970..842d6b8dc3c4 100644
> --- a/drivers/gpu/drm/exynos/exynos_drm_fimc.c
> +++ b/drivers/gpu/drm/exynos/exynos_drm_fimc.c
> @@ -461,7 +461,6 @@ static int fimc_src_set_fmt_order(struct fimc_context *ctx, u32 fmt)
>  		cfg |= EXYNOS_MSCTRL_C_INT_IN_3PLANE;
>  		break;
>  	case DRM_FORMAT_NV12:
> -	case DRM_FORMAT_NV12MT:
>  	case DRM_FORMAT_NV16:
>  		cfg |= (EXYNOS_MSCTRL_ORDER2P_LSB_CBCR |
>  			EXYNOS_MSCTRL_C_INT_IN_2PLANE);
> @@ -511,7 +510,6 @@ static int fimc_src_set_fmt(struct device *dev, u32 fmt)
>  	case DRM_FORMAT_YVU420:
>  	case DRM_FORMAT_NV12:
>  	case DRM_FORMAT_NV21:
> -	case DRM_FORMAT_NV12MT:
>  		cfg |= EXYNOS_MSCTRL_INFORMAT_YCBCR420;
>  		break;
>  	default:
> @@ -524,10 +522,7 @@ static int fimc_src_set_fmt(struct device *dev, u32 fmt)
>  	cfg = fimc_read(ctx, EXYNOS_CIDMAPARAM);
>  	cfg &= ~EXYNOS_CIDMAPARAM_R_MODE_MASK;
>  
> -	if (fmt == DRM_FORMAT_NV12MT)
> -		cfg |= EXYNOS_CIDMAPARAM_R_MODE_64X32;
> -	else
> -		cfg |= EXYNOS_CIDMAPARAM_R_MODE_LINEAR;
> +	cfg |= EXYNOS_CIDMAPARAM_R_MODE_LINEAR;
>  
>  	fimc_write(ctx, cfg, EXYNOS_CIDMAPARAM);
>  
> @@ -812,7 +807,6 @@ static int fimc_dst_set_fmt_order(struct fimc_context *ctx, u32 fmt)
>  		cfg |= EXYNOS_CIOCTRL_YCBCR_3PLANE;
>  		break;
>  	case DRM_FORMAT_NV12:
> -	case DRM_FORMAT_NV12MT:
>  	case DRM_FORMAT_NV16:
>  		cfg |= EXYNOS_CIOCTRL_ORDER2P_LSB_CBCR;
>  		cfg |= EXYNOS_CIOCTRL_YCBCR_2PLANE;
> @@ -867,7 +861,6 @@ static int fimc_dst_set_fmt(struct device *dev, u32 fmt)
>  		case DRM_FORMAT_YUV420:
>  		case DRM_FORMAT_YVU420:
>  		case DRM_FORMAT_NV12:
> -		case DRM_FORMAT_NV12MT:
>  		case DRM_FORMAT_NV21:
>  			cfg |= EXYNOS_CITRGFMT_OUTFORMAT_YCBCR420;
>  			break;
> @@ -883,10 +876,7 @@ static int fimc_dst_set_fmt(struct device *dev, u32 fmt)
>  	cfg = fimc_read(ctx, EXYNOS_CIDMAPARAM);
>  	cfg &= ~EXYNOS_CIDMAPARAM_W_MODE_MASK;
>  
> -	if (fmt == DRM_FORMAT_NV12MT)
> -		cfg |= EXYNOS_CIDMAPARAM_W_MODE_64X32;
> -	else
> -		cfg |= EXYNOS_CIDMAPARAM_W_MODE_LINEAR;
> +	cfg |= EXYNOS_CIDMAPARAM_W_MODE_LINEAR;
>  
>  	fimc_write(ctx, cfg, EXYNOS_CIDMAPARAM);
>  
> diff --git a/drivers/gpu/drm/exynos/exynos_drm_gsc.c b/drivers/gpu/drm/exynos/exynos_drm_gsc.c
> index 0261468c8019..8040ed2a831f 100644
> --- a/drivers/gpu/drm/exynos/exynos_drm_gsc.c
> +++ b/drivers/gpu/drm/exynos/exynos_drm_gsc.c
> @@ -542,9 +542,6 @@ static int gsc_src_set_fmt(struct device *dev, u32 fmt)
>  		cfg |= (GSC_IN_CHROMA_ORDER_CBCR |
>  			GSC_IN_YUV420_2P);
>  		break;
> -	case DRM_FORMAT_NV12MT:
> -		cfg |= (GSC_IN_TILE_C_16x8 | GSC_IN_TILE_MODE);
> -		break;
>  	default:
>  		dev_err(ippdrv->dev, "inavlid target yuv order 0x%x.\n", fmt);
>  		return -EINVAL;
> @@ -809,9 +806,6 @@ static int gsc_dst_set_fmt(struct device *dev, u32 fmt)
>  		cfg |= (GSC_OUT_CHROMA_ORDER_CBCR |
>  			GSC_OUT_YUV420_2P);
>  		break;
> -	case DRM_FORMAT_NV12MT:
> -		cfg |= (GSC_OUT_TILE_C_16x8 | GSC_OUT_TILE_MODE);
> -		break;
>  	default:
>  		dev_err(ippdrv->dev, "inavlid target yuv order 0x%x.\n", fmt);
>  		return -EINVAL;
> diff --git a/drivers/gpu/drm/exynos/exynos_drm_plane.c b/drivers/gpu/drm/exynos/exynos_drm_plane.c
> index c7045a663763..92d75a4eabd7 100644
> --- a/drivers/gpu/drm/exynos/exynos_drm_plane.c
> +++ b/drivers/gpu/drm/exynos/exynos_drm_plane.c
> @@ -30,7 +30,6 @@ static const uint32_t formats[] = {
>  	DRM_FORMAT_XRGB8888,
>  	DRM_FORMAT_ARGB8888,
>  	DRM_FORMAT_NV12,
> -	DRM_FORMAT_NV12MT,
>  };
>  
>  /*
> diff --git a/drivers/gpu/drm/exynos/exynos_mixer.c b/drivers/gpu/drm/exynos/exynos_mixer.c
> index 820b76234ef4..5da28443342d 100644
> --- a/drivers/gpu/drm/exynos/exynos_mixer.c
> +++ b/drivers/gpu/drm/exynos/exynos_mixer.c
> @@ -417,8 +417,6 @@ static void vp_video_buffer(struct mixer_context *ctx, int win)
>  	win_data = &ctx->win_data[win];
>  
>  	switch (win_data->pixel_format) {
> -	case DRM_FORMAT_NV12MT:
> -		tiled_mode = true;
>  	case DRM_FORMAT_NV12:
>  		crcb_mode = false;
>  		buf_num = 2;
> diff --git a/include/uapi/drm/drm_fourcc.h b/include/uapi/drm/drm_fourcc.h
> index 646ae5f39f42..a284f11a8ef5 100644
> --- a/include/uapi/drm/drm_fourcc.h
> +++ b/include/uapi/drm/drm_fourcc.h
> @@ -109,9 +109,6 @@
>  #define DRM_FORMAT_NV24		fourcc_code('N', 'V', '2', '4') /* non-subsampled Cr:Cb plane */
>  #define DRM_FORMAT_NV42		fourcc_code('N', 'V', '4', '2') /* non-subsampled Cb:Cr plane */
>  
> -/* special NV12 tiled format */
> -#define DRM_FORMAT_NV12MT	fourcc_code('T', 'M', '1', '2') /* 2x2 subsampled Cr:Cb plane 64x32 macroblocks */
> -
>  /*
>   * 3 plane YCbCr
>   * index 0: Y plane, [7:0] Y
> 

-- 
Seung-Woo Kim
Samsung Software R&D Center
--

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel

      parent reply	other threads:[~2015-02-04  4:55 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-02-03 15:48 [PATCH] drm: remove DRM_FORMAT_NV12MT Daniel Vetter
2015-02-03 16:17 ` Gustavo Padovan
2015-02-04  2:30 ` Joonyoung Shim
2015-02-04  9:13   ` Daniel Vetter
2015-02-04  4:55 ` Seung-Woo Kim [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=54D1A656.2090008@samsung.com \
    --to=sw0312.kim@samsung.com \
    --cc=daniel.vetter@ffwll.ch \
    --cc=daniel.vetter@intel.com \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=kyungmin.park@samsung.com \
    --cc=robclark@freedesktop.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox