Skip to content

Commit 0bf68f0

Browse files
committed
570.190
1 parent e0566f7 commit 0bf68f0

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+1074
-705
lines changed

README.md

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# NVIDIA Linux Open GPU Kernel Module Source
22

33
This is the source release of the NVIDIA Linux open GPU kernel modules,
4-
version 570.181.
4+
version 570.190.
55

66

77
## How to Build
@@ -17,7 +17,7 @@ as root:
1717

1818
Note that the kernel modules built here must be used with GSP
1919
firmware and user-space NVIDIA GPU driver components from a corresponding
20-
570.181 driver release. This can be achieved by installing
20+
570.190 driver release. This can be achieved by installing
2121
the NVIDIA GPU driver from the .run file using the `--no-kernel-modules`
2222
option. E.g.,
2323

@@ -185,7 +185,7 @@ table below).
185185
For details on feature support and limitations, see the NVIDIA GPU driver
186186
end user README here:
187187

188-
https://us.download.nvidia.com/XFree86/Linux-x86_64/570.181/README/kernel_open.html
188+
https://us.download.nvidia.com/XFree86/Linux-x86_64/570.190/README/kernel_open.html
189189

190190
For vGPU support, please refer to the README.vgpu packaged in the vGPU Host
191191
Package for more details.
@@ -970,6 +970,9 @@ Subsystem Device ID.
970970
| NVIDIA RTX PRO 4500 Blackwell | 2C31 103C 2051 |
971971
| NVIDIA RTX PRO 4500 Blackwell | 2C31 10DE 2051 |
972972
| NVIDIA RTX PRO 4500 Blackwell | 2C31 17AA 2051 |
973+
| NVIDIA RTX PRO 4000 Blackwell SFF Edition | 2C33 1028 2053 |
974+
| NVIDIA RTX PRO 4000 Blackwell SFF Edition | 2C33 103C 2053 |
975+
| NVIDIA RTX PRO 4000 Blackwell SFF Edition | 2C33 17AA 2053 |
973976
| NVIDIA RTX PRO 4000 Blackwell | 2C34 1028 2052 |
974977
| NVIDIA RTX PRO 4000 Blackwell | 2C34 103C 2052 |
975978
| NVIDIA RTX PRO 4000 Blackwell | 2C34 10DE 2052 |
@@ -982,6 +985,9 @@ Subsystem Device ID.
982985
| NVIDIA GeForce RTX 5060 | 2D05 |
983986
| NVIDIA GeForce RTX 5070 Laptop GPU | 2D18 |
984987
| NVIDIA GeForce RTX 5060 Laptop GPU | 2D19 |
988+
| NVIDIA RTX PRO 2000 Blackwell | 2D30 1028 2054 |
989+
| NVIDIA RTX PRO 2000 Blackwell | 2D30 103C 2054 |
990+
| NVIDIA RTX PRO 2000 Blackwell | 2D30 17AA 2054 |
985991
| NVIDIA RTX PRO 2000 Blackwell Generation Laptop GPU | 2D39 |
986992
| NVIDIA GeForce RTX 5070 Laptop GPU | 2D58 |
987993
| NVIDIA GeForce RTX 5060 Laptop GPU | 2D59 |

kernel-open/Kbuild

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ ccflags-y += -I$(src)/common/inc
7979
ccflags-y += -I$(src)
8080
ccflags-y += -Wall $(DEFINES) $(INCLUDES) -Wno-cast-qual -Wno-format-extra-args
8181
ccflags-y += -D__KERNEL__ -DMODULE -DNVRM
82-
ccflags-y += -DNV_VERSION_STRING=\"570.181\"
82+
ccflags-y += -DNV_VERSION_STRING=\"570.190\"
8383

8484
ifneq ($(SYSSRCHOST1X),)
8585
ccflags-y += -I$(SYSSRCHOST1X)

