From patchwork Wed Mar 29 17:41:36 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 9652043 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 3478060349 for ; Wed, 29 Mar 2017 17:41:47 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2FD7528505 for ; Wed, 29 Mar 2017 17:41:47 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 246F728507; Wed, 29 Mar 2017 17:41:47 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 7859C28505 for ; Wed, 29 Mar 2017 17:41:46 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id E94706E75F; Wed, 29 Mar 2017 17:41:45 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-wr0-x244.google.com (mail-wr0-x244.google.com [IPv6:2a00:1450:400c:c0c::244]) by gabe.freedesktop.org (Postfix) with ESMTPS id CB9B46E761 for ; Wed, 29 Mar 2017 17:41:44 +0000 (UTC) Received: by mail-wr0-x244.google.com with SMTP id p52so5041507wrc.2 for ; Wed, 29 Mar 2017 10:41:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=from:to:cc:subject:date:message-id; bh=LPA0+Y6eWv5rS2ZHVscSCJ/Xjg7vnsxYrjzH7gm78p4=; b=W4THtg+bf09m4YGZirvAbD8rR5rajF2u785wS1M2N3iJlKBhEik+F6RymMfsxMgTC1 EUtyrhkMrvBVEUlT9J/ewelelqwzaGOnDcfILAdDoYUnok4fzYBwVwjZjCc25wVb4zsg m3xIs5LeFX3XS4TK4IDoAYcOXPbvk5mTJ6NRw= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=LPA0+Y6eWv5rS2ZHVscSCJ/Xjg7vnsxYrjzH7gm78p4=; b=SvHmW8k8DEAMqS8akuWsEooutZH0PvvjqIIoJzrUdQZD0KNTI9KZDJXLMj/Ckw+F3o TxtIG3JMMYRTltlvTQvG9NIXabSpxFxqC7PdOWbKOa30ipyDghJgcEIP1Q/aYz65ikX+ 0NwXanF52uLSAYJ3ebXdixj9SAmSoLFaVVaJcCtWPavOS9PdrnwQOgx0QM/ZlJEHiiWd 6C0CY6YEqciF3JrUv7B83JGJxTvGNgtIjvmsKr+9onpYJPUWT1Q7cBYtMMbbDVFiIA2t 577TlN5nHz7KvAfg2K7qPRJ5AsZSQ+hNQbRNZS+MyWZ7XkCoPI37+xp+YoZNfeuZFQlw K9aw== X-Gm-Message-State: AFeK/H3TAWaYw+M/HTRyAqfHWCzEKtL1M/Tmt456aRK2QUgNBmyCm6LstoafCZvfdrkXDQ== X-Received: by 10.28.128.209 with SMTP id b200mr1927396wmd.140.1490809303436; Wed, 29 Mar 2017 10:41:43 -0700 (PDT) Received: from phenom.ffwll.local ([2a02:168:56c9:0:5d85:e4f4:fe56:1feb]) by smtp.gmail.com with ESMTPSA id l90sm8986512wmi.25.2017.03.29.10.41.42 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 29 Mar 2017 10:41:42 -0700 (PDT) From: Daniel Vetter To: DRI Development Date: Wed, 29 Mar 2017 19:41:36 +0200 Message-Id: <20170329174136.10330-1-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.11.0 Cc: David Airlie , Daniel Vetter , Intel Graphics Development , Daniel Vetter , Harry Wentland Subject: [Intel-gfx] [PATCH] drm: Fixup failure paths in drm_atomic_helper_set_config X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Virus-Scanned: ClamAV using ClamSMTP I've screwed this up when removing the legacy backoff hack. Fixes: 38b6441e4e75 ("drm/atomic-helper: Remove the backoff hack from set_config") Cc: Harry Wentland Cc: Daniel Vetter Cc: Daniel Vetter Cc: Jani Nikula Cc: Sean Paul Cc: David Airlie Cc: dri-devel@lists.freedesktop.org Signed-off-by: Daniel Vetter Reviewed-by: Harry Wentland --- drivers/gpu/drm/drm_atomic_helper.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/drm_atomic_helper.c b/drivers/gpu/drm/drm_atomic_helper.c index 9dc67b52b905..d5915317e7d3 100644 --- a/drivers/gpu/drm/drm_atomic_helper.c +++ b/drivers/gpu/drm/drm_atomic_helper.c @@ -2294,10 +2294,11 @@ int drm_atomic_helper_set_config(struct drm_mode_set *set, state->acquire_ctx = ctx; ret = __drm_atomic_helper_set_config(set, state); if (ret != 0) - return ret; + goto fail; ret = drm_atomic_commit(state); +fail: drm_atomic_state_put(state); return ret; }