From patchwork Sun May 26 21:20:21 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonas Karlman X-Patchwork-Id: 10961897 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 3EEEE76 for ; Sun, 26 May 2019 21:20:26 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2F696288EE for ; Sun, 26 May 2019 21:20:26 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 20F312892A; Sun, 26 May 2019 21:20:26 +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 C839D288EE for ; Sun, 26 May 2019 21:20:25 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 14F96897FB; Sun, 26 May 2019 21:20:25 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from EUR03-VE1-obe.outbound.protection.outlook.com (mail-ve1eur03olkn082b.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe09::82b]) by gabe.freedesktop.org (Postfix) with ESMTPS id 6D450897FB for ; Sun, 26 May 2019 21:20:23 +0000 (UTC) Received: from VE1EUR03FT043.eop-EUR03.prod.protection.outlook.com (10.152.18.53) by VE1EUR03HT092.eop-EUR03.prod.protection.outlook.com (10.152.19.175) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.1922.16; Sun, 26 May 2019 21:20:21 +0000 Received: from VI1PR03MB4206.eurprd03.prod.outlook.com (10.152.18.55) by VE1EUR03FT043.mail.protection.outlook.com (10.152.19.122) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.1922.16 via Frontend Transport; Sun, 26 May 2019 21:20:21 +0000 Received: from VI1PR03MB4206.eurprd03.prod.outlook.com ([fe80::883e:1bd6:cd36:5fb0]) by VI1PR03MB4206.eurprd03.prod.outlook.com ([fe80::883e:1bd6:cd36:5fb0%4]) with mapi id 15.20.1922.021; Sun, 26 May 2019 21:20:21 +0000 From: Jonas Karlman To: "a.hajda@samsung.com" , "Laurent.pinchart@ideasonboard.com" Subject: [PATCH 3/4] drm/meson: Enable DRM InfoFrame support on GXL, GXM and G12A Thread-Topic: [PATCH 3/4] drm/meson: Enable DRM InfoFrame support on GXL, GXM and G12A Thread-Index: AQHVFAjTiBUVlVzg0Ey27UDn0LdoFg== Date: Sun, 26 May 2019 21:20:21 +0000 Message-ID: References: In-Reply-To: Accept-Language: sv-SE, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: AM5P194CA0016.EURP194.PROD.OUTLOOK.COM (2603:10a6:203:8f::26) To VI1PR03MB4206.eurprd03.prod.outlook.com (2603:10a6:803:51::23) x-incomingtopheadermarker: OriginalChecksum:B4F359A41AA2A6E855DFAB7927CCB6099252EB3CFAD3B62BAA21F8BAB040625C; UpperCasedChecksum:2FD75F5FEF2A62BCE2C7C2D69009653194286B004FD6F074AB58A1761D1CA78F; SizeAsReceived:8121; Count:50 x-ms-exchange-messagesentrepresentingtype: 1 x-mailer: git-send-email 2.17.1 x-tmn: [khpGtoKFcGyh6rGSRWTft7uY3QUY3+Ok] x-microsoft-original-message-id: <20190526212012.31994-1-jonas@kwiboo.se> x-ms-publictraffictype: Email x-incomingheadercount: 50 x-eopattributedmessage: 0 x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(5050001)(7020095)(20181119110)(201702061078)(5061506573)(5061507331)(1603103135)(2017031320274)(2017031323274)(2017031324274)(2017031322404)(1601125500)(1603101475)(1701031045); SRVR:VE1EUR03HT092; x-ms-traffictypediagnostic: VE1EUR03HT092: x-microsoft-antispam-message-info: 5chgj3XDhLQKiSPmioevvDxbwXfCvotxovdABLndbYScaY/rb9Hw4XXO56c4OfAMipNAXom1gfoWJ8m9Mect00n4P98vYl7ZyaSJlbAudsm3CiHtlHydQUWN+9y9Iv+2rM4gM5X3Axf2ECb7iNhD2LtRtzW2/WbsvVGKsy1tr2mKAYlDlWZLSccWVV2i7PLI MIME-Version: 1.0 X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-CrossTenant-Network-Message-Id: 155994aa-743c-4a9a-9b32-08d6e21ff54d X-MS-Exchange-CrossTenant-rms-persistedconsumerorg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-CrossTenant-originalarrivaltime: 26 May 2019 21:20:21.0459 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Internet X-MS-Exchange-CrossTenant-id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-Transport-CrossTenantHeadersStamped: VE1EUR03HT092 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" , "narmstrong@baylibre.com" , "maxime.ripard@bootlin.com" , "khilman@baylibre.com" , Jonas Karlman , "dri-devel@lists.freedesktop.org" , "linux-kernel@vger.kernel.org" , "wens@csie.org" , "zhengyang@rock-chips.com" Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP This patch enables Dynamic Range and Mastering InfoFrame on GXL, GXM and G12A. Cc: Neil Armstrong Signed-off-by: Jonas Karlman Reviewed-by: Neil Armstrong --- drivers/gpu/drm/meson/meson_dw_hdmi.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/gpu/drm/meson/meson_dw_hdmi.c b/drivers/gpu/drm/meson/meson_dw_hdmi.c index df3f9ddd2234..f7761e698c03 100644 --- a/drivers/gpu/drm/meson/meson_dw_hdmi.c +++ b/drivers/gpu/drm/meson/meson_dw_hdmi.c @@ -966,6 +966,11 @@ static int meson_dw_hdmi_bind(struct device *dev, struct device *master, dw_plat_data->input_bus_format = MEDIA_BUS_FMT_YUV8_1X24; dw_plat_data->input_bus_encoding = V4L2_YCBCR_ENC_709; + if (dw_hdmi_is_compatible(meson_dw_hdmi, "amlogic,meson-gxl-dw-hdmi") || + dw_hdmi_is_compatible(meson_dw_hdmi, "amlogic,meson-gxm-dw-hdmi") || + dw_hdmi_is_compatible(meson_dw_hdmi, "amlogic,meson-g12a-dw-hdmi")) + dw_plat_data->drm_infoframe = true; + platform_set_drvdata(pdev, meson_dw_hdmi); meson_dw_hdmi->hdmi = dw_hdmi_bind(pdev, encoder,