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 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4F6E4C433EF for ; Mon, 8 Nov 2021 15:31:23 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (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 22B436108E for ; Mon, 8 Nov 2021 15:31:23 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 22B436108E Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=ffwll.ch Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References: Message-ID:Subject:Cc:To:From:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=31NJdUucbMeHywEfLaNFNJbRddKu1Ra0vlDglzDwfLs=; b=Qv5ZvBqdv4tftx 5QpgIUeVylldaWMHEe1+fbdzuvv6Cz1S7W37fJo/DqGlAyI3/Z+sBTuY57QbidzFCmM2tlV5GohU7 LBeSx3eA+17Ag+4m3v8LvGC0MV7mMHvJEtWEY5GZKqX2gJBppuSr2SNllKiupVMWWJVbW3eC4gnsD je+uv0cKEtRdu8kfO8c87LCcFe//Jk1o+L/HKDXzpJlH3qWJngu2lAvw22I0ut5UomFprzGrPQOPC N87y3CNPz+f4YugQMzxpSJV0SLde+imgToqB7ufNwNxaLt8UdRHgxXRr7lpswJmTPantrIoMOZsl0 f6fmhmWiH5T4m9lNBiIg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mk6aO-00GqNz-NY; Mon, 08 Nov 2021 15:29:28 +0000 Received: from mail-wr1-x429.google.com ([2a00:1450:4864:20::429]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mk6aK-00GqMw-MM for linux-arm-kernel@lists.infradead.org; Mon, 08 Nov 2021 15:29:26 +0000 Received: by mail-wr1-x429.google.com with SMTP id w29so16004329wra.12 for ; Mon, 08 Nov 2021 07:29:23 -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:references:mime-version :content-disposition:in-reply-to; bh=c1Vs+8e8CI/eQJgbpfI/Ztxvzb9lQKxlTgF3ypUWX2Q=; b=EvlGKfzWf4YR8a+ai4RU3CDMnu3ajWJwo8Sp6Li16gYPErtkuf7ySvMFaMs3zqU6i/ ekw32AsoVDd52jHf+vVFPbMOH91z7Cj9FjCy9/QctcBukSoXe60I7bH9hY3/3TUo9+d6 J0ZpzzHXIqYXbJmYZukljOghYAs4PpBo3VFnU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=c1Vs+8e8CI/eQJgbpfI/Ztxvzb9lQKxlTgF3ypUWX2Q=; b=3JsgP8Kh4afFEJUfaod4hOpFqhkuVPzCIsrAzJ1U/kIR74R4E/3vLZbBBYu8uqHdQu aPNvsdG1ojuUAAxQQHWeqJpUOSMAFujKVCWEwVWswW6X26h4qYNsGfTQxncraqWXWebn 9ppHFTPFf5jmnXwwDuwmeo/tRmFb8e43jfzcuBzlltJnXwHufskDvqqFVPSF1InP8Z8+ ES8RsudGsqJWXm5nN9gFsYyojxS6H5q/RrrhMa+Of47aXjaKRJk0Rpp6SG3Jl5HjxoG8 3TIrwqxhDNpkVPrdJ5Tuxe9QOqbYPe4keByZIVfRfKX1a7atVuQUdTRyVwlEOkHBmFGZ EoCg== X-Gm-Message-State: AOAM531tsJcWAwZU0p0S5tvo7QoTIsvhsyKYV/eWicogMMUDKaXpJGFn TaeuVBxuvCoPIHsQcX01wdDKsQ== X-Google-Smtp-Source: ABdhPJwb/aFbIu8dIyZ/rHwVyiCtAdp7dmdzWNFLSsD1GwQ69nph/cPeSUCecltAOeJjHsbs2fHFGQ== X-Received: by 2002:adf:e6c5:: with SMTP id y5mr664478wrm.79.1636385362480; Mon, 08 Nov 2021 07:29:22 -0800 (PST) Received: from phenom.ffwll.local ([2a02:168:57f4:0:efd0:b9e5:5ae6:c2fa]) by smtp.gmail.com with ESMTPSA id z135sm24083422wmc.45.2021.11.08.07.29.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Nov 2021 07:29:21 -0800 (PST) Date: Mon, 8 Nov 2021 16:29:20 +0100 From: Daniel Vetter To: Thomas Zimmermann Cc: daniel@ffwll.ch, airlied@linux.ie, maarten.lankhorst@linux.intel.com, mripard@kernel.org, inki.dae@samsung.com, jy0922.shim@samsung.com, sw0312.kim@samsung.com, kyungmin.park@samsung.com, krzysztof.kozlowski@canonical.com, oleksandr_andrushchenko@epam.com, dri-devel@lists.freedesktop.org, linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org, xen-devel@lists.xenproject.org Subject: Re: [PATCH 1/3] drm/exynox: Implement mmap as GEM object function Message-ID: References: <20211108102846.309-1-tzimmermann@suse.de> <20211108102846.309-2-tzimmermann@suse.de> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20211108102846.309-2-tzimmermann@suse.de> X-Operating-System: Linux phenom 5.10.0-8-amd64 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20211108_072924_765446_88BA624B X-CRM114-Status: GOOD ( 26.91 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Mon, Nov 08, 2021 at 11:28:44AM +0100, Thomas Zimmermann wrote: > Moving the driver-specific mmap code into a GEM object function allows > for using DRM helpers for various mmap callbacks. > > The respective exynos functions are being removed. The file_operations > structure exynos_drm_driver_fops is now being created by the helper macro > DEFINE_DRM_GEM_FOPS(). > > Signed-off-by: Thomas Zimmermann s/exynox/exynos in the subject. Patch lgtm, but would still be good if exynos maintainers would ack/review/test it. But if you don't get anything within 2 weeks here's my: Acked-by: Daniel Vetter > --- > drivers/gpu/drm/exynos/exynos_drm_drv.c | 13 ++----- > drivers/gpu/drm/exynos/exynos_drm_fbdev.c | 20 ++--------- > drivers/gpu/drm/exynos/exynos_drm_gem.c | 43 +++++------------------ > drivers/gpu/drm/exynos/exynos_drm_gem.h | 5 --- > 4 files changed, 13 insertions(+), 68 deletions(-) > > diff --git a/drivers/gpu/drm/exynos/exynos_drm_drv.c b/drivers/gpu/drm/exynos/exynos_drm_drv.c > index d8f1cf4d6b69..9743b6b17447 100644 > --- a/drivers/gpu/drm/exynos/exynos_drm_drv.c > +++ b/drivers/gpu/drm/exynos/exynos_drm_drv.c > @@ -102,16 +102,7 @@ static const struct drm_ioctl_desc exynos_ioctls[] = { > DRM_RENDER_ALLOW), > }; > > -static const struct file_operations exynos_drm_driver_fops = { > - .owner = THIS_MODULE, > - .open = drm_open, > - .mmap = exynos_drm_gem_mmap, > - .poll = drm_poll, > - .read = drm_read, > - .unlocked_ioctl = drm_ioctl, > - .compat_ioctl = drm_compat_ioctl, > - .release = drm_release, > -}; > +DEFINE_DRM_GEM_FOPS(exynos_drm_driver_fops); > > static const struct drm_driver exynos_drm_driver = { > .driver_features = DRIVER_MODESET | DRIVER_GEM > @@ -124,7 +115,7 @@ static const struct drm_driver exynos_drm_driver = { > .prime_fd_to_handle = drm_gem_prime_fd_to_handle, > .gem_prime_import = exynos_drm_gem_prime_import, > .gem_prime_import_sg_table = exynos_drm_gem_prime_import_sg_table, > - .gem_prime_mmap = exynos_drm_gem_prime_mmap, > + .gem_prime_mmap = drm_gem_prime_mmap, > .ioctls = exynos_ioctls, > .num_ioctls = ARRAY_SIZE(exynos_ioctls), > .fops = &exynos_drm_driver_fops, > diff --git a/drivers/gpu/drm/exynos/exynos_drm_fbdev.c b/drivers/gpu/drm/exynos/exynos_drm_fbdev.c > index 5147f5929be7..02c97b9ca926 100644 > --- a/drivers/gpu/drm/exynos/exynos_drm_fbdev.c > +++ b/drivers/gpu/drm/exynos/exynos_drm_fbdev.c > @@ -15,6 +15,7 @@ > #include > #include > #include > +#include > #include > #include > > @@ -39,25 +40,8 @@ static int exynos_drm_fb_mmap(struct fb_info *info, > struct drm_fb_helper *helper = info->par; > struct exynos_drm_fbdev *exynos_fbd = to_exynos_fbdev(helper); > struct exynos_drm_gem *exynos_gem = exynos_fbd->exynos_gem; > - unsigned long vm_size; > - int ret; > - > - vma->vm_flags |= VM_IO | VM_DONTEXPAND | VM_DONTDUMP; > - > - vm_size = vma->vm_end - vma->vm_start; > - > - if (vm_size > exynos_gem->size) > - return -EINVAL; > > - ret = dma_mmap_attrs(to_dma_dev(helper->dev), vma, exynos_gem->cookie, > - exynos_gem->dma_addr, exynos_gem->size, > - exynos_gem->dma_attrs); > - if (ret < 0) { > - DRM_DEV_ERROR(to_dma_dev(helper->dev), "failed to mmap.\n"); > - return ret; > - } > - > - return 0; > + return drm_gem_prime_mmap(&exynos_gem->base, vma); > } > > static const struct fb_ops exynos_drm_fb_ops = { > diff --git a/drivers/gpu/drm/exynos/exynos_drm_gem.c b/drivers/gpu/drm/exynos/exynos_drm_gem.c > index 4396224227d1..c4b63902ee7a 100644 > --- a/drivers/gpu/drm/exynos/exynos_drm_gem.c > +++ b/drivers/gpu/drm/exynos/exynos_drm_gem.c > @@ -17,6 +17,8 @@ > #include "exynos_drm_drv.h" > #include "exynos_drm_gem.h" > > +static int exynos_drm_gem_mmap(struct drm_gem_object *obj, struct vm_area_struct *vma); > + > static int exynos_drm_alloc_buf(struct exynos_drm_gem *exynos_gem, bool kvmap) > { > struct drm_device *dev = exynos_gem->base.dev; > @@ -135,6 +137,7 @@ static const struct vm_operations_struct exynos_drm_gem_vm_ops = { > static const struct drm_gem_object_funcs exynos_drm_gem_object_funcs = { > .free = exynos_drm_gem_free_object, > .get_sg_table = exynos_drm_gem_prime_get_sg_table, > + .mmap = exynos_drm_gem_mmap, > .vm_ops = &exynos_drm_gem_vm_ops, > }; > > @@ -354,12 +357,16 @@ int exynos_drm_gem_dumb_create(struct drm_file *file_priv, > return 0; > } > > -static int exynos_drm_gem_mmap_obj(struct drm_gem_object *obj, > - struct vm_area_struct *vma) > +static int exynos_drm_gem_mmap(struct drm_gem_object *obj, struct vm_area_struct *vma) > { > struct exynos_drm_gem *exynos_gem = to_exynos_gem(obj); > int ret; > > + if (obj->import_attach) > + return dma_buf_mmap(obj->dma_buf, vma, 0); > + > + vma->vm_flags |= VM_IO | VM_DONTEXPAND | VM_DONTDUMP; > + > DRM_DEV_DEBUG_KMS(to_dma_dev(obj->dev), "flags = 0x%x\n", > exynos_gem->flags); > > @@ -385,26 +392,6 @@ static int exynos_drm_gem_mmap_obj(struct drm_gem_object *obj, > return ret; > } > > -int exynos_drm_gem_mmap(struct file *filp, struct vm_area_struct *vma) > -{ > - struct drm_gem_object *obj; > - int ret; > - > - /* set vm_area_struct. */ > - ret = drm_gem_mmap(filp, vma); > - if (ret < 0) { > - DRM_ERROR("failed to mmap.\n"); > - return ret; > - } > - > - obj = vma->vm_private_data; > - > - if (obj->import_attach) > - return dma_buf_mmap(obj->dma_buf, vma, 0); > - > - return exynos_drm_gem_mmap_obj(obj, vma); > -} > - > /* low-level interface prime helpers */ > struct drm_gem_object *exynos_drm_gem_prime_import(struct drm_device *dev, > struct dma_buf *dma_buf) > @@ -466,15 +453,3 @@ exynos_drm_gem_prime_import_sg_table(struct drm_device *dev, > exynos_gem->sgt = sgt; > return &exynos_gem->base; > } > - > -int exynos_drm_gem_prime_mmap(struct drm_gem_object *obj, > - struct vm_area_struct *vma) > -{ > - int ret; > - > - ret = drm_gem_mmap_obj(obj, obj->size, vma); > - if (ret < 0) > - return ret; > - > - return exynos_drm_gem_mmap_obj(obj, vma); > -} > diff --git a/drivers/gpu/drm/exynos/exynos_drm_gem.h b/drivers/gpu/drm/exynos/exynos_drm_gem.h > index a23272fb96fb..79d7e1a87419 100644 > --- a/drivers/gpu/drm/exynos/exynos_drm_gem.h > +++ b/drivers/gpu/drm/exynos/exynos_drm_gem.h > @@ -96,9 +96,6 @@ int exynos_drm_gem_dumb_create(struct drm_file *file_priv, > struct drm_device *dev, > struct drm_mode_create_dumb *args); > > -/* set vm_flags and we can change the vm attribute to other one at here. */ > -int exynos_drm_gem_mmap(struct file *filp, struct vm_area_struct *vma); > - > /* low-level interface prime helpers */ > struct drm_gem_object *exynos_drm_gem_prime_import(struct drm_device *dev, > struct dma_buf *dma_buf); > @@ -107,7 +104,5 @@ struct drm_gem_object * > exynos_drm_gem_prime_import_sg_table(struct drm_device *dev, > struct dma_buf_attachment *attach, > struct sg_table *sgt); > -int exynos_drm_gem_prime_mmap(struct drm_gem_object *obj, > - struct vm_area_struct *vma); > > #endif > -- > 2.33.1 > -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel