From: Daniel Vetter <daniel@ffwll.ch>
To: Matthew Auld <matthew.william.auld@gmail.com>
Cc: "Daniel Vetter" <daniel.vetter@ffwll.ch>,
"Intel Graphics Development" <intel-gfx@lists.freedesktop.org>,
"Thomas Hellström" <thomas.hellstrom@linux.intel.com>,
"DRI Development" <dri-devel@lists.freedesktop.org>,
"Daniel Vetter" <daniel.vetter@intel.com>
Subject: Re: [Intel-gfx] [PATCH] drm/i915/gem: Remove duplicated call to ops->pread
Date: Thu, 17 Jun 2021 10:38:52 +0200 [thread overview]
Message-ID: <YMsKHLshWwakmUAR@phenom.ffwll.local> (raw)
In-Reply-To: <CAM0jSHMTc6o5M=xbYJDoR0NWpEthOcHMSB=Pb4dHnV9gdDj9eA@mail.gmail.com>
On Wed, Jun 16, 2021 at 11:45:28AM +0100, Matthew Auld wrote:
> On Wed, 16 Jun 2021 at 10:04, Daniel Vetter <daniel.vetter@ffwll.ch> wrote:
> >
> > Between
> >
> > commit ae30af84edb5b7cc95485922e43afd909a892e1b
> > Author: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
> > Date: Tue Mar 23 16:50:00 2021 +0100
> >
> > drm/i915: Disable userptr pread/pwrite support.
> >
> > and
> >
> > commit 0049b688459b846f819b6e51c24cd0781fcfde41
> > Author: Matthew Auld <matthew.auld@intel.com>
> > Date: Thu Nov 5 15:49:33 2020 +0000
> >
> > drm/i915/gem: Allow backends to override pread implementation
> >
> > this accidentally landed twice.
> >
> > Cc: Matthew Auld <matthew.auld@intel.com
> > Cc: Thomas Hellström <thomas.hellstrom@linux.intel.com>
> > Cc: Jason Ekstrand <jason@jlekstrand.net>
> > Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
> > Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
> Reviewed-by: Matthew Auld <matthew.auld@intel.com
Pushed to drm-intel-gt-next, thanks for your review.
-Daniel
>
> > ---
> > drivers/gpu/drm/i915/i915_gem.c | 6 ------
> > 1 file changed, 6 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
> > index 6a0a3f0e36e1..07aa80773a02 100644
> > --- a/drivers/gpu/drm/i915/i915_gem.c
> > +++ b/drivers/gpu/drm/i915/i915_gem.c
> > @@ -469,12 +469,6 @@ i915_gem_pread_ioctl(struct drm_device *dev, void *data,
> > if (ret != -ENODEV)
> > goto out;
> >
> > - ret = -ENODEV;
> > - if (obj->ops->pread)
> > - ret = obj->ops->pread(obj, args);
> > - if (ret != -ENODEV)
> > - goto out;
> > -
> > ret = i915_gem_object_wait(obj,
> > I915_WAIT_INTERRUPTIBLE,
> > MAX_SCHEDULE_TIMEOUT);
> > --
> > 2.32.0.rc2
> >
> > _______________________________________________
> > Intel-gfx mailing list
> > Intel-gfx@lists.freedesktop.org
> > https://lists.freedesktop.org/mailman/listinfo/intel-gfx
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2021-06-17 8:38 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-16 9:03 [Intel-gfx] [PATCH] drm/i915/gem: Remove duplicated call to ops->pread Daniel Vetter
2021-06-16 9:18 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for " Patchwork
2021-06-16 9:47 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork
2021-06-16 10:45 ` [Intel-gfx] [PATCH] " Matthew Auld
2021-06-17 8:38 ` Daniel Vetter [this message]
2021-06-16 11:22 ` [Intel-gfx] ✗ Fi.CI.IGT: failure for " Patchwork
2021-06-16 16:09 ` [Intel-gfx] ✓ Fi.CI.IGT: success " 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=YMsKHLshWwakmUAR@phenom.ffwll.local \
--to=daniel@ffwll.ch \
--cc=daniel.vetter@ffwll.ch \
--cc=daniel.vetter@intel.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=intel-gfx@lists.freedesktop.org \
--cc=matthew.william.auld@gmail.com \
--cc=thomas.hellstrom@linux.intel.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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox