mirror of
https://github.com/yuzu-mirror/yuzu.git
synced 2024-09-07 03:59:10 +01:00
Fix DMA engine register offsets
This commit is contained in:
parent
df56ecc318
commit
4f69be8169
2 changed files with 32 additions and 28 deletions
|
@ -109,10 +109,11 @@ void MaxwellDMA::Launch() {
|
||||||
const bool is_const_a_dst = regs.remap_const.dst_x == RemapConst::Swizzle::CONST_A;
|
const bool is_const_a_dst = regs.remap_const.dst_x == RemapConst::Swizzle::CONST_A;
|
||||||
if (regs.launch_dma.remap_enable != 0 && is_const_a_dst) {
|
if (regs.launch_dma.remap_enable != 0 && is_const_a_dst) {
|
||||||
ASSERT(regs.remap_const.component_size_minus_one == 3);
|
ASSERT(regs.remap_const.component_size_minus_one == 3);
|
||||||
accelerate.BufferClear(regs.offset_out, regs.line_length_in, regs.remap_consta_value);
|
accelerate.BufferClear(regs.offset_out, regs.line_length_in,
|
||||||
|
regs.remap_const.remap_consta_value);
|
||||||
read_buffer.resize_destructive(regs.line_length_in * sizeof(u32));
|
read_buffer.resize_destructive(regs.line_length_in * sizeof(u32));
|
||||||
std::span<u32> span(reinterpret_cast<u32*>(read_buffer.data()), regs.line_length_in);
|
std::span<u32> span(reinterpret_cast<u32*>(read_buffer.data()), regs.line_length_in);
|
||||||
std::ranges::fill(span, regs.remap_consta_value);
|
std::ranges::fill(span, regs.remap_const.remap_consta_value);
|
||||||
memory_manager.WriteBlockUnsafe(regs.offset_out,
|
memory_manager.WriteBlockUnsafe(regs.offset_out,
|
||||||
reinterpret_cast<u8*>(read_buffer.data()),
|
reinterpret_cast<u8*>(read_buffer.data()),
|
||||||
regs.line_length_in * sizeof(u32));
|
regs.line_length_in * sizeof(u32));
|
||||||
|
|
|
@ -214,14 +214,15 @@ public:
|
||||||
NO_WRITE = 6,
|
NO_WRITE = 6,
|
||||||
};
|
};
|
||||||
|
|
||||||
PackedGPUVAddr address;
|
u32 remap_consta_value;
|
||||||
|
u32 remap_constb_value;
|
||||||
|
|
||||||
union {
|
union {
|
||||||
|
BitField<0, 12, u32> dst_components_raw;
|
||||||
BitField<0, 3, Swizzle> dst_x;
|
BitField<0, 3, Swizzle> dst_x;
|
||||||
BitField<4, 3, Swizzle> dst_y;
|
BitField<4, 3, Swizzle> dst_y;
|
||||||
BitField<8, 3, Swizzle> dst_z;
|
BitField<8, 3, Swizzle> dst_z;
|
||||||
BitField<12, 3, Swizzle> dst_w;
|
BitField<12, 3, Swizzle> dst_w;
|
||||||
BitField<0, 12, u32> dst_components_raw;
|
|
||||||
BitField<16, 2, u32> component_size_minus_one;
|
BitField<16, 2, u32> component_size_minus_one;
|
||||||
BitField<20, 2, u32> num_src_components_minus_one;
|
BitField<20, 2, u32> num_src_components_minus_one;
|
||||||
BitField<24, 2, u32> num_dst_components_minus_one;
|
BitField<24, 2, u32> num_dst_components_minus_one;
|
||||||
|
@ -274,55 +275,57 @@ private:
|
||||||
struct Regs {
|
struct Regs {
|
||||||
union {
|
union {
|
||||||
struct {
|
struct {
|
||||||
u32 reserved[0x40];
|
INSERT_PADDING_BYTES_NOINIT(0x100);
|
||||||
u32 nop;
|
u32 nop;
|
||||||
u32 reserved01[0xf];
|
INSERT_PADDING_BYTES_NOINIT(0x3C);
|
||||||
u32 pm_trigger;
|
u32 pm_trigger;
|
||||||
u32 reserved02[0x3f];
|
INSERT_PADDING_BYTES_NOINIT(0xFC);
|
||||||
Semaphore semaphore;
|
Semaphore semaphore;
|
||||||
u32 reserved03[0x2];
|
INSERT_PADDING_BYTES_NOINIT(0x8);
|
||||||
RenderEnable render_enable;
|
RenderEnable render_enable;
|
||||||
PhysMode src_phys_mode;
|
PhysMode src_phys_mode;
|
||||||
PhysMode dst_phys_mode;
|
PhysMode dst_phys_mode;
|
||||||
u32 reserved04[0x26];
|
INSERT_PADDING_BYTES_NOINIT(0x98);
|
||||||
LaunchDMA launch_dma;
|
LaunchDMA launch_dma;
|
||||||
u32 reserved05[0x3f];
|
INSERT_PADDING_BYTES_NOINIT(0xFC);
|
||||||
PackedGPUVAddr offset_in;
|
PackedGPUVAddr offset_in;
|
||||||
PackedGPUVAddr offset_out;
|
PackedGPUVAddr offset_out;
|
||||||
s32 pitch_in;
|
s32 pitch_in;
|
||||||
s32 pitch_out;
|
s32 pitch_out;
|
||||||
u32 line_length_in;
|
u32 line_length_in;
|
||||||
u32 line_count;
|
u32 line_count;
|
||||||
u32 reserved06[0xb6];
|
INSERT_PADDING_BYTES_NOINIT(0x2E0);
|
||||||
u32 remap_consta_value;
|
|
||||||
u32 remap_constb_value;
|
|
||||||
RemapConst remap_const;
|
RemapConst remap_const;
|
||||||
DMA::Parameters dst_params;
|
DMA::Parameters dst_params;
|
||||||
u32 reserved07[0x1];
|
INSERT_PADDING_BYTES_NOINIT(0x4);
|
||||||
DMA::Parameters src_params;
|
DMA::Parameters src_params;
|
||||||
u32 reserved08[0x275];
|
INSERT_PADDING_BYTES_NOINIT(0x9D4);
|
||||||
u32 pm_trigger_end;
|
u32 pm_trigger_end;
|
||||||
u32 reserved09[0x3ba];
|
INSERT_PADDING_BYTES_NOINIT(0xEE8);
|
||||||
};
|
};
|
||||||
std::array<u32, NUM_REGS> reg_array;
|
std::array<u32, NUM_REGS> reg_array;
|
||||||
};
|
};
|
||||||
} regs{};
|
} regs{};
|
||||||
|
static_assert(sizeof(Regs) == NUM_REGS * 4);
|
||||||
|
|
||||||
#define ASSERT_REG_POSITION(field_name, position) \
|
#define ASSERT_REG_POSITION(field_name, position) \
|
||||||
static_assert(offsetof(MaxwellDMA::Regs, field_name) == position * 4, \
|
static_assert(offsetof(MaxwellDMA::Regs, field_name) == position, \
|
||||||
"Field " #field_name " has invalid position")
|
"Field " #field_name " has invalid position")
|
||||||
|
|
||||||
ASSERT_REG_POSITION(launch_dma, 0xC0);
|
ASSERT_REG_POSITION(semaphore, 0x240);
|
||||||
ASSERT_REG_POSITION(offset_in, 0x100);
|
ASSERT_REG_POSITION(render_enable, 0x254);
|
||||||
ASSERT_REG_POSITION(offset_out, 0x102);
|
ASSERT_REG_POSITION(src_phys_mode, 0x260);
|
||||||
ASSERT_REG_POSITION(pitch_in, 0x104);
|
ASSERT_REG_POSITION(launch_dma, 0x300);
|
||||||
ASSERT_REG_POSITION(pitch_out, 0x105);
|
ASSERT_REG_POSITION(offset_in, 0x400);
|
||||||
ASSERT_REG_POSITION(line_length_in, 0x106);
|
ASSERT_REG_POSITION(offset_out, 0x408);
|
||||||
ASSERT_REG_POSITION(line_count, 0x107);
|
ASSERT_REG_POSITION(pitch_in, 0x410);
|
||||||
ASSERT_REG_POSITION(remap_const, 0x1C0);
|
ASSERT_REG_POSITION(pitch_out, 0x414);
|
||||||
ASSERT_REG_POSITION(dst_params, 0x1C3);
|
ASSERT_REG_POSITION(line_length_in, 0x418);
|
||||||
ASSERT_REG_POSITION(src_params, 0x1CA);
|
ASSERT_REG_POSITION(line_count, 0x41C);
|
||||||
|
ASSERT_REG_POSITION(remap_const, 0x700);
|
||||||
|
ASSERT_REG_POSITION(dst_params, 0x70C);
|
||||||
|
ASSERT_REG_POSITION(src_params, 0x728);
|
||||||
|
ASSERT_REG_POSITION(pm_trigger_end, 0x1114);
|
||||||
#undef ASSERT_REG_POSITION
|
#undef ASSERT_REG_POSITION
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue