From patchwork Fri Mar 29 10:42:38 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Neil Armstrong X-Patchwork-Id: 10876839 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 6842B1874 for ; Fri, 29 Mar 2019 10:42:57 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 55F0528761 for ; Fri, 29 Mar 2019 10:42:57 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 49F5828D1E; Fri, 29 Mar 2019 10:42:57 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id BBD9528761 for ; Fri, 29 Mar 2019 10:42:56 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 70CFF6E8AB; Fri, 29 Mar 2019 10:42:53 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wm1-x341.google.com (mail-wm1-x341.google.com [IPv6:2a00:1450:4864:20::341]) by gabe.freedesktop.org (Postfix) with ESMTPS id 7834B6E8A7 for ; Fri, 29 Mar 2019 10:42:48 +0000 (UTC) Received: by mail-wm1-x341.google.com with SMTP id h18so2239696wml.1 for ; Fri, 29 Mar 2019 03:42:48 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=LYYL89nl7eawVXaDcC2Z0CCMgtJUjPZK9Iw2v8mdixE=; b=QsuRbPvpkHtbSa/f8SM9kvwuKXzndfgryGM7ILgEay3HWtdDAHT1PnOj9hUceRUwKc ddBulGhAO/lsYuZHqR13T2U4tA347rvu+Tz7ZNIXd7RKpLMdHkcBKt+4fHp6zYeJHYYh 1Or1CBF/9oa6kukMlzsJisYeXF9+j92Tk8osHUpL9Qhmx6igF2EcCILZ8YXc4JshYZ66 XpPnSnKVVdyFBxr8dUjJt/s1XOe1e4C+OfpoZyBBmAtYwzuYZ7HulU6/TbYyj0tqLYHF owDxtFaZF7H76cmSmko7jlDQCgjT7w59Gc7l7f7GBfFw089ODTDneQx3YROanc+B4V/r Pbwg== X-Gm-Message-State: APjAAAVA9Ncja1Z9b9rV3iBTFCP6R/raUkn7CBh1lbvLE+KGnth5ovZ1 Kb2WW/l6hbYeS/9ZrGumxhcTAg== X-Google-Smtp-Source: APXvYqyRXaNU6I3JeZoqiYGLoee7iet+HOwkcVOVrM3H+WY+axbZt9iyv3Tm/ojdv13G4sYRN75pSw== X-Received: by 2002:a1c:c013:: with SMTP id q19mr3101073wmf.148.1553856166735; Fri, 29 Mar 2019 03:42:46 -0700 (PDT) Received: from bender.baylibre.local (lmontsouris-657-1-212-31.w90-63.abo.wanadoo.fr. [90.63.244.31]) by smtp.gmail.com with ESMTPSA id o15sm1632826wrj.59.2019.03.29.03.42.45 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 29 Mar 2019 03:42:45 -0700 (PDT) From: Neil Armstrong To: a.hajda@samsung.com, Laurent.pinchart@ideasonboard.com Subject: [PATCH RFC 3/5] drm/bridge: dw-hdmi: Add support for dynamic output format setup Date: Fri, 29 Mar 2019 11:42:38 +0100 Message-Id: <20190329104240.29585-4-narmstrong@baylibre.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190329104240.29585-1-narmstrong@baylibre.com> References: <20190329104240.29585-1-narmstrong@baylibre.com> MIME-Version: 1.0 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=LYYL89nl7eawVXaDcC2Z0CCMgtJUjPZK9Iw2v8mdixE=; b=ZuqEJ34HRHG/bwL0h+SZl2XrQKjyCP2xstLz80Vq/+Y9oqdnIcx9KpctCbtHB8zC6y +6eeRhQGkssTjLL71pnQW6W/Jma7pWSVUlGJF3iS7YruBGhmtxj+l6blu9I8RT0Qu3ox 96DvMfPg/7Vvf/ftONKnCegz2fI9Udd9tRfSU8z7BqVTyt9IZYs8CtFGfTPNrhoNxJXE oOK2JVe3Y1irwo3KWzLXN9mX41Um7gbeC5hT162TkGxLVxAo8SBnPc/vuD5BMPouUFFu v/Y8h8xGwHltIBRUFv/SgedsDi4MEP8I3JB9G+AtPGx70quLMED3E/7bfwB/KuUcc1mk 1L3A== X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: jernej.skrabec@siol.net, Neil Armstrong , maxime.ripard@bootlin.com, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, linux-amlogic@lists.infradead.org Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP In order to support the HDMI2.0 YUV420, YUV422 and the 10bit, 12bit and 16bits outpu use cases, add support for the recently introduced bridge callback format_set(). This callback will setup the new input format and encoding from encoder, then these information will be used instead of the default ones in the dw_hdmi_setup() function. To determine the output bus format, has been added : - support for the connector display_info bus_formats, where a fixed output bus format can be enforced by the encoder - support for synami output bus format depending on the input format, especially the YUV420 input bus format, enforcing YUV420 as output with the correct bit depth Signed-off-by: Neil Armstrong --- drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 121 ++++++++++++++++++++-- 1 file changed, 112 insertions(+), 9 deletions(-) diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c index 325a87a82048..67f8788de213 100644 --- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c @@ -103,6 +103,8 @@ struct hdmi_vmode { }; struct hdmi_data_info { + unsigned int bridge_in_bus_format; + unsigned int bridge_in_encoding; unsigned int enc_in_bus_format; unsigned int enc_out_bus_format; unsigned int enc_in_encoding; @@ -1830,8 +1832,51 @@ static void hdmi_disable_overflow_interrupts(struct dw_hdmi *hdmi) HDMI_IH_MUTE_FC_STAT2); } +/* + * The DW-HDMI CSC can only interpolate and decimate from 4:2:2 to 4:4:4/RGB + * and from 4:4:4/RGB to 4:2:2. + * Default to RGB output except if 4:2:0 as input, which CSC cannot convert. + */ +static unsigned long dw_hdmi_determine_output_bus_format(struct dw_hdmi *hdmi) +{ + unsigned int depth = hdmi_bus_fmt_color_depth( + hdmi->hdmi_data.enc_in_bus_format); + bool is_420 = hdmi_bus_fmt_is_yuv420(hdmi->hdmi_data.enc_in_bus_format); + unsigned long fmt = MEDIA_BUS_FMT_RGB888_1X24; + + switch (depth) { + case 8: + if (is_420) + fmt = MEDIA_BUS_FMT_UYYVYY8_0_5X24; + else + fmt = MEDIA_BUS_FMT_RGB888_1X24; + break; + case 10: + if (is_420) + fmt = MEDIA_BUS_FMT_UYYVYY10_0_5X30; + else + fmt = MEDIA_BUS_FMT_RGB101010_1X30; + break; + case 12: + if (is_420) + fmt = MEDIA_BUS_FMT_UYYVYY12_0_5X36; + else + fmt = MEDIA_BUS_FMT_RGB121212_1X36; + break; + case 16: + if (is_420) + fmt = MEDIA_BUS_FMT_UYYVYY16_0_5X48; + else + fmt = MEDIA_BUS_FMT_RGB161616_1X48; + break; + } + + return fmt; +} + static int dw_hdmi_setup(struct dw_hdmi *hdmi, struct drm_display_mode *mode) { + struct drm_display_info *display = &hdmi->connector.display_info; int ret; hdmi_disable_overflow_interrupts(hdmi); @@ -1845,9 +1890,9 @@ static int dw_hdmi_setup(struct dw_hdmi *hdmi, struct drm_display_mode *mode) } if ((hdmi->vic == 6) || (hdmi->vic == 7) || - (hdmi->vic == 21) || (hdmi->vic == 22) || - (hdmi->vic == 2) || (hdmi->vic == 3) || - (hdmi->vic == 17) || (hdmi->vic == 18)) + (hdmi->vic == 21) || (hdmi->vic == 22) || + (hdmi->vic == 2) || (hdmi->vic == 3) || + (hdmi->vic == 17) || (hdmi->vic == 18)) hdmi->hdmi_data.enc_out_encoding = V4L2_YCBCR_ENC_601; else hdmi->hdmi_data.enc_out_encoding = V4L2_YCBCR_ENC_709; @@ -1855,22 +1900,29 @@ 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; - /* TOFIX: Get input format from plat data or fallback to RGB888 */ - if (hdmi->plat_data->input_bus_format) + if (hdmi->hdmi_data.bridge_in_bus_format) + hdmi->hdmi_data.enc_in_bus_format = + hdmi->hdmi_data.bridge_in_bus_format; + else if (hdmi->plat_data->input_bus_format) hdmi->hdmi_data.enc_in_bus_format = hdmi->plat_data->input_bus_format; else hdmi->hdmi_data.enc_in_bus_format = MEDIA_BUS_FMT_RGB888_1X24; - /* TOFIX: Get input encoding from plat data or fallback to none */ - if (hdmi->plat_data->input_bus_encoding) + if (hdmi->hdmi_data.bridge_in_encoding) + hdmi->hdmi_data.enc_in_encoding = + hdmi->hdmi_data.bridge_in_encoding; + else if (hdmi->plat_data->input_bus_encoding) hdmi->hdmi_data.enc_in_encoding = hdmi->plat_data->input_bus_encoding; else hdmi->hdmi_data.enc_in_encoding = V4L2_YCBCR_ENC_DEFAULT; - /* TOFIX: Default to RGB888 output format */ - hdmi->hdmi_data.enc_out_bus_format = MEDIA_BUS_FMT_RGB888_1X24; + if (display->num_bus_formats) + hdmi->hdmi_data.enc_out_bus_format = display->bus_formats[0]; + else + hdmi->hdmi_data.enc_out_bus_format = + dw_hdmi_determine_output_bus_format(hdmi); hdmi->hdmi_data.pix_repet_factor = 0; hdmi->hdmi_data.hdcp_enable = 0; @@ -2142,6 +2194,56 @@ dw_hdmi_bridge_mode_valid(struct drm_bridge *bridge, return mode_status; } +static bool dw_hdmi_drm_bridge_format_set(struct drm_bridge *bridge, + const u32 input_bus_format, + const u32 input_encoding) +{ + struct dw_hdmi *hdmi = bridge->driver_private; + + /* Filter supported input bus formats */ + switch (input_bus_format) { + case MEDIA_BUS_FMT_RGB888_1X24: + case MEDIA_BUS_FMT_RGB101010_1X30: + case MEDIA_BUS_FMT_RGB121212_1X36: + case MEDIA_BUS_FMT_RGB161616_1X48: + case MEDIA_BUS_FMT_YUV8_1X24: + case MEDIA_BUS_FMT_YUV10_1X30: + case MEDIA_BUS_FMT_YUV12_1X36: + case MEDIA_BUS_FMT_YUV16_1X48: + case MEDIA_BUS_FMT_UYVY8_1X16: + case MEDIA_BUS_FMT_UYVY10_1X20: + case MEDIA_BUS_FMT_UYVY12_1X24: + case MEDIA_BUS_FMT_UYYVYY8_0_5X24: + case MEDIA_BUS_FMT_UYYVYY10_0_5X30: + case MEDIA_BUS_FMT_UYYVYY12_0_5X36: + case MEDIA_BUS_FMT_UYYVYY16_0_5X48: + break; + default: + dev_dbg(hdmi->dev, "Unsupported Input bus format %x\n", + input_bus_format); + return false; + } + + /* Filter supported input bus encoding */ + switch (input_encoding) { + case V4L2_YCBCR_ENC_DEFAULT: + case V4L2_YCBCR_ENC_601: + case V4L2_YCBCR_ENC_709: + case V4L2_YCBCR_ENC_XV601: + case V4L2_YCBCR_ENC_XV709: + break; + default: + dev_dbg(hdmi->dev, "Unsupported Input encoding %x\n", + input_bus_format); + return false; + } + + hdmi->hdmi_data.bridge_in_bus_format = input_bus_format; + hdmi->hdmi_data.bridge_in_encoding = input_encoding; + + return true; +} + static void dw_hdmi_bridge_mode_set(struct drm_bridge *bridge, const struct drm_display_mode *orig_mode, const struct drm_display_mode *mode) @@ -2184,6 +2286,7 @@ static const struct drm_bridge_funcs dw_hdmi_bridge_funcs = { .disable = dw_hdmi_bridge_disable, .mode_set = dw_hdmi_bridge_mode_set, .mode_valid = dw_hdmi_bridge_mode_valid, + .format_set = dw_hdmi_drm_bridge_format_set, }; static irqreturn_t dw_hdmi_i2c_irq(struct dw_hdmi *hdmi)