From patchwork Mon Oct 24 19:22:23 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hamza Mahfooz X-Patchwork-Id: 10316 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp657608wru; Mon, 24 Oct 2022 14:22:02 -0700 (PDT) X-Google-Smtp-Source: AMsMyM69JlPYzuMlrGShLqmmQI/UBilxcQ5/bL52+rfUCqRSMWumVdRA3U6PLqyZvq6biXL1bcdi X-Received: by 2002:a17:902:e545:b0:184:2f27:b34 with SMTP id n5-20020a170902e54500b001842f270b34mr34883369plf.15.1666646521756; Mon, 24 Oct 2022 14:22:01 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1666646521; cv=pass; d=google.com; s=arc-20160816; b=oXupUr2Csqn3VCu4x2zSNNYFAEVZJYsP1PVLdWgi3xGcuz40//Mq+z50xAo1Fd6KRo ja9djtgmyImn6aCI5kmS8fMUB2+UGRBQqMdyAL0xx4wZSwjQ82HcxpK+fVOdwsw/USKz 3EjFedlysETL1C1/yNHpUMOffa2RPI1ewsbRTAUZg746uXNLxZXAVT5rkgFbxw7zmINx xie64xPrgftDOciPACxNkFEjef7KjrAFD9QzKXGsHRtPFAiMIJFjeROfw+TPIllFHII2 YBjPrNkF+vX5Xw90AJSZb1UQu5xj7IaLwPjImsbQ11qgJ8JzK4pUTDy49FxqXm/H9pmo 0Psw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=/FZIDUtBWWbZ/wPiPscK9ZnHx0FFs3KSQkoOu752NP0=; b=UF+eksUci+ahtbK+ITwQ23TVyYxVX3J926eL8utH32INvUPNAIw4NXBKU7gRgSumKz vYZzy25kIVLytx3cGOo2ZSicS/dGc0ROkWNg2NFHXM+XMfMSln98QE5IiXbfFOhAvcZp xP284JqxbfHhRzHZKsm2k8TgA6RKoi/ftTiJ0GeDWhQ8z/jmcUV1SmIdtC11Sdxm+8xM zI9tCPra5RXdqRIF/Ij3no8gQmvRxVUWl1oRJi2uInsMXE0IHXBovRQNU/eVbILQMUUx 4aVHbtFArVlA5vXMWK7jKEMNOWWfvcgoKv4yeBaWzddfYPeG0Fu1rEG9u87SiXKRtjgH XGvg== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amd.com header.s=selector1 header.b=mMmO6Xxf; arc=pass (i=1 spf=pass spfdomain=amd.com dmarc=pass fromdomain=amd.com); spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=amd.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id bc7-20020a170902930700b001867ea919bdsi629309plb.25.2022.10.24.14.21.47; Mon, 24 Oct 2022 14:22:01 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@amd.com header.s=selector1 header.b=mMmO6Xxf; arc=pass (i=1 spf=pass spfdomain=amd.com dmarc=pass fromdomain=amd.com); spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=amd.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233692AbiJXVTw (ORCPT + 99 others); Mon, 24 Oct 2022 17:19:52 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49068 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232578AbiJXVSp (ORCPT ); Mon, 24 Oct 2022 17:18:45 -0400 Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2082.outbound.protection.outlook.com [40.107.220.82]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0A080E4C00 for ; Mon, 24 Oct 2022 12:25:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=b2nReaG1mCRiKbCZjQgb4YgXzFQlU7/T+Rc0H2wStkOnyKACYpqX8DsKXHYnsscLx49YzCGRNR6NZIXtCpQtwKO0hsVYFXleX248XDizUdnzzuxpzDX4KAb72fFanUlWB+Yrj/LANu72ieJs1aim+jC4TSWyiSIklP7RShvmSNsz11GQ7zlMgEOMXp0jbxIKg2T7MlBR7kalbsDzpemIVN1RO3o35xPGTejuoysR4MIipwL/GVTeutAbNgnuI+mPBCGI9HDDwZBG7hoRbQhtWxojW5r7WGm8Z2TGt37XgvVdLaXjDd6Sk6IvudNMFVvcKnIxG0yfgh6HroW3/Y6aRQ== 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-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=/FZIDUtBWWbZ/wPiPscK9ZnHx0FFs3KSQkoOu752NP0=; b=HEKcYgU1FlICKplRGmCY6hF87pLKGPAUPc7jBzkrlFsyVCkCJ8uZyRUsRnvqEtX9nOvOzgRG3KskYBTue2DAt2aPEQqkf81dsG9AGkrGMxnH+jNlOYgWtl78eIvnPhWe3r38anglVlrWAjAeZcqodAq3730q0PLufR2U53kL2Vp6dxIUInOa5Y4OBj2H2wEKdJYNP5ErXcIE9mYFV7eya1lTwZfpQeJhUjY0hT1G3cONLdBH6emmzwyyiO6BCQn3z2PoOIRohXqVslQG+4iWEL/YZ27ny/86cGcd7Okkfl47vnvFHnaaOLS66G5fnT6FN5GbQdDsU/hCHn7NKzC+9A== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=vger.kernel.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=/FZIDUtBWWbZ/wPiPscK9ZnHx0FFs3KSQkoOu752NP0=; b=mMmO6XxfxfGp5b/UPFZxaxuggkTDabq1DYUe1lNqmUDWZEW9y7oNi/tbyqvX6vgt59OOWRiLfr9wt+1z7E+yJg2LNRQguRB3q/bdqWOi4Re6EjM87EDmOYA7y7D2+p+goeL/bWYszYfwK9N1MfgrqTzSKy3XFCDnKeTv06LI/r8= Received: from BN9PR03CA0717.namprd03.prod.outlook.com (2603:10b6:408:ef::32) by BY5PR12MB4146.namprd12.prod.outlook.com (2603:10b6:a03:20d::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5746.23; Mon, 24 Oct 2022 19:22:17 +0000 Received: from BL02EPF0000C406.namprd05.prod.outlook.com (2603:10b6:408:ef:cafe::25) by BN9PR03CA0717.outlook.office365.com (2603:10b6:408:ef::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5746.26 via Frontend Transport; Mon, 24 Oct 2022 19:22:17 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by BL02EPF0000C406.mail.protection.outlook.com (10.167.241.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5723.20 via Frontend Transport; Mon, 24 Oct 2022 19:22:17 +0000 Received: from hamza-pc.amd.com (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Mon, 24 Oct 2022 14:22:15 -0500 From: Hamza Mahfooz To: CC: Roman Li , Hamza Mahfooz , "Harry Wentland" , Leo Li , "Rodrigo Siqueira" , Alex Deucher , =?utf-8?q?Christian_K=C3=B6nig?= , "Pan, Xinhui" , David Airlie , Daniel Vetter , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , Nicholas Kazlauskas , Aurabindo Pillai , Wayne Lin , Fangzhi Zuo , Lyude Paul , Ian Chen , Bhawanpreet Lakha , Claudio Suarez , Colin Ian King , hersen wu , , Subject: [PATCH 3/3] Revert "drm/amd/display: Limit max DSC target bpp for specific monitors" Date: Mon, 24 Oct 2022 15:22:23 -0400 Message-ID: <20221024192224.180507-3-hamza.mahfooz@amd.com> X-Mailer: git-send-email 2.38.0 In-Reply-To: <20221024192224.180507-1-hamza.mahfooz@amd.com> References: <20221024192224.180507-1-hamza.mahfooz@amd.com> MIME-Version: 1.0 X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB03.amd.com (10.181.40.144) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BL02EPF0000C406:EE_|BY5PR12MB4146:EE_ X-MS-Office365-Filtering-Correlation-Id: 22709067-cc6e-47c9-9188-08dab5f5107d X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: lOoDvX2nGXwNv9SYB5BSZlI2uz3IMgJi/ZFQR3ZgEH0R8IU44rxVHhqQLAImVL/v2NzK2LjkkrDMgAxlkS8saG53BxQWDCeCjXSyrRsRTs1ACL7OxZMphtPMe+jSi8VKXXDpQboha5b2B1itEzt8/07m+SuQgwf9OPsBFDltbgLmw4SwiIaUzt4Cn6mAywQ1YADChEYsW3UbSyjpARCWTU3YuK7YRLGqHX5NTIMOpLDySWx/lQsCypJHm3uAZSxpXsrty976cZcKAej8Q6+DUS1dNZqjGDlthkWCIO6hHWtN4MzJZAheY2cUBCT4DQHEmVXXIC7Ksgp4CPJaiHe42LDIWMoJf/EH7QmOyXNR7QC6OfJJLbFIKkJBwlm7LWpadxyu5i2Df6F6+TM98CwmXRtUhhGDwd3Xh37OmTBoieevHCvG57pgMHKet7KHiTVASjU50CjokKy9yOJlXD/cqh3uTHJ9rGnMYLZF/I76lpVNTA06KTfj9w2kLrqUo7+/WGiRHK7/7+YcEnDqFnJ2RZSY3JQ5S8TQ65PWSKEKisldz7qH4Bc0aZKROtLZDCD+AvxonYCMR+6q4L9gYdsFwSp8ep+9OlnE9PxO2ZEfGcSrCb2OzF24WgOzeymov4JsyzLuSKwLOFS4xlX4MzbSDdtmTZJEfyUqoxaJ3IoZd1CuoczhocSAhyoNhf9GmrqJ0wZ7YaSpMEwFKBGklXh9JWyl141zuAqhTuUjNymjgNYy6tyTQF8b5bKsM46qg1/uiMQVjIn2xzxyonStAcNDLXt/+eVLR425rmt3NFUkUupoPzu0aHptIfcPluXuMAj3LiKgU94vi2oS/NKYVByZOg== X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:SATLEXMB04.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230022)(4636009)(396003)(376002)(39860400002)(136003)(346002)(451199015)(46966006)(36840700001)(40470700004)(6666004)(316002)(36860700001)(54906003)(6916009)(426003)(47076005)(8936002)(40480700001)(40460700003)(2906002)(186003)(16526019)(2616005)(1076003)(70206006)(7416002)(8676002)(7696005)(5660300002)(44832011)(4326008)(26005)(83380400001)(336012)(70586007)(86362001)(41300700001)(478600001)(36756003)(81166007)(82310400005)(356005)(82740400003)(16060500005)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Oct 2022 19:22:17.4157 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 22709067-cc6e-47c9-9188-08dab5f5107d 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=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: BL02EPF0000C406.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY5PR12MB4146 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1747605543027470922?= X-GMAIL-MSGID: =?utf-8?q?1747605543027470922?= This reverts commit 55eea8ef98641f6e1e1c202bd3a49a57c1dd4059. This quirk is now handled in the DRM core, so we can drop all of the internal code that was added to handle it. Signed-off-by: Hamza Mahfooz Reviewed-by: Harry Wentland --- .../amd/display/amdgpu_dm/amdgpu_dm_helpers.c | 35 ------------------- 1 file changed, 35 deletions(-) diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c index 4956a0118215..a21e2ba77ddb 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c @@ -41,39 +41,6 @@ #include "dm_helpers.h" #include "ddc_service_types.h" -struct monitor_patch_info { - unsigned int manufacturer_id; - unsigned int product_id; - void (*patch_func)(struct dc_edid_caps *edid_caps, unsigned int param); - unsigned int patch_param; -}; -static void set_max_dsc_bpp_limit(struct dc_edid_caps *edid_caps, unsigned int param); - -static const struct monitor_patch_info monitor_patch_table[] = { -{0x6D1E, 0x5BBF, set_max_dsc_bpp_limit, 15}, -{0x6D1E, 0x5B9A, set_max_dsc_bpp_limit, 15}, -}; - -static void set_max_dsc_bpp_limit(struct dc_edid_caps *edid_caps, unsigned int param) -{ - if (edid_caps) - edid_caps->panel_patch.max_dsc_target_bpp_limit = param; -} - -static int amdgpu_dm_patch_edid_caps(struct dc_edid_caps *edid_caps) -{ - int i, ret = 0; - - for (i = 0; i < ARRAY_SIZE(monitor_patch_table); i++) - if ((edid_caps->manufacturer_id == monitor_patch_table[i].manufacturer_id) - && (edid_caps->product_id == monitor_patch_table[i].product_id)) { - monitor_patch_table[i].patch_func(edid_caps, monitor_patch_table[i].patch_param); - ret++; - } - - return ret; -} - /* dm_helpers_parse_edid_caps * * Parse edid caps @@ -148,8 +115,6 @@ enum dc_edid_status dm_helpers_parse_edid_caps( kfree(sads); kfree(sadb); - amdgpu_dm_patch_edid_caps(edid_caps); - return result; }