[PATCH] drm/radeon: soft reset uvd on RV770 uvd init

[Alex Deucher]

On Wed, Aug 27, 2014 at 4:10 AM, Christian König
<deathsimple at vodafone.de> wrote:
> Am 27.08.2014 um 05:04 schrieb Alex Deucher:
>
>> Fixes avoids and error message on boot which is harmless,
>> but confusing to users.
>>
>> Signed-off-by: Alex Deucher <alexander.deucher at amd.com>
>
>
> The attached patch fixes the underlying issue for me on RS780.
>
> Does it also work on RV770? If yes than it's probably the better approach.

Yup, that fixes it on RV770.  I'll add that patch to the 3.18 queue.

Thanks!

Alex

>
> Christian.
>
>
>> ---
>>   drivers/gpu/drm/radeon/uvd_v1_0.c | 7 +++++++
>>   1 file changed, 7 insertions(+)
>>
>> diff --git a/drivers/gpu/drm/radeon/uvd_v1_0.c
>> b/drivers/gpu/drm/radeon/uvd_v1_0.c
>> index e251624..82e4fa6 100644
>> --- a/drivers/gpu/drm/radeon/uvd_v1_0.c
>> +++ b/drivers/gpu/drm/radeon/uvd_v1_0.c
>> @@ -325,6 +325,13 @@ int uvd_v1_0_start(struct radeon_device *rdev)
>>         WREG32_P(UVD_RB_ARB_CTRL, 0, ~(1 << 3));
>>   +     if (rdev->family == CHIP_RV770) {
>> +               WREG32_P(UVD_SOFT_RESET, VCPU_SOFT_RESET,
>> ~VCPU_SOFT_RESET);
>> +               mdelay(10);
>> +               WREG32_P(UVD_SOFT_RESET, 0, ~VCPU_SOFT_RESET);
>> +               mdelay(10);
>> +       }
>> +
>>         for (i = 0; i < 10; ++i) {
>>                 uint32_t status;
>>                 for (j = 0; j < 100; ++j) {
>
>