From mboxrd@z Thu Jan 1 00:00:00 1970 From: laurent.pinchart@ideasonboard.com (Laurent Pinchart) Date: Tue, 17 Jan 2017 16:48:41 +0200 Subject: [RFC/RFT PATCH 4/4] drm/bridge: dw-hdmi: Take input format from plat_data In-Reply-To: <1484656294-6140-5-git-send-email-narmstrong@baylibre.com> References: <1484656294-6140-1-git-send-email-narmstrong@baylibre.com> <1484656294-6140-5-git-send-email-narmstrong@baylibre.com> Message-ID: <5448085.cpOE2LFyiJ@avalon> To: linus-amlogic@lists.infradead.org List-Id: linus-amlogic.lists.infradead.org Hi Neil, Thank you for the patch. On Tuesday 17 Jan 2017 13:31:34 Neil Armstrong wrote: > Some display pipelines can only provide non-RBG input pixels to the HDMI TX > Controller, this patch takes the pixel format from the plat_data if > provided. > > Signed-off-by: Neil Armstrong > --- > drivers/gpu/drm/bridge/dw-hdmi.c | 7 +++++-- > include/drm/bridge/dw_hdmi.h | 9 +++++++++ > 2 files changed, 14 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/bridge/dw-hdmi.c > b/drivers/gpu/drm/bridge/dw-hdmi.c index 8a6a183..fa4147c 100644 > --- a/drivers/gpu/drm/bridge/dw-hdmi.c > +++ b/drivers/gpu/drm/bridge/dw-hdmi.c > @@ -1420,8 +1420,11 @@ static int dw_hdmi_setup(struct dw_hdmi *hdmi, struct > drm_display_mode *mode) hdmi->hdmi_data.video_mode.mpixelrepetitionoutput = > 0; > hdmi->hdmi_data.video_mode.mpixelrepetitioninput = 0; > > - /* TODO: Get input format from IPU (via FB driver interface) */ > - hdmi->hdmi_data.enc_in_format = RGB; > + /* Get input format from plat data or fallback to RGB */ > + if (hdmi->plat_data->input_fmt >= 0) > + hdmi->hdmi_data.enc_in_format = hdmi->plat_data->input_fmt; > + else > + hdmi->hdmi_data.enc_in_format = RGB; This should ideally be queried dynamically. I believe we need to extend the DRM bridge API for this purpose. I might be willing to accept a pdata-based solution in the meantime though. > hdmi->hdmi_data.enc_out_format = RGB; > > diff --git a/include/drm/bridge/dw_hdmi.h b/include/drm/bridge/dw_hdmi.h > index d6a0ab3..4f426c3 100644 > --- a/include/drm/bridge/dw_hdmi.h > +++ b/include/drm/bridge/dw_hdmi.h > @@ -21,6 +21,14 @@ enum { > DW_HDMI_RES_MAX, > }; > > +enum { > + DW_HDMI_INPUT_FMT_RGB = 0, > + DW_HDMI_INPUT_FMT_YCBCR444, > + DW_HDMI_INPUT_FMT_YCBCR422_16BITS, > + DW_HDMI_INPUT_FMT_YCBCR422_8BITS, > + DW_HDMI_INPUT_FMT_XVYCC444, > +}; How about giving the enum a name and dropping the #define RGB 0 #define YCBCR444 1 #define YCBCR422_16BITS 2 #define YCBCR422_8BITS 3 #define XVYCC444 4 macros from the driver ? Even better, how about using a media bus format code from include/uapi/linux/media-bus-format.h ? We would need an additional colorspace field to express the difference between the YCBCR and XVYCC formats, as both of them are YUV 4:4:4 and map to the same bus format. > enum dw_hdmi_phy_type { > DW_HDMI_PHY_DWC_HDMI_TX_PHY = 0x00, > DW_HDMI_PHY_DWC_MHL_PHY_HEAC = 0xb2, > @@ -68,6 +76,7 @@ struct dw_hdmi_plat_data { > const struct dw_hdmi_plat_data *data); > bool (*hdmi_read_hpd)(struct dw_hdmi *hdmi, > const struct dw_hdmi_plat_data *data); > + int input_fmt; > }; > > int dw_hdmi_probe(struct platform_device *pdev, -- Regards, Laurent Pinchart From mboxrd@z Thu Jan 1 00:00:00 1970 From: Laurent Pinchart Subject: Re: [RFC/RFT PATCH 4/4] drm/bridge: dw-hdmi: Take input format from plat_data Date: Tue, 17 Jan 2017 16:48:41 +0200 Message-ID: <5448085.cpOE2LFyiJ@avalon> References: <1484656294-6140-1-git-send-email-narmstrong@baylibre.com> <1484656294-6140-5-git-send-email-narmstrong@baylibre.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from galahad.ideasonboard.com (galahad.ideasonboard.com [185.26.127.97]) by gabe.freedesktop.org (Postfix) with ESMTPS id 89F356E68C for ; Tue, 17 Jan 2017 14:48:25 +0000 (UTC) In-Reply-To: <1484656294-6140-5-git-send-email-narmstrong@baylibre.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Neil Armstrong Cc: Jose.Abreu@synopsys.com, laurent.pinchart+renesas@ideasonboard.com, kieran.bingham@ideasonboard.com, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, linux-amlogic@lists.infradead.org List-Id: dri-devel@lists.freedesktop.org SGkgTmVpbCwKClRoYW5rIHlvdSBmb3IgdGhlIHBhdGNoLgoKT24gVHVlc2RheSAxNyBKYW4gMjAx NyAxMzozMTozNCBOZWlsIEFybXN0cm9uZyB3cm90ZToKPiBTb21lIGRpc3BsYXkgcGlwZWxpbmVz IGNhbiBvbmx5IHByb3ZpZGUgbm9uLVJCRyBpbnB1dCBwaXhlbHMgdG8gdGhlIEhETUkgVFgKPiBD b250cm9sbGVyLCB0aGlzIHBhdGNoIHRha2VzIHRoZSBwaXhlbCBmb3JtYXQgZnJvbSB0aGUgcGxh dF9kYXRhIGlmCj4gcHJvdmlkZWQuCj4gCj4gU2lnbmVkLW9mZi1ieTogTmVpbCBBcm1zdHJvbmcg PG5hcm1zdHJvbmdAYmF5bGlicmUuY29tPgo+IC0tLQo+ICBkcml2ZXJzL2dwdS9kcm0vYnJpZGdl L2R3LWhkbWkuYyB8IDcgKysrKystLQo+ICBpbmNsdWRlL2RybS9icmlkZ2UvZHdfaGRtaS5oICAg ICB8IDkgKysrKysrKysrCj4gIDIgZmlsZXMgY2hhbmdlZCwgMTQgaW5zZXJ0aW9ucygrKSwgMiBk ZWxldGlvbnMoLSkKPiAKPiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2JyaWRnZS9kdy1o ZG1pLmMKPiBiL2RyaXZlcnMvZ3B1L2RybS9icmlkZ2UvZHctaGRtaS5jIGluZGV4IDhhNmExODMu LmZhNDE0N2MgMTAwNjQ0Cj4gLS0tIGEvZHJpdmVycy9ncHUvZHJtL2JyaWRnZS9kdy1oZG1pLmMK PiArKysgYi9kcml2ZXJzL2dwdS9kcm0vYnJpZGdlL2R3LWhkbWkuYwo+IEBAIC0xNDIwLDggKzE0 MjAsMTEgQEAgc3RhdGljIGludCBkd19oZG1pX3NldHVwKHN0cnVjdCBkd19oZG1pICpoZG1pLCBz dHJ1Y3QKPiBkcm1fZGlzcGxheV9tb2RlICptb2RlKSBoZG1pLT5oZG1pX2RhdGEudmlkZW9fbW9k ZS5tcGl4ZWxyZXBldGl0aW9ub3V0cHV0ID0KPiAwOwo+ICAJaGRtaS0+aGRtaV9kYXRhLnZpZGVv X21vZGUubXBpeGVscmVwZXRpdGlvbmlucHV0ID0gMDsKPiAKPiAtCS8qIFRPRE86IEdldCBpbnB1 dCBmb3JtYXQgZnJvbSBJUFUgKHZpYSBGQiBkcml2ZXIgaW50ZXJmYWNlKSAqLwo+IC0JaGRtaS0+ aGRtaV9kYXRhLmVuY19pbl9mb3JtYXQgPSBSR0I7Cj4gKwkvKiBHZXQgaW5wdXQgZm9ybWF0IGZy b20gcGxhdCBkYXRhIG9yIGZhbGxiYWNrIHRvIFJHQiAqLwo+ICsJaWYgKGhkbWktPnBsYXRfZGF0 YS0+aW5wdXRfZm10ID49IDApCj4gKwkJaGRtaS0+aGRtaV9kYXRhLmVuY19pbl9mb3JtYXQgPSBo ZG1pLT5wbGF0X2RhdGEtPmlucHV0X2ZtdDsKPiArCWVsc2UKPiArCQloZG1pLT5oZG1pX2RhdGEu ZW5jX2luX2Zvcm1hdCA9IFJHQjsKClRoaXMgc2hvdWxkIGlkZWFsbHkgYmUgcXVlcmllZCBkeW5h bWljYWxseS4gSSBiZWxpZXZlIHdlIG5lZWQgdG8gZXh0ZW5kIHRoZSAKRFJNIGJyaWRnZSBBUEkg Zm9yIHRoaXMgcHVycG9zZS4gSSBtaWdodCBiZSB3aWxsaW5nIHRvIGFjY2VwdCBhIHBkYXRhLWJh c2VkIApzb2x1dGlvbiBpbiB0aGUgbWVhbnRpbWUgdGhvdWdoLgoKPiAgCWhkbWktPmhkbWlfZGF0 YS5lbmNfb3V0X2Zvcm1hdCA9IFJHQjsKPiAKPiBkaWZmIC0tZ2l0IGEvaW5jbHVkZS9kcm0vYnJp ZGdlL2R3X2hkbWkuaCBiL2luY2x1ZGUvZHJtL2JyaWRnZS9kd19oZG1pLmgKPiBpbmRleCBkNmEw YWIzLi40ZjQyNmMzIDEwMDY0NAo+IC0tLSBhL2luY2x1ZGUvZHJtL2JyaWRnZS9kd19oZG1pLmgK PiArKysgYi9pbmNsdWRlL2RybS9icmlkZ2UvZHdfaGRtaS5oCj4gQEAgLTIxLDYgKzIxLDE0IEBA IGVudW0gewo+ICAJRFdfSERNSV9SRVNfTUFYLAo+ICB9Owo+IAo+ICtlbnVtIHsKPiArCURXX0hE TUlfSU5QVVRfRk1UX1JHQiA9IDAsCj4gKwlEV19IRE1JX0lOUFVUX0ZNVF9ZQ0JDUjQ0NCwKPiAr CURXX0hETUlfSU5QVVRfRk1UX1lDQkNSNDIyXzE2QklUUywKPiArCURXX0hETUlfSU5QVVRfRk1U X1lDQkNSNDIyXzhCSVRTLAo+ICsJRFdfSERNSV9JTlBVVF9GTVRfWFZZQ0M0NDQsCj4gK307CgpI b3cgYWJvdXQgZ2l2aW5nIHRoZSBlbnVtIGEgbmFtZSBhbmQgZHJvcHBpbmcgdGhlCgojZGVmaW5l IFJHQiAgICAgICAgICAgICAgICAgICAgIDAKI2RlZmluZSBZQ0JDUjQ0NCAgICAgICAgICAgICAg ICAxCiNkZWZpbmUgWUNCQ1I0MjJfMTZCSVRTICAgICAgICAgMgojZGVmaW5lIFlDQkNSNDIyXzhC SVRTICAgICAgICAgIDMKI2RlZmluZSBYVllDQzQ0NCAgICAgICAgICAgICAgICA0CgptYWNyb3Mg ZnJvbSB0aGUgZHJpdmVyID8gRXZlbiBiZXR0ZXIsIGhvdyBhYm91dCB1c2luZyBhIG1lZGlhIGJ1 cyBmb3JtYXQgY29kZSAKZnJvbSBpbmNsdWRlL3VhcGkvbGludXgvbWVkaWEtYnVzLWZvcm1hdC5o ID8gV2Ugd291bGQgbmVlZCBhbiBhZGRpdGlvbmFsIApjb2xvcnNwYWNlIGZpZWxkIHRvIGV4cHJl c3MgdGhlIGRpZmZlcmVuY2UgYmV0d2VlbiB0aGUgWUNCQ1IgYW5kIFhWWUNDIApmb3JtYXRzLCBh cyBib3RoIG9mIHRoZW0gYXJlIFlVViA0OjQ6NCBhbmQgbWFwIHRvIHRoZSBzYW1lIGJ1cyBmb3Jt YXQuCgo+ICBlbnVtIGR3X2hkbWlfcGh5X3R5cGUgewo+ICAJRFdfSERNSV9QSFlfRFdDX0hETUlf VFhfUEhZID0gMHgwMCwKPiAgCURXX0hETUlfUEhZX0RXQ19NSExfUEhZX0hFQUMgPSAweGIyLAo+ IEBAIC02OCw2ICs3Niw3IEBAIHN0cnVjdCBkd19oZG1pX3BsYXRfZGF0YSB7Cj4gIAkJCQkgY29u c3Qgc3RydWN0IGR3X2hkbWlfcGxhdF9kYXRhICpkYXRhKTsKPiAgCWJvb2wgKCpoZG1pX3JlYWRf aHBkKShzdHJ1Y3QgZHdfaGRtaSAqaGRtaSwKPiAgCQkJICAgICAgY29uc3Qgc3RydWN0IGR3X2hk bWlfcGxhdF9kYXRhICpkYXRhKTsKPiArCWludCBpbnB1dF9mbXQ7Cj4gIH07Cj4gCj4gIGludCBk d19oZG1pX3Byb2JlKHN0cnVjdCBwbGF0Zm9ybV9kZXZpY2UgKnBkZXYsCgotLSAKUmVnYXJkcywK CkxhdXJlbnQgUGluY2hhcnQKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fCmRyaS1kZXZlbCBtYWlsaW5nIGxpc3QKZHJpLWRldmVsQGxpc3RzLmZyZWVkZXNr dG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2Ry aS1kZXZlbAo= From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751186AbdAQOtS (ORCPT ); Tue, 17 Jan 2017 09:49:18 -0500 Received: from galahad.ideasonboard.com ([185.26.127.97]:34808 "EHLO galahad.ideasonboard.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750826AbdAQOsZ (ORCPT ); Tue, 17 Jan 2017 09:48:25 -0500 From: Laurent Pinchart To: Neil Armstrong Cc: dri-devel@lists.freedesktop.org, laurent.pinchart+renesas@ideasonboard.com, Jose.Abreu@synopsys.com, kieran.bingham@ideasonboard.com, linux-amlogic@lists.infradead.org, linux-kernel@vger.kernel.org Subject: Re: [RFC/RFT PATCH 4/4] drm/bridge: dw-hdmi: Take input format from plat_data Date: Tue, 17 Jan 2017 16:48:41 +0200 Message-ID: <5448085.cpOE2LFyiJ@avalon> User-Agent: KMail/4.14.10 (Linux/4.8.6-gentoo; KDE/4.14.24; x86_64; ; ) In-Reply-To: <1484656294-6140-5-git-send-email-narmstrong@baylibre.com> References: <1484656294-6140-1-git-send-email-narmstrong@baylibre.com> <1484656294-6140-5-git-send-email-narmstrong@baylibre.com> MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Neil, Thank you for the patch. On Tuesday 17 Jan 2017 13:31:34 Neil Armstrong wrote: > Some display pipelines can only provide non-RBG input pixels to the HDMI TX > Controller, this patch takes the pixel format from the plat_data if > provided. > > Signed-off-by: Neil Armstrong > --- > drivers/gpu/drm/bridge/dw-hdmi.c | 7 +++++-- > include/drm/bridge/dw_hdmi.h | 9 +++++++++ > 2 files changed, 14 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/bridge/dw-hdmi.c > b/drivers/gpu/drm/bridge/dw-hdmi.c index 8a6a183..fa4147c 100644 > --- a/drivers/gpu/drm/bridge/dw-hdmi.c > +++ b/drivers/gpu/drm/bridge/dw-hdmi.c > @@ -1420,8 +1420,11 @@ static int dw_hdmi_setup(struct dw_hdmi *hdmi, struct > drm_display_mode *mode) hdmi->hdmi_data.video_mode.mpixelrepetitionoutput = > 0; > hdmi->hdmi_data.video_mode.mpixelrepetitioninput = 0; > > - /* TODO: Get input format from IPU (via FB driver interface) */ > - hdmi->hdmi_data.enc_in_format = RGB; > + /* Get input format from plat data or fallback to RGB */ > + if (hdmi->plat_data->input_fmt >= 0) > + hdmi->hdmi_data.enc_in_format = hdmi->plat_data->input_fmt; > + else > + hdmi->hdmi_data.enc_in_format = RGB; This should ideally be queried dynamically. I believe we need to extend the DRM bridge API for this purpose. I might be willing to accept a pdata-based solution in the meantime though. > hdmi->hdmi_data.enc_out_format = RGB; > > diff --git a/include/drm/bridge/dw_hdmi.h b/include/drm/bridge/dw_hdmi.h > index d6a0ab3..4f426c3 100644 > --- a/include/drm/bridge/dw_hdmi.h > +++ b/include/drm/bridge/dw_hdmi.h > @@ -21,6 +21,14 @@ enum { > DW_HDMI_RES_MAX, > }; > > +enum { > + DW_HDMI_INPUT_FMT_RGB = 0, > + DW_HDMI_INPUT_FMT_YCBCR444, > + DW_HDMI_INPUT_FMT_YCBCR422_16BITS, > + DW_HDMI_INPUT_FMT_YCBCR422_8BITS, > + DW_HDMI_INPUT_FMT_XVYCC444, > +}; How about giving the enum a name and dropping the #define RGB 0 #define YCBCR444 1 #define YCBCR422_16BITS 2 #define YCBCR422_8BITS 3 #define XVYCC444 4 macros from the driver ? Even better, how about using a media bus format code from include/uapi/linux/media-bus-format.h ? We would need an additional colorspace field to express the difference between the YCBCR and XVYCC formats, as both of them are YUV 4:4:4 and map to the same bus format. > enum dw_hdmi_phy_type { > DW_HDMI_PHY_DWC_HDMI_TX_PHY = 0x00, > DW_HDMI_PHY_DWC_MHL_PHY_HEAC = 0xb2, > @@ -68,6 +76,7 @@ struct dw_hdmi_plat_data { > const struct dw_hdmi_plat_data *data); > bool (*hdmi_read_hpd)(struct dw_hdmi *hdmi, > const struct dw_hdmi_plat_data *data); > + int input_fmt; > }; > > int dw_hdmi_probe(struct platform_device *pdev, -- Regards, Laurent Pinchart