diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c
index 851d64e83166b4e85e3c7d095f70972eb9a75995..28c4e1fe5cd4cc2d401732917ee8a2c650539bfb 100644
--- a/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c
@@ -1355,7 +1355,7 @@ static int gfx_v8_0_mec_init(struct amdgpu_device *adev)
 		}
 
 #if IS_ENABLED(CONFIG_SW64)
-		_memset_c_io(hpd, 0, mec_hpd_size);
+		memset_io(hpd, 0, mec_hpd_size);
 #else
 		memset(hpd, 0, mec_hpd_size);
 #endif
@@ -4654,7 +4654,7 @@ static int gfx_v8_0_kiq_init_queue(struct amdgpu_ring *ring)
 		mutex_unlock(&adev->srbm_mutex);
 	} else {
 #if IS_ENABLED(CONFIG_SW64)
-		_memset_c_io((void *)mqd, 0, sizeof(struct vi_mqd_allocation));
+		memset_io((void *)mqd, 0, sizeof(struct vi_mqd_allocation));
 #else
 		memset((void *)mqd, 0, sizeof(struct vi_mqd_allocation));
 #endif
diff --git a/drivers/gpu/drm/radeon/radeon_vce.c b/drivers/gpu/drm/radeon/radeon_vce.c
index 68cc5a347d3bfe2ef6015ac9cbd2d259ced0b21d..b9680d38d9242322b3290234560f855ac8d9aec8 100644
--- a/drivers/gpu/drm/radeon/radeon_vce.c
+++ b/drivers/gpu/drm/radeon/radeon_vce.c
@@ -240,7 +240,7 @@ int radeon_vce_resume(struct radeon_device *rdev)
 	}
 
 #ifdef __sw_64__
-	_memset_c_io(cpu_addr, 0, radeon_bo_size(rdev->vce.vcpu_bo));
+	memset_io(cpu_addr, 0, radeon_bo_size(rdev->vce.vcpu_bo));
 #else
 	memset(cpu_addr, 0, radeon_bo_size(rdev->vce.vcpu_bo));
 #endif