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