fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-03-06 23:00:31 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

asahi/virtio: fix ptr cats

Browse source 
../src/asahi/lib/decode.c:933:7: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast]
  933 |       (void *)c->vertex_attachments;
      |       ^
../src/asahi/lib/decode.c:941:7: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast]
  941 |       (void *)c->fragment_attachments;

etc

Signed-off-by: Alyssa Rosenzweig <alyssa@rosenzweig.io>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/31532>
This commit is contained in:
Alyssa Rosenzweig 2024-09-17 14:20:30 -04:00 • committed by Marge Bot
parent 9bd3a854e6
commit e0cda48a90
1 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/asahi/lib/agx_device_virtio.c
View file

@ -197,10 +197,11 @@ agx_virtio_submit(struct agx_device *dev, struct drm_asahi_submit *submit,
struct agx_submit_virt *virt)
{
struct drm_asahi_command *commands =
(struct drm_asahi_command *)submit->commands;
struct drm_asahi_sync *in_syncs = (struct drm_asahi_sync *)submit->in_syncs;
(struct drm_asahi_command *)(uintptr_t)submit->commands;
struct drm_asahi_sync *in_syncs =
(struct drm_asahi_sync *)(uintptr_t)submit->in_syncs;
struct drm_asahi_sync *out_syncs =
(struct drm_asahi_sync *)submit->out_syncs;
(struct drm_asahi_sync *)(uintptr_t)submit->out_syncs;
size_t req_len = sizeof(struct asahi_ccmd_submit_req);
for (int i = 0; i < submit->command_count; i++) {
@ -213,7 +214,7 @@ agx_virtio_submit(struct agx_device *dev, struct drm_asahi_submit *submit,
case DRM_ASAHI_CMD_RENDER: {
struct drm_asahi_cmd_render *render =
(struct drm_asahi_cmd_render *)commands[i].cmd_buffer;
(struct drm_asahi_cmd_render *)(uintptr_t)commands[i].cmd_buffer;
req_len += sizeof(struct drm_asahi_command) +
sizeof(struct drm_asahi_cmd_render);
req_len += render->fragment_attachment_count *
@ -244,15 +245,17 @@ agx_virtio_submit(struct agx_device *dev, struct drm_asahi_submit *submit,
memcpy(ptr, &commands[i], sizeof(struct drm_asahi_command));
ptr += sizeof(struct drm_asahi_command);
memcpy(ptr, (char *)commands[i].cmd_buffer, commands[i].cmd_buffer_size);
memcpy(ptr, (char *)(uintptr_t)commands[i].cmd_buffer,
commands[i].cmd_buffer_size);
ptr += commands[i].cmd_buffer_size;
if (commands[i].cmd_type == DRM_ASAHI_CMD_RENDER) {
struct drm_asahi_cmd_render *render =
(struct drm_asahi_cmd_render *)commands[i].cmd_buffer;
(struct drm_asahi_cmd_render *)(uintptr_t)commands[i].cmd_buffer;
size_t fragments_size = sizeof(struct drm_asahi_attachment) *
render->fragment_attachment_count;
memcpy(ptr, (char *)render->fragment_attachments, fragments_size);
memcpy(ptr, (char *)(uintptr_t)render->fragment_attachments,
fragments_size);
ptr += fragments_size;
}
}