From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751968AbdAXBhN (ORCPT ); Mon, 23 Jan 2017 20:37:13 -0500 Received: from mailgw02.mediatek.com ([210.61.82.184]:25815 "EHLO mailgw02.mediatek.com" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1751778AbdAXBhM (ORCPT ); Mon, 23 Jan 2017 20:37:12 -0500 Message-ID: <1485221752.9687.2.camel@mtksdaap41> Subject: Re: [PATCH v2] drm/mediatek: Support UYVY and YUYV format for overlay From: Bibby Hsieh To: Daniel Kurtz 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 Date: Tue, 24 Jan 2017 09:35:52 +0800 In-Reply-To: References: <1483079183-38637-1-git-send-email-bibby.hsieh@mediatek.com> Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.2.3-0ubuntu6 Content-Transfer-Encoding: 7bit MIME-Version: 1.0 X-MTK: N Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi, Daniel, Thanks for your comment. On Tue, 2017-01-03 at 14:27 +0800, Daniel Kurtz wrote: > 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; > > + } > > +} How about adding " | OVL_CON_MTX_YUV_TO_RGB" after here in "return OVL_CON_CLRFMT_UYVY" and "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 > > -- Bibby From mboxrd@z Thu Jan 1 00:00:00 1970 From: Bibby Hsieh Subject: Re: [PATCH v2] drm/mediatek: Support UYVY and YUYV format for overlay Date: Tue, 24 Jan 2017 09:35:52 +0800 Message-ID: <1485221752.9687.2.camel@mtksdaap41> References: <1483079183-38637-1-git-send-email-bibby.hsieh@mediatek.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Daniel Kurtz Cc: "linux-kernel@vger.kernel.org" , Sascha Hauer , Daniel Vetter , Cawa Cheng , dri-devel , Mao Huang , "moderated list:ARM/Mediatek SoC support" , Matthias Brugger , Yingjoe Chen , "linux-arm-kernel@lists.infradead.org" List-Id: linux-mediatek@lists.infradead.org SGksIERhbmllbCwKClRoYW5rcyBmb3IgeW91ciBjb21tZW50LgoKT24gVHVlLCAyMDE3LTAxLTAz IGF0IDE0OjI3ICswODAwLCBEYW5pZWwgS3VydHogd3JvdGU6Cj4gT24gRnJpLCBEZWMgMzAsIDIw MTYgYXQgMjoyNiBQTSwgQmliYnkgSHNpZWggPGJpYmJ5LmhzaWVoQG1lZGlhdGVrLmNvbT4gd3Jv dGU6Cj4gPgo+ID4gTVQ4MTczIG92ZXJsYXkgY2FuIHN1cHBvcnQgVVlWWSBhbmQgWVVZViBmb3Jt YXQsCj4gPiB3ZSBhZGQgdGhlIGZvcm1hdCBpbiBEUk0gZHJpdmVyLgo+ID4KPiA+IFNpZ25lZC1v ZmYtYnk6IEJpYmJ5IEhzaWVoIDxiaWJieS5oc2llaEBtZWRpYXRlay5jb20+Cj4gPiBSZXZpZXdl ZC1ieTogRGFuaWVsIEt1cnR6IDxkamt1cnR6QGNocm9taXVtLm9yZz4KPiA+IC0tLQo+ID4gIGRy aXZlcnMvZ3B1L2RybS9tZWRpYXRlay9tdGtfZGlzcF9vdmwuYyAgfCAyMSArKysrKysrKysrKysr KysrKysrKysKPiA+ICBkcml2ZXJzL2dwdS9kcm0vbWVkaWF0ZWsvbXRrX2RybV9wbGFuZS5jIHwg IDIgKysKPiA+ICAyIGZpbGVzIGNoYW5nZWQsIDIzIGluc2VydGlvbnMoKykKPiA+Cj4gPiBkaWZm IC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL21lZGlhdGVrL210a19kaXNwX292bC5jIGIvZHJpdmVy cy9ncHUvZHJtL21lZGlhdGVrL210a19kaXNwX292bC5jCj4gPiBpbmRleCBjNzAzMTAyLi5kZTA1 ODQ1IDEwMDY0NAo+ID4gLS0tIGEvZHJpdmVycy9ncHUvZHJtL21lZGlhdGVrL210a19kaXNwX292 bC5jCj4gPiArKysgYi9kcml2ZXJzL2dwdS9kcm0vbWVkaWF0ZWsvbXRrX2Rpc3Bfb3ZsLmMKPiA+ IEBAIC00MCwxMCArNDAsMTMgQEAKPiA+ICAjZGVmaW5lICAgICAgICBPVkxfUkRNQV9NRU1fR01D ICAgICAgICAweDQwNDAyMDIwCj4gPgo+ID4gICNkZWZpbmUgT1ZMX0NPTl9CWVRFX1NXQVAgICAg ICBCSVQoMjQpCj4gPiArI2RlZmluZSBPVkxfQ09OX01UWF9ZVVZfVE9fUkdCICg2IDw8IDE2KQo+ ID4gICNkZWZpbmUgT1ZMX0NPTl9DTFJGTVRfUkdCNTY1ICAoMCA8PCAxMikKPiA+ICAjZGVmaW5l IE9WTF9DT05fQ0xSRk1UX1JHQjg4OCAgKDEgPDwgMTIpCj4gPiAgI2RlZmluZSBPVkxfQ09OX0NM UkZNVF9SR0JBODg4OCAgICAgICAgKDIgPDwgMTIpCj4gPiAgI2RlZmluZSBPVkxfQ09OX0NMUkZN VF9BUkdCODg4OCAgICAgICAgKDMgPDwgMTIpCj4gPiArI2RlZmluZSBPVkxfQ09OX0NMUkZNVF9V WVZZICAgICg0IDw8IDEyKQo+ID4gKyNkZWZpbmUgT1ZMX0NPTl9DTFJGTVRfWVVZViAgICAoNSA8 PCAxMikKPiAKPiBXaHkgbm90IGp1c3QgYWRkICIgfCBPVkxfQ09OX01UWF9ZVVZfVE9fUkdCIiBo ZXJlIGluIHRoZSBkZWZpbml0aW9uIG9mCj4gdGhlc2UgdHdvIGNvbnN0YW50cywgaW5zdGVhZCBv ZiBhZGRpbmcgYSBoZWxwZXIgZnVuY3Rpb24/Cj4gCj4gPiAgI2RlZmluZSAgICAgICAgT1ZMX0NP Tl9BRU4gICAgICAgICAgICAgQklUKDgpCj4gPiAgI2RlZmluZSAgICAgICAgT1ZMX0NPTl9BTFBI QSAgICAgICAgICAgMHhmZgo+ID4KPiA+IEBAIC0xNjIsNiArMTY1LDIxIEBAIHN0YXRpYyB1bnNp Z25lZCBpbnQgb3ZsX2ZtdF9jb252ZXJ0KHVuc2lnbmVkIGludCBmbXQpCj4gPiAgICAgICAgIGNh c2UgRFJNX0ZPUk1BVF9YQkdSODg4ODoKPiA+ICAgICAgICAgY2FzZSBEUk1fRk9STUFUX0FCR1I4 ODg4Ogo+ID4gICAgICAgICAgICAgICAgIHJldHVybiBPVkxfQ09OX0NMUkZNVF9SR0JBODg4OCB8 IE9WTF9DT05fQllURV9TV0FQOwo+ID4gKyAgICAgICBjYXNlIERSTV9GT1JNQVRfVVlWWToKPiA+ ICsgICAgICAgICAgICAgICByZXR1cm4gT1ZMX0NPTl9DTFJGTVRfVVlWWTsKPiA+ICsgICAgICAg Y2FzZSBEUk1fRk9STUFUX1lVWVY6Cj4gPiArICAgICAgICAgICAgICAgcmV0dXJuIE9WTF9DT05f Q0xSRk1UX1lVWVY7Cj4gPiArICAgICAgIH0KPiA+ICt9CkhvdyBhYm91dCBhZGRpbmcgIiB8IE9W TF9DT05fTVRYX1lVVl9UT19SR0IiIGFmdGVyIGhlcmUgaW4gInJldHVybgpPVkxfQ09OX0NMUkZN VF9VWVZZIiBhbmQgInJldHVybiBPVkxfQ09OX0NMUkZNVF9ZVVlWIiA/Pwo+ID4gKwo+ID4gK3N0 YXRpYyBib29sIG92bF95dXZfc3BhY2UodW5zaWduZWQgaW50IGZtdCkKPiA+ICt7Cj4gPiArICAg ICAgIHN3aXRjaCAoZm10KSB7Cj4gPiArICAgICAgIGNhc2UgRFJNX0ZPUk1BVF9VWVZZOgo+ID4g KyAgICAgICBjYXNlIERSTV9GT1JNQVRfWVVZVjoKPiA+ICsgICAgICAgICAgICAgICByZXR1cm4g dHJ1ZTsKPiA+ICsgICAgICAgZGVmYXVsdDoKPiA+ICsgICAgICAgICAgICAgICByZXR1cm4gZmFs c2U7Cj4gPiAgICAgICAgIH0KPiA+ICB9Cj4gPgo+ID4gQEAgLTE4Myw2ICsyMDEsOSBAQCBzdGF0 aWMgdm9pZCBtdGtfb3ZsX2xheWVyX2NvbmZpZyhzdHJ1Y3QgbXRrX2RkcF9jb21wICpjb21wLCB1 bnNpZ25lZCBpbnQgaWR4LAo+ID4gICAgICAgICBpZiAoaWR4ICE9IDApCj4gPiAgICAgICAgICAg ICAgICAgY29uIHw9IE9WTF9DT05fQUVOIHwgT1ZMX0NPTl9BTFBIQTsKPiA+Cj4gPiArICAgICAg IGlmIChvdmxfeXV2X3NwYWNlKGZtdCkpCj4gPiArICAgICAgICAgICAgICAgY29uIHw9IE9WTF9D T05fTVRYX1lVVl9UT19SR0I7Cj4gPiArCj4gPiAgICAgICAgIHdyaXRlbF9yZWxheGVkKGNvbiwg Y29tcC0+cmVncyArIERJU1BfUkVHX09WTF9DT04oaWR4KSk7Cj4gPiAgICAgICAgIHdyaXRlbF9y ZWxheGVkKHBpdGNoLCBjb21wLT5yZWdzICsgRElTUF9SRUdfT1ZMX1BJVENIKGlkeCkpOwo+ID4g ICAgICAgICB3cml0ZWxfcmVsYXhlZChzcmNfc2l6ZSwgY29tcC0+cmVncyArIERJU1BfUkVHX09W TF9TUkNfU0laRShpZHgpKTsKPiA+IGRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vbWVkaWF0 ZWsvbXRrX2RybV9wbGFuZS5jIGIvZHJpdmVycy9ncHUvZHJtL21lZGlhdGVrL210a19kcm1fcGxh bmUuYwo+ID4gaW5kZXggYzQ2MWEyMy4uOGMwMmQxZCAxMDA2NDQKPiA+IC0tLSBhL2RyaXZlcnMv Z3B1L2RybS9tZWRpYXRlay9tdGtfZHJtX3BsYW5lLmMKPiA+ICsrKyBiL2RyaXZlcnMvZ3B1L2Ry bS9tZWRpYXRlay9tdGtfZHJtX3BsYW5lLmMKPiA+IEBAIC0yOCw2ICsyOCw4IEBACj4gPiAgICAg ICAgIERSTV9GT1JNQVRfWFJHQjg4ODgsCj4gPiAgICAgICAgIERSTV9GT1JNQVRfQVJHQjg4ODgs Cj4gPiAgICAgICAgIERSTV9GT1JNQVRfUkdCNTY1LAo+ID4gKyAgICAgICBEUk1fRk9STUFUX1VZ VlksCj4gPiArICAgICAgIERSTV9GT1JNQVRfWVVZViwKPiA+ICB9Owo+ID4KPiA+ICBzdGF0aWMg dm9pZCBtdGtfcGxhbmVfcmVzZXQoc3RydWN0IGRybV9wbGFuZSAqcGxhbmUpCj4gPiAtLQo+ID4g MS45LjEKPiA+CgotLSAKQmliYnkKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fCmRyaS1kZXZlbCBtYWlsaW5nIGxpc3QKZHJpLWRldmVsQGxpc3RzLmZyZWVk ZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZv L2RyaS1kZXZlbAo= From mboxrd@z Thu Jan 1 00:00:00 1970 From: bibby.hsieh@mediatek.com (Bibby Hsieh) Date: Tue, 24 Jan 2017 09:35:52 +0800 Subject: [PATCH v2] drm/mediatek: Support UYVY and YUYV format for overlay In-Reply-To: References: <1483079183-38637-1-git-send-email-bibby.hsieh@mediatek.com> Message-ID: <1485221752.9687.2.camel@mtksdaap41> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org Hi, Daniel, Thanks for your comment. On Tue, 2017-01-03 at 14:27 +0800, Daniel Kurtz wrote: > 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; > > + } > > +} How about adding " | OVL_CON_MTX_YUV_TO_RGB" after here in "return OVL_CON_CLRFMT_UYVY" and "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 > > -- Bibby