From mboxrd@z Thu Jan  1 00:00:00 1970
From: =?ISO-8859-1?Q?Christian_K=F6nig?= <deathsimple@vodafone.de>
Subject: Re: [PATCH 1/2] drm/radeon: activate UVD clocks before sending the
	destroy msg
Date: Mon, 11 Nov 2013 09:54:14 +0100
Message-ID: <52809B36.1060406@vodafone.de>
References: <1383134165-2064-1-git-send-email-deathsimple@vodafone.de>
	<CADnq5_PSxEycUNe_JsTKuibBzCy-DzocYN6DxqxNA2H_FXifPw@mail.gmail.com>
Mime-Version: 1.0
Content-Type: text/plain; charset="iso-8859-1"; Format="flowed"
Content-Transfer-Encoding: quoted-printable
Return-path: <dri-devel-bounces@lists.freedesktop.org>
Received: from pegasos-out.vodafone.de (pegasos-out.vodafone.de [80.84.1.38])
	by gabe.freedesktop.org (Postfix) with ESMTP id 3F0B6FAC8F
	for <dri-devel@lists.freedesktop.org>;
	Mon, 11 Nov 2013 00:54:21 -0800 (PST)
In-Reply-To: <CADnq5_PSxEycUNe_JsTKuibBzCy-DzocYN6DxqxNA2H_FXifPw@mail.gmail.com>
List-Unsubscribe: <http://lists.freedesktop.org/mailman/options/dri-devel>,
	<mailto:dri-devel-request@lists.freedesktop.org?subject=unsubscribe>
List-Archive: <http://lists.freedesktop.org/archives/dri-devel>
List-Post: <mailto:dri-devel@lists.freedesktop.org>
List-Help: <mailto:dri-devel-request@lists.freedesktop.org?subject=help>
List-Subscribe: <http://lists.freedesktop.org/mailman/listinfo/dri-devel>,
	<mailto:dri-devel-request@lists.freedesktop.org?subject=subscribe>
Sender: dri-devel-bounces@lists.freedesktop.org
Errors-To: dri-devel-bounces@lists.freedesktop.org
To: Alex Deucher <alexdeucher@gmail.com>
Cc: Maling list - DRI developers <dri-devel@lists.freedesktop.org>
List-Id: dri-devel@lists.freedesktop.org

Am 30.10.2013 15:29, schrieb Alex Deucher:
> On Wed, Oct 30, 2013 at 7:56 AM, Christian K=F6nig
> <deathsimple@vodafone.de> wrote:
>> From: Christian K=F6nig <christian.koenig@amd.com>
>>
>> Make sure the UVD clocks are still active before sending
>> the destroy message, otherwise the hw might hang.
>>
>> Signed-off-by: Christian K=F6nig <christian.koenig@amd.com>
>> Cc: stable@vger.kernel.org
> Both applied!

On which branch? Those two where intended for drm-fixes-3.12, but they =

didn't showed up in 3.12.0.

Could you apply them to drm-fixes-3.12 as well? They prevent hw lockups =

in case of crashed userspace applications and should also go into older =

stable kernels.

Christian.

> Alex
>
>> ---
>>   drivers/gpu/drm/radeon/radeon_uvd.c | 2 ++
>>   1 file changed, 2 insertions(+)
>>
>> diff --git a/drivers/gpu/drm/radeon/radeon_uvd.c b/drivers/gpu/drm/radeo=
n/radeon_uvd.c
>> index 308eff5..a56dfe4 100644
>> --- a/drivers/gpu/drm/radeon/radeon_uvd.c
>> +++ b/drivers/gpu/drm/radeon/radeon_uvd.c
>> @@ -240,6 +240,8 @@ void radeon_uvd_free_handles(struct radeon_device *r=
dev, struct drm_file *filp)
>>                  if (handle !=3D 0 && rdev->uvd.filp[i] =3D=3D filp) {
>>                          struct radeon_fence *fence;
>>
>> +                       radeon_uvd_note_usage(rdev);
>> +
>>                          r =3D radeon_uvd_get_destroy_msg(rdev,
>>                                  R600_RING_TYPE_UVD_INDEX, handle, &fenc=
e);
>>                          if (r) {
>> --
>> 1.8.1.2
>>