1 From df6b55bb77ad479fcbcbcdaffd756369ed9dc4fb Mon Sep 17 00:00:00 2001
2 From: Andreas Beckmann <anbe@debian.org>
3 Date: Wed, 1 Nov 2023 10:31:40 +0100
4 Subject: [PATCH] backport drm_gem_prime_handle_to_fd changes from 470.223.02
7 nvidia-drm/nvidia-drm-drv.c | 12 ++++++++++++
8 nvidia-drm/nvidia-drm.Kbuild | 1 +
9 2 files changed, 13 insertions(+)
11 diff --git a/kernel/nvidia-drm/nvidia-drm-drv.c b/kernel/nvidia-drm/nvidia-drm-drv.c
12 index 7e6f5e8..c0cc77a 100644
13 --- a/kernel/nvidia-drm/nvidia-drm-drv.c
14 +++ b/kernel/nvidia-drm/nvidia-drm-drv.c
15 @@ -697,7 +697,19 @@ static struct drm_driver nv_drm_driver = {
16 .ioctls = nv_drm_ioctls,
17 .num_ioctls = ARRAY_SIZE(nv_drm_ioctls),
20 + * linux-next commit 71a7974ac701 ("drm/prime: Unexport helpers for fd/handle
21 + * conversion") unexports drm_gem_prime_handle_to_fd() and
22 + * drm_gem_prime_fd_to_handle().
24 + * Prior linux-next commit 6b85aa68d9d5 ("drm: Enable PRIME import/export for
25 + * all drivers") made these helpers the default when .prime_handle_to_fd /
26 + * .prime_fd_to_handle are unspecified, so it's fine to just skip specifying
27 + * them if the helpers aren't present.
29 +#if NV_IS_EXPORT_SYMBOL_PRESENT_drm_gem_prime_handle_to_fd
30 .prime_handle_to_fd = drm_gem_prime_handle_to_fd,
33 #if defined(NV_DRM_DRIVER_HAS_GEM_PRIME_CALLBACKS)
34 .gem_prime_export = nv_drm_gem_prime_export,
35 diff --git a/kernel/nvidia-drm/nvidia-drm.Kbuild b/kernel/nvidia-drm/nvidia-drm.Kbuild
36 index 60b0412..2a8148f 100644
37 --- a/kernel/nvidia-drm/nvidia-drm.Kbuild
38 +++ b/kernel/nvidia-drm/nvidia-drm.Kbuild
39 @@ -51,6 +51,7 @@ NV_CONFTEST_GENERIC_COMPILE_TESTS += drm_available
40 NV_CONFTEST_GENERIC_COMPILE_TESTS += drm_atomic_available
41 NV_CONFTEST_GENERIC_COMPILE_TESTS += is_export_symbol_gpl_refcount_inc
42 NV_CONFTEST_GENERIC_COMPILE_TESTS += is_export_symbol_gpl_refcount_dec_and_test
43 +NV_CONFTEST_GENERIC_COMPILE_TESTS += is_export_symbol_present_drm_gem_prime_handle_to_fd
45 NV_CONFTEST_FUNCTION_COMPILE_TESTS += drm_dev_unref
46 NV_CONFTEST_FUNCTION_COMPILE_TESTS += drm_reinit_primary_mode_group