drm/i915: Reinstate the mmap ioctl for some platforms
Subsystems (2)
PATCH v3 1/1 drm/i915: Reinstate the mmap ioctl for some platforms
Reinstate the mmap ioctl for all current integrated platforms. The intention was really to have it disabled for discrete graphics where we enforce a single mmap mode.
This fixes media on rkl/adl.
v2:
- Added a R-B.
- Fixed up the code comment a bit.
v3:
- Added an A-B.
- Point out in the commit message that there was an issue with media on rkl/adl.
--- drivers/gpu/drm/i915/gem/i915_gem_mman.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
drivers/gpu/drm/i915/gem/i915_gem_mman.c +4 -3
@@ -62,10 +62,11 @@ i915_gem_mmap_ioctl(struct drm_device *dev, void *data,struct drm_i915_gem_object *obj;unsigned long addr; -/* mmap ioctl is disallowed for all platforms after TGL-LP. This also -* covers all platforms with local memory. +/* +* mmap ioctl is disallowed for all discrete platforms, +* and for all platforms with GRAPHICS_VER > 12. */ -if (GRAPHICS_VER (i915) >=12 && !IS_TIGERLAKE (i915)) +if (IS_DGFX (i915) ||GRAPHICS_VER (i915) >12 )return -EOPNOTSUPP ;if (args->flags & ~(I915_MMAP_WC ))
Signature · 1 line
2.31.1
Quoted 14 lines · Thomas Hellström
Reinstate the mmap ioctl for all current integrated platforms. The intention was really to have it disabled for discrete graphics where we enforce a single mmap mode.
This fixes media on rkl/adl.
v2:
- Added a R-B.
- Fixed up the code comment a bit.
v3:
- Added an A-B.
- Point out in the commit message that there was an issue with media on rkl/adl.
Quoted 4 lines
Fixes 35cbd91eb541 ("drm/i915: Disable mmap ioctl for gen12+")Signed-off-by Thomas Hellström <[email protected]>Reviewed-by Matthew Auld <[email protected]>Acked-by Daniel Vetter <[email protected]>
I already pushed v2 of this last week with the following amended:
"This was reported to break ADL-P with the media stack, which was not the intention. Although longer term we do still plan to sunset this ioctl even for integrated, in favour of using mmap_offset instead."
Quoted 14 lines
--- drivers/gpu/drm/i915/gem/i915_gem_mman.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)drivers/gpu/drm/i915/gem/i915_gem_mman.c +0
-1@@ -62,10 +62,11 @@ i915_gem_mmap_ioctl(struct drm_device *dev, void *data,struct drm_i915_gem_object *obj;unsigned long addr; -/* mmap ioctl is disallowed for all platforms after TGL-LP. This also
drivers/gpu/drm/i915/gem/i915_gem_mman.c i915_gem_mmap_ioctl(struct drm_device *dev, void *data, · line 72
Quoted 10 lines
drivers/gpu/drm/i915/gem/i915_gem_mman.c +4
-2-* covers all platforms with local memory. +/* +* mmap ioctl is disallowed for all discrete platforms, +* and for all platforms with GRAPHICS_VER > 12. */ -if (GRAPHICS_VER (i915) >=12 && !IS_TIGERLAKE (i915)) +if (IS_DGFX (i915) ||GRAPHICS_VER (i915) >12 )return -EOPNOTSUPP ;if (args->flags & ~(I915_MMAP_WC ))
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 15 lines · Matthew Auld
Quoted 14 lines · Thomas Hellström
Reinstate the mmap ioctl for all current integrated platforms. The intention was really to have it disabled for discrete graphics where we enforce a single mmap mode.
This fixes media on rkl/adl.
v2:
- Added a R-B.
- Fixed up the code comment a bit.
v3:
- Added an A-B.
- Point out in the commit message that there was an issue with media on rkl/adl.
Quoted 9 lines
Quoted 4 lines
Fixes 35cbd91eb541 ("drm/i915: Disable mmap ioctl for gen12+")Signed-off-by Thomas Hellström <[email protected]>Reviewed-by Matthew Auld <[email protected]>Acked-by Daniel Vetter <[email protected]>I already pushed v2 of this last week with the following amended:
"This was reported to break ADL-P with the media stack, which was not the intention. Although longer term we do still plan to sunset this ioctl even for integrated, in favour of using
mmap_offsetinstead."
Ah, OK.
Thanks.
Thomas
Patchwork
CI[Intel-gfx] ✗ Fi.CI.BAT: failure for drm/i915: Reinstate the mmap ioctl for some platforms (rev3)
In reply to Thomas Hellström== Series Details ==
== Series Details ==
Series: drm/i915: Reinstate the mmap ioctl for some platforms (rev3)
URL : https://patchwork.freedesktop.org/series/91865/
State : failure
== Summary ==
Applying: drm/i915: Reinstate the mmap ioctl for some platforms Using index info to reconstruct a base tree...
M drivers/gpu/drm/i915/gem/i915_gem_mman.c
Falling back to patching base and 3-way merge...
No changes -- Patch already applied.
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx