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=-6.6 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS autolearn=unavailable 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 075E4C83001 for ; Tue, 28 Apr 2020 18:04:46 +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 CDF57206A1 for ; Tue, 28 Apr 2020 18:04:45 +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="OjJH7+tH" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org CDF57206A1 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=ffwll.ch Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 1D6116E8C2; Tue, 28 Apr 2020 18:04:43 +0000 (UTC) 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 EBCD96E8BF for ; Tue, 28 Apr 2020 18:04:41 +0000 (UTC) Received: by mail-wr1-x442.google.com with SMTP id b11so25758672wrs.6 for ; Tue, 28 Apr 2020 11:04:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=jUphhxDb4Rg2BkT6KiwROpgoyZctnFopLh4ce52idEA=; b=OjJH7+tHuPrfGseS4GC9QdI6SvWTDsYdlP+CN6VmyxuH1p15vM5V8EJGljA669jafX 0it5KxZnWFc0nXX/+msIcaBzNOIi6+65LkAQ9H6vXnyJhQ7YzaAEnRn0DyDtd8GbrmQs tW70f75SNFWftKVX5SArTaBX3mSLu5v5oTKRU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=jUphhxDb4Rg2BkT6KiwROpgoyZctnFopLh4ce52idEA=; b=UwkXsDMFlWFbET4DRKN8rh8tD9SCXBp1pOEoopqzrld7WwTVsIPcbOLxkZ1r85nP09 PHRFqmQ72ldxFQLDa6qJVx4DJyid7M+fpjQoM7RdvMjh/WXOk4/Qw7KmrcLJripiweGd kZbonfyQCbsJMUL7PpkeCsK8l7HAzze3pigpzrN6iVbPFPJKQ3zfosp/nUuohL9SolBQ 07+NGKAG9MD57sdDfeio/fC89pXvMLkcaC7e0FLdeqia1iM/BCXs3rzgoA9+biFUiMGc rA+n8ZYUE7Pjs8bnpZS0aQCIiA857qARGLN1tNIqpijnvWxPGTF48EYj5opCIjD8K07q Ws2A== X-Gm-Message-State: AGi0PuYrXVqbtMMKRd1B/T4gCIZlYAVfAqZBw08Fb7lDItVpS0BLsMgB VUqzosXAzmsXeNYhnXYRnpJGP770GO0= X-Google-Smtp-Source: APiQypLLfh7zYf6x+cb/I4EtikP3kdsgClHMq4YOpw9qcCb5Abv01n4gncvbWJ1Av2QLtrxgJ23f7A== X-Received: by 2002:adf:e450:: with SMTP id t16mr37060920wrm.301.1588097080548; Tue, 28 Apr 2020 11:04:40 -0700 (PDT) Received: from phenom.ffwll.local ([2a02:168:57f4:0:efd0:b9e5:5ae6:c2fa]) by smtp.gmail.com with ESMTPSA id t17sm25630901wro.2.2020.04.28.11.04.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 28 Apr 2020 11:04:39 -0700 (PDT) Date: Tue, 28 Apr 2020 20:04:37 +0200 From: Daniel Vetter To: Sam Ravnborg Subject: Re: [PATCH 26/59] drm/qxl: Use devm_drm_dev_alloc Message-ID: <20200428180437.GZ3456981@phenom.ffwll.local> References: <20200415074034.175360-1-daniel.vetter@ffwll.ch> <20200415074034.175360-27-daniel.vetter@ffwll.ch> <20200424150911.GB20856@ravnborg.org> <20200428140011.GK3456981@phenom.ffwll.local> <20200428170026.GA27234@ravnborg.org> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20200428170026.GA27234@ravnborg.org> X-Operating-System: Linux phenom 5.3.0-3-amd64 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Dave Airlie , Daniel Vetter , Intel Graphics Development , DRI Development , virtualization@lists.linux-foundation.org, Gerd Hoffmann , Daniel Vetter , spice-devel@lists.freedesktop.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" On Tue, Apr 28, 2020 at 07:00:26PM +0200, Sam Ravnborg wrote: > On Tue, Apr 28, 2020 at 04:00:11PM +0200, Daniel Vetter wrote: > > On Fri, Apr 24, 2020 at 05:09:11PM +0200, Sam Ravnborg wrote: > > > 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. > > > > Hm I know we're inconsistent here, but some drivers have error logging on > > all branches, some dont. I'm just trying to go with the prevailing style. > > > > > With this fixed: > > > > Insisting on this or ok as-is? > OK as-is. Ok, merged the two qxl patches too, plus a lot of the driver conversions. Thanks a lot to everyone who commented, reviewed and tested thus far. -Daniel > > Sam > > > -Daniel > > > > > 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 > > > > -- > > Daniel Vetter > > Software Engineer, Intel Corporation > > http://blog.ffwll.ch -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel