Skip to content

Commit 35657f5

Browse files
hoshinolinajannau
authored andcommitted
drm/asahi: Set a bit for internal non-render barriers on G14X
Signed-off-by: Asahi Lina <lina@asahilina.net>
1 parent 9a3e1c5 commit 35657f5

3 files changed

Lines changed: 7 additions & 4 deletions

File tree

drivers/gpu/drm/asahi/fw/workqueue.rs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,10 @@ pub(crate) mod raw {
3434
pub(crate) wait_slot: u32,
3535
pub(crate) stamp_self: EventValue,
3636
pub(crate) uuid: u32,
37-
pub(crate) barrier_type: u32,
37+
pub(crate) external_barrier: u32,
3838
// G14X addition
39-
pub(crate) padding: Pad<0x20>,
39+
pub(crate) internal_barrier_type: u32,
40+
pub(crate) padding: Pad<0x1c>,
4041
}
4142

4243
#[derive(Debug, Clone, Copy)]

drivers/gpu/drm/asahi/queue/mod.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -703,7 +703,8 @@ impl Queue for Queue::ver {
703703
wait_slot: event.slot,
704704
stamp_self: queue_job.event_info().value.next(),
705705
uuid: 0xffffbbbb,
706-
barrier_type: 0,
706+
external_barrier: 0,
707+
internal_barrier_type: 1,
707708
padding: Default::default(),
708709
})
709710
},

drivers/gpu/drm/asahi/queue/render.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -499,7 +499,8 @@ impl super::QueueInner::ver {
499499
wait_slot: ev_vtx.slot,
500500
stamp_self: ev_frag.value.next(),
501501
uuid: uuid_3d,
502-
barrier_type: 0,
502+
external_barrier: 0,
503+
internal_barrier_type: 0,
503504
padding: Default::default(),
504505
})
505506
},

0 commit comments

Comments
 (0)