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=-12.8 required=3.0 tests=BAYES_00,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=unavailable 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 C244EC388F9 for ; Tue, 27 Oct 2020 17:23:10 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 8023D21D24 for ; Tue, 27 Oct 2020 17:23:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1603819390; bh=Y6cgY3oUu3wLw2JdIFybvkHTjbjzW/z4guvS7ng9Q6A=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=1hv1rGQo+1Nn6auLW01/q34ZsY2NZ4GJU3KM+R/G1dLTSVYlco1knyWC6jADZkivA wskm+tjz1Wvplict9PtOh3lvqSadQlxoUSoRcGFFyXcYWRVQdCoOady3p/Ze1qJEbE CVDxRUp5EZJFnqzvASPjiwFk0+GA3g7nkD/xsLSg= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1818746AbgJ0RXJ (ORCPT ); Tue, 27 Oct 2020 13:23:09 -0400 Received: from mail.kernel.org ([198.145.29.99]:55358 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1780603AbgJ0Oys (ORCPT ); Tue, 27 Oct 2020 10:54:48 -0400 Received: from localhost (83-86-74-64.cable.dynamic.v4.ziggo.nl [83.86.74.64]) (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 8B8F122202; Tue, 27 Oct 2020 14:54:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1603810488; bh=Y6cgY3oUu3wLw2JdIFybvkHTjbjzW/z4guvS7ng9Q6A=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hPPbzQKbM/iwLfJZUZjuW3WiLnes+ud7lZemu+flAmF6h7Mk+oKed/bhT92fBJgdG h4Bl6B8Irdnhsm1Mgj/Ey/BZSG32Lj9BExXJ/VVuNC4LKha2abSgHGwbW1U+6vbpnG CFG+VQ7PuxGpHz7O/iZTAFolpAdApj38wqHJC/mI= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Leo Li , Tianjia Zhang , Alex Deucher , Sasha Levin Subject: [PATCH 5.8 157/633] drm/amd/display: Fix wrong return value in dm_update_plane_state() Date: Tue, 27 Oct 2020 14:48:20 +0100 Message-Id: <20201027135530.049979849@linuxfoundation.org> X-Mailer: git-send-email 2.29.1 In-Reply-To: <20201027135522.655719020@linuxfoundation.org> References: <20201027135522.655719020@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: Tianjia Zhang [ Upstream commit c35376137e940c3389df2726a92649c01a9844b4 ] On an error exit path, a negative error code should be returned instead of a positive return value. Fixes: 9e869063b0021 ("drm/amd/display: Move iteration out of dm_update_planes") Cc: Leo Li Signed-off-by: Tianjia Zhang Signed-off-by: Alex Deucher Signed-off-by: Sasha Levin --- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c index 7c1cc0ba30a55..78cf9e4fddbdf 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c @@ -8178,8 +8178,7 @@ static int dm_update_plane_state(struct dc *dc, dm_old_plane_state->dc_state, dm_state->context)) { - ret = EINVAL; - return ret; + return -EINVAL; } -- 2.25.1