Received: by 2002:a25:7ec1:0:0:0:0:0 with SMTP id z184csp3226215ybc; Mon, 25 Nov 2019 10:58:56 -0800 (PST) X-Google-Smtp-Source: APXvYqxBztTH3vhb6VVrjvnFaiQl0ughbFi4aiqeTBayewTCpZw43z7gPWs1cyZhCpWfkdq+YpIu X-Received: by 2002:a50:ef17:: with SMTP id m23mr20291140eds.81.1574708336665; Mon, 25 Nov 2019 10:58:56 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1574708336; cv=pass; d=google.com; s=arc-20160816; b=0juN83vRJGdULxBd+ZQNKSj5CiqI0hJF6EjLoxsuASV0MLY5LaiDThSDfIpx7twfYI gCFYYhIvIpsxAVQOv5Wc3YjmoF97nyxbiekaBZH59noDs1N28DkUq4qt8SsrUGbrLNVZ SaiWkKHtthR1PcAEMjP2Gb8njJH/u/cUOErpMKO5jxyzlvC10109AVg2DS708M/+d0Jb 3exl43aPoa6oz7DyUc/3huotA8lsHJKeXT7NN76/gvo3PnpkmNv6WN6txom2VIKV5Ouh tW1NLsjP6qmJqrB1PusAUhhjM7cK0nrwjACA/RHoEt1qca98Efu5tIO02WrHzUM3s785 2fwA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:content-language :content-transfer-encoding:in-reply-to:user-agent:date:message-id :from:references:cc:to:subject:dkim-signature; bh=GPAXEGqzlcbC3xFxiApzqPee56Xzl+A06wDPc3crhvg=; b=OMIoeXU6IOioqJlxosuA5O9FQxMkmqYnAZFuRmNixUH0ylkdQ/WaLsmJG8Obnq2IJK pvbqULhSDxg4cEUtu+/TFgrC66T6lUyv8Y9AC3kEhHlPzIBoTs0gtXJd82MwODXUSZDP 2r3IDypqlHtgdiA+xfLc33d4k+2TF8Y4r0V7JEYqiquSXCuVy9e2sAhWiDL0suEA5+bW 7KVJtG7FWkVdbkW76c4RhzyTV4vsxBWuHmXgwXPxvaNqSnVDnqevZNzboVxD5EGqeObx c6AmJMTLmAAizdMCvqSwl7mK96yuJTfjRDU7oWKj+tm2pL7NWssl/hyVDr9iIixh81xG aWJw== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amdcloud.onmicrosoft.com header.s=selector2-amdcloud-onmicrosoft-com header.b=mTeMNESB; arc=pass (i=1 spf=pass spfdomain=amd.com dkim=pass dkdomain=amd.com dmarc=pass fromdomain=amd.com); spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id f36si5958602ede.159.2019.11.25.10.58.32; Mon, 25 Nov 2019 10:58:56 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@amdcloud.onmicrosoft.com header.s=selector2-amdcloud-onmicrosoft-com header.b=mTeMNESB; arc=pass (i=1 spf=pass spfdomain=amd.com dkim=pass dkdomain=amd.com dmarc=pass fromdomain=amd.com); spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727142AbfKYSmL (ORCPT + 99 others); Mon, 25 Nov 2019 13:42:11 -0500 Received: from mail-eopbgr730073.outbound.protection.outlook.com ([40.107.73.73]:15040 "EHLO NAM05-DM3-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727022AbfKYSmL (ORCPT ); Mon, 25 Nov 2019 13:42:11 -0500 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=BWonvvrMQqTS7mncgMVys00g9cg7x0//WG+tENDvHX0ukAbX5/ViYAE+5YKc71100ZN1wwNvHruzujJDb0UGH3XOEEakqx46J5KrGOw5bNUba+PJF46qKCy3HlHILRxC0DB+8iBvO4qjv9ryzsarC8QOVqBQPolP2TDDz3/sa9G0+90cxWZtZs9bto1BkKqXqHpWdeX/fvuESnHh674atwP7vR3NxQ3WYq53SXpeLs88f+jAdZB4UOOSxFBO797ZYQ4TDlBv58bIGo8XH2fptsmNnmoB+ZkQql3PsEcnetO6eCnwbYNedDOcxY0FVcjQEpTI1XuEuF/R+rwOBzYivQ== 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=GPAXEGqzlcbC3xFxiApzqPee56Xzl+A06wDPc3crhvg=; b=M+JHsBWMPxQAD3N9/JP8VY6Rpm6k7x64kFXNiB6bfSm+N5FTLPp9juwsfrPjb1qcdm1EmBPihWqmwN+/Ht1Z+aIHJ2IQ4nzSCTBC+P2bPh8aTqpk8AvKBTTqaEeWN7gkzYyiCdkg81AMaqG1zgIKfpgpDo4yEkUSM+qDRguvB1EVuJ1ikfTPdhT5rSXBzMYxN6KEDfOLDxhxMVh3XAzh6Ukl30GKmdT0e+Vu2mayFPJyD9yuN7XkHqOUbL5diskCGPqEZIzMjBCJ0qdp/hFwGKnFcPcA+c565w9PdC3htMICs0nuYZRALxj7xkzmZoXwjI3GlB2j9gFSqrPR16zyaA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=amd.com; dmarc=pass action=none header.from=amd.com; dkim=pass header.d=amd.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amdcloud.onmicrosoft.com; s=selector2-amdcloud-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=GPAXEGqzlcbC3xFxiApzqPee56Xzl+A06wDPc3crhvg=; b=mTeMNESBCXvbiDPzTaUP/JdOzvT5RRV5bsYWjGFePaxJEtJnoRaNjmGEIzeNjTFwHU01QAUdXLXaHFOaJxygmBJP/LaoIBcg6mUoDor+pmxAvQMz+ixJLkc771G9VLW2AW8C0u3P+2Zc+dqNeX6pylhBb4y7NnICt9mf4ZJDhao= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Bhawanpreet.Lakha@amd.com; Received: from CH2PR12MB4231.namprd12.prod.outlook.com (20.180.17.216) by CH2PR12MB4151.namprd12.prod.outlook.com (20.180.16.144) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2474.22; Mon, 25 Nov 2019 18:42:02 +0000 Received: from CH2PR12MB4231.namprd12.prod.outlook.com ([fe80::4ced:894e:2bea:d5e4]) by CH2PR12MB4231.namprd12.prod.outlook.com ([fe80::4ced:894e:2bea:d5e4%7]) with mapi id 15.20.2474.023; Mon, 25 Nov 2019 18:42:02 +0000 Subject: Re: [PATCH] drm/edid: Add modes from CTA-861-G To: Harry Wentland , Thomas Anderson , Maarten Lankhorst , Maxime Ripard , Sean Paul , Daniel Vetter Cc: David Airlie , linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org References: <20191123055053.154550-1-thomasanderson@google.com> From: Bhawanpreet Lakha Message-ID: Date: Mon, 25 Nov 2019 13:42:00 -0500 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.9.0 In-Reply-To: Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit Content-Language: en-US X-ClientProxiedBy: YTBPR01CA0011.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:b01:14::24) To CH2PR12MB4231.namprd12.prod.outlook.com (2603:10b6:610:7d::24) MIME-Version: 1.0 X-Originating-IP: [165.204.55.250] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 0b4893c6-61f8-4488-b3d8-08d771d72926 X-MS-TrafficTypeDiagnostic: CH2PR12MB4151:|CH2PR12MB4151: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:9508; X-Forefront-PRVS: 0232B30BBC X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10009020)(4636009)(136003)(366004)(346002)(376002)(396003)(39860400002)(199004)(189003)(26005)(23676004)(50466002)(2486003)(76176011)(8936002)(47776003)(2616005)(66066001)(11346002)(52116002)(65956001)(65806001)(6246003)(5660300002)(30864003)(6506007)(53546011)(230700001)(386003)(4001150100001)(4326008)(446003)(81166006)(81156014)(8676002)(31686004)(6512007)(36756003)(2906002)(305945005)(14454004)(186003)(6436002)(99286004)(66556008)(66946007)(66476007)(229853002)(6116002)(31696002)(3846002)(25786009)(86362001)(478600001)(110136005)(316002)(7736002)(58126008)(6486002);DIR:OUT;SFP:1101;SCL:1;SRVR:CH2PR12MB4151;H:CH2PR12MB4231.namprd12.prod.outlook.com;FPR:;SPF:None;LANG:en;PTR:InfoNoRecords;A:1;MX:1; Received-SPF: None (protection.outlook.com: amd.com does not designate permitted sender hosts) X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: xdOWGp8ypzX3/dxTPFLwrY8NTASTX4teu2rFLr5qEd09bMb5jasrUXG/H7DZWV+Odql3Nd3zf7e35WkyB9mN3JVWhPy1VAfihj9WSHIwRKSZ/06pCBXJQ0fPttIsksBYvr/AeBCJ6uE3dPze2Sf19Ydc6nHgdfvf0gvcOeR2eApGqK1oC7L9c3KRfBYCYLkLuv/td/I9Kc2qejGFfLPvFHt3w8c9afA1oEQbi1H1rAnnUn9mVFRGbQ4NIFzmG2wAvWKUWXH8Hh+1rdDgMpwsjCDKU6gYNEdik6XojdAWb2qixvnZUDJ1Uv2LFpYNyP+nUQCpD4S6Q+vfLOVvowmvAHrSiCl8EDbg+VA5Vlgt4oLZQ36VNLWoTTVzN5NZYFYSXPAeEPXWIh6LVFG//x9hlK6swZP+uvqeLUQSJDcmgpUy6ZizpZ9K3hv6AZLdAMA1 X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0b4893c6-61f8-4488-b3d8-08d771d72926 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Nov 2019 18:42:02.0117 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 1uNzgrlHn7hssWx4AMAVsLGnCtwFnbDi4C3hLpa23iEYWgG90gQwHyz8hVvrP99T X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH2PR12MB4151 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Reviewed-by: Bhawanpreet Lakha On 2019-11-25 1:14 p.m., Harry Wentland wrote: > +Bhawan who has been looking at this from our side. > > Harry > > On 2019-11-23 12:50 a.m., Thomas Anderson wrote: >> The new modes are needed for exotic displays such as 8K. Verified that >> modes like 8K60 and 4K120 are properly obtained from a Samsung Q900R. >> >> Signed-off-by: Thomas Anderson >> --- >> drivers/gpu/drm/drm_edid.c | 388 +++++++++++++++++++++++++++++++++++- >> include/drm/drm_connector.h | 16 +- >> 2 files changed, 391 insertions(+), 13 deletions(-) >> >> diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c >> index 6b0177112e18..ff5c928516fb 100644 >> --- a/drivers/gpu/drm/drm_edid.c >> +++ b/drivers/gpu/drm/drm_edid.c >> @@ -1278,6 +1278,374 @@ static const struct drm_display_mode edid_cea_modes[] = { >> 4104, 4400, 0, 2160, 2168, 2178, 2250, 0, >> DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC), >> .vrefresh = 60, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_64_27, }, >> + /* 108 - 1280x720@48Hz 16:9 */ >> + { DRM_MODE("1280x720", DRM_MODE_TYPE_DRIVER, 90000, 1280, 2240, >> + 2280, 2500, 0, 720, 725, 730, 750, 0, >> + DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC), >> + .vrefresh = 48, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_16_9, }, >> + /* 109 - 1280x720@48Hz 64:27 */ >> + { DRM_MODE("1280x720", DRM_MODE_TYPE_DRIVER, 90000, 1280, 2240, >> + 2280, 2500, 0, 720, 725, 730, 750, 0, >> + DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC), >> + .vrefresh = 48, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_64_27, }, >> + /* 110 - 1680x720@48Hz 64:27 */ >> + { DRM_MODE("1680x720", DRM_MODE_TYPE_DRIVER, 99000, 1680, 2490, >> + 2530, 2750, 0, 720, 725, 730, 750, 0, >> + DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC), >> + .vrefresh = 48, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_64_27, }, >> + /* 111 - 1920x1080@48Hz 16:9 */ >> + { DRM_MODE("1920x1080", DRM_MODE_TYPE_DRIVER, 148500, 1920, 2558, >> + 2602, 2750, 0, 1080, 1084, 1089, 1125, 0, >> + DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC), >> + .vrefresh = 48, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_16_9, }, >> + /* 112 - 1920x1080@48Hz 64:27 */ >> + { DRM_MODE("1920x1080", DRM_MODE_TYPE_DRIVER, 148500, 1920, 2558, >> + 2602, 2750, 0, 1080, 1084, 1089, 1125, 0, >> + DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC), >> + .vrefresh = 48, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_64_27, }, >> + /* 113 - 2560x1080@48Hz 64:27 */ >> + { DRM_MODE("2560x1080", DRM_MODE_TYPE_DRIVER, 198000, 2560, 3558, >> + 3602, 3750, 0, 1080, 1084, 1089, 1100, 0, >> + DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC), >> + .vrefresh = 48, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_64_27, }, >> + /* 114 - 3840x2160@48Hz 16:9 */ >> + { DRM_MODE("3840x2160", DRM_MODE_TYPE_DRIVER, 594000, 3840, 5116, >> + 5204, 5500, 0, 2160, 2168, 2178, 2250, 0, >> + DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC), >> + .vrefresh = 48, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_16_9, }, >> + /* 115 - 4096x2160@48Hz 256:135 */ >> + { DRM_MODE("4096x2160", DRM_MODE_TYPE_DRIVER, 594000, 4096, 5116, >> + 5204, 5500, 0, 2160, 2168, 2178, 2250, 0, >> + DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC), >> + .vrefresh = 48, >> + .picture_aspect_ratio = HDMI_PICTURE_ASPECT_256_135, }, >> + /* 116 - 3840x2160@48Hz 64:27 */ >> + { DRM_MODE("3840x2160", DRM_MODE_TYPE_DRIVER, 594000, 3840, 5116, >> + 5204, 5500, 0, 2160, 2168, 2178, 2250, 0, >> + DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC), >> + .vrefresh = 48, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_64_27, }, >> + /* 117 - 3840x2160@100Hz 16:9 */ >> + { DRM_MODE("3840x2160", DRM_MODE_TYPE_DRIVER, 1188000, 3840, 4896, >> + 4984, 5280, 0, 2160, 2168, 2178, 2250, 0, >> + DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC), >> + .vrefresh = 100, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_16_9, }, >> + /* 118 - 3840x2160@120Hz 16:9 */ >> + { DRM_MODE("3840x2160", DRM_MODE_TYPE_DRIVER, 1188000, 3840, 4016, >> + 4104, 4400, 0, 2160, 2168, 2178, 2250, 0, >> + DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC), >> + .vrefresh = 120, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_16_9, }, >> + /* 119 - 3840x2160@100Hz 64:27 */ >> + { DRM_MODE("3840x2160", DRM_MODE_TYPE_DRIVER, 1188000, 3840, 4896, >> + 4984, 5280, 0, 2160, 2168, 2178, 2250, 0, >> + DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC), >> + .vrefresh = 100, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_64_27, }, >> + /* 120 - 3840x2160@120Hz 64:27 */ >> + { DRM_MODE("3840x2160", DRM_MODE_TYPE_DRIVER, 1188000, 3840, 4016, >> + 4104, 4400, 0, 2160, 2168, 2178, 2250, 0, >> + DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC), >> + .vrefresh = 120, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_64_27, }, >> + /* 121 - 5120x2160@24Hz 64:27 */ >> + { DRM_MODE("5120x2160", DRM_MODE_TYPE_DRIVER, 396000, 5120, 7116, >> + 7204, 7500, 0, 2160, 2168, 2178, 2200, 0, >> + DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC), >> + .vrefresh = 24, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_64_27, }, >> + /* 122 - 5120x2160@25Hz 64:27 */ >> + { DRM_MODE("5120x2160", DRM_MODE_TYPE_DRIVER, 396000, 5120, 6816, >> + 6904, 7200, 0, 2160, 2168, 2178, 2200, 0, >> + DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC), >> + .vrefresh = 25, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_64_27, }, >> + /* 123 - 5120x2160@30Hz 64:27 */ >> + { DRM_MODE("5120x2160", DRM_MODE_TYPE_DRIVER, 396000, 5120, 5784, >> + 5872, 6000, 0, 2160, 2168, 2178, 2200, 0, >> + DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC), >> + .vrefresh = 30, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_64_27, }, >> + /* 124 - 5120x2160@48Hz 64:27 */ >> + { DRM_MODE("5120x2160", DRM_MODE_TYPE_DRIVER, 742500, 5120, 5866, >> + 5954, 6250, 0, 2160, 2168, 2178, 2475, 0, >> + DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC), >> + .vrefresh = 48, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_64_27, }, >> + /* 125 - 5120x2160@50Hz 64:27 */ >> + { DRM_MODE("5120x2160", DRM_MODE_TYPE_DRIVER, 742500, 5120, 6216, >> + 6304, 6600, 0, 2160, 2168, 2178, 2250, 0, >> + DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC), >> + .vrefresh = 50, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_64_27, }, >> + /* 126 - 5120x2160@60Hz 64:27 */ >> + { DRM_MODE("5120x2160", DRM_MODE_TYPE_DRIVER, 742500, 5120, 5284, >> + 5372, 5500, 0, 2160, 2168, 2178, 2250, 0, >> + DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC), >> + .vrefresh = 60, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_64_27, }, >> + /* 127 - 5120x2160@100Hz 64:27 */ >> + { DRM_MODE("5120x2160", DRM_MODE_TYPE_DRIVER, 1485000, 5120, 6216, >> + 6304, 6600, 0, 2160, 2168, 2178, 2250, 0, >> + DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC), >> + .vrefresh = 100, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_64_27, }, >> + /* 128 - dummy */ >> + { }, >> + /* 129 - reserved for native timing 1 */ >> + { }, >> + /* 130 - reserved for native timing 2 */ >> + { }, >> + /* 131 - reserved for native timing 3 */ >> + { }, >> + /* 132 - reserved for native timing 4 */ >> + { }, >> + /* 133 - reserved for native timing 5 */ >> + { }, >> + /* 134 - reserved for native timing 6 */ >> + { }, >> + /* 135 - reserved for native timing 7 */ >> + { }, >> + /* 136 - reserved for native timing 8 */ >> + { }, >> + /* 137 - reserved for native timing 9 */ >> + { }, >> + /* 138 - reserved for native timing 10 */ >> + { }, >> + /* 139 - reserved for native timing 11 */ >> + { }, >> + /* 140 - reserved for native timing 12 */ >> + { }, >> + /* 141 - reserved for native timing 13 */ >> + { }, >> + /* 142 - reserved for native timing 14 */ >> + { }, >> + /* 143 - reserved for native timing 15 */ >> + { }, >> + /* 144 - reserved for native timing 16 */ >> + { }, >> + /* 145 - reserved for native timing 17 */ >> + { }, >> + /* 146 - reserved for native timing 18 */ >> + { }, >> + /* 147 - reserved for native timing 19 */ >> + { }, >> + /* 148 - reserved for native timing 20 */ >> + { }, >> + /* 149 - reserved for native timing 21 */ >> + { }, >> + /* 150 - reserved for native timing 22 */ >> + { }, >> + /* 151 - reserved for native timing 23 */ >> + { }, >> + /* 152 - reserved for native timing 24 */ >> + { }, >> + /* 153 - reserved for native timing 25 */ >> + { }, >> + /* 154 - reserved for native timing 26 */ >> + { }, >> + /* 155 - reserved for native timing 27 */ >> + { }, >> + /* 156 - reserved for native timing 28 */ >> + { }, >> + /* 157 - reserved for native timing 29 */ >> + { }, >> + /* 158 - reserved for native timing 30 */ >> + { }, >> + /* 159 - reserved for native timing 31 */ >> + { }, >> + /* 160 - reserved for native timing 32 */ >> + { }, >> + /* 161 - reserved for native timing 33 */ >> + { }, >> + /* 162 - reserved for native timing 34 */ >> + { }, >> + /* 163 - reserved for native timing 35 */ >> + { }, >> + /* 164 - reserved for native timing 36 */ >> + { }, >> + /* 165 - reserved for native timing 37 */ >> + { }, >> + /* 166 - reserved for native timing 38 */ >> + { }, >> + /* 167 - reserved for native timing 39 */ >> + { }, >> + /* 168 - reserved for native timing 40 */ >> + { }, >> + /* 169 - reserved for native timing 41 */ >> + { }, >> + /* 170 - reserved for native timing 42 */ >> + { }, >> + /* 171 - reserved for native timing 43 */ >> + { }, >> + /* 172 - reserved for native timing 44 */ >> + { }, >> + /* 173 - reserved for native timing 45 */ >> + { }, >> + /* 174 - reserved for native timing 46 */ >> + { }, >> + /* 175 - reserved for native timing 47 */ >> + { }, >> + /* 176 - reserved for native timing 48 */ >> + { }, >> + /* 177 - reserved for native timing 49 */ >> + { }, >> + /* 178 - reserved for native timing 50 */ >> + { }, >> + /* 179 - reserved for native timing 51 */ >> + { }, >> + /* 180 - reserved for native timing 52 */ >> + { }, >> + /* 181 - reserved for native timing 53 */ >> + { }, >> + /* 182 - reserved for native timing 54 */ >> + { }, >> + /* 183 - reserved for native timing 55 */ >> + { }, >> + /* 184 - reserved for native timing 56 */ >> + { }, >> + /* 185 - reserved for native timing 57 */ >> + { }, >> + /* 186 - reserved for native timing 58 */ >> + { }, >> + /* 187 - reserved for native timing 59 */ >> + { }, >> + /* 188 - reserved for native timing 60 */ >> + { }, >> + /* 189 - reserved for native timing 61 */ >> + { }, >> + /* 190 - reserved for native timing 62 */ >> + { }, >> + /* 191 - reserved for native timing 63 */ >> + { }, >> + /* 192 - reserved for native timing 64 */ >> + { }, >> + /* 193 - 5120x2160@120Hz 64:27 */ >> + { DRM_MODE("5120x2160", DRM_MODE_TYPE_DRIVER, 1485000, 5120, 5284, >> + 5372, 5500, 0, 2160, 2168, 2178, 2250, 0, >> + DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC), >> + .vrefresh = 120, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_64_27, }, >> + /* 194 - 7680x4320@24Hz 16:9 */ >> + { DRM_MODE("7680x4320", DRM_MODE_TYPE_DRIVER, 1188000, 7680, 10232, >> + 10408, 11000, 0, 4320, 4336, 4356, 4500, 0, >> + DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC), >> + .vrefresh = 24, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_16_9, }, >> + /* 195 - 7680x4320@25Hz 16:9 */ >> + { DRM_MODE("7680x4320", DRM_MODE_TYPE_DRIVER, 1188000, 7680, 10032, >> + 10208, 10800, 0, 4320, 4336, 4356, 4400, 0, >> + DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC), >> + .vrefresh = 25, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_16_9, }, >> + /* 196 - 7680x4320@30Hz 16:9 */ >> + { DRM_MODE("7680x4320", DRM_MODE_TYPE_DRIVER, 1188000, 7680, 8232, >> + 8408, 9000, 0, 4320, 4336, 4356, 4400, 0, >> + DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC), >> + .vrefresh = 30, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_16_9, }, >> + /* 197 - 7680x4320@48Hz 16:9 */ >> + { DRM_MODE("7680x4320", DRM_MODE_TYPE_DRIVER, 2376000, 7680, 10232, >> + 10408, 11000, 0, 4320, 4336, 4356, 4500, 0, >> + DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC), >> + .vrefresh = 48, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_16_9, }, >> + /* 198 - 7680x4320@50Hz 16:9 */ >> + { DRM_MODE("7680x4320", DRM_MODE_TYPE_DRIVER, 2376000, 7680, 10032, >> + 10208, 10800, 0, 4320, 4336, 4356, 4400, 0, >> + DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC), >> + .vrefresh = 50, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_16_9, }, >> + /* 199 - 7680x4320@60Hz 16:9 */ >> + { DRM_MODE("7680x4320", DRM_MODE_TYPE_DRIVER, 2376000, 7680, 8232, >> + 8408, 9000, 0, 4320, 4336, 4356, 4400, 0, >> + DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC), >> + .vrefresh = 60, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_16_9, }, >> + /* 200 - 7680x4320@100Hz 16:9 */ >> + { DRM_MODE("7680x4320", DRM_MODE_TYPE_DRIVER, 4752000, 7680, 9792, >> + 9968, 10560, 0, 4320, 4336, 4356, 4500, 0, >> + DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC), >> + .vrefresh = 100, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_16_9, }, >> + /* 201 - 7680x4320@120Hz 16:9 */ >> + { DRM_MODE("7680x4320", DRM_MODE_TYPE_DRIVER, 4752000, 7680, 8032, >> + 8208, 8800, 0, 4320, 4336, 4356, 4500, 0, >> + DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC), >> + .vrefresh = 120, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_16_9, }, >> + /* 202 - 7680x4320@24Hz 64:27 */ >> + { DRM_MODE("7680x4320", DRM_MODE_TYPE_DRIVER, 1188000, 7680, 10232, >> + 10408, 11000, 0, 4320, 4336, 4356, 4500, 0, >> + DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC), >> + .vrefresh = 24, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_64_27, }, >> + /* 203 - 7680x4320@25Hz 64:27 */ >> + { DRM_MODE("7680x4320", DRM_MODE_TYPE_DRIVER, 1188000, 7680, 10032, >> + 10208, 10800, 0, 4320, 4336, 4356, 4400, 0, >> + DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC), >> + .vrefresh = 25, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_64_27, }, >> + /* 204 - 7680x4320@30Hz 64:27 */ >> + { DRM_MODE("7680x4320", DRM_MODE_TYPE_DRIVER, 1188000, 7680, 8232, >> + 8408, 9000, 0, 4320, 4336, 4356, 4400, 0, >> + DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC), >> + .vrefresh = 30, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_64_27, }, >> + /* 205 - 7680x4320@48Hz 64:27 */ >> + { DRM_MODE("7680x4320", DRM_MODE_TYPE_DRIVER, 2376000, 7680, 10232, >> + 10408, 11000, 0, 4320, 4336, 4356, 4500, 0, >> + DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC), >> + .vrefresh = 48, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_64_27, }, >> + /* 206 - 7680x4320@50Hz 64:27 */ >> + { DRM_MODE("7680x4320", DRM_MODE_TYPE_DRIVER, 2376000, 7680, 10032, >> + 10208, 10800, 0, 4320, 4336, 4356, 4400, 0, >> + DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC), >> + .vrefresh = 50, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_64_27, }, >> + /* 207 - 7680x4320@60Hz 64:27 */ >> + { DRM_MODE("7680x4320", DRM_MODE_TYPE_DRIVER, 2376000, 7680, 8232, >> + 8408, 9000, 0, 4320, 4336, 4356, 4400, 0, >> + DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC), >> + .vrefresh = 60, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_64_27, }, >> + /* 208 - 7680x4320@100Hz 64:27 */ >> + { DRM_MODE("7680x4320", DRM_MODE_TYPE_DRIVER, 4752000, 7680, 9792, >> + 9968, 10560, 0, 4320, 4336, 4356, 4500, 0, >> + DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC), >> + .vrefresh = 100, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_64_27, }, >> + /* 209 - 7680x4320@120Hz 64:27 */ >> + { DRM_MODE("7680x4320", DRM_MODE_TYPE_DRIVER, 4752000, 7680, 8032, >> + 8208, 8800, 0, 4320, 4336, 4356, 4500, 0, >> + DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC), >> + .vrefresh = 120, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_64_27, }, >> + /* 210 - 10240x4320@24Hz 64:27 */ >> + { DRM_MODE("10240x4320", DRM_MODE_TYPE_DRIVER, 1485000, 10240, 11732, >> + 11908, 12500, 0, 4320, 4336, 4356, 4950, 0, >> + DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC), >> + .vrefresh = 24, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_64_27, }, >> + /* 211 - 10240x4320@25Hz 64:27 */ >> + { DRM_MODE("10240x4320", DRM_MODE_TYPE_DRIVER, 1485000, 10240, 12732, >> + 12908, 13500, 0, 4320, 4336, 4356, 4400, 0, >> + DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC), >> + .vrefresh = 25, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_64_27, }, >> + /* 212 - 10240x4320@30Hz 64:27 */ >> + { DRM_MODE("10240x4320", DRM_MODE_TYPE_DRIVER, 1485000, 10240, 10528, >> + 10704, 11000, 0, 4320, 4336, 4356, 4500, 0, >> + DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC), >> + .vrefresh = 30, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_64_27, }, >> + /* 213 - 10240x4320@48Hz 64:27 */ >> + { DRM_MODE("10240x4320", DRM_MODE_TYPE_DRIVER, 2970000, 10240, 11732, >> + 11908, 12500, 0, 4320, 4336, 4356, 4950, 0, >> + DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC), >> + .vrefresh = 48, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_64_27, }, >> + /* 214 - 10240x4320@50Hz 64:27 */ >> + { DRM_MODE("10240x4320", DRM_MODE_TYPE_DRIVER, 2970000, 10240, 12732, >> + 12908, 13500, 0, 4320, 4336, 4356, 4400, 0, >> + DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC), >> + .vrefresh = 50, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_64_27, }, >> + /* 215 - 10240x4320@60Hz 64:27 */ >> + { DRM_MODE("10240x4320", DRM_MODE_TYPE_DRIVER, 2970000, 10240, 10528, >> + 10704, 11000, 0, 4320, 4336, 4356, 4500, 0, >> + DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC), >> + .vrefresh = 60, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_64_27, }, >> + /* 216 - 10240x4320@100Hz 64:27 */ >> + { DRM_MODE("10240x4320", DRM_MODE_TYPE_DRIVER, 5940000, 10240, 12432, >> + 12608, 13200, 0, 4320, 4336, 4356, 4500, 0, >> + DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC), >> + .vrefresh = 100, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_64_27, }, >> + /* 217 - 10240x4320@120Hz 64:27 */ >> + { DRM_MODE("10240x4320", DRM_MODE_TYPE_DRIVER, 5940000, 10240, 10528, >> + 10704, 11000, 0, 4320, 4336, 4356, 4500, 0, >> + DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC), >> + .vrefresh = 120, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_64_27, }, >> + /* 218 - 4096x2160@100Hz 256:135 */ >> + { DRM_MODE("4096x2160", DRM_MODE_TYPE_DRIVER, 1188000, 4096, 4896, >> + 4984, 5280, 0, 2160, 2168, 2178, 2250, 0, >> + DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC), >> + .vrefresh = 100, >> + .picture_aspect_ratio = HDMI_PICTURE_ASPECT_256_135, }, >> + /* 219 - 4096x2160@120Hz 256:135 */ >> + { DRM_MODE("4096x2160", DRM_MODE_TYPE_DRIVER, 1188000, 4096, 4184, >> + 4272, 4400, 0, 2160, 2168, 2178, 2250, 0, >> + DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC), >> + .vrefresh = 120, >> + .picture_aspect_ratio = HDMI_PICTURE_ASPECT_256_135, }, >> }; >> >> /* >> @@ -3030,6 +3398,12 @@ cea_mode_alternate_timings(u8 vic, struct drm_display_mode *mode) >> return false; >> } >> >> +static bool drm_valid_cea_vic(u8 vic) >> +{ >> + return (vic > 0 && vic < 128) || >> + (vic > 192 && vic < ARRAY_SIZE(edid_cea_modes)); >> +} >> + >> static u8 drm_match_cea_mode_clock_tolerance(const struct drm_display_mode *to_match, >> unsigned int clock_tolerance) >> { >> @@ -3046,6 +3420,9 @@ static u8 drm_match_cea_mode_clock_tolerance(const struct drm_display_mode *to_m >> struct drm_display_mode cea_mode = edid_cea_modes[vic]; >> unsigned int clock1, clock2; >> >> + if (!drm_valid_cea_vic(vic)) >> + continue; >> + >> /* Check both 60Hz and 59.94Hz */ >> clock1 = cea_mode.clock; >> clock2 = cea_mode_alternate_clock(&cea_mode); >> @@ -3085,6 +3462,9 @@ u8 drm_match_cea_mode(const struct drm_display_mode *to_match) >> struct drm_display_mode cea_mode = edid_cea_modes[vic]; >> unsigned int clock1, clock2; >> >> + if (!drm_valid_cea_vic(vic)) >> + continue; >> + >> /* Check both 60Hz and 59.94Hz */ >> clock1 = cea_mode.clock; >> clock2 = cea_mode_alternate_clock(&cea_mode); >> @@ -3103,11 +3483,6 @@ u8 drm_match_cea_mode(const struct drm_display_mode *to_match) >> } >> EXPORT_SYMBOL(drm_match_cea_mode); >> >> -static bool drm_valid_cea_vic(u8 vic) >> -{ >> - return vic > 0 && vic < ARRAY_SIZE(edid_cea_modes); >> -} >> - >> /** >> * drm_get_cea_aspect_ratio - get the picture aspect ratio corresponding to >> * the input VIC from the CEA mode list >> @@ -3117,6 +3492,9 @@ static bool drm_valid_cea_vic(u8 vic) >> */ >> enum hdmi_picture_aspect drm_get_cea_aspect_ratio(const u8 video_code) >> { >> + if (!drm_valid_cea_vic(video_code)) >> + return HDMI_PICTURE_ASPECT_NONE; >> + >> return edid_cea_modes[video_code].picture_aspect_ratio; >> } >> EXPORT_SYMBOL(drm_get_cea_aspect_ratio); >> diff --git a/include/drm/drm_connector.h b/include/drm/drm_connector.h >> index 681cb590f952..0a90efa0246e 100644 >> --- a/include/drm/drm_connector.h >> +++ b/include/drm/drm_connector.h >> @@ -188,19 +188,19 @@ struct drm_hdmi_info { >> >> /** >> * @y420_vdb_modes: bitmap of modes which can support ycbcr420 >> - * output only (not normal RGB/YCBCR444/422 outputs). There are total >> - * 107 VICs defined by CEA-861-F spec, so the size is 128 bits to map >> - * upto 128 VICs; >> + * output only (not normal RGB/YCBCR444/422 outputs). The max VIC >> + * defined by the CEA-861-G spec is 219, so the size is 256 bits to map >> + * upto 256 VICs. >> */ >> - unsigned long y420_vdb_modes[BITS_TO_LONGS(128)]; >> + unsigned long y420_vdb_modes[BITS_TO_LONGS(256)]; >> >> /** >> * @y420_cmdb_modes: bitmap of modes which can support ycbcr420 >> - * output also, along with normal HDMI outputs. There are total 107 >> - * VICs defined by CEA-861-F spec, so the size is 128 bits to map upto >> - * 128 VICs; >> + * output also, along with normal HDMI outputs. The max VIC defined by >> + * the CEA-861-G spec is 219, so the size is 256 bits to map upto 256 >> + * VICs. >> */ >> - unsigned long y420_cmdb_modes[BITS_TO_LONGS(128)]; >> + unsigned long y420_cmdb_modes[BITS_TO_LONGS(256)]; >> >> /** @y420_cmdb_map: bitmap of SVD index, to extraxt vcb modes */ >> u64 y420_cmdb_map; >>