Skip to content

Commit e1075f6

Browse files
committed
fixes
1 parent cf3ac75 commit e1075f6

File tree

2 files changed

+8
-3
lines changed

2 files changed

+8
-3
lines changed

src/core/address_space.cpp

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -306,6 +306,12 @@ struct AddressSpace::Impl {
306306
new_flags = PAGE_EXECUTE;
307307
} else if (!read && !write && !execute) {
308308
new_flags = PAGE_NOACCESS;
309+
} else if (!read && write && !execute) {
310+
new_flags = PAGE_READWRITE;
311+
LOG_WARNING(
312+
Common_Memory,
313+
"Requested write-only protection at {:#x} upgraded to read/write (PAGE_READWRITE)",
314+
virtual_addr);
309315
} else {
310316
LOG_CRITICAL(Common_Memory,
311317
"Unsupported protection flag combination for address {:#x}, size {}, "

src/video_core/amdgpu/liverpool.h

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1478,7 +1478,7 @@ struct Liverpool {
14781478

14791479
void SubmitGfx(std::span<const u32> dcb, std::span<const u32> ccb);
14801480
void SubmitAsc(u32 gnm_vqid, std::span<const u32> acb);
1481-
1481+
std::thread::id gpu_id;
14821482
void SubmitDone() noexcept {
14831483
std::scoped_lock lk{submit_mutex};
14841484
mapped_queues[GfxQueueId].ccb_buffer_offset = 0;
@@ -1534,7 +1534,6 @@ struct Liverpool {
15341534
u32 tmp_dwords;
15351535
};
15361536
Common::SlotVector<AscQueueInfo> asc_queues{};
1537-
std::thread::id gpu_id;
15381537

15391538
private:
15401539
struct Task {
@@ -1699,4 +1698,4 @@ static_assert(GFX6_3D_REG_INDEX(vgt_tf_memory_base) == 0xc250);
16991698

17001699
#undef GFX6_3D_REG_INDEX
17011700

1702-
} // namespace AmdGpu
1701+
} // namespace AmdGpu

0 commit comments

Comments
 (0)