Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/asahi/lib/agx_device.c
Original file line number Diff line number Diff line change
Expand Up @@ -516,7 +516,8 @@ agx_open_device(void *memctx, struct agx_device *dev)
return NULL;
}

if (!strcmp(version->name, "asahi")) {
if (!strcmp(version->name, "asahi") ||
!strcmp(version->name, "aurora")) {
Comment on lines +519 to +520

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P1 Native OpenGL still misses Asahi

Accepting aurora here does not fix normal native OpenGL discovery. Without a driver override, loader_get_driver_for_fd() returns aurora, but Gallium registers this driver as asahi. The loader therefore picks kmsro instead, whose Apple GPU check also accepts only asahi. Native OpenGL still cannot reach this new branch.

Map aurora to asahi during driver discovery and cover the kmsro path too.

Knowledge Base Used:

Note: If this suggestion doesn't match your team's coding style, reply to this and let me know. I'll remember it for next time!

dev->is_virtio = false;
dev->ops = agx_device_drm_ops;
} else if (!strcmp(version->name, "virtio_gpu")) {
Expand Down
1 change: 1 addition & 0 deletions src/asahi/vulkan/hk_physical_device.c
Original file line number Diff line number Diff line change
Expand Up @@ -1220,6 +1220,7 @@ hk_create_drm_physical_device(struct vk_instance *_instance,
}

bool is_asahi = (strcmp(version->name, "asahi") == 0);
is_asahi |= strcmp(version->name, "aurora") == 0;
is_asahi |= strcmp(version->name, "virtio_gpu") == 0;
drmFreeVersion(version);

Expand Down
3 changes: 2 additions & 1 deletion src/broadcom/simulator/v3d_simulator.c
Original file line number Diff line number Diff line change
Expand Up @@ -1224,7 +1224,8 @@ v3d_simulator_init(int fd)
sim_file->gem_type = GEM_I915;
else if (version && strncmp(version->name, "amdgpu", version->name_len) == 0)
sim_file->gem_type = GEM_AMDGPU;
else if (version && strncmp(version->name, "asahi", version->name_len) == 0)
else if (version && (strncmp(version->name, "asahi", version->name_len) == 0 ||
strncmp(version->name, "aurora", version->name_len) == 0))
sim_file->gem_type = GEM_ASAHI;
else
sim_file->gem_type = GEM_DUMB;
Expand Down