From patchwork Thu Oct 4 20:24:38 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 10626643 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 C6262174A for ; Thu, 4 Oct 2018 20:26:03 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B8D5A296FF for ; Thu, 4 Oct 2018 20:26:03 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id AD68A29717; Thu, 4 Oct 2018 20:26:03 +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 4EC45296FF for ; Thu, 4 Oct 2018 20:26:03 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id BE7296E683; Thu, 4 Oct 2018 20:25:22 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-ed1-x541.google.com (mail-ed1-x541.google.com [IPv6:2a00:1450:4864:20::541]) by gabe.freedesktop.org (Postfix) with ESMTPS id 4FA6A6E682 for ; Thu, 4 Oct 2018 20:25:21 +0000 (UTC) Received: by mail-ed1-x541.google.com with SMTP id b7-v6so3160431edd.9 for ; Thu, 04 Oct 2018 13:25:21 -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=xkNXSh9DH1irhGuYGD5KHt8fZUk11Yh2qfMUzlfw0Nw=; b=G7dV9Twe4spPNvclqvBY0YgMoJOExJNgnazJAGgiQqL4CpWKQesE22ne6pKxtp8X88 3UpNLjs1EvI4ObpTuHUyhPuwJj0Kj62lBtCx4ODvoRKAP+vOhbxMZg/mnv8A496T+WDO 33DcC0Nk3SuAvck2lneSK4a1FuDQivIg/5jigOztWm5GYxBgDJZCyv+MjA6ZCQvyKYoK YEmdg9QCdpIoThjWiesKhuMNNldUuqh6/1PmUA8pVezaE72+Nn9F80NqnUtlK/ExNAb/ S0cXxEdo+WkvoXoiW4wQXE04+NianRblZdn9r0MerBkLlLbKkGJ1zKdZs7FkywEOleC3 E4pQ== X-Gm-Message-State: ABuFfog/rlIdVfSg9FWLDk6iQhS5YRQKf4F4vqQoLQLGER5LajHKKnup wNyyWYZQOkbpyKJCUnfX4if/8MsuNGs= X-Google-Smtp-Source: ACcGV6293wWGwMrrD4ABk6woYXWGzN+wa4Jdbe2lQvaAlymK6BaqYyavJ6fuREnuUwGFtBkGpDlMRQ== X-Received: by 2002:a50:b6cf:: with SMTP id f15-v6mr10783157ede.268.1538684719658; Thu, 04 Oct 2018 13:25:19 -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.16 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 04 Oct 2018 13:25:16 -0700 (PDT) From: Daniel Vetter To: DRI Development Subject: [PATCH 13/21] drm/vc4: Use drm_atomic_helper_shutdown Date: Thu, 4 Oct 2018 22:24:38 +0200 Message-Id: <20181004202446.22905-14-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 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. v2: Rebase. Reviewed-by: Ville Syrjälä Acked-by: Eric Anholt Signed-off-by: Daniel Vetter Cc: Eric Anholt --- drivers/gpu/drm/vc4/vc4_drv.c | 3 +++ drivers/gpu/drm/vc4/vc4_plane.c | 1 - 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/vc4/vc4_drv.c b/drivers/gpu/drm/vc4/vc4_drv.c index 1f1780ccdbdf..f6f5cd80c04d 100644 --- a/drivers/gpu/drm/vc4/vc4_drv.c +++ b/drivers/gpu/drm/vc4/vc4_drv.c @@ -33,6 +33,7 @@ #include #include #include +#include #include "uapi/drm/vc4_drm.h" #include "vc4_drv.h" @@ -308,6 +309,8 @@ static void vc4_drm_unbind(struct device *dev) drm_dev_unregister(drm); + drm_atomic_helper_shutdown(drm); + drm_mode_config_cleanup(drm); drm_atomic_private_obj_fini(&vc4->ctm_manager); diff --git a/drivers/gpu/drm/vc4/vc4_plane.c b/drivers/gpu/drm/vc4/vc4_plane.c index 9dc3fcbd290b..d04b3c3246ba 100644 --- a/drivers/gpu/drm/vc4/vc4_plane.c +++ b/drivers/gpu/drm/vc4/vc4_plane.c @@ -903,7 +903,6 @@ static const struct drm_plane_helper_funcs vc4_plane_helper_funcs = { static void vc4_plane_destroy(struct drm_plane *plane) { - drm_plane_helper_disable(plane, NULL); drm_plane_cleanup(plane); }