From mboxrd@z Thu Jan  1 00:00:00 1970
From: Alex Deucher <alexdeucher@gmail.com>
Subject: Re: [PATCH 1/2] drm/radeon: activate UVD clocks before sending the
	destroy msg
Date: Wed, 30 Oct 2013 10:29:45 -0400
Message-ID: <CADnq5_PSxEycUNe_JsTKuibBzCy-DzocYN6DxqxNA2H_FXifPw@mail.gmail.com>
References: <1383134165-2064-1-git-send-email-deathsimple@vodafone.de>
Mime-Version: 1.0
Content-Type: text/plain; charset="iso-8859-1"
Content-Transfer-Encoding: quoted-printable
Return-path: <dri-devel-bounces+sf-dri-devel=m.gmane.org@lists.freedesktop.org>
Received: from mail-vc0-f175.google.com (mail-vc0-f175.google.com
	[209.85.220.175])
	by gabe.freedesktop.org (Postfix) with ESMTP id 8CBB1EEEA2
	for <dri-devel@lists.freedesktop.org>;
	Wed, 30 Oct 2013 07:29:46 -0700 (PDT)
Received: by mail-vc0-f175.google.com with SMTP id ht10so955273vcb.20
	for <dri-devel@lists.freedesktop.org>;
	Wed, 30 Oct 2013 07:29:45 -0700 (PDT)
In-Reply-To: <1383134165-2064-1-git-send-email-deathsimple@vodafone.de>
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+sf-dri-devel=m.gmane.org@lists.freedesktop.org
Errors-To: dri-devel-bounces+sf-dri-devel=m.gmane.org@lists.freedesktop.org
To: =?ISO-8859-1?Q?Christian_K=F6nig?= <deathsimple@vodafone.de>
Cc: Maling list - DRI developers <dri-devel@lists.freedesktop.org>
List-Id: dri-devel@lists.freedesktop.org

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!

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/radeon=
/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 *rd=
ev, 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, &fence);
>                         if (r) {
> --
> 1.8.1.2
>