Message ID | 20190627205633.1143-24-matthew.auld@intel.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | Introduce memory region concept (including device local memory) | expand |
Quoting Matthew Auld (2019-06-27 21:56:19) > From: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com> > > Done by returning -ENODEV from the map_gtt version ioctl. > > Cc: Antonio Argenziano <antonio.argenziano@intel.com> > Cc: Matthew Auld <matthew.auld@intel.com> > Signed-off-by: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com> > --- > drivers/gpu/drm/i915/i915_drv.c | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c > index ac8fbada0406..34edc0302691 100644 > --- a/drivers/gpu/drm/i915/i915_drv.c > +++ b/drivers/gpu/drm/i915/i915_drv.c > @@ -425,6 +425,8 @@ static int i915_getparam_ioctl(struct drm_device *dev, void *data, > return value; > break; > case I915_PARAM_MMAP_GTT_VERSION: > + if (!HAS_MAPPABLE_APERTURE(dev_priv)) > + return -ENODEV; The ioctl version is still going to be there, since we just extend it report offsets fot the many alternative mappings, with the different fences and everything. Right? If we don't support a ggtt mmap via the extended mmap_offset ioctl, we report the flags as being invalid. -Chris
diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c index ac8fbada0406..34edc0302691 100644 --- a/drivers/gpu/drm/i915/i915_drv.c +++ b/drivers/gpu/drm/i915/i915_drv.c @@ -425,6 +425,8 @@ static int i915_getparam_ioctl(struct drm_device *dev, void *data, return value; break; case I915_PARAM_MMAP_GTT_VERSION: + if (!HAS_MAPPABLE_APERTURE(dev_priv)) + return -ENODEV; /* Though we've started our numbering from 1, and so class all * earlier versions as 0, in effect their value is undefined as * the ioctl will report EINVAL for the unknown param!