Received: by 2002:a05:6a10:8c0a:0:0:0:0 with SMTP id go10csp4135474pxb; Mon, 8 Feb 2021 08:44:59 -0800 (PST) X-Google-Smtp-Source: ABdhPJzYTwcmrXIbTKd/8jntTijPI9o+2pH0kyRAhIgK45ObsuXK+mH4CpT9Qbzir1lVruoLbBpN X-Received: by 2002:aa7:d906:: with SMTP id a6mr8998248edr.74.1612802699500; Mon, 08 Feb 2021 08:44:59 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1612802699; cv=none; d=google.com; s=arc-20160816; b=mZy9HD8NPb52wgz9cRKAUDOiW1/KeDRv5FFnkvhGpKd51jUAL3qQCyOJpftkqZoVv6 uJxnXHik07IafrS18hyCiAMW13KcaWuyLJPkx0PBferCnJTTcHbbN2hmSdp12ezdn9K3 k6RLF8E+uSrtGpeQcii5U2ENgDKbJGoKahREAiCLczPZ+srlb9wZplvobhjP13LCPs5F hoaEjwsHj7OLUOerm/7cH+/B49xnjHcsvxLOgitvB9Y+D/xDyIdYir18lS7/DiwVaCj8 h7L9m+zOfe7014xxY++p2isFcX8NiUGta1uVDi/hBv+/mihrTplcgEQpFXHog/D74aBw S53Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=RIf2KlFvDv0utlcq0tKhrrxXqmQ0G7j6FvbcDbl+Djo=; b=fB+ibprK/Y1wwhEc8DmhZGczZwTwmg1bqWo2cL4/FGeY6gshwidMlqoWEc0JxtdW6a n4n/wikW0Ui4/VIhuNqC38pzKtXmn2FNAWvamwS8mDUAJlixjoXxWBeGJzlI1XyKkgyO 5bROAuEDQRIZVuZrrKjjN5QMAshrhck/dQRK1kMoKyvN83NLq/O9IBZSA3gPjAQ1CWf5 PYjSH7QRDwk7dPwnWUAb3ZV8RwENGuGGg9gE4aqqiS9ZSuUM1TODeawf3fimbidbfO2z Q+gHmvznBl9wjyBEarv2gCaQyzSjHLk5pu+SLsCKsjf6+8pfBBEpQbE7Dx71nwyqkO/b zLlw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=I41v4RnU; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id mj22si12649533ejb.115.2021.02.08.08.44.35; Mon, 08 Feb 2021 08:44:59 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=I41v4RnU; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232913AbhBHQoG (ORCPT + 99 others); Mon, 8 Feb 2021 11:44:06 -0500 Received: from mail.kernel.org ([198.145.29.99]:56648 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233516AbhBHPOt (ORCPT ); Mon, 8 Feb 2021 10:14:49 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id 32ACD64ECF; Mon, 8 Feb 2021 15:10:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1612797059; bh=1tIf1/ts3LmImnt+l2+rS1rHr4ljQ4b0tGcspUITR7I=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=I41v4RnU98KSrUcyKlDZ7XQtIgpEcnb5KnlwK8fDUTXmPvZTioDlkwpLfbyXnKw8p LaBFgMMpUssolw4kfPsw9AZ6/ZkDp75EZI9VdQbeesWrOPd+R08E1ouBiS3FPKv/jv UvEoSyTftK8gcUxAog94EOclu/apffkITbktBgi0= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Stylon Wang , Rodrigo Siqueira , Anson Jacob , Daniel Wheeler , Alex Deucher Subject: [PATCH 5.4 43/65] drm/amd/display: Revert "Fix EDID parsing after resume from suspend" Date: Mon, 8 Feb 2021 16:01:15 +0100 Message-Id: <20210208145811.884368771@linuxfoundation.org> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20210208145810.230485165@linuxfoundation.org> References: <20210208145810.230485165@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Stylon Wang commit 1a10e5244778169a5a53a527d7830cf0438132a1 upstream. This reverts commit b24bdc37d03a0478189e20a50286092840f414fa. It caused memory leak after S3 on 4K HDMI displays. Signed-off-by: Stylon Wang Reviewed-by: Rodrigo Siqueira Acked-by: Anson Jacob Tested-by: Daniel Wheeler Signed-off-by: Alex Deucher Cc: stable@vger.kernel.org Signed-off-by: Greg Kroah-Hartman --- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 2 -- 1 file changed, 2 deletions(-) --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c @@ -1434,8 +1434,6 @@ amdgpu_dm_update_connector_after_detect( drm_connector_update_edid_property(connector, aconnector->edid); - drm_add_edid_modes(connector, aconnector->edid); - if (aconnector->dc_link->aux_mode) drm_dp_cec_set_edid(&aconnector->dm_dp_aux.aux, aconnector->edid);