From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5C949C35641 for ; Fri, 21 Feb 2020 08:14:39 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2A38220722 for ; Fri, 21 Feb 2020 08:14:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1582272879; bh=We/SMqES5kF9MPTnXDpKNKHaq6SPjYDZobbxfBZQkFw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=03BFispv7BqwIc6DtNeOzWc60dG+DZV7SlY6b0XQmgQpXQxctmaEmh+0q58q5eZYB DV0omW1gbWR/FbAB3LTY1nAFmScXZpefNksKRA59hiIsbmP1uak6UBOOXaMcMoLJkZ lZKavADfu0LxsQ2Q/tIkFxJkE3MKrWO3W3pVW1MI= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732902AbgBUIOi (ORCPT ); Fri, 21 Feb 2020 03:14:38 -0500 Received: from mail.kernel.org ([198.145.29.99]:51154 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1733203AbgBUIOh (ORCPT ); Fri, 21 Feb 2020 03:14:37 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 26F0320722; Fri, 21 Feb 2020 08:14:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1582272876; bh=We/SMqES5kF9MPTnXDpKNKHaq6SPjYDZobbxfBZQkFw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=wFEHXwTRU5OSOZuyne7uGX+8+ABJ1A3dvZjJnzjInBxpOHc3rT2siIHPSZqv9ZXBu QYGYB1WzUs4yL6gHeKbecOHCjUhoeOyGPhS7t6g+f9XUoInorklvlx7N2VdwngUpkZ X7lN5QP977vXo+N7q75gxV5JUAWYDM1y5monZZnY= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Dor Askayo , Leo Li , Alex Deucher , Sasha Levin Subject: [PATCH 5.4 309/344] drm/amd/display: do not allocate display_mode_lib unnecessarily Date: Fri, 21 Feb 2020 08:41:48 +0100 Message-Id: <20200221072418.050680237@linuxfoundation.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200221072349.335551332@linuxfoundation.org> References: <20200221072349.335551332@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Dor Askayo [ Upstream commit bb67bfd2e7101bf2ac5327b0b7a847cd9fb9723f ] This allocation isn't required and can fail when resuming from suspend. Bug: https://gitlab.freedesktop.org/drm/amd/issues/1009 Signed-off-by: Dor Askayo Reviewed-by: Leo Li Signed-off-by: Alex Deucher Signed-off-by: Sasha Levin --- drivers/gpu/drm/amd/display/dc/core/dc.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/drivers/gpu/drm/amd/display/dc/core/dc.c b/drivers/gpu/drm/amd/display/dc/core/dc.c index 4b8819c27fcda..4704aac336c29 100644 --- a/drivers/gpu/drm/amd/display/dc/core/dc.c +++ b/drivers/gpu/drm/amd/display/dc/core/dc.c @@ -2267,12 +2267,7 @@ void dc_set_power_state( enum dc_acpi_cm_power_state power_state) { struct kref refcount; - struct display_mode_lib *dml = kzalloc(sizeof(struct display_mode_lib), - GFP_KERNEL); - - ASSERT(dml); - if (!dml) - return; + struct display_mode_lib *dml; switch (power_state) { case DC_ACPI_CM_POWER_STATE_D0: @@ -2294,6 +2289,12 @@ void dc_set_power_state( * clean state, and dc hw programming optimizations will not * cause any trouble. */ + dml = kzalloc(sizeof(struct display_mode_lib), + GFP_KERNEL); + + ASSERT(dml); + if (!dml) + return; /* Preserve refcount */ refcount = dc->current_state->refcount; @@ -2307,10 +2308,10 @@ void dc_set_power_state( dc->current_state->refcount = refcount; dc->current_state->bw_ctx.dml = *dml; + kfree(dml); + break; } - - kfree(dml); } void dc_resume(struct dc *dc) -- 2.20.1