diff --git a/include/amd_smi/amdsmi.h b/include/amd_smi/amdsmi.h index 27ab70830d..fc44f7095a 100644 --- a/include/amd_smi/amdsmi.h +++ b/include/amd_smi/amdsmi.h @@ -1447,7 +1447,7 @@ amdsmi_get_gpu_subsystem_name(amdsmi_processor_handle processor_handle, char *na * @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail */ amdsmi_status_t -amdsmi_dev_get_drm_render_minor(amdsmi_processor_handle processor_handle, uint32_t *minor); +amdsmi_get_gpu_drm_render_minor(amdsmi_processor_handle processor_handle, uint32_t *minor); /** @} End IDQuer */ diff --git a/py-interface/README.md b/py-interface/README.md index 58b320bcad..028f44339e 100644 --- a/py-interface/README.md +++ b/py-interface/README.md @@ -2958,7 +2958,7 @@ except AmdSmiException as e: print(e) ``` -## amdsmi_dev_get_drm_render_minor +## amdsmi_get_gpu_drm_render_minor Description: Get the drm minor number associated with this device. Input parameters: @@ -2967,7 +2967,7 @@ Input parameters: Output: drm minor number -Exceptions that can be thrown by `amdsmi_dev_get_drm_render_minor` function: +Exceptions that can be thrown by `amdsmi_get_gpu_drm_render_minor` function: * `AmdSmiLibraryException` * `AmdSmiRetryException` * `AmdSmiParameterException` @@ -2980,7 +2980,7 @@ try: print("No GPUs on machine") else: for device in devices: - render_minor = amdsmi_dev_get_drm_render_minor(device) + render_minor = amdsmi_get_gpu_drm_render_minor(device) print(render_minor) except AmdSmiException as e: print(e) diff --git a/py-interface/__init__.py b/py-interface/__init__.py index 5bcd8b40b3..9010499fbd 100644 --- a/py-interface/__init__.py +++ b/py-interface/__init__.py @@ -160,7 +160,7 @@ from .amdsmi_interface import AmdSmiEventReader from .amdsmi_interface import amdsmi_get_gpu_vendor_name from .amdsmi_interface import amdsmi_get_gpu_id from .amdsmi_interface import amdsmi_get_gpu_vram_vendor -from .amdsmi_interface import amdsmi_dev_get_drm_render_minor +from .amdsmi_interface import amdsmi_get_gpu_drm_render_minor from .amdsmi_interface import amdsmi_get_gpu_subsystem_id from .amdsmi_interface import amdsmi_get_gpu_subsystem_name diff --git a/py-interface/amdsmi_interface.py b/py-interface/amdsmi_interface.py index a48d33a1e9..1c42b55a3c 100644 --- a/py-interface/amdsmi_interface.py +++ b/py-interface/amdsmi_interface.py @@ -1121,7 +1121,7 @@ def amdsmi_get_gpu_vram_vendor(processor_handle: amdsmi_wrapper.amdsmi_processor return vram_vendor.value.decode("utf-8") -def amdsmi_dev_get_drm_render_minor(processor_handle: amdsmi_wrapper.amdsmi_processor_handle): +def amdsmi_get_gpu_drm_render_minor(processor_handle: amdsmi_wrapper.amdsmi_processor_handle): if not isinstance(processor_handle, amdsmi_wrapper.amdsmi_processor_handle): raise AmdSmiParameterException( processor_handle, amdsmi_wrapper.amdsmi_processor_handle @@ -1129,7 +1129,7 @@ def amdsmi_dev_get_drm_render_minor(processor_handle: amdsmi_wrapper.amdsmi_proc minor = ctypes.c_uint32() _check_res( - amdsmi_wrapper.amdsmi_dev_get_drm_render_minor( + amdsmi_wrapper.amdsmi_get_gpu_drm_render_minor( processor_handle, ctypes.byref(minor) ) ) diff --git a/py-interface/amdsmi_wrapper.py b/py-interface/amdsmi_wrapper.py index 641a3984db..16f924dcf0 100644 --- a/py-interface/amdsmi_wrapper.py +++ b/py-interface/amdsmi_wrapper.py @@ -1436,9 +1436,9 @@ amdsmi_get_gpu_subsystem_id.argtypes = [amdsmi_processor_handle, ctypes.POINTER( amdsmi_get_gpu_subsystem_name = _libraries['libamd_smi.so'].amdsmi_get_gpu_subsystem_name amdsmi_get_gpu_subsystem_name.restype = amdsmi_status_t amdsmi_get_gpu_subsystem_name.argtypes = [amdsmi_processor_handle, ctypes.POINTER(ctypes.c_char), size_t] -amdsmi_dev_get_drm_render_minor = _libraries['libamd_smi.so'].amdsmi_dev_get_drm_render_minor -amdsmi_dev_get_drm_render_minor.restype = amdsmi_status_t -amdsmi_dev_get_drm_render_minor.argtypes = [amdsmi_processor_handle, ctypes.POINTER(ctypes.c_uint32)] +amdsmi_get_gpu_drm_render_minor = _libraries['libamd_smi.so'].amdsmi_get_gpu_drm_render_minor +amdsmi_get_gpu_drm_render_minor.restype = amdsmi_status_t +amdsmi_get_gpu_drm_render_minor.argtypes = [amdsmi_processor_handle, ctypes.POINTER(ctypes.c_uint32)] amdsmi_dev_get_pci_bandwidth = _libraries['libamd_smi.so'].amdsmi_dev_get_pci_bandwidth amdsmi_dev_get_pci_bandwidth.restype = amdsmi_status_t amdsmi_dev_get_pci_bandwidth.argtypes = [amdsmi_processor_handle, ctypes.POINTER(struct_c__SA_amdsmi_pcie_bandwidth_t)] @@ -1852,7 +1852,7 @@ __all__ = \ 'amdsmi_dev_close_supported_func_iterator', 'amdsmi_dev_counter_group_supported', 'amdsmi_dev_create_counter', 'amdsmi_dev_destroy_counter', 'amdsmi_dev_get_busy_percent', - 'amdsmi_dev_get_drm_render_minor', 'amdsmi_dev_get_ecc_count', + 'amdsmi_get_gpu_drm_render_minor', 'amdsmi_dev_get_ecc_count', 'amdsmi_dev_get_ecc_enabled', 'amdsmi_dev_get_ecc_status', 'amdsmi_dev_get_energy_count', 'amdsmi_dev_get_fan_rpms', 'amdsmi_dev_get_fan_speed', 'amdsmi_dev_get_fan_speed_max', diff --git a/py-interface/rocm_smi_tool.py b/py-interface/rocm_smi_tool.py index b7d25d891d..12f8f06f31 100644 --- a/py-interface/rocm_smi_tool.py +++ b/py-interface/rocm_smi_tool.py @@ -290,7 +290,7 @@ class Formatter: | """ + self.style.text(" 1 Get device vendor name. Api: amdsmi_get_gpu_vendor_name ") + """ | | """ + self.style.text(" 2 Get device id. Api: amdsmi_get_gpu_id ") + """ | | """ + self.style.text(" 3 Get device vram vendor. Api: amdsmi_get_gpu_vram_vendor ") + """ | - | """ + self.style.text(" 4 Get device drm render minor. Api: amdsmi_dev_get_drm_render_minor ") + """ | + | """ + self.style.text(" 4 Get device drm render minor. Api: amdsmi_get_gpu_drm_render_minor ") + """ | | """ + self.style.text(" 5 Get device subsystem id. Api: amdsmi_get_gpu_subsystem_id ") + """ | | """ + self.style.text(" 6 Get device subsystem name. Api: amdsmi_get_gpu_subsystem_name ") + """ | | """ + self.style.text(" 7 Get device pci id. Api: amdsmi_dev_get_pci_id ") + """ | @@ -731,7 +731,7 @@ commands = { 3: [smi_api.amdsmi_get_gpu_vram_vendor, { "device_identifier1": [None, True] }], - 4: [smi_api.amdsmi_dev_get_drm_render_minor, { + 4: [smi_api.amdsmi_get_gpu_drm_render_minor, { "device_identifier1": [None, True] }], 5: [smi_api.amdsmi_get_gpu_subsystem_id, { diff --git a/src/amd_smi/amd_smi.cc b/src/amd_smi/amd_smi.cc index 91296046f2..cd5de4c13a 100644 --- a/src/amd_smi/amd_smi.cc +++ b/src/amd_smi/amd_smi.cc @@ -898,7 +898,7 @@ amdsmi_get_func_iter_value(amdsmi_func_id_iter_handle_t handle, {"rsmi_dev_serial_number_get", "amdsmi_get_asic_info"}, {"rsmi_dev_subsystem_id_get", "amdsmi_get_gpu_subsystem_id"}, {"rsmi_dev_subsystem_name_get", "amdsmi_get_gpu_subsystem_name"}, - {"rsmi_dev_drm_render_minor_get", "amdsmi_dev_get_drm_render_minor"}, + {"rsmi_dev_drm_render_minor_get", "amdsmi_get_gpu_drm_render_minor"}, {"rsmi_dev_subsystem_vendor_id_get", "amdsmi_get_asic_info"}, {"rsmi_dev_unique_id_get", "amdsmi_get_board_info"}, {"rsmi_dev_pci_bandwidth_get", "amdsmi_dev_get_pci_bandwidth"}, @@ -1379,7 +1379,7 @@ amdsmi_status_t amdsmi_dev_get_energy_count(amdsmi_processor_handle processor_ha power, counter_resolution, timestamp); } -amdsmi_status_t amdsmi_dev_get_drm_render_minor( +amdsmi_status_t amdsmi_get_gpu_drm_render_minor( amdsmi_processor_handle processor_handle, uint32_t *minor) { return rsmi_wrapper(rsmi_dev_drm_render_minor_get, processor_handle, minor); diff --git a/tests/amd_smi_test/functional/id_info_read.cc b/tests/amd_smi_test/functional/id_info_read.cc index 052a4cceb6..208cb21cc3 100755 --- a/tests/amd_smi_test/functional/id_info_read.cc +++ b/tests/amd_smi_test/functional/id_info_read.cc @@ -145,10 +145,10 @@ void TestIdInfoRead::Run(void) { } } - err = amdsmi_dev_get_drm_render_minor(processor_handles_[i], &drm_render_minor); + err = amdsmi_get_gpu_drm_render_minor(processor_handles_[i], &drm_render_minor); if (err == AMDSMI_STATUS_NOT_SUPPORTED) { // Verify api support checking functionality is working - err = amdsmi_dev_get_drm_render_minor(processor_handles_[i], nullptr); + err = amdsmi_get_gpu_drm_render_minor(processor_handles_[i], nullptr); ASSERT_EQ(err, AMDSMI_STATUS_NOT_SUPPORTED); } else { CHK_ERR_ASRT(err) @@ -156,7 +156,7 @@ void TestIdInfoRead::Run(void) { std::cout << "\t**DRM Render Minor: " << drm_render_minor << std::endl; } // Verify api support checking functionality is working - err = amdsmi_dev_get_drm_render_minor(processor_handles_[i], nullptr); + err = amdsmi_get_gpu_drm_render_minor(processor_handles_[i], nullptr); ASSERT_EQ(err, AMDSMI_STATUS_INVAL); } err = amdsmi_get_gpu_vendor_name(processor_handles_[i], buffer, kBufferLen); diff --git a/tests/amd_smi_test/functional/mutual_exclusion.cc b/tests/amd_smi_test/functional/mutual_exclusion.cc index 970eded965..99a392ff7b 100755 --- a/tests/amd_smi_test/functional/mutual_exclusion.cc +++ b/tests/amd_smi_test/functional/mutual_exclusion.cc @@ -267,7 +267,7 @@ void TestMutualExclusion::Run(void) { amdsmi_dev_brand_get amdsmi_get_gpu_vram_vendor amdsmi_get_gpu_subsystem_name - amdsmi_dev_get_drm_render_minor + amdsmi_get_gpu_drm_render_minor amdsmi_get_gpu_vendor_name amdsmi_dev_get_pci_bandwidth amdsmi_dev_set_pci_bandwidth