diff --git a/kernel/nvidia-drm/nvidia-drm-drv.c b/kernel/nvidia-drm/nvidia-drm-drv.c index 7feb5d2..2bcf29c 100644 --- a/kernel/nvidia-drm/nvidia-drm-drv.c +++ b/kernel/nvidia-drm/nvidia-drm-drv.c @@ -139,6 +139,10 @@ static void nv_drm_output_poll_changed(struct drm_device *dev) static struct drm_framebuffer *nv_drm_framebuffer_create( struct drm_device *dev, struct drm_file *file, +#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 17, 0) + // Rel. commit. "drm: Pass the format info to .fb_create()" (Ville Syrjälä, 1 Jul 2025) + const struct drm_format_info *info, +#endif #if defined(NV_DRM_HELPER_MODE_FILL_FB_STRUCT_HAS_CONST_MODE_CMD_ARG) const struct drm_mode_fb_cmd2 *cmd #else @@ -154,6 +158,10 @@ static struct drm_framebuffer *nv_drm_framebuffer_create( fb = nv_drm_internal_framebuffer_create( dev, file, +#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 17, 0) + // Rel. commit. "drm: Allow the caller to pass in the format info to drm_helper_mode_fill_fb_struct()" (Ville Syrjälä, 1 Jul 2025) + info, +#endif &local_cmd); #if !defined(NV_DRM_HELPER_MODE_FILL_FB_STRUCT_HAS_CONST_MODE_CMD_ARG) diff --git a/kernel/nvidia-drm/nvidia-drm-fb.c b/kernel/nvidia-drm/nvidia-drm-fb.c index c35e0ee..91161ff 100644 --- a/kernel/nvidia-drm/nvidia-drm-fb.c +++ b/kernel/nvidia-drm/nvidia-drm-fb.c @@ -32,6 +32,7 @@ #include "nvidia-drm-helper.h" #include +#include static void nv_drm_framebuffer_destroy(struct drm_framebuffer *fb) { @@ -157,6 +158,10 @@ static int nv_drm_framebuffer_init( struct drm_framebuffer *nv_drm_internal_framebuffer_create( struct drm_device *dev, struct drm_file *file, +#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 17, 0) + // Rel. commit. "drm: Allow the caller to pass in the format info to drm_helper_mode_fill_fb_struct()" (Ville Syrjälä, 1 Jul 2025) + const struct drm_format_info *info, +#endif struct drm_mode_fb_cmd2 *cmd) { struct nv_drm_framebuffer *nv_fb; @@ -183,6 +188,10 @@ struct drm_framebuffer *nv_drm_internal_framebuffer_create( dev, #endif &nv_fb->base, +#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 17, 0) + // Rel. commit. "drm: Allow the caller to pass in the format info to drm_helper_mode_fill_fb_struct()" (Ville Syrjälä, 1 Jul 2025) + info, +#endif cmd); /* diff --git a/kernel/nvidia-drm/nvidia-drm-fb.h b/kernel/nvidia-drm/nvidia-drm-fb.h index bfa93fd..68a634a 100644 --- a/kernel/nvidia-drm/nvidia-drm-fb.h +++ b/kernel/nvidia-drm/nvidia-drm-fb.h @@ -35,6 +35,8 @@ #include #endif +#include + #include "nvidia-drm-gem-nvkms-memory.h" #include "nvkms-kapi.h" @@ -58,6 +60,10 @@ static inline struct nv_drm_framebuffer *to_nv_framebuffer( struct drm_framebuffer *nv_drm_internal_framebuffer_create( struct drm_device *dev, struct drm_file *file, +#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 17, 0) + // Rel. commit. "drm: Allow the caller to pass in the format info to drm_helper_mode_fill_fb_struct()" (Ville Syrjälä, 1 Jul 2025) + const struct drm_format_info *info, +#endif struct drm_mode_fb_cmd2 *cmd); #endif /* NV_DRM_ATOMIC_MODESET_AVAILABLE */