From patchwork Thu Oct 4 20:24:39 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 10626645 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 0CB1F174A for ; Thu, 4 Oct 2018 20:26:09 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id F3317296F1 for ; Thu, 4 Oct 2018 20:26:08 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E7C5F29717; Thu, 4 Oct 2018 20:26:08 +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=-5.2 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED 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 A2905296F1 for ; Thu, 4 Oct 2018 20:26:08 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 22AFE6E685; Thu, 4 Oct 2018 20:25:25 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-ed1-x544.google.com (mail-ed1-x544.google.com [IPv6:2a00:1450:4864:20::544]) by gabe.freedesktop.org (Postfix) with ESMTPS id 843396E682 for ; Thu, 4 Oct 2018 20:25:22 +0000 (UTC) Received: by mail-ed1-x544.google.com with SMTP id g26-v6so9767037edp.0 for ; Thu, 04 Oct 2018 13:25:22 -0700 (PDT) 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=xazagAOBpJvVT14eSCsuTmVPLNdDxuhYR2Lof9CcJ3o=; b=I8glyU1hydd6vrTHIZ/JfVE2OV6TrmKNmjuwrdctdYFY8vqd0y/dHVWHcyqHctnaZ6 Kw8W6NQTTjK2Xp7G2Ip3Oa6Ceb+hfIGJJnB2LL465760AKgS27dXAa1UTfcl+pFMiBAf W2fQnNAfY+fbZTUQelztMl8lKvjscCOvlUlAuvl6BsHxHLcjIbh1s1CkeIwSoMcAMvvX f4lERJ2tEq/zAcDbfMcx2/UtPvVl8GlieWC/ztuVmUYB/StU+rQJznGYRGv6O1nMZ2Sh KhpZzALLatZye0gF4adXSU7KXE4yzcmEXDqJ8zvblJHvoHzRCscCGFmLItE6TFDsEQ7s qgog== X-Gm-Message-State: ABuFfoiIQkgwfI0DDAkSKOq/7YmJEsXBZHWrlR6HbsHs5UtnoD7cCPEr +q3lnVxw/wA9GHosSySs2P+Izzpr4bQ= X-Google-Smtp-Source: ACcGV61kHpNo8t4EAwGs+OdT2F2Mvq36roHDIuys1U9FhpUlurmGR86HAIQJFcTBnOLklLUwxBYamA== X-Received: by 2002:a50:9471:: with SMTP id q46-v6mr10540651eda.70.1538684720944; Thu, 04 Oct 2018 13:25:20 -0700 (PDT) Received: from phenom.ffwll.local ([2a02:168:569e:0:3106:d637:d723:e855]) by smtp.gmail.com with ESMTPSA id y8-v6sm2040002edd.43.2018.10.04.13.25.19 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 04 Oct 2018 13:25:19 -0700 (PDT) From: Daniel Vetter To: DRI Development Subject: [PATCH 14/21] drm/zte: Use drm_atomic_helper_shutdown Date: Thu, 4 Oct 2018 22:24:39 +0200 Message-Id: <20181004202446.22905-15-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.19.0.rc2 In-Reply-To: <20181004202446.22905-1-daniel.vetter@ffwll.ch> References: <20181004202446.22905-1-daniel.vetter@ffwll.ch> MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Daniel Vetter , Shawn Guo Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP drm_plane_helper_disable is a non-atomic drivers only function, and will blow up (since no one passes the locking context it needs). Atomic drivers which want to quiescent their hw on unload should use drm_atomic_helper_shutdown() instead. Reviewed-by: Ville Syrjälä Signed-off-by: Daniel Vetter Cc: Shawn Guo Acked-by: Shawn Guo --- drivers/gpu/drm/zte/zx_drm_drv.c | 1 + drivers/gpu/drm/zte/zx_plane.c | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/zte/zx_drm_drv.c b/drivers/gpu/drm/zte/zx_drm_drv.c index 5b6f1eda52e0..f5ea32ae8600 100644 --- a/drivers/gpu/drm/zte/zx_drm_drv.c +++ b/drivers/gpu/drm/zte/zx_drm_drv.c @@ -124,6 +124,7 @@ static void zx_drm_unbind(struct device *dev) drm_dev_unregister(drm); drm_kms_helper_poll_fini(drm); + drm_atomic_helper_shutdown(drm); drm_mode_config_cleanup(drm); component_unbind_all(dev, drm); dev_set_drvdata(dev, NULL); diff --git a/drivers/gpu/drm/zte/zx_plane.c b/drivers/gpu/drm/zte/zx_plane.c index ae8c53b4b261..83d236fd893c 100644 --- a/drivers/gpu/drm/zte/zx_plane.c +++ b/drivers/gpu/drm/zte/zx_plane.c @@ -446,7 +446,6 @@ static const struct drm_plane_helper_funcs zx_gl_plane_helper_funcs = { static void zx_plane_destroy(struct drm_plane *plane) { - drm_plane_helper_disable(plane, NULL); drm_plane_cleanup(plane); }