From patchwork Mon Oct 7 19:21:50 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonas Karlman X-Patchwork-Id: 11178359 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 8A90F13BD for ; Mon, 7 Oct 2019 19:22:02 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 72B2F2173B for ; Mon, 7 Oct 2019 19:22:02 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 72B2F2173B Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=kwiboo.se Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id A84176E182; Mon, 7 Oct 2019 19:22:01 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from EUR02-HE1-obe.outbound.protection.outlook.com (mail-oln040092068022.outbound.protection.outlook.com [40.92.68.22]) by gabe.freedesktop.org (Postfix) with ESMTPS id 920266E182 for ; Mon, 7 Oct 2019 19:21:58 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Xs4KXq4b8XdBdUDOdF4XHoKkdFvwlliggUhL95TdT3RA7l1mGiccUBp540tNhYSRLeBQ7Fl39konDQ6aETdNKsQde6vfxoY8WUVNM/PGp2Io1yFzuAOnl6HRqZHrPmJlqxJO/3ubJboZ66oTnBmEAnpJrqjY2gQQFCGKuoQaPjJd31N38oCiEXmc+9VgblGu2Q4mlHdXxqNz2r3fT/vI1DXYVGeXuLpoE8LzPbQf0FfLRqQjRm5QmlWTR5zavSGukQAP0rvZ3gq2sUDyLIFxzh58ESp84EIlAkCO2fp9bbTv8BXIFbmHq1z4icT3GXTtJpUwYXzvJlU1zVV+Ue+r6w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=bLc8L5qQCi0pUmElDMGjHX2OonOIUPq279NDhdighZY=; b=F8dmQOosEWP2j3UQoya/DyJnAMrjY1pvZ2hJ7P4ZRESI3qIMUUe4dSZZDqxB7iW5TKAKWIzK+Ib0xupvlk84LhXPBHn5DV24xvuu2SZggifb9Gal9UtwoUojNy9KCNH/pCa2dI9UDOdpH4N1MLLE1/5iYP+I5f0yXXg4p/gM2FM4dKI0qaZ5eSty9jbI0vzZ0ZvOOh/QMrFHkh1y08iJr1QLP8jwSI+9L8wtb+2V5MoNp1k2GTLYAT6x0h2LS7U3hupGwqBs9akMc8mOkfrll14hYfBjYzSYsfXbyZO3CH/RbXcJeOhmdqqOKX48CV/WtMkBeWc3XcJ0doKnRCEhGA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none Received: from AM5EUR02FT039.eop-EUR02.prod.protection.outlook.com (10.152.8.53) by AM5EUR02HT237.eop-EUR02.prod.protection.outlook.com (10.152.8.235) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2327.20; Mon, 7 Oct 2019 19:21:50 +0000 Received: from HE1PR06MB4011.eurprd06.prod.outlook.com (10.152.8.55) by AM5EUR02FT039.mail.protection.outlook.com (10.152.9.27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2327.20 via Frontend Transport; Mon, 7 Oct 2019 19:21:50 +0000 Received: from HE1PR06MB4011.eurprd06.prod.outlook.com ([fe80::5c5a:1160:a2e0:43d8]) by HE1PR06MB4011.eurprd06.prod.outlook.com ([fe80::5c5a:1160:a2e0:43d8%4]) with mapi id 15.20.2305.023; Mon, 7 Oct 2019 19:21:50 +0000 From: Jonas Karlman To: Andrzej Hajda , Neil Armstrong Subject: [PATCH v2 3/4] drm/meson: Enable DRM InfoFrame support on GXL, GXM and G12A Thread-Topic: [PATCH v2 3/4] drm/meson: Enable DRM InfoFrame support on GXL, GXM and G12A Thread-Index: AQHVfUR4VXUsmRcTa0qRNMTEEkbniA== Date: Mon, 7 Oct 2019 19:21:50 +0000 Message-ID: References: <20191007192135.4525-1-jonas@kwiboo.se> In-Reply-To: <20191007192135.4525-1-jonas@kwiboo.se> Accept-Language: sv-SE, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: HE1P18901CA0018.EURP189.PROD.OUTLOOK.COM (2603:10a6:3:8b::28) To HE1PR06MB4011.eurprd06.prod.outlook.com (2603:10a6:7:9c::32) x-incomingtopheadermarker: OriginalChecksum:8897984F656CAFD5D019FF35F86727E7B16C96EB020469B996F045C8F555B2DD; UpperCasedChecksum:E5069E95D2C647470642CF3B56BE12BF0A7E9B2DC05CAAF1A22AF3A2456BD95B; SizeAsReceived:8107; Count:51 x-ms-exchange-messagesentrepresentingtype: 1 x-mailer: git-send-email 2.17.1 x-tmn: [7dsOqHODkpSjBsJFfy5pzr072GXio++K] x-microsoft-original-message-id: <20191007192135.4525-3-jonas@kwiboo.se> x-ms-publictraffictype: Email x-incomingheadercount: 51 x-eopattributedmessage: 0 x-ms-traffictypediagnostic: AM5EUR02HT237: x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: IvFVas48xPXWo/HMtHsEk6xoQjEgWzAppPfOttnymx76pYP54z5g0HmvvGfe4h72Twp1zEHYYP1bGqc9OiEgkAWcrOa50UATpU5B1gmiU78sWgUDHNWS9m8jfWpuPbJoHpmZYhokD8gQFQs6XBjkdLEKMlYxscYBn8u83J3cg/eGQUOWetfNkFk8R8lztVN6 x-ms-exchange-transport-forked: True 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: 4d77ad6c-e0df-4707-7194-08d74b5b9a5f X-MS-Exchange-CrossTenant-rms-persistedconsumerorg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-CrossTenant-originalarrivaltime: 07 Oct 2019 19:21:50.5904 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Internet X-MS-Exchange-CrossTenant-id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM5EUR02HT237 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 , Jonas Karlman , Kevin Hilman , "dri-devel@lists.freedesktop.org" , Maxime Ripard , "linux-kernel@vger.kernel.org" , Chen-Yu Tsai , Laurent Pinchart , "zhengyang@rock-chips.com" Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" 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 022286dc6ab2..3bb7ffe5fc39 100644 --- a/drivers/gpu/drm/meson/meson_dw_hdmi.c +++ b/drivers/gpu/drm/meson/meson_dw_hdmi.c @@ -977,6 +977,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->use_drm_infoframe = true; + platform_set_drvdata(pdev, meson_dw_hdmi); meson_dw_hdmi->hdmi = dw_hdmi_bind(pdev, encoder,