diff --git a/commitFile.txt b/commitFile.txt index 6ba1361..45387fd 100644 --- a/commitFile.txt +++ b/commitFile.txt @@ -1158,7 +1158,7 @@ cda75171ca7d8bf920aab6d56ef9aadec16fd15d - kernel-open/common/inc/os/nv_memory_t 86443277db67b64c70260e5668bb4140bc90165c - kernel-open/nvidia/nv-clk.c ef8fd76c55625aeaa71c9b789c4cf519ef6116b2 - kernel-open/nvidia/libspdm_hkdf.c 4c64885083621f5f313a7dee72e14eee8abed2a0 - kernel-open/nvidia/nvidia-sources.Kbuild -bdd4cf90dc9719e421b536811fc3802029a7a45a - kernel-open/nvidia/nv-platform.c +e5d6dfa062d2d9533760f883bdd36a669d79b759 - kernel-open/nvidia/nv-platform.c e5cd40b060a69cf71220c910e9428d7f261892f7 - kernel-open/nvidia/internal_crypt_lib.h 646e6b03521587cc1a02617afd697183e5d1a83a - kernel-open/nvidia/nv-kthread-q.c 4e5a330fa40dab218821976ac1b530c649d48994 - kernel-open/nvidia/libspdm_ecc.c diff --git a/kernel-open/nvidia/nv-platform.c b/kernel-open/nvidia/nv-platform.c index a5193e6..bb7357e 100644 --- a/kernel-open/nvidia/nv-platform.c +++ b/kernel-open/nvidia/nv-platform.c @@ -1389,6 +1389,7 @@ NvBool nv_get_hdcp_enabled(nv_state_t *nv) int nv_disable_simplefb_clocks(void) { int status = 0; + static bool is_coldboot = true; #if defined(CONFIG_FB) && defined(NV_NUM_REGISTERED_FB_PRESENT) if (num_registered_fb > 0) @@ -1407,7 +1408,7 @@ int nv_disable_simplefb_clocks(void) int j; np = of_find_node_by_name(NULL, "framebuffer"); - if ((np != NULL) && of_device_is_available(np)) + if ((np != NULL) && of_device_is_available(np) && is_coldboot) { #if defined(NV_LINUX_OF_CLK_H_PRESENT) && defined(NV_OF_CLK_GET_PARENT_COUNT_PRESENT) clk_count = of_clk_get_parent_count(np); @@ -1429,6 +1430,7 @@ int nv_disable_simplefb_clocks(void) } } #endif + is_coldboot = false; } of_node_put(np); #endif diff --git a/push_info.txt b/push_info.txt index a4ae2f7..80738a4 100644 --- a/push_info.txt +++ b/push_info.txt @@ -1 +1 @@ -rel-36_eng_2024-04-04 +l4t-l4t-r36.3_eng_2024-04-24