misc: Merge branch release-staging-v21-1 into develop

Change-Id: Ic94e5abde646df4c228f5204c19c0e8ff519bbd9
This commit is contained in:
Bobby R. Bruce
2021-07-12 17:17:48 -07:00
2 changed files with 4 additions and 4 deletions

View File

@@ -332,9 +332,9 @@ class HSAPacketProcessor: public DmaVirtDevice
void getCommandsFromHost(int pid, uint32_t rl_idx);
// PIO interface
virtual Tick read(Packet*);
virtual Tick write(Packet*);
virtual AddrRangeList getAddrRanges() const;
virtual Tick read(Packet*) override;
virtual Tick write(Packet*) override;
virtual AddrRangeList getAddrRanges() const override;
void finishPkt(void *pkt, uint32_t rl_idx);
void finishPkt(void *pkt) { finishPkt(pkt, 0); }
void schedAQLProcessing(uint32_t rl_idx);

View File

@@ -135,7 +135,7 @@ class GPUCommandProcessor : public DmaVirtDevice
typedef void (DmaDevice::*DmaFnPtr)(Addr, int, Event*, uint8_t*, Tick);
void initABI(HSAQueueEntry *task);
HSAPacketProcessor *hsaPP;
void translateOrDie(Addr vaddr, Addr &paddr);
void translateOrDie(Addr vaddr, Addr &paddr) override;
/**
* Perform a DMA read of the read_dispatch_id_field_base_byte_offset