From patchwork Thu Jan 19 11:41:21 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Wilson X-Patchwork-Id: 9525511 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 22E8660113 for ; Thu, 19 Jan 2017 11:42:07 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 11F32284E8 for ; Thu, 19 Jan 2017 11:42:07 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 06E11284FF; Thu, 19 Jan 2017 11:42:07 +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 93E53284E8 for ; Thu, 19 Jan 2017 11:42:06 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 2B0C16E9DE; Thu, 19 Jan 2017 11:42:06 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-wm0-x244.google.com (mail-wm0-x244.google.com [IPv6:2a00:1450:400c:c09::244]) by gabe.freedesktop.org (Postfix) with ESMTPS id 638316E129 for ; Thu, 19 Jan 2017 11:42:03 +0000 (UTC) Received: by mail-wm0-x244.google.com with SMTP id r144so11390947wme.0 for ; Thu, 19 Jan 2017 03:42:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=5fSQo4OUC8m1ytz3n3iZTXgYYflnRtAnM8KE+7XSX24=; b=T0fsskrnDUFlMy5ouji7fgDZQKIV30T1IAbSOXkeD3Rm3Hitw/2TXZB0IAqK/mCD69 WEfOp+ygyOic5yfDb+QxdEFK6OiclaeVt2xRBS3VajsAhbuw/C++Ozx0LjqBhyLCCL12 GTHmjMV3mJwWzvwdYJzmuUMi4z1iMzSEv7RgOrj1oLNmb70kjt/Eca4p2AJf6cJzMu1Z ownv6O3cGQJgwDRvvoVyIEuvmBl+JWEwuavG5+bEzg3ACkq5WxY7DItcMQYFJW8L1nhi Mc/LLE7uJtdfETtId0shtm9UzXqrgFJBPtCZbIWB7LnpRBYZeeUsW3ZX5vBSzVIamGJS h+WQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=5fSQo4OUC8m1ytz3n3iZTXgYYflnRtAnM8KE+7XSX24=; b=r9l6j/hOrti+iV3PDGFWucDMHrt/XJ6vh/pEvSSJ3c2rLuDpY8HRlncorOL2YU/DvT QWlns1R9PPqzqw9YbmEa8+4gaSxsopTIUzB6OZRvLGGmiE8IcDaJ49cD5q7gniNdR4bI kZVwdyPFEff1cBKbfuNuKPgODE43M/1PqjHUgOGMlqNPNijOKL63QAA4RqzYjJ92ijHV io8y/2+8aS/7eUHkPLOahFPjqWAkQZPm+XVHidPLth7GUWodOpIPxlc+qPIxeNPoojyp R/njfXeEIkDk0PGE7KStNEgIZhwM/yzdJiJ6kSS8a/qneR+bNXsH5Bi+u3BU6vCPGBQ0 W0ug== X-Gm-Message-State: AIkVDXINH1xuYhKtOgQuvzgw1nWMskPnnFg57AjaiFTf55l7bnikwCPNFjrPrb80zBbCaw== X-Received: by 10.223.148.194 with SMTP id 60mr8061422wrr.88.1484826121833; Thu, 19 Jan 2017 03:42:01 -0800 (PST) Received: from haswell.alporthouse.com ([78.156.65.138]) by smtp.gmail.com with ESMTPSA id t194sm5102702wmd.1.2017.01.19.03.42.00 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 19 Jan 2017 03:42:01 -0800 (PST) From: Chris Wilson To: intel-gfx@lists.freedesktop.org Date: Thu, 19 Jan 2017 11:41:21 +0000 Message-Id: <20170119114158.17941-2-chris@chris-wilson.co.uk> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170119114158.17941-1-chris@chris-wilson.co.uk> References: <20170119114158.17941-1-chris@chris-wilson.co.uk> Subject: [Intel-gfx] [PATCH v2 01/38] drm: Provide a driver hook for drm_dev_release() 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 Some state is coupled into the device lifetime outside of the load/unload timeframe and requires teardown during final unreference from drm_dev_release(). For example, dmabufs hold both a device and module reference and may live longer than expected (i.e. the current pattern of the driver tearing down its state and then releasing a reference to the drm device) and yet touch driver private state when destroyed. Signed-off-by: Chris Wilson Reviewed-by: Joonas Lahtinen --- drivers/gpu/drm/drm_drv.c | 3 +++ include/drm/drm_drv.h | 9 +++++++++ 2 files changed, 12 insertions(+) diff --git a/drivers/gpu/drm/drm_drv.c b/drivers/gpu/drm/drm_drv.c index 1b11ab628da7..a150f0c6a299 100644 --- a/drivers/gpu/drm/drm_drv.c +++ b/drivers/gpu/drm/drm_drv.c @@ -598,6 +598,9 @@ static void drm_dev_release(struct kref *ref) { struct drm_device *dev = container_of(ref, struct drm_device, ref); + if (dev->driver->release) + dev->driver->release(dev); + if (drm_core_check_feature(dev, DRIVER_GEM)) drm_gem_destroy(dev); diff --git a/include/drm/drm_drv.h b/include/drm/drm_drv.h index 34ece393c639..dfddd8c15b62 100644 --- a/include/drm/drm_drv.h +++ b/include/drm/drm_drv.h @@ -103,6 +103,15 @@ struct drm_driver { * */ void (*unload) (struct drm_device *); + + /** + * @release: + * + * Optional callback for destroying device state after the final + * reference is released, i.e. the device is being destroyed. + */ + void (*release) (struct drm_device *); + int (*dma_ioctl) (struct drm_device *dev, void *data, struct drm_file *file_priv); int (*dma_quiescent) (struct drm_device *); int (*context_dtor) (struct drm_device *dev, int context);