From patchwork Tue Jan 19 12:11:27 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pan Bian X-Patchwork-Id: 12035119 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=-13.5 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,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 5E259C43381 for ; Thu, 21 Jan 2021 08:36:36 +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 0D1E4216C4 for ; Thu, 21 Jan 2021 08:36:36 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0D1E4216C4 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=163.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 4BDBD6E52A; Thu, 21 Jan 2021 08:36:33 +0000 (UTC) X-Greylist: delayed 990 seconds by postgrey-1.36 at gabe; Tue, 19 Jan 2021 12:30:46 UTC Received: from m12-13.163.com (m12-13.163.com [220.181.12.13]) by gabe.freedesktop.org (Postfix) with ESMTPS id 640336E270 for ; Tue, 19 Jan 2021 12:30:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-Id; bh=NZGos6Tvdki8RvSsBC WBQtx4tZjAg15U+vqKeffYzIs=; b=dwqHWTSGSeBY5Z/bQgNoIa1lLHhORcmc5t /QqU6WhWpS4P0Ry/9ydZDDtxgRoR1FjdaslcBvVrjH/OIee54x3t+DPG+Brxt+lG q05QqVatIaEF1UuG8OnPuo4x1p1nEKIMPkvKdEQrei6KKviueozVgOSffCFkQGDv qU2ToxEBI= Received: from localhost.localdomain (unknown [119.3.119.20]) by smtp9 (Coremail) with SMTP id DcCowACXmpJyzAZgi+pLbg--.38347S4; Tue, 19 Jan 2021 20:11:34 +0800 (CST) From: Pan Bian To: Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Daniel Vetter , Sean Paul Subject: [PATCH 1/1] drm/atomic: put state on error path Date: Tue, 19 Jan 2021 04:11:27 -0800 Message-Id: <20210119121127.84127-1-bianpan2016@163.com> X-Mailer: git-send-email 2.17.1 X-CM-TRANSID: DcCowACXmpJyzAZgi+pLbg--.38347S4 X-Coremail-Antispam: 1Uf129KBjvdXoW7GF15Jw4fXw45Kw4kZrW3Awb_yoW3JFg_CF 18XFs7KrZak34vvw1Ska1SqFyIkFnrZrs5u3W7tFW3AFn7Wr13K3s0gryrWr1jqr1fJrWD Xan2qFyfZryxCjkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUvcSsGvfC2KfnxnUUI43ZEXa7IU5oT5JUUUUU== X-Originating-IP: [119.3.119.20] X-CM-SenderInfo: held01tdqsiiqw6rljoofrz/1tbiDhYfclXly7ZZuQAAsY X-Mailman-Approved-At: Thu, 21 Jan 2021 08:36:20 +0000 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Pan Bian , linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Put the state before returning error code. Fixes: 44596b8c4750 ("drm/atomic: Unify conflicting encoder handling.") Signed-off-by: Pan Bian --- drivers/gpu/drm/drm_atomic_helper.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/drm_atomic_helper.c b/drivers/gpu/drm/drm_atomic_helper.c index ba1507036f26..4a8cbec832bc 100644 --- a/drivers/gpu/drm/drm_atomic_helper.c +++ b/drivers/gpu/drm/drm_atomic_helper.c @@ -3021,7 +3021,7 @@ int drm_atomic_helper_set_config(struct drm_mode_set *set, ret = handle_conflicting_encoders(state, true); if (ret) - return ret; + goto fail; ret = drm_atomic_commit(state);