diff options
author | Maxime Ripard <maxime@cerno.tech> | 2023-05-12 10:47:12 +0300 |
---|---|---|
committer | Maxime Ripard <maxime@cerno.tech> | 2023-05-12 10:47:12 +0300 |
commit | 50282fd57bcd3525c9d81eef58df8718e4337c6d (patch) | |
tree | 9795dfdb1a9b66904d9320f33c9216683d10576a /include/drm/drm_gem_vram_helper.h | |
parent | ad81e23426a651eb89a4b306e1c4169e6308c124 (diff) | |
parent | ac9a78681b921877518763ba0e89202254349d1b (diff) | |
download | linux-50282fd57bcd3525c9d81eef58df8718e4337c6d.tar.xz |
Merge drm/drm-fixes into drm-misc-fixes
Let's bring 6.4-rc1 in drm-misc-fixes to start the new fix cycle.
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
Diffstat (limited to 'include/drm/drm_gem_vram_helper.h')
-rw-r--r-- | include/drm/drm_gem_vram_helper.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/drm/drm_gem_vram_helper.h b/include/drm/drm_gem_vram_helper.h index d3e8920c0b64..f4aab64411d8 100644 --- a/include/drm/drm_gem_vram_helper.h +++ b/include/drm/drm_gem_vram_helper.h @@ -160,7 +160,9 @@ void drm_gem_vram_simple_display_pipe_cleanup_fb( .debugfs_init = drm_vram_mm_debugfs_init, \ .dumb_create = drm_gem_vram_driver_dumb_create, \ .dumb_map_offset = drm_gem_ttm_dumb_map_offset, \ - .gem_prime_mmap = drm_gem_prime_mmap + .gem_prime_mmap = drm_gem_prime_mmap, \ + .prime_handle_to_fd = drm_gem_prime_handle_to_fd, \ + .prime_fd_to_handle = drm_gem_prime_fd_to_handle /* * VRAM memory manager |