From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.2 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 943B5C55191 for ; Fri, 24 Apr 2020 15:09:17 +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 759012075A for ; Fri, 24 Apr 2020 15:09:17 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 759012075A Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=ravnborg.org 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 ED3F06E9FC; Fri, 24 Apr 2020 15:09:16 +0000 (UTC) Received: from asavdk4.altibox.net (asavdk4.altibox.net [109.247.116.15]) by gabe.freedesktop.org (Postfix) with ESMTPS id 4A3C46E9FC; Fri, 24 Apr 2020 15:09:15 +0000 (UTC) Received: from ravnborg.org (unknown [158.248.194.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by asavdk4.altibox.net (Postfix) with ESMTPS id 4FEAE804B9; Fri, 24 Apr 2020 17:09:12 +0200 (CEST) Date: Fri, 24 Apr 2020 17:09:11 +0200 From: Sam Ravnborg To: Daniel Vetter Message-ID: <20200424150911.GB20856@ravnborg.org> References: <20200415074034.175360-1-daniel.vetter@ffwll.ch> <20200415074034.175360-27-daniel.vetter@ffwll.ch> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20200415074034.175360-27-daniel.vetter@ffwll.ch> User-Agent: Mutt/1.10.1 (2018-07-13) X-CMAE-Score: 0 X-CMAE-Analysis: v=2.3 cv=MOBOZvRl c=1 sm=1 tr=0 a=UWs3HLbX/2nnQ3s7vZ42gw==:117 a=UWs3HLbX/2nnQ3s7vZ42gw==:17 a=kj9zAlcOel0A:10 a=20KFwNOVAAAA:8 a=QyXUC8HyAAAA:8 a=Z4Rwk6OoAAAA:8 a=e5mUnYsNAAAA:8 a=7gkXJVJtAAAA:8 a=klBfEf9cFz23oOmI4GgA:9 a=CjuIK1q_8ugA:10 a=HkZW87K1Qel5hWWM3VKY:22 a=Vxmtnl_E_bksehYqCbjh:22 a=E9Po1WZjFZOl8hwRPBS3:22 Subject: Re: [Intel-gfx] [PATCH 26/59] drm/qxl: Use devm_drm_dev_alloc X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Dave Airlie , Intel Graphics Development , DRI Development , virtualization@lists.linux-foundation.org, Gerd Hoffmann , spice-devel@lists.freedesktop.org, Daniel Vetter Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" Hi Daniel On Wed, Apr 15, 2020 at 09:40:01AM +0200, Daniel Vetter wrote: > Also need to remove the drm_dev_put from the remove hook. > > Acked-by: Gerd Hoffmann > Signed-off-by: Daniel Vetter > Cc: Dave Airlie > Cc: Gerd Hoffmann > Cc: virtualization@lists.linux-foundation.org > Cc: spice-devel@lists.freedesktop.org > --- > drivers/gpu/drm/qxl/qxl_drv.c | 15 ++++++++------- > drivers/gpu/drm/qxl/qxl_drv.h | 3 +-- > drivers/gpu/drm/qxl/qxl_kms.c | 12 +----------- > 3 files changed, 10 insertions(+), 20 deletions(-) > > diff --git a/drivers/gpu/drm/qxl/qxl_drv.c b/drivers/gpu/drm/qxl/qxl_drv.c > index 09102e2efabc..6b4ae4c5fb76 100644 > --- a/drivers/gpu/drm/qxl/qxl_drv.c > +++ b/drivers/gpu/drm/qxl/qxl_drv.c > @@ -81,13 +81,16 @@ qxl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent) > return -EINVAL; /* TODO: ENODEV ? */ > } > > - qdev = kzalloc(sizeof(struct qxl_device), GFP_KERNEL); > - if (!qdev) > + qdev = devm_drm_dev_alloc(&pdev->dev, &qxl_driver, > + struct qxl_device, ddev); > + if (IS_ERR(qdev)) { > + pr_err("Unable to init drm dev"); > return -ENOMEM; > + } The other patches do not add any error message when devm_drm_dev_alloc() fails and driver core will log that driver init failed. So the pr_err() above should be dropped. I know it comes from qxl_device_init() but that does not make it a good idea. With this fixed: Acked-by: Sam Ravnborg > > ret = pci_enable_device(pdev); > if (ret) > - goto free_dev; > + return ret; > > ret = drm_fb_helper_remove_conflicting_pci_framebuffers(pdev, "qxl"); > if (ret) > @@ -101,7 +104,7 @@ qxl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent) > } > } > > - ret = qxl_device_init(qdev, &qxl_driver, pdev); > + ret = qxl_device_init(qdev, pdev); > if (ret) > goto put_vga; > > @@ -128,8 +131,7 @@ qxl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent) > vga_put(pdev, VGA_RSRC_LEGACY_IO); > disable_pci: > pci_disable_device(pdev); > -free_dev: > - kfree(qdev); > + > return ret; > } > > @@ -155,7 +157,6 @@ qxl_pci_remove(struct pci_dev *pdev) > drm_atomic_helper_shutdown(dev); > if (is_vga(pdev)) > vga_put(pdev, VGA_RSRC_LEGACY_IO); > - drm_dev_put(dev); > } > > DEFINE_DRM_GEM_FOPS(qxl_fops); > diff --git a/drivers/gpu/drm/qxl/qxl_drv.h b/drivers/gpu/drm/qxl/qxl_drv.h > index 435126facc9b..86ac191d9205 100644 > --- a/drivers/gpu/drm/qxl/qxl_drv.h > +++ b/drivers/gpu/drm/qxl/qxl_drv.h > @@ -276,8 +276,7 @@ struct qxl_device { > extern const struct drm_ioctl_desc qxl_ioctls[]; > extern int qxl_max_ioctl; > > -int qxl_device_init(struct qxl_device *qdev, struct drm_driver *drv, > - struct pci_dev *pdev); > +int qxl_device_init(struct qxl_device *qdev, struct pci_dev *pdev); > void qxl_device_fini(struct qxl_device *qdev); > > int qxl_modeset_init(struct qxl_device *qdev); > diff --git a/drivers/gpu/drm/qxl/qxl_kms.c b/drivers/gpu/drm/qxl/qxl_kms.c > index 9eed1a375f24..91a34dd835d7 100644 > --- a/drivers/gpu/drm/qxl/qxl_kms.c > +++ b/drivers/gpu/drm/qxl/qxl_kms.c > @@ -108,21 +108,13 @@ static void qxl_gc_work(struct work_struct *work) > } > > int qxl_device_init(struct qxl_device *qdev, > - struct drm_driver *drv, > struct pci_dev *pdev) > { > int r, sb; > > - r = drm_dev_init(&qdev->ddev, drv, &pdev->dev); > - if (r) { > - pr_err("Unable to init drm dev"); > - goto error; > - } > - > 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); > @@ -138,8 +130,7 @@ int qxl_device_init(struct qxl_device *qdev, > qdev->vram_mapping = io_mapping_create_wc(qdev->vram_base, pci_resource_len(pdev, 0)); > if (!qdev->vram_mapping) { > pr_err("Unable to create vram_mapping"); > - r = -ENOMEM; > - goto error; > + return -ENOMEM; > } > > if (pci_resource_len(pdev, 4) > 0) { > @@ -293,7 +284,6 @@ int qxl_device_init(struct qxl_device *qdev, > io_mapping_free(qdev->surface_mapping); > vram_mapping_free: > io_mapping_free(qdev->vram_mapping); > -error: > return r; > } > > -- > 2.25.1 > > _______________________________________________ > dri-devel mailing list > dri-devel@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/dri-devel _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx