From: Thomas Zimmermann <tzimmermann@suse.de> To: Daniel Vetter <daniel.vetter@ffwll.ch>, DRI Development <dri-devel@lists.freedesktop.org> Cc: Intel Graphics Development <intel-gfx@lists.freedesktop.org>, Boris Brezillon <boris.brezillon@collabora.com>, Gerd Hoffmann <kraxel@redhat.com>, Daniel Vetter <daniel.vetter@intel.com> Subject: Re: [PATCH] drm/shmem-helper: Only dma-buf imports are private obj Date: Tue, 16 Jun 2020 14:06:24 +0200 [thread overview] Message-ID: <8c125158-fe7c-29a9-d9a8-9e6b418b6dd5@suse.de> (raw) In-Reply-To: <20200616114723.2363268-1-daniel.vetter@ffwll.ch> [-- Attachment #1.1.1: Type: text/plain, Size: 2359 bytes --] Hi Am 16.06.20 um 13:47 schrieb Daniel Vetter: > I broke that in my refactoring: > > commit 7d2cd72a9aa3df3604cafd169a2d4a525afb68ca > Author: Daniel Vetter <daniel.vetter@ffwll.ch> > Date: Fri May 29 16:05:42 2020 +0200 > > drm/shmem-helpers: Simplify dma-buf importing > > I'm not entirely sure of the history here, but I suspect that in one > of the rebases or when applying the patch I moved the hunk from > drm_gem_shmem_prime_import_sg_table(), where it should be, to > drm_gem_shmem_create_with_handle(), which is totally wrong. > > Remedy this. > > Thanks for Thomas for the crucual hint in debugging this. > > Reported-by: Thomas Zimmermann <tzimmermann@suse.de> > Fixes: 7d2cd72a9aa3 ("drm/shmem-helpers: Simplify dma-buf importing") > Cc: Boris Brezillon <boris.brezillon@collabora.com> > Cc: Thomas Zimmermann <tzimmermann@suse.de> > Cc: Gerd Hoffmann <kraxel@redhat.com> > Cc: Rob Herring <robh@kernel.org> > Cc: Noralf Trønnes <noralf@tronnes.org> > Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> Tested-by: Thomas Zimmermann <tzimmermann@suse.de> Reviewed-by: Thomas Zimmermann <tzimmermann@suse.de> > --- > drivers/gpu/drm/drm_gem_shmem_helper.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/drm_gem_shmem_helper.c b/drivers/gpu/drm/drm_gem_shmem_helper.c > index 0a7e3b664bc2..837e0840990c 100644 > --- a/drivers/gpu/drm/drm_gem_shmem_helper.c > +++ b/drivers/gpu/drm/drm_gem_shmem_helper.c > @@ -377,7 +377,7 @@ drm_gem_shmem_create_with_handle(struct drm_file *file_priv, > struct drm_gem_shmem_object *shmem; > int ret; > > - shmem = __drm_gem_shmem_create(dev, size, true); > + shmem = drm_gem_shmem_create(dev, size); > if (IS_ERR(shmem)) > return shmem; > > @@ -730,7 +730,7 @@ drm_gem_shmem_prime_import_sg_table(struct drm_device *dev, > size_t size = PAGE_ALIGN(attach->dmabuf->size); > struct drm_gem_shmem_object *shmem; > > - shmem = drm_gem_shmem_create(dev, size); > + shmem = __drm_gem_shmem_create(dev, size, true); > if (IS_ERR(shmem)) > return ERR_CAST(shmem); > > -- Thomas Zimmermann Graphics Driver Developer SUSE Software Solutions Germany GmbH Maxfeldstr. 5, 90409 Nürnberg, Germany (HRB 36809, AG Nürnberg) Geschäftsführer: Felix Imendörffer [-- Attachment #1.2: OpenPGP digital signature --] [-- Type: application/pgp-signature, Size: 488 bytes --] [-- Attachment #2: Type: text/plain, Size: 160 bytes --] _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel
WARNING: multiple messages have this Message-ID (diff)
From: Thomas Zimmermann <tzimmermann@suse.de> To: Daniel Vetter <daniel.vetter@ffwll.ch>, DRI Development <dri-devel@lists.freedesktop.org> Cc: "Rob Herring" <robh@kernel.org>, "Noralf Trønnes" <noralf@tronnes.org>, "Intel Graphics Development" <intel-gfx@lists.freedesktop.org>, "Gerd Hoffmann" <kraxel@redhat.com>, "Daniel Vetter" <daniel.vetter@intel.com> Subject: Re: [Intel-gfx] [PATCH] drm/shmem-helper: Only dma-buf imports are private obj Date: Tue, 16 Jun 2020 14:06:24 +0200 [thread overview] Message-ID: <8c125158-fe7c-29a9-d9a8-9e6b418b6dd5@suse.de> (raw) In-Reply-To: <20200616114723.2363268-1-daniel.vetter@ffwll.ch> [-- Attachment #1.1.1: Type: text/plain, Size: 2359 bytes --] Hi Am 16.06.20 um 13:47 schrieb Daniel Vetter: > I broke that in my refactoring: > > commit 7d2cd72a9aa3df3604cafd169a2d4a525afb68ca > Author: Daniel Vetter <daniel.vetter@ffwll.ch> > Date: Fri May 29 16:05:42 2020 +0200 > > drm/shmem-helpers: Simplify dma-buf importing > > I'm not entirely sure of the history here, but I suspect that in one > of the rebases or when applying the patch I moved the hunk from > drm_gem_shmem_prime_import_sg_table(), where it should be, to > drm_gem_shmem_create_with_handle(), which is totally wrong. > > Remedy this. > > Thanks for Thomas for the crucual hint in debugging this. > > Reported-by: Thomas Zimmermann <tzimmermann@suse.de> > Fixes: 7d2cd72a9aa3 ("drm/shmem-helpers: Simplify dma-buf importing") > Cc: Boris Brezillon <boris.brezillon@collabora.com> > Cc: Thomas Zimmermann <tzimmermann@suse.de> > Cc: Gerd Hoffmann <kraxel@redhat.com> > Cc: Rob Herring <robh@kernel.org> > Cc: Noralf Trønnes <noralf@tronnes.org> > Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> Tested-by: Thomas Zimmermann <tzimmermann@suse.de> Reviewed-by: Thomas Zimmermann <tzimmermann@suse.de> > --- > drivers/gpu/drm/drm_gem_shmem_helper.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/drm_gem_shmem_helper.c b/drivers/gpu/drm/drm_gem_shmem_helper.c > index 0a7e3b664bc2..837e0840990c 100644 > --- a/drivers/gpu/drm/drm_gem_shmem_helper.c > +++ b/drivers/gpu/drm/drm_gem_shmem_helper.c > @@ -377,7 +377,7 @@ drm_gem_shmem_create_with_handle(struct drm_file *file_priv, > struct drm_gem_shmem_object *shmem; > int ret; > > - shmem = __drm_gem_shmem_create(dev, size, true); > + shmem = drm_gem_shmem_create(dev, size); > if (IS_ERR(shmem)) > return shmem; > > @@ -730,7 +730,7 @@ drm_gem_shmem_prime_import_sg_table(struct drm_device *dev, > size_t size = PAGE_ALIGN(attach->dmabuf->size); > struct drm_gem_shmem_object *shmem; > > - shmem = drm_gem_shmem_create(dev, size); > + shmem = __drm_gem_shmem_create(dev, size, true); > if (IS_ERR(shmem)) > return ERR_CAST(shmem); > > -- Thomas Zimmermann Graphics Driver Developer SUSE Software Solutions Germany GmbH Maxfeldstr. 5, 90409 Nürnberg, Germany (HRB 36809, AG Nürnberg) Geschäftsführer: Felix Imendörffer [-- Attachment #1.2: OpenPGP digital signature --] [-- Type: application/pgp-signature, Size: 488 bytes --] [-- Attachment #2: Type: text/plain, Size: 160 bytes --] _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2020-06-16 12:06 UTC|newest] Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-06-16 11:47 [PATCH] drm/shmem-helper: Only dma-buf imports are private obj Daniel Vetter 2020-06-16 11:47 ` [Intel-gfx] " Daniel Vetter 2020-06-16 12:06 ` Thomas Zimmermann [this message] 2020-06-16 12:06 ` Thomas Zimmermann 2020-06-16 17:12 ` Daniel Vetter 2020-06-16 17:12 ` [Intel-gfx] " Daniel Vetter 2020-06-16 19:23 ` [Intel-gfx] ✗ Fi.CI.BAT: failure for " Patchwork
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=8c125158-fe7c-29a9-d9a8-9e6b418b6dd5@suse.de \ --to=tzimmermann@suse.de \ --cc=boris.brezillon@collabora.com \ --cc=daniel.vetter@ffwll.ch \ --cc=daniel.vetter@intel.com \ --cc=dri-devel@lists.freedesktop.org \ --cc=intel-gfx@lists.freedesktop.org \ --cc=kraxel@redhat.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.