diff options
| author | Lucas De Marchi <lucas.demarchi@intel.com> | 2023-05-09 00:53:19 +0200 |
|---|---|---|
| committer | Rodrigo Vivi <rodrigo.vivi@intel.com> | 2023-12-20 00:33:49 +0100 |
| commit | ce8bf5bd059542431230eac216693a579dc09dba (patch) | |
| tree | b6841c93b343466920343f999046fb596aa50e30 /drivers/gpu/drm/xe/xe_pcode.c | |
| parent | drm/xe: Handle -EDEADLK case in exec ioctl (diff) | |
| download | linux-ce8bf5bd059542431230eac216693a579dc09dba.tar.xz linux-ce8bf5bd059542431230eac216693a579dc09dba.zip | |
drm/xe/mmio: Use struct xe_reg
Convert all the callers to deal with xe_mmio_*() using struct xe_reg
instead of plain u32. In a few places there was also a rename
s/reg/reg_val/ when dealing with the value returned so it doesn't get
mixed up with the register address.
Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Link: https://lore.kernel.org/r/20230508225322.2692066-2-lucas.demarchi@intel.com
Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Diffstat (limited to 'drivers/gpu/drm/xe/xe_pcode.c')
| -rw-r--r-- | drivers/gpu/drm/xe/xe_pcode.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/gpu/drm/xe/xe_pcode.c b/drivers/gpu/drm/xe/xe_pcode.c index 99bb730684ed..7ab70a83f88d 100644 --- a/drivers/gpu/drm/xe/xe_pcode.c +++ b/drivers/gpu/drm/xe/xe_pcode.c @@ -43,7 +43,7 @@ static int pcode_mailbox_status(struct xe_gt *gt) lockdep_assert_held(>->pcode.lock); - err = xe_mmio_read32(gt, PCODE_MAILBOX.reg) & PCODE_ERROR_MASK; + err = xe_mmio_read32(gt, PCODE_MAILBOX) & PCODE_ERROR_MASK; if (err) { drm_err(>_to_xe(gt)->drm, "PCODE Mailbox failed: %d %s", err, err_decode[err].str ?: "Unknown"); @@ -60,22 +60,22 @@ static int pcode_mailbox_rw(struct xe_gt *gt, u32 mbox, u32 *data0, u32 *data1, int err; lockdep_assert_held(>->pcode.lock); - if ((xe_mmio_read32(gt, PCODE_MAILBOX.reg) & PCODE_READY) != 0) + if ((xe_mmio_read32(gt, PCODE_MAILBOX) & PCODE_READY) != 0) return -EAGAIN; - xe_mmio_write32(gt, PCODE_DATA0.reg, *data0); - xe_mmio_write32(gt, PCODE_DATA1.reg, data1 ? *data1 : 0); - xe_mmio_write32(gt, PCODE_MAILBOX.reg, PCODE_READY | mbox); + xe_mmio_write32(gt, PCODE_DATA0, *data0); + xe_mmio_write32(gt, PCODE_DATA1, data1 ? *data1 : 0); + xe_mmio_write32(gt, PCODE_MAILBOX, PCODE_READY | mbox); - err = xe_mmio_wait32(gt, PCODE_MAILBOX.reg, 0, PCODE_READY, + err = xe_mmio_wait32(gt, PCODE_MAILBOX, 0, PCODE_READY, timeout_ms * 1000, NULL, atomic); if (err) return err; if (return_data) { - *data0 = xe_mmio_read32(gt, PCODE_DATA0.reg); + *data0 = xe_mmio_read32(gt, PCODE_DATA0); if (data1) - *data1 = xe_mmio_read32(gt, PCODE_DATA1.reg); + *data1 = xe_mmio_read32(gt, PCODE_DATA1); } return pcode_mailbox_status(gt); |