From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934081AbdACG2I (ORCPT ); Tue, 3 Jan 2017 01:28:08 -0500 Received: from mail-io0-f171.google.com ([209.85.223.171]:33315 "EHLO mail-io0-f171.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934010AbdACG17 (ORCPT ); Tue, 3 Jan 2017 01:27:59 -0500 MIME-Version: 1.0 In-Reply-To: <1483079183-38637-1-git-send-email-bibby.hsieh@mediatek.com> References: <1483079183-38637-1-git-send-email-bibby.hsieh@mediatek.com> From: Daniel Kurtz Date: Tue, 3 Jan 2017 14:27:37 +0800 X-Google-Sender-Auth: RECxB4rGDjv_E3-bIx8864pMVQk Message-ID: Subject: Re: [PATCH v2] drm/mediatek: Support UYVY and YUYV format for overlay To: Bibby Hsieh Cc: David Airlie , Matthias Brugger , Daniel Vetter , dri-devel , "moderated list:ARM/Mediatek SoC support" , Yingjoe Chen , Cawa Cheng , Philipp Zabel , YT Shen , Thierry Reding , CK Hu , Mao Huang , "linux-arm-kernel@lists.infradead.org" , "linux-kernel@vger.kernel.org" , Sascha Hauer Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri, Dec 30, 2016 at 2:26 PM, Bibby Hsieh wrote: > > MT8173 overlay can support UYVY and YUYV format, > we add the format in DRM driver. > > Signed-off-by: Bibby Hsieh > Reviewed-by: Daniel Kurtz > --- > drivers/gpu/drm/mediatek/mtk_disp_ovl.c | 21 +++++++++++++++++++++ > drivers/gpu/drm/mediatek/mtk_drm_plane.c | 2 ++ > 2 files changed, 23 insertions(+) > > diff --git a/drivers/gpu/drm/mediatek/mtk_disp_ovl.c b/drivers/gpu/drm/mediatek/mtk_disp_ovl.c > index c703102..de05845 100644 > --- a/drivers/gpu/drm/mediatek/mtk_disp_ovl.c > +++ b/drivers/gpu/drm/mediatek/mtk_disp_ovl.c > @@ -40,10 +40,13 @@ > #define OVL_RDMA_MEM_GMC 0x40402020 > > #define OVL_CON_BYTE_SWAP BIT(24) > +#define OVL_CON_MTX_YUV_TO_RGB (6 << 16) > #define OVL_CON_CLRFMT_RGB565 (0 << 12) > #define OVL_CON_CLRFMT_RGB888 (1 << 12) > #define OVL_CON_CLRFMT_RGBA8888 (2 << 12) > #define OVL_CON_CLRFMT_ARGB8888 (3 << 12) > +#define OVL_CON_CLRFMT_UYVY (4 << 12) > +#define OVL_CON_CLRFMT_YUYV (5 << 12) Why not just add " | OVL_CON_MTX_YUV_TO_RGB" here in the definition of these two constants, instead of adding a helper function? > #define OVL_CON_AEN BIT(8) > #define OVL_CON_ALPHA 0xff > > @@ -162,6 +165,21 @@ static unsigned int ovl_fmt_convert(unsigned int fmt) > case DRM_FORMAT_XBGR8888: > case DRM_FORMAT_ABGR8888: > return OVL_CON_CLRFMT_RGBA8888 | OVL_CON_BYTE_SWAP; > + case DRM_FORMAT_UYVY: > + return OVL_CON_CLRFMT_UYVY; > + case DRM_FORMAT_YUYV: > + return OVL_CON_CLRFMT_YUYV; > + } > +} > + > +static bool ovl_yuv_space(unsigned int fmt) > +{ > + switch (fmt) { > + case DRM_FORMAT_UYVY: > + case DRM_FORMAT_YUYV: > + return true; > + default: > + return false; > } > } > > @@ -183,6 +201,9 @@ static void mtk_ovl_layer_config(struct mtk_ddp_comp *comp, unsigned int idx, > if (idx != 0) > con |= OVL_CON_AEN | OVL_CON_ALPHA; > > + if (ovl_yuv_space(fmt)) > + con |= OVL_CON_MTX_YUV_TO_RGB; > + > writel_relaxed(con, comp->regs + DISP_REG_OVL_CON(idx)); > writel_relaxed(pitch, comp->regs + DISP_REG_OVL_PITCH(idx)); > writel_relaxed(src_size, comp->regs + DISP_REG_OVL_SRC_SIZE(idx)); > diff --git a/drivers/gpu/drm/mediatek/mtk_drm_plane.c b/drivers/gpu/drm/mediatek/mtk_drm_plane.c > index c461a23..8c02d1d 100644 > --- a/drivers/gpu/drm/mediatek/mtk_drm_plane.c > +++ b/drivers/gpu/drm/mediatek/mtk_drm_plane.c > @@ -28,6 +28,8 @@ > DRM_FORMAT_XRGB8888, > DRM_FORMAT_ARGB8888, > DRM_FORMAT_RGB565, > + DRM_FORMAT_UYVY, > + DRM_FORMAT_YUYV, > }; > > static void mtk_plane_reset(struct drm_plane *plane) > -- > 1.9.1 > From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Kurtz Subject: Re: [PATCH v2] drm/mediatek: Support UYVY and YUYV format for overlay Date: Tue, 3 Jan 2017 14:27:37 +0800 Message-ID: References: <1483079183-38637-1-git-send-email-bibby.hsieh@mediatek.com> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Return-path: In-Reply-To: <1483079183-38637-1-git-send-email-bibby.hsieh@mediatek.com> Sender: linux-kernel-owner@vger.kernel.org To: Bibby Hsieh Cc: David Airlie , Matthias Brugger , Daniel Vetter , dri-devel , "moderated list:ARM/Mediatek SoC support" , Yingjoe Chen , Cawa Cheng , Philipp Zabel , YT Shen , Thierry Reding , CK Hu , Mao Huang , "linux-arm-kernel@lists.infradead.org" , "linux-kernel@vger.kernel.org" , Sascha Hauer List-Id: linux-mediatek@lists.infradead.org On Fri, Dec 30, 2016 at 2:26 PM, Bibby Hsieh wrote: > > MT8173 overlay can support UYVY and YUYV format, > we add the format in DRM driver. > > Signed-off-by: Bibby Hsieh > Reviewed-by: Daniel Kurtz > --- > drivers/gpu/drm/mediatek/mtk_disp_ovl.c | 21 +++++++++++++++++++++ > drivers/gpu/drm/mediatek/mtk_drm_plane.c | 2 ++ > 2 files changed, 23 insertions(+) > > diff --git a/drivers/gpu/drm/mediatek/mtk_disp_ovl.c b/drivers/gpu/drm/mediatek/mtk_disp_ovl.c > index c703102..de05845 100644 > --- a/drivers/gpu/drm/mediatek/mtk_disp_ovl.c > +++ b/drivers/gpu/drm/mediatek/mtk_disp_ovl.c > @@ -40,10 +40,13 @@ > #define OVL_RDMA_MEM_GMC 0x40402020 > > #define OVL_CON_BYTE_SWAP BIT(24) > +#define OVL_CON_MTX_YUV_TO_RGB (6 << 16) > #define OVL_CON_CLRFMT_RGB565 (0 << 12) > #define OVL_CON_CLRFMT_RGB888 (1 << 12) > #define OVL_CON_CLRFMT_RGBA8888 (2 << 12) > #define OVL_CON_CLRFMT_ARGB8888 (3 << 12) > +#define OVL_CON_CLRFMT_UYVY (4 << 12) > +#define OVL_CON_CLRFMT_YUYV (5 << 12) Why not just add " | OVL_CON_MTX_YUV_TO_RGB" here in the definition of these two constants, instead of adding a helper function? > #define OVL_CON_AEN BIT(8) > #define OVL_CON_ALPHA 0xff > > @@ -162,6 +165,21 @@ static unsigned int ovl_fmt_convert(unsigned int fmt) > case DRM_FORMAT_XBGR8888: > case DRM_FORMAT_ABGR8888: > return OVL_CON_CLRFMT_RGBA8888 | OVL_CON_BYTE_SWAP; > + case DRM_FORMAT_UYVY: > + return OVL_CON_CLRFMT_UYVY; > + case DRM_FORMAT_YUYV: > + return OVL_CON_CLRFMT_YUYV; > + } > +} > + > +static bool ovl_yuv_space(unsigned int fmt) > +{ > + switch (fmt) { > + case DRM_FORMAT_UYVY: > + case DRM_FORMAT_YUYV: > + return true; > + default: > + return false; > } > } > > @@ -183,6 +201,9 @@ static void mtk_ovl_layer_config(struct mtk_ddp_comp *comp, unsigned int idx, > if (idx != 0) > con |= OVL_CON_AEN | OVL_CON_ALPHA; > > + if (ovl_yuv_space(fmt)) > + con |= OVL_CON_MTX_YUV_TO_RGB; > + > writel_relaxed(con, comp->regs + DISP_REG_OVL_CON(idx)); > writel_relaxed(pitch, comp->regs + DISP_REG_OVL_PITCH(idx)); > writel_relaxed(src_size, comp->regs + DISP_REG_OVL_SRC_SIZE(idx)); > diff --git a/drivers/gpu/drm/mediatek/mtk_drm_plane.c b/drivers/gpu/drm/mediatek/mtk_drm_plane.c > index c461a23..8c02d1d 100644 > --- a/drivers/gpu/drm/mediatek/mtk_drm_plane.c > +++ b/drivers/gpu/drm/mediatek/mtk_drm_plane.c > @@ -28,6 +28,8 @@ > DRM_FORMAT_XRGB8888, > DRM_FORMAT_ARGB8888, > DRM_FORMAT_RGB565, > + DRM_FORMAT_UYVY, > + DRM_FORMAT_YUYV, > }; > > static void mtk_plane_reset(struct drm_plane *plane) > -- > 1.9.1 > From mboxrd@z Thu Jan 1 00:00:00 1970 From: djkurtz@chromium.org (Daniel Kurtz) Date: Tue, 3 Jan 2017 14:27:37 +0800 Subject: [PATCH v2] drm/mediatek: Support UYVY and YUYV format for overlay In-Reply-To: <1483079183-38637-1-git-send-email-bibby.hsieh@mediatek.com> References: <1483079183-38637-1-git-send-email-bibby.hsieh@mediatek.com> Message-ID: To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On Fri, Dec 30, 2016 at 2:26 PM, Bibby Hsieh wrote: > > MT8173 overlay can support UYVY and YUYV format, > we add the format in DRM driver. > > Signed-off-by: Bibby Hsieh > Reviewed-by: Daniel Kurtz > --- > drivers/gpu/drm/mediatek/mtk_disp_ovl.c | 21 +++++++++++++++++++++ > drivers/gpu/drm/mediatek/mtk_drm_plane.c | 2 ++ > 2 files changed, 23 insertions(+) > > diff --git a/drivers/gpu/drm/mediatek/mtk_disp_ovl.c b/drivers/gpu/drm/mediatek/mtk_disp_ovl.c > index c703102..de05845 100644 > --- a/drivers/gpu/drm/mediatek/mtk_disp_ovl.c > +++ b/drivers/gpu/drm/mediatek/mtk_disp_ovl.c > @@ -40,10 +40,13 @@ > #define OVL_RDMA_MEM_GMC 0x40402020 > > #define OVL_CON_BYTE_SWAP BIT(24) > +#define OVL_CON_MTX_YUV_TO_RGB (6 << 16) > #define OVL_CON_CLRFMT_RGB565 (0 << 12) > #define OVL_CON_CLRFMT_RGB888 (1 << 12) > #define OVL_CON_CLRFMT_RGBA8888 (2 << 12) > #define OVL_CON_CLRFMT_ARGB8888 (3 << 12) > +#define OVL_CON_CLRFMT_UYVY (4 << 12) > +#define OVL_CON_CLRFMT_YUYV (5 << 12) Why not just add " | OVL_CON_MTX_YUV_TO_RGB" here in the definition of these two constants, instead of adding a helper function? > #define OVL_CON_AEN BIT(8) > #define OVL_CON_ALPHA 0xff > > @@ -162,6 +165,21 @@ static unsigned int ovl_fmt_convert(unsigned int fmt) > case DRM_FORMAT_XBGR8888: > case DRM_FORMAT_ABGR8888: > return OVL_CON_CLRFMT_RGBA8888 | OVL_CON_BYTE_SWAP; > + case DRM_FORMAT_UYVY: > + return OVL_CON_CLRFMT_UYVY; > + case DRM_FORMAT_YUYV: > + return OVL_CON_CLRFMT_YUYV; > + } > +} > + > +static bool ovl_yuv_space(unsigned int fmt) > +{ > + switch (fmt) { > + case DRM_FORMAT_UYVY: > + case DRM_FORMAT_YUYV: > + return true; > + default: > + return false; > } > } > > @@ -183,6 +201,9 @@ static void mtk_ovl_layer_config(struct mtk_ddp_comp *comp, unsigned int idx, > if (idx != 0) > con |= OVL_CON_AEN | OVL_CON_ALPHA; > > + if (ovl_yuv_space(fmt)) > + con |= OVL_CON_MTX_YUV_TO_RGB; > + > writel_relaxed(con, comp->regs + DISP_REG_OVL_CON(idx)); > writel_relaxed(pitch, comp->regs + DISP_REG_OVL_PITCH(idx)); > writel_relaxed(src_size, comp->regs + DISP_REG_OVL_SRC_SIZE(idx)); > diff --git a/drivers/gpu/drm/mediatek/mtk_drm_plane.c b/drivers/gpu/drm/mediatek/mtk_drm_plane.c > index c461a23..8c02d1d 100644 > --- a/drivers/gpu/drm/mediatek/mtk_drm_plane.c > +++ b/drivers/gpu/drm/mediatek/mtk_drm_plane.c > @@ -28,6 +28,8 @@ > DRM_FORMAT_XRGB8888, > DRM_FORMAT_ARGB8888, > DRM_FORMAT_RGB565, > + DRM_FORMAT_UYVY, > + DRM_FORMAT_YUYV, > }; > > static void mtk_plane_reset(struct drm_plane *plane) > -- > 1.9.1 >