From df6b55bb77ad479fcbcbcdaffd756369ed9dc4fb Mon Sep 17 00:00:00 2001 From: Andreas Beckmann Date: Wed, 1 Nov 2023 10:31:40 +0100 Subject: [PATCH] backport drm_gem_prime_handle_to_fd changes from 470.223.02 --- nvidia-drm/nvidia-drm-drv.c | 12 ++++++++++++ nvidia-drm/nvidia-drm.Kbuild | 1 + 2 files changed, 13 insertions(+) diff --git a/kernel/nvidia-drm/nvidia-drm-drv.c b/kernel/nvidia-drm/nvidia-drm-drv.c index 7e6f5e8..c0cc77a 100644 --- a/kernel/nvidia-drm/nvidia-drm-drv.c +++ b/kernel/nvidia-drm/nvidia-drm-drv.c @@ -697,7 +697,19 @@ static struct drm_driver nv_drm_driver = { .ioctls = nv_drm_ioctls, .num_ioctls = ARRAY_SIZE(nv_drm_ioctls), +/* + * linux-next commit 71a7974ac701 ("drm/prime: Unexport helpers for fd/handle + * conversion") unexports drm_gem_prime_handle_to_fd() and + * drm_gem_prime_fd_to_handle(). + * + * Prior linux-next commit 6b85aa68d9d5 ("drm: Enable PRIME import/export for + * all drivers") made these helpers the default when .prime_handle_to_fd / + * .prime_fd_to_handle are unspecified, so it's fine to just skip specifying + * them if the helpers aren't present. + */ +#if NV_IS_EXPORT_SYMBOL_PRESENT_drm_gem_prime_handle_to_fd .prime_handle_to_fd = drm_gem_prime_handle_to_fd, +#endif #if defined(NV_DRM_DRIVER_HAS_GEM_PRIME_CALLBACKS) .gem_prime_export = nv_drm_gem_prime_export, diff --git a/kernel/nvidia-drm/nvidia-drm.Kbuild b/kernel/nvidia-drm/nvidia-drm.Kbuild index 60b0412..2a8148f 100644 --- a/kernel/nvidia-drm/nvidia-drm.Kbuild +++ b/kernel/nvidia-drm/nvidia-drm.Kbuild @@ -51,6 +51,7 @@ NV_CONFTEST_GENERIC_COMPILE_TESTS += drm_available NV_CONFTEST_GENERIC_COMPILE_TESTS += drm_atomic_available NV_CONFTEST_GENERIC_COMPILE_TESTS += is_export_symbol_gpl_refcount_inc NV_CONFTEST_GENERIC_COMPILE_TESTS += is_export_symbol_gpl_refcount_dec_and_test +NV_CONFTEST_GENERIC_COMPILE_TESTS += is_export_symbol_present_drm_gem_prime_handle_to_fd NV_CONFTEST_FUNCTION_COMPILE_TESTS += drm_dev_unref NV_CONFTEST_FUNCTION_COMPILE_TESTS += drm_reinit_primary_mode_group -- 2.20.1