525.125.06

This commit is contained in:
Maneet Singh
2023-06-27 14:38:03 -07:00
parent ad22fd4262
commit 1f3ce1beab
108 changed files with 7969 additions and 5966 deletions

View File

@@ -72,7 +72,7 @@ EXTRA_CFLAGS += -I$(src)/common/inc
EXTRA_CFLAGS += -I$(src)
EXTRA_CFLAGS += -Wall -MD $(DEFINES) $(INCLUDES) -Wno-cast-qual -Wno-error -Wno-format-extra-args
EXTRA_CFLAGS += -D__KERNEL__ -DMODULE -DNVRM
EXTRA_CFLAGS += -DNV_VERSION_STRING=\"525.116.04\"
EXTRA_CFLAGS += -DNV_VERSION_STRING=\"525.125.06\"
EXTRA_CFLAGS += -Wno-unused-function

View File

@@ -495,6 +495,12 @@ struct nv_file_private_t
nv_file_private_t *ctl_nvfp;
void *ctl_nvfp_priv;
NvU32 register_or_refcount;
//
// True if a client or an event was ever allocated on this fd.
// If false, RMAPI cleanup is skipped.
//
NvBool bCleanupRmapi;
};
// Forward define the gpu ops structures

View File

@@ -213,7 +213,7 @@ void NV_API_CALL nv_cancel_nano_timer(
#if NV_NANO_TIMER_USE_HRTIMER
hrtimer_cancel(&nv_nstimer->hr_timer);
#else
del_timer(&nv_nstimer->jiffy_timer);
del_timer_sync(&nv_nstimer->jiffy_timer);
#endif
}