Message ID | 20200221210319.2245170-8-daniel.vetter@ffwll.ch (mailing list archive) |
---|---|
State | New, archived |
Headers | show
Return-Path: <SRS0=KiHL=4J=lists.freedesktop.org=intel-gfx-bounces@kernel.org> Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id B2E811580 for <patchwork-intel-gfx@patchwork.kernel.org>; Fri, 21 Feb 2020 21:04:00 +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 912862073A for <patchwork-intel-gfx@patchwork.kernel.org>; Fri, 21 Feb 2020 21:04:00 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=ffwll.ch header.i=@ffwll.ch header.b="OUs744sf" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 912862073A Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=ffwll.ch Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=intel-gfx-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id D48126F524; Fri, 21 Feb 2020 21:03:46 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-wr1-x442.google.com (mail-wr1-x442.google.com [IPv6:2a00:1450:4864:20::442]) by gabe.freedesktop.org (Postfix) with ESMTPS id DD7B36F51C for <intel-gfx@lists.freedesktop.org>; Fri, 21 Feb 2020 21:03:38 +0000 (UTC) Received: by mail-wr1-x442.google.com with SMTP id n10so3557319wrm.1 for <intel-gfx@lists.freedesktop.org>; Fri, 21 Feb 2020 13:03:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=jGkQy6GARMrTdcko1Rer3WUnvLpzhV0C66wlxAxhWNE=; b=OUs744sfBj5Yz8FxWBbt8pW3CMj0kJQQuffQ6w3kONmB7i7nLUpEo6lRzYKC9JV7i8 9TpKdlpvdxRAbYZqx3zz4rE0OH6c3o/y5Fpet2Z6OUurTg1yZRHHBiYlNaBdnqY/abnm Osr1M+2I5bcERAqC/o5bxjfmgVS5FgYaCozLI= 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=jGkQy6GARMrTdcko1Rer3WUnvLpzhV0C66wlxAxhWNE=; b=pdN+VbBZJ/aR4Snhh3poYg5BKOnMRKyLGjRSvFJ7W5N3NVtIPho0NAQakpz+dPdwia C+Zjegusb1iItiwtqnOSmFMWaBnYzUho4Hu8gNgqnhzqpoIdP7kEPTD0hsk6jw+M3Br2 oxT6W+v0Dnho1MM3PfC1wKGZF/4p4DPZOdfnffODrsF4h93yVdwrM5+A5Ld0HKpyRqMm +9bml0QJPFlH0PeZUY/TD3Fd/5ND7eNFi2f4kGWFJsfJyGWmS34oZLhBea3IqDat1OvN J+SM050QR6LMbwIZ2vNw7iFMuIjq2iv27gq0+S6RoTA1+98rpxLKdcJ5RFwwA23sdc7O SMQw== X-Gm-Message-State: APjAAAVd+0e9ezuY620EJfsmWBPGQJfJyeC/EwVT2jojM4kZ5N+Viba0 QhVTz8FkL5kKjJLbYXFnHoSc/w== X-Google-Smtp-Source: APXvYqzmMEGPKaIKETbiA7OJ6Ovghfws0dfiq7Mol0uFNN7+X3yV0LhNGEsGp238gAJXe0N+E0ExQw== X-Received: by 2002:a5d:5011:: with SMTP id e17mr47740612wrt.134.1582319017533; Fri, 21 Feb 2020 13:03:37 -0800 (PST) Received: from phenom.ffwll.local ([2a02:168:57f4:0:efd0:b9e5:5ae6:c2fa]) by smtp.gmail.com with ESMTPSA id z6sm5483930wrw.36.2020.02.21.13.03.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Feb 2020 13:03:36 -0800 (PST) From: Daniel Vetter <daniel.vetter@ffwll.ch> To: DRI Development <dri-devel@lists.freedesktop.org> Date: Fri, 21 Feb 2020 22:02:35 +0100 Message-Id: <20200221210319.2245170-8-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200221210319.2245170-1-daniel.vetter@ffwll.ch> References: <20200221210319.2245170-1-daniel.vetter@ffwll.ch> MIME-Version: 1.0 Subject: [Intel-gfx] [PATCH 07/51] drm/qxl: Use drmm_add_final_kfree X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development <intel-gfx.lists.freedesktop.org> List-Unsubscribe: <https://lists.freedesktop.org/mailman/options/intel-gfx>, <mailto:intel-gfx-request@lists.freedesktop.org?subject=unsubscribe> List-Archive: <https://lists.freedesktop.org/archives/intel-gfx> List-Post: <mailto:intel-gfx@lists.freedesktop.org> List-Help: <mailto:intel-gfx-request@lists.freedesktop.org?subject=help> List-Subscribe: <https://lists.freedesktop.org/mailman/listinfo/intel-gfx>, <mailto:intel-gfx-request@lists.freedesktop.org?subject=subscribe> Cc: spice-devel@lists.freedesktop.org, Daniel Vetter <daniel.vetter@ffwll.ch>, Intel Graphics Development <intel-gfx@lists.freedesktop.org>, virtualization@lists.linux-foundation.org, Gerd Hoffmann <kraxel@redhat.com>, Daniel Vetter <daniel.vetter@intel.com>, Dave Airlie <airlied@redhat.com> Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" <intel-gfx-bounces@lists.freedesktop.org> |
Series |
drm managed resources, v2
|
expand
|
diff --git a/drivers/gpu/drm/qxl/qxl_drv.c b/drivers/gpu/drm/qxl/qxl_drv.c index 4fda3f9b29f4..09102e2efabc 100644 --- a/drivers/gpu/drm/qxl/qxl_drv.c +++ b/drivers/gpu/drm/qxl/qxl_drv.c @@ -144,8 +144,6 @@ static void qxl_drm_release(struct drm_device *dev) */ qxl_modeset_fini(qdev); qxl_device_fini(qdev); - dev->dev_private = NULL; - kfree(qdev); } static void diff --git a/drivers/gpu/drm/qxl/qxl_kms.c b/drivers/gpu/drm/qxl/qxl_kms.c index 70b20ee4741a..09d7b5f6d172 100644 --- a/drivers/gpu/drm/qxl/qxl_kms.c +++ b/drivers/gpu/drm/qxl/qxl_kms.c @@ -27,6 +27,7 @@ #include <linux/pci.h> #include <drm/drm_drv.h> +#include <drm/drm_managed.h> #include <drm/drm_probe_helper.h> #include "qxl_drv.h" @@ -121,6 +122,7 @@ int qxl_device_init(struct qxl_device *qdev, qdev->ddev.pdev = pdev; pci_set_drvdata(pdev, &qdev->ddev); qdev->ddev.dev_private = qdev; + drmm_add_final_kfree(&qdev->ddev, qdev); mutex_init(&qdev->gem.mutex); mutex_init(&qdev->update_area_mutex);
With this we can drop the final kfree from the release function. Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> Cc: Dave Airlie <airlied@redhat.com> Cc: Gerd Hoffmann <kraxel@redhat.com> Cc: virtualization@lists.linux-foundation.org Cc: spice-devel@lists.freedesktop.org --- drivers/gpu/drm/qxl/qxl_drv.c | 2 -- drivers/gpu/drm/qxl/qxl_kms.c | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-)