Skip to content

Commit 3d87b99

Browse files
Iouri Tarassovchessturo
authored andcommitted
drivers: hv: dxgkrnl: Fix build breaks when switching to 6.6 kernel due to removed uuid_le_cmp
uuid_le_cmp was removed and needs to be replaced by guid_equal. The relevant upstream commits are: 1fb1ea0 "mei: Move uuid.h to the MEI namespace" f5b3c34 "mei: Move uuid_le_cmp() to its only user" 5e6a517 "uuid: Decouple guid_t and uuid_le types and respective macros" Signed-off-by: Iouri Tarassov <iourit@linux.microsoft.com>
1 parent 9c6234e commit 3d87b99

1 file changed

Lines changed: 4 additions & 6 deletions

File tree

drivers/hv/dxgkrnl/dxgmodule.c

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -762,7 +762,7 @@ static int dxg_probe_vmbus(struct hv_device *hdev,
762762

763763
mutex_lock(&dxgglobal->device_mutex);
764764

765-
if (uuid_le_cmp(hdev->dev_type, dxg_vmbus_id_table[0].guid) == 0) {
765+
if (guid_equal(&hdev->dev_type, &dxg_vmbus_id_table[0].guid)) {
766766
/* This is a new virtual GPU channel */
767767
guid_to_luid(&hdev->channel->offermsg.offer.if_instance, &luid);
768768
DXG_TRACE("vGPU channel: %pUb",
@@ -777,8 +777,7 @@ static int dxg_probe_vmbus(struct hv_device *hdev,
777777
list_add_tail(&vgpuch->vgpu_ch_list_entry,
778778
&dxgglobal->vgpu_ch_list_head);
779779
dxgglobal_start_adapters();
780-
} else if (uuid_le_cmp(hdev->dev_type,
781-
dxg_vmbus_id_table[1].guid) == 0) {
780+
} else if (guid_equal(&hdev->dev_type, &dxg_vmbus_id_table[1].guid)) {
782781
/* This is the global Dxgkgnl channel */
783782
DXG_TRACE("Global channel: %pUb",
784783
&hdev->channel->offermsg.offer.if_instance);
@@ -810,7 +809,7 @@ static void dxg_remove_vmbus(struct hv_device *hdev)
810809

811810
mutex_lock(&dxgglobal->device_mutex);
812811

813-
if (uuid_le_cmp(hdev->dev_type, dxg_vmbus_id_table[0].guid) == 0) {
812+
if (guid_equal(&hdev->dev_type, &dxg_vmbus_id_table[0].guid)) {
814813
DXG_TRACE("Remove virtual GPU channel");
815814
dxgglobal_stop_adapter_vmbus(hdev);
816815
list_for_each_entry(vgpu_channel,
@@ -822,8 +821,7 @@ static void dxg_remove_vmbus(struct hv_device *hdev)
822821
break;
823822
}
824823
}
825-
} else if (uuid_le_cmp(hdev->dev_type,
826-
dxg_vmbus_id_table[1].guid) == 0) {
824+
} else if (guid_equal(&hdev->dev_type, &dxg_vmbus_id_table[1].guid)) {
827825
DXG_TRACE("Remove global channel device");
828826
dxgglobal_destroy_global_channel();
829827
} else {

0 commit comments

Comments
 (0)