From patchwork Mon Nov 18 10:18:32 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Lin, Wayne" X-Patchwork-Id: 11249285 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 56580913 for ; Mon, 18 Nov 2019 10:19:08 +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 3E8D220727 for ; Mon, 18 Nov 2019 10:19:08 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 3E8D220727 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=amd.com 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 BCACF89FD7; Mon, 18 Nov 2019 10:19:05 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from NAM04-SN1-obe.outbound.protection.outlook.com (mail-eopbgr700077.outbound.protection.outlook.com [40.107.70.77]) by gabe.freedesktop.org (Postfix) with ESMTPS id E546B89FAD; Mon, 18 Nov 2019 10:19:02 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Eex8XJrPBMw7feISP6KOyMzvUjp4fDyQC9AD6OXqi4VnV3Ygi5gzyMfjnkXVdtBPjGtRwGXgmrBmEA/Ujt9IsjZZzOhOOdyPCdqrOjXeck97AWhby+RcjC/YPoAKtr40grHivhKfKigDVucwGFtXGVX7DlRbqzLTPxrgDkGAuqrsUFxnd7yQg1IV4LDUeF6DPuGzXnhJ516fe/UKLZ3TEJRjoYTBcyg6cxdbGCCNpQYbuMYJ1sfBVaVqKypLOpXUN2qaGnPe1WZNyWxPN1vf8P3vB0po4R+/n83Eaa5r3le35NYF58uGTjE0/glAvImSNcgiP4NpNt1jgfNe+kpcsw== 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=G3COM2ODV8XXa5dOCNSHyDpF20xE//Ly4I9KGiFFCJw=; b=JWUCv9kxlaLtufYSuaQsZrdrHePHemhOgocNnzPvg++izlghj4+wSnUTQJa4Mk55luJzRv5YSc3afCv3ZrB0OuPfw4da3qmdgWDUA1JT0nC5A0E00jDOLzFve7axmUwSQgK/lVfo5GbPBn5jts2bt6B2pAfjgcwmxv6CTtTWR/mRKm247nr8oCS3yKNOfJSN3AQotok+8YuzmMxZ+st1GR8EkrtgoM+Tegq8stYkaDPryCQnVpniUQEgPA+fuBR88KwP8nVXL96fYVaNZ/sy5guVPQtCfOAkCUZDXDjM+9gsVZGkRrKZBUhyo3eRbViJNAfzwyJKdimdUUo3io5LXg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none (sender ip is 165.204.84.17) smtp.rcpttodomain=lists.freedesktop.org smtp.mailfrom=amd.com; dmarc=permerror action=none header.from=amd.com; dkim=none (message not signed); arc=none Received: from DM3PR12CA0097.namprd12.prod.outlook.com (2603:10b6:0:55::17) by SN1PR12MB2349.namprd12.prod.outlook.com (2603:10b6:802:24::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2451.23; Mon, 18 Nov 2019 10:19:01 +0000 Received: from BN8NAM11FT068.eop-nam11.prod.protection.outlook.com (2a01:111:f400:7eae::200) by DM3PR12CA0097.outlook.office365.com (2603:10b6:0:55::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.2451.23 via Frontend Transport; Mon, 18 Nov 2019 10:19:01 +0000 Received-SPF: None (protection.outlook.com: amd.com does not designate permitted sender hosts) Received: from SATLEXMB02.amd.com (165.204.84.17) by BN8NAM11FT068.mail.protection.outlook.com (10.13.177.69) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256) id 15.20.2451.23 via Frontend Transport; Mon, 18 Nov 2019 10:19:01 +0000 Received: from SATLEXMB01.amd.com (10.181.40.142) by SATLEXMB02.amd.com (10.181.40.143) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1713.5; Mon, 18 Nov 2019 04:19:00 -0600 Received: from wayne-System-Product-Name.amd.com (10.180.168.240) by SATLEXMB01.amd.com (10.181.40.142) with Microsoft SMTP Server id 15.1.1713.5 via Frontend Transport; Mon, 18 Nov 2019 04:18:58 -0600 From: Wayne Lin To: , Subject: [PATCH V2 2/2] drm/edid: Add alternate clock for SMPTE 4K Date: Mon, 18 Nov 2019 18:18:32 +0800 Message-ID: <20191118101832.15487-2-Wayne.Lin@amd.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191118101832.15487-1-Wayne.Lin@amd.com> References: <20191118101832.15487-1-Wayne.Lin@amd.com> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-HT: Tenant X-Forefront-Antispam-Report: CIP:165.204.84.17; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(4636009)(376002)(396003)(346002)(39860400002)(136003)(428003)(199004)(189003)(110136005)(36756003)(70206006)(76176011)(26005)(7696005)(51416003)(54906003)(5660300002)(356004)(6666004)(47776003)(316002)(70586007)(86362001)(50466002)(48376002)(16586007)(1076003)(2906002)(426003)(478600001)(486006)(50226002)(8936002)(126002)(2616005)(446003)(336012)(476003)(4326008)(8676002)(53416004)(186003)(305945005)(81156014)(81166006)(11346002); DIR:OUT; SFP:1101; SCL:1; SRVR:SN1PR12MB2349; H:SATLEXMB02.amd.com; FPR:; SPF:None; LANG:en; PTR:InfoDomainNonexistent; A:1; MX:1; X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: bc6f68e1-4de6-4551-b7a5-08d76c10bb27 X-MS-TrafficTypeDiagnostic: SN1PR12MB2349: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:6790; X-Forefront-PRVS: 0225B0D5BC X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ELFtq5JSikGJo2AGDqIryOIZuUyYuPMfEFNUr3Bx688HvADuvaq3J01iFe/ojBfkT6jKeUVh+Xv523bRbpFclT64B4/FScHa83ZCzI2tMlIm4bMj++20On+zTlFWvNJ2i+sotHGaWqSoCOZhffqa+6ztrNPiEGSsiKHuROXeD/7Vbrh0VulKcxmUYAeshE2lZOYhNJDKpk5yfDUymB9WQx0YxWe+47/hQKJSKzEa4OEIBW/y1zXDDj6Y/s6FKcNoMgc0T3waeFHB9h4bk829I1ovuFyE1ZqGQDh2z4n6okWVlg2dOB3i+1K8oFV//48Sipr8mTP7uUVvyrW2nvsekyjoR/zPZjJtDeTlo1N/dFZAgQwWIg3sC+zfvEJsfFLUYMgYp8TWwGvqoC9VqwmHSXcocY7gmNScGtLI5K/KcnUMEjtBy8evXaeEKjNq138J X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Nov 2019 10:19:01.1003 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: bc6f68e1-4de6-4551-b7a5-08d76c10bb27 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d; Ip=[165.204.84.17]; Helo=[SATLEXMB02.amd.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN1PR12MB2349 X-Mailman-Original-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=G3COM2ODV8XXa5dOCNSHyDpF20xE//Ly4I9KGiFFCJw=; b=osmL0W1PbZQAvXEJv2Xvfsz+c9c7v+hCoPLMk5i/EHVvI6ENF16Hc0y8c8ln5rasgr+5vAZEdBpyCdPHUxi81q0jq2INtDrODkw8/li2X6YqdOZUiy3XF+1qzJ8xIjLMJivMFizwmzzt43crJf/AiORb1TroG4TeChoQQB+pZrY= X-Mailman-Original-Authentication-Results: spf=none (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; lists.freedesktop.org; dkim=none (message not signed) header.d=none;lists.freedesktop.org; dmarc=permerror action=none header.from=amd.com; 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: Wayne Lin Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" [Why] In hdmi_mode_alternate_clock(), it adds an exception for VIC 4 mode (4096x2160@24) due to there is no alternate clock defined for that mode in HDMI1.4b. But HDMI2.0 adds 23.98Hz for that mode. [How] Remove the exception v2: Adjust the comment description of hdmi_mode_alternate_clock() due to there is no more exception for VIC 4 mode. Signed-off-by: Wayne Lin --- drivers/gpu/drm/drm_edid.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c index 0307cad36f14..e6368c3c4471 100644 --- a/drivers/gpu/drm/drm_edid.c +++ b/drivers/gpu/drm/drm_edid.c @@ -3118,17 +3118,10 @@ static enum hdmi_picture_aspect drm_get_hdmi_aspect_ratio(const u8 video_code) /* * Calculate the alternate clock for HDMI modes (those from the HDMI vendor * specific block). - * - * It's almost like cea_mode_alternate_clock(), we just need to add an - * exception for the VIC 4 mode (4096x2160@24Hz): no alternate clock for this - * one. */ static unsigned int hdmi_mode_alternate_clock(const struct drm_display_mode *hdmi_mode) { - if (hdmi_mode->vdisplay == 4096 && hdmi_mode->hdisplay == 2160) - return hdmi_mode->clock; - return cea_mode_alternate_clock(hdmi_mode); }