kernel-open/conftest.sh

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4071,6 +4071,43 @@ compile_test() {
40714071
fi
40724072
;;
40734073

4074+
drm_fb_create_takes_format_info)
4075+
#
4076+
# Determine if a `struct drm_format_info *` is passed into
4077+
# the .fb_create callback. If so, it will have 4 arguments.
4078+
# This parameter was added in commit 81112eaac559 ("drm:
4079+
# Pass the format info to .fb_create") in linux-next
4080+
# (2025-07-16)
4081+
CODE="
4082+
#include <drm/drm_mode_config.h>
4083+
#include <drm/drm_framebuffer.h>
4084+
4085+
static const struct drm_mode_config_funcs funcs;
4086+
void conftest_drm_fb_create_takes_format_info(void) {
4087+
funcs.fb_create(NULL, NULL, NULL, NULL);
4088+
}"
4089+
4090+
compile_check_conftest "$CODE" "NV_DRM_FB_CREATE_TAKES_FORMAT_INFO" "" "types"
4091+
;;
4092+
4093+
drm_fill_fb_struct_takes_format_info)
4094+
#
4095+
# Determine if a `struct drm_format_info *` is passed into
4096+
# drm_helper_mode_fill_fb_struct(). If so, it will have 4 arguments.
4097+
# This parameter was added in commit a34cc7bf1034 ("drm:
4098+
# Allow the caller to pass in the format info to
4099+
# drm_helper_mode_fill_fb_struct()") in linux-next
4100+
# (2025-07-16)
4101+
CODE="
4102+
#include <drm/drm_modeset_helper.h>
4103+
4104+
void conftest_drm_fill_fb_struct_takes_format_info(void) {
4105+
drm_helper_mode_fill_fb_struct(NULL, NULL, NULL, NULL);
4106+
}"
4107+
4108+
compile_check_conftest "$CODE" "NV_DRM_FILL_FB_STRUCT_TAKES_FORMAT_INFO" "" "types"
4109+
;;
4110+
40744111
drm_connector_funcs_have_mode_in_name)
40754112
#
40764113
# Determine if _mode_ is present in connector function names. We

kernel-open/nvidia-drm/nvidia-drm-drv.c

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -209,11 +209,14 @@ static void nv_drm_output_poll_changed(struct drm_device *dev)
209209
static struct drm_framebuffer *nv_drm_framebuffer_create(
210210
struct drm_device *dev,
211211
struct drm_file *file,
212-
#if defined(NV_DRM_HELPER_MODE_FILL_FB_STRUCT_HAS_CONST_MODE_CMD_ARG)
212+
#if defined(NV_DRM_FB_CREATE_TAKES_FORMAT_INFO)
213+
const struct drm_format_info *info,
214+
#endif
215+
#if defined(NV_DRM_HELPER_MODE_FILL_FB_STRUCT_HAS_CONST_MODE_CMD_ARG)
213216
const struct drm_mode_fb_cmd2 *cmd
214-
#else
217+
#else
215218
struct drm_mode_fb_cmd2 *cmd
216-
#endif
219+
#endif
217220
)
218221
{
219222
struct drm_mode_fb_cmd2 local_cmd;
@@ -224,11 +227,14 @@ static struct drm_framebuffer *nv_drm_framebuffer_create(
224227
fb = nv_drm_internal_framebuffer_create(
225228
dev,
226229
file,
230+
#if defined(NV_DRM_FB_CREATE_TAKES_FORMAT_INFO)
231+
info,
232+
#endif
227233
&local_cmd);
228234

229-
#if !defined(NV_DRM_HELPER_MODE_FILL_FB_STRUCT_HAS_CONST_MODE_CMD_ARG)
235+
#if !defined(NV_DRM_HELPER_MODE_FILL_FB_STRUCT_HAS_CONST_MODE_CMD_ARG)
230236
*cmd = local_cmd;
231-
#endif
237+
#endif
232238

233239
return fb;
234240
}
@@ -2046,13 +2052,13 @@ void nv_drm_register_drm_device(const nv_gpu_info_t *gpu_info)
20462052
#endif
20472053
nvKms->framebufferConsoleDisabled(nv_dev->pDevice);
20482054
}
2049-
#if defined(NV_DRM_CLIENT_AVAILABLE)
2055+
#if defined(NV_DRM_CLIENT_AVAILABLE)
20502056
drm_client_setup(dev, NULL);
2051-
#elif defined(NV_DRM_FBDEV_TTM_AVAILABLE)
2057+
#elif defined(NV_DRM_FBDEV_TTM_AVAILABLE)
20522058
drm_fbdev_ttm_setup(dev, 32);
2053-
#elif defined(NV_DRM_FBDEV_GENERIC_AVAILABLE)
2059+
#elif defined(NV_DRM_FBDEV_GENERIC_AVAILABLE)
20542060
drm_fbdev_generic_setup(dev, 32);
2055-
#endif
2061+
#endif
20562062
}
20572063
#endif /* defined(NV_DRM_FBDEV_AVAILABLE) */
20582064

