1 files changed, 33 insertions, 20 deletions

diff --git a/nvdebug_entry.c b/nvdebug_entry.c
index 5f99976..d5df7db 100644
--- a/nvdebug_entry.c
+++ b/nvdebug_entry.c
@@ -289,17 +289,45 @@ int __init nvdebug_init(void) {
                         snprintf(runlist_name, 12, "runlist%lu", last_runlist);
                         if (!(rl_dir = proc_mkdir_data(runlist_name, 0555, dir, (void*)device_id)))
                                 goto out_nomem;
+                        // Create one file for each runlist on Ampere+, or one file for each GPU on older
+                        if (g_nvdebug_state[res].chip_id >= NV_CHIP_ID_AMPERE || last_runlist == 0) {
+                                struct proc_dir_entry *chram_scope;
+                                // preempt_tsg, enable_channel, and disable_channel refer to a GPU-global channel
+                                // RAM on pre-Ampere GPUs
+                                if (g_nvdebug_state[res].chip_id >= NV_CHIP_ID_AMPERE)
+                                        chram_scope = rl_dir;
+                                else
+                                        chram_scope = dir;
+                                // Create file `/proc/gpu#/runlist#/preempt_tsg`, world writable
+                                // On Turing and older, `/proc/gpu#/preempt_tsg`
+                                if (!proc_create_data(
+                                                "preempt_tsg", 0222, chram_scope, compat_ops(&preempt_tsg_file_ops),
+                                                (void*)last_runlist))
+                                        goto out_nomem;
+                                // Create file `/proc/gpu#/runlist#/disable_channel`, world writable
+                                // On Turing and older, `/proc/gpu#/disable_channel`
+                                if (!proc_create_data(
+                                                "disable_channel", 0222, chram_scope, compat_ops(&disable_channel_file_ops),
+                                                (void*)last_runlist))
+                                        goto out_nomem;
+                                // Create file `/proc/gpu#/runlist#/enable_channel`, world writable
+                                // On Turing and older, `/proc/gpu#/enable_channel`
+                                if (!proc_create_data(
+                                                "enable_channel", 0222, chram_scope, compat_ops(&enable_channel_file_ops),
+                                                (void*)last_runlist))
+                                        goto out_nomem;
+                        }
                         // Create file `/proc/gpu#/runlist#/runlist`, world readable
                         if (!proc_create_data(
                                         "runlist", 0444, rl_dir, compat_ops(&runlist_file_ops),
                                         (void*)last_runlist))
                                 goto out_nomem;
+                        // Create file `/proc/gpu#/runlist#/switch_to_tsg`, world writable
+                        if (!proc_create_data(
+                                        "switch_to_tsg", 0222, rl_dir, compat_ops(&switch_to_tsg_file_ops),
+                                        (void*)last_runlist))
+                                goto out_nomem;
                 } while (last_runlist-- > 0);
-                // Create file `/proc/gpu#/preempt_tsg`, world writable
-                if (!proc_create_data(
-                                "preempt_tsg", 0222, dir, compat_ops(&preempt_tsg_file_ops),
-                                (void*)device_id))
-                        goto out_nomem;
                 /* On the TU104, the context scheduler (contained in the Host, aka
                  * PFIFO, unit) has been observed to sometimes to fail to schedule TSGs
                  * containing re-enabled channels. Resubmitting the runlist
@@ -311,21 +339,6 @@ int __init nvdebug_init(void) {
                                 "resubmit_runlist", 0222, dir, compat_ops(&resubmit_runlist_file_ops),
                                 (void*)device_id))
                         goto out_nomem;
-                // Create file `/proc/gpu#/disable_channel`, world writable
-                if (!proc_create_data(
-                                "disable_channel", 0222, dir, compat_ops(&disable_channel_file_ops),
-                                (void*)device_id))
-                        goto out_nomem;
-                // Create file `/proc/gpu#/enable_channel`, world writable
-                if (!proc_create_data(
-                                "enable_channel", 0222, dir, compat_ops(&enable_channel_file_ops),
-                                (void*)device_id))
-                        goto out_nomem;
-                // Create file `/proc/gpu#/switch_to_tsg`, world writable
-                if (!proc_create_data(
-                                "switch_to_tsg", 0222, dir, compat_ops(&switch_to_tsg_file_ops),
-                                (void*)device_id))
-                        goto out_nomem;
                 // Create file `/proc/gpu#/device_info`, world readable
                 if (!proc_create_data(
                                 "device_info", 0444, dir, compat_ops(&device_info_file_ops),