[PATCH] drm/amdgpu: return an error for hw access in INFO ioctl when in reset
Christian König
ckoenig.leichtzumerken at gmail.com
Wed Jul 1 08:20:03 UTC 2020
I don't think this is a good idea, we should probably rather wait for
the GPU reset to finish by taking the appropriate lock.
Christian.
Am 01.07.20 um 07:33 schrieb Alex Deucher:
> ping?
>
> On Fri, Jun 26, 2020 at 10:04 AM Alex Deucher <alexdeucher at gmail.com> wrote:
>> When the GPU is in reset, accessing the hw is unreliable and could
>> interfere with the reset. Return an error in those cases.
>>
>> Signed-off-by: Alex Deucher <alexander.deucher at amd.com>
>> ---
>> drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 6 ++++++
>> 1 file changed, 6 insertions(+)
>>
>> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
>> index 341d072edd95..fd51d6554ee2 100644
>> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
>> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
>> @@ -684,6 +684,9 @@ static int amdgpu_info_ioctl(struct drm_device *dev, void *data, struct drm_file
>> if (info->read_mmr_reg.count > 128)
>> return -EINVAL;
>>
>> + if (adev->in_gpu_reset)
>> + return -EPERM;
>> +
>> regs = kmalloc_array(info->read_mmr_reg.count, sizeof(*regs), GFP_KERNEL);
>> if (!regs)
>> return -ENOMEM;
>> @@ -854,6 +857,9 @@ static int amdgpu_info_ioctl(struct drm_device *dev, void *data, struct drm_file
>> if (!adev->pm.dpm_enabled)
>> return -ENOENT;
>>
>> + if (adev->in_gpu_reset)
>> + return -EPERM;
>> +
>> switch (info->sensor_info.type) {
>> case AMDGPU_INFO_SENSOR_GFX_SCLK:
>> /* get sclk in Mhz */
>> --
>> 2.25.4
>>
> _______________________________________________
> amd-gfx mailing list
> amd-gfx at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/amd-gfx
More information about the amd-gfx
mailing list