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.9 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED 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 2C4F8C3B186 for ; Tue, 11 Feb 2020 14:22:48 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id EC46F20848 for ; Tue, 11 Feb 2020 14:22:47 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=ffwll.ch header.i=@ffwll.ch header.b="KzUjILm1" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730095AbgBKOWr (ORCPT ); Tue, 11 Feb 2020 09:22:47 -0500 Received: from mail-wm1-f68.google.com ([209.85.128.68]:38710 "EHLO mail-wm1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727963AbgBKOWq (ORCPT ); Tue, 11 Feb 2020 09:22:46 -0500 Received: by mail-wm1-f68.google.com with SMTP id a9so3786439wmj.3 for ; Tue, 11 Feb 2020 06:22:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=date:from:to:cc:subject:message-id:mail-followup-to:references :mime-version:content-disposition:in-reply-to; bh=zbCpoEzMkXhuds3sawE1UyW9vC3Fj6dPXq0u004qUn4=; b=KzUjILm1iSPNky6CD9uanf3G3iyYl/J28iOaqMo/AmK22/0X3/LFIPTbBn0ydkCkiQ N3TUyrOKjzvrCTmwbRapoiQDmjvHM/cdxSkI7kAxwhN3rhvuh51eMXEvhkDwIyxgMbLr MmDPzcI626frvOBJR1qfCVefDQp0ipbGYci1Q= 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 :mail-followup-to:references:mime-version:content-disposition :in-reply-to; bh=zbCpoEzMkXhuds3sawE1UyW9vC3Fj6dPXq0u004qUn4=; b=Ui2cVXBcsyhG5HIbLRxOJDk5O+R2sZGv65dNZ7PErQCp59M9N+9tsxN8Bml4CsDTsy IBtepOKS4HJYugFdpvIhCHpoD5X0WRUzw0vTTZYP7AMBowCfuwTe7L1BmPEMBrBe3MZy E9phLgeow9UBxd+xtN51cPBB+VNuD3oF3wpmNjU5Wkuq4emgyVQkqwcKTRtTd4C9keKg 2io7XzSyp52nITcIZCTVK6Oozb8qDGj60tBHKy9s+H+hBQLvbXDd9ojMg9eFnlW0SYAE G6LMCvPZQhs7ZwJlShVgvSFj6XcmsyfvoE8P0EvtER4aCJ0FrDP6Ws8D4UpN+dLvms9w d2VQ== X-Gm-Message-State: APjAAAWGsCHuRQIPJOJohQ/xq6fr6Y5ZDn/31uiG2GgGPQqFtjDqBjyg lgnV5R9raBmjjvbNVuMRRIPG4Q== X-Google-Smtp-Source: APXvYqzYF5XCaXVSaa4gHRNv6N8Qaghaww1USAbGGjBeOKDuCJVmSMfWpAroKmZNMq/swNcVY7dXLQ== X-Received: by 2002:a7b:cb97:: with SMTP id m23mr5621995wmi.37.1581430964656; Tue, 11 Feb 2020 06:22:44 -0800 (PST) Received: from phenom.ffwll.local ([2a02:168:57f4:0:efd0:b9e5:5ae6:c2fa]) by smtp.gmail.com with ESMTPSA id c4sm3869494wml.7.2020.02.11.06.22.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Feb 2020 06:22:44 -0800 (PST) Date: Tue, 11 Feb 2020 15:22:42 +0100 From: Daniel Vetter To: Gerd Hoffmann Cc: dri-devel@lists.freedesktop.org, Dave Airlie , David Airlie , Daniel Vetter , "open list:DRM DRIVER FOR QEMU'S CIRRUS DEVICE" , open list Subject: Re: [PATCH v4] drm/cirrus: add drm_driver.release callback. Message-ID: <20200211142242.GD2363188@phenom.ffwll.local> Mail-Followup-To: Gerd Hoffmann , dri-devel@lists.freedesktop.org, Dave Airlie , David Airlie , "open list:DRM DRIVER FOR QEMU'S CIRRUS DEVICE" , open list References: <20200211135522.23654-1-kraxel@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20200211135522.23654-1-kraxel@redhat.com> X-Operating-System: Linux phenom 5.3.0-3-amd64 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, Feb 11, 2020 at 02:55:22PM +0100, Gerd Hoffmann wrote: > Move final cleanups from cirrus_pci_remove() to the new callback. > Add drm_atomic_helper_shutdown() call to cirrus_pci_remove(). > > Use drm_dev_{enter,exit,unplug} to avoid touching hardware after > device removal. > > v4: add changelog. > v3: use drm_dev*. > v2: stop touching hardware after pci_remove(). > > Signed-off-by: Gerd Hoffmann I think you got them all with drm_dev_enter/exit. Reviewed-by: Daniel Vetter Aside: everyone ignores the return value of cirrus_fb_blit_rect and cirrus_mode_set (with atomic those shouldn't be able to fail anymore), could ditch those. -Daniel > --- > drivers/gpu/drm/cirrus/cirrus.c | 43 ++++++++++++++++++++++++++++----- > 1 file changed, 37 insertions(+), 6 deletions(-) > > diff --git a/drivers/gpu/drm/cirrus/cirrus.c b/drivers/gpu/drm/cirrus/cirrus.c > index a91fb0d7282c..d2ff63ce8eaf 100644 > --- a/drivers/gpu/drm/cirrus/cirrus.c > +++ b/drivers/gpu/drm/cirrus/cirrus.c > @@ -151,9 +151,13 @@ static int cirrus_pitch(struct drm_framebuffer *fb) > > static void cirrus_set_start_address(struct cirrus_device *cirrus, u32 offset) > { > + int idx; > u32 addr; > u8 tmp; > > + if (!drm_dev_enter(&cirrus->dev, &idx)) > + return; > + > addr = offset >> 2; > wreg_crt(cirrus, 0x0c, (u8)((addr >> 8) & 0xff)); > wreg_crt(cirrus, 0x0d, (u8)(addr & 0xff)); > @@ -168,6 +172,8 @@ static void cirrus_set_start_address(struct cirrus_device *cirrus, u32 offset) > tmp &= 0x7f; > tmp |= (addr >> 12) & 0x80; > wreg_crt(cirrus, 0x1d, tmp); > + > + drm_dev_exit(idx); > } > > static int cirrus_mode_set(struct cirrus_device *cirrus, > @@ -176,9 +182,12 @@ static int cirrus_mode_set(struct cirrus_device *cirrus, > { > int hsyncstart, hsyncend, htotal, hdispend; > int vtotal, vdispend; > - int tmp; > + int tmp, idx; > int sr07 = 0, hdr = 0; > > + if (!drm_dev_enter(&cirrus->dev, &idx)) > + return -1; > + > htotal = mode->htotal / 8; > hsyncend = mode->hsync_end / 8; > hsyncstart = mode->hsync_start / 8; > @@ -264,6 +273,7 @@ static int cirrus_mode_set(struct cirrus_device *cirrus, > hdr = 0xc5; > break; > default: > + drm_dev_exit(idx); > return -1; > } > > @@ -292,6 +302,8 @@ static int cirrus_mode_set(struct cirrus_device *cirrus, > > /* Unblank (needed on S3 resume, vgabios doesn't do it then) */ > outb(0x20, 0x3c0); > + > + drm_dev_exit(idx); > return 0; > } > > @@ -300,10 +312,16 @@ static int cirrus_fb_blit_rect(struct drm_framebuffer *fb, > { > struct cirrus_device *cirrus = fb->dev->dev_private; > void *vmap; > + int idx, ret; > > + ret = -ENODEV; > + if (!drm_dev_enter(&cirrus->dev, &idx)) > + goto out; > + > + ret = -ENOMEM; > vmap = drm_gem_shmem_vmap(fb->obj[0]); > if (!vmap) > - return -ENOMEM; > + goto out_dev_exit; > > if (cirrus->cpp == fb->format->cpp[0]) > drm_fb_memcpy_dstclip(cirrus->vram, > @@ -323,7 +341,12 @@ static int cirrus_fb_blit_rect(struct drm_framebuffer *fb, > WARN_ON_ONCE("cpp mismatch"); > > drm_gem_shmem_vunmap(fb->obj[0], vmap); > - return 0; > + ret = 0; > + > +out_dev_exit: > + drm_dev_exit(idx); > +out: > + return ret; > } > > static int cirrus_fb_blit_fullscreen(struct drm_framebuffer *fb) > @@ -502,6 +525,14 @@ static void cirrus_mode_config_init(struct cirrus_device *cirrus) > > /* ------------------------------------------------------------------ */ > > +static void cirrus_release(struct drm_device *dev) > +{ > + struct cirrus_device *cirrus = dev->dev_private; > + > + drm_mode_config_cleanup(dev); > + kfree(cirrus); > +} > + > DEFINE_DRM_GEM_FOPS(cirrus_fops); > > static struct drm_driver cirrus_driver = { > @@ -515,6 +546,7 @@ static struct drm_driver cirrus_driver = { > > .fops = &cirrus_fops, > DRM_GEM_SHMEM_DRIVER_OPS, > + .release = cirrus_release, > }; > > static int cirrus_pci_probe(struct pci_dev *pdev, > @@ -598,12 +630,11 @@ static void cirrus_pci_remove(struct pci_dev *pdev) > struct drm_device *dev = pci_get_drvdata(pdev); > struct cirrus_device *cirrus = dev->dev_private; > > - drm_dev_unregister(dev); > - drm_mode_config_cleanup(dev); > + drm_dev_unplug(dev); > + drm_atomic_helper_shutdown(dev); > iounmap(cirrus->mmio); > iounmap(cirrus->vram); > drm_dev_put(dev); > - kfree(cirrus); > pci_release_regions(pdev); > } > > -- > 2.18.2 > -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch