diff options
| author | Dmitry Torokhov <[email protected]> | 2021-09-05 18:58:05 -0700 |
|---|---|---|
| committer | Dmitry Torokhov <[email protected]> | 2021-09-05 18:58:05 -0700 |
| commit | 8be98d2f2a0a262f8bf8a0bc1fdf522b3c7aab17 (patch) | |
| tree | a226b265d692d1933c0541802527d8aeb0d469ab /drivers/gpu/drm/amd/amdgpu/atom.c | |
| parent | 818b26588994d9d95743fca0a427f08ec6c1c41d (diff) | |
| parent | 3e204d6b76b29274cc8e57f8bd8d9873f04a7f48 (diff) | |
Merge branch 'next' into for-linus
Prepare input updates for 5.15 merge window.
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/atom.c')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/atom.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/atom.c b/drivers/gpu/drm/amd/amdgpu/atom.c index 515890f4f5a0..3dcb8b32f48b 100644 --- a/drivers/gpu/drm/amd/amdgpu/atom.c +++ b/drivers/gpu/drm/amd/amdgpu/atom.c @@ -114,11 +114,11 @@ static uint32_t atom_iio_execute(struct atom_context *ctx, int base, base++; break; case ATOM_IIO_READ: - temp = ctx->card->ioreg_read(ctx->card, CU16(base + 1)); + temp = ctx->card->reg_read(ctx->card, CU16(base + 1)); base += 3; break; case ATOM_IIO_WRITE: - ctx->card->ioreg_write(ctx->card, CU16(base + 1), temp); + ctx->card->reg_write(ctx->card, CU16(base + 1), temp); base += 3; break; case ATOM_IIO_CLEAR: |