kernel-open/nvidia-drm/nvidia-drm-fb.c

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -220,6 +220,9 @@ static int nv_drm_framebuffer_init(struct drm_device *dev,
220220
struct drm_framebuffer *nv_drm_internal_framebuffer_create(
221221
struct drm_device *dev,
222222
struct drm_file *file,
223+
#if defined(NV_DRM_FB_CREATE_TAKES_FORMAT_INFO)
224+
const struct drm_format_info *info,
225+
#endif
223226
struct drm_mode_fb_cmd2 *cmd)
224227
{
225228
struct nv_drm_device *nv_dev = to_nv_device(dev);
@@ -273,6 +276,9 @@ struct drm_framebuffer *nv_drm_internal_framebuffer_create(
273276
dev,
274277
#endif
275278
&nv_fb->base,
279+
#if defined(NV_DRM_FB_CREATE_TAKES_FORMAT_INFO)
280+
info,
281+
#endif
276282
cmd);
277283

278284
/*

kernel-open/nvidia-drm/nvidia-drm-fb.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,9 @@ static inline void nv_fb_set_gem_obj(
8484
struct drm_framebuffer *nv_drm_internal_framebuffer_create(
8585
struct drm_device *dev,
8686
struct drm_file *file,
87+
#if defined(NV_DRM_FB_CREATE_TAKES_FORMAT_INFO)
88+
const struct drm_format_info *info,
89+
#endif
8790
struct drm_mode_fb_cmd2 *cmd);
8891

8992
#endif /* NV_DRM_ATOMIC_MODESET_AVAILABLE */

kernel-open/nvidia-drm/nvidia-drm-modeset.c

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -703,6 +703,13 @@ int nv_drm_atomic_commit(struct drm_device *dev,
703703
#else
704704
drm_atomic_helper_swap_state(dev, state);
705705
#endif
706+
/*
707+
* Used to update legacy modeset state pointers to support UAPIs not updated
708+
* by the core atomic modeset infrastructure.
709+
*
710+
* Example: /sys/class/drm/<card connector>/enabled
711+
*/
712+
drm_atomic_helper_update_legacy_modeset_state(dev, state);
706713

707714
/*
708715
* nv_drm_atomic_commit_internal() must not return failure after

kernel-open/nvidia-drm/nvidia-drm-sources.mk

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -148,3 +148,4 @@ NV_CONFTEST_TYPE_COMPILE_TESTS += drm_output_poll_changed
148148
NV_CONFTEST_TYPE_COMPILE_TESTS += drm_driver_has_date
149149
NV_CONFTEST_TYPE_COMPILE_TESTS += file_operations_fop_unsigned_offset_present
150150
NV_CONFTEST_TYPE_COMPILE_TESTS += drm_connector_helper_funcs_mode_valid_has_const_mode_arg
151+
NV_CONFTEST_TYPE_COMPILE_TESTS += drm_fb_create_takes_format_info

0 commit comments

Comments
 (0)