From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Ma, Le" Subject: RE: [PATCH 10/10] drm/amdgpu: reduce redundant uvd context lost warning message Date: Wed, 27 Nov 2019 09:54:56 +0000 Message-ID: References: <1574846129-4826-1-git-send-email-le.ma@amd.com> <1574846129-4826-9-git-send-email-le.ma@amd.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="===============1626797980==" Return-path: In-Reply-To: Content-Language: en-US List-Id: Discussion list for AMD gfx List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: amd-gfx-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org Sender: "amd-gfx" To: "Chen, Guchun" , "amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org" Cc: "Deucher, Alexander" , "Zhou1, Tao" , "Li, Dennis" , "Zhang, Hawking" --===============1626797980== Content-Language: en-US Content-Type: multipart/alternative; boundary="_000_MN2PR12MB42858C745C5D0D125236BD51F6440MN2PR12MB4285namp_" --_000_MN2PR12MB42858C745C5D0D125236BD51F6440MN2PR12MB4285namp_ Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable -----Original Message----- From: Chen, Guchun Sent: Wednesday, November 27, 2019 5:50 PM To: Ma, Le ; amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org Cc: Zhang, Hawking ; Zhou1, Tao ;= Li, Dennis ; Deucher, Alexander ; Ma, Le Subject: RE: [PATCH 10/10] drm/amdgpu: reduce redundant uvd context lost wa= rning message [AMD Official Use Only - Internal Distribution Only] -----Original Message----- From: Le Ma > Sent: Wednesday, November 27, 2019 5:15 PM To: amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org Cc: Zhang, Hawking >; C= hen, Guchun >; Zhou1, Tao <= Tao.Zhou1-5C7GfCeVMHo@public.gmane.org>; Li, Dennis >; Deucher, Alexander >; Ma, Le > Subject: [PATCH 10/10] drm/amdgpu: reduce redundant uvd context lost warnin= g message Move the print out of uvd instance loop in amdgpu_uvd_suspend Change-Id: Ifad997debd84763e1b55d668e144b729598f115e Signed-off-by: Le Ma > --- drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c b/drivers/gpu/drm/amd/= amdgpu/amdgpu_uvd.c index e324bfe..ac7c7795 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c @@ -377,12 +377,15 @@ int amdgpu_uvd_suspend(struct amdgpu_device *adev) /* re-write 0 since err_event_athub will corrupt VC= PU buffer */ if (amdgpu_ras_intr_triggered()) { - DRM_WARN("UVD VCPU state may lost due t= o RAS ERREVENT_ATHUB_INTERRUPT\n"); memset(adev->uvd.inst[j].saved_bo, 0, si= ze); } else { memcpy_fromio(adev->uvd.inst[j].saved_bo= , ptr, size); } } + + if (amdgpu_ras_intr_triggered()) { + DRM_WARN("UVD VCPU state may lost due to RAS ERREVEN= T_ATHUB_INTERRUPT\n"); + [Guchun]the "{" after the if condition needs to be removed? [Le] Yes, sent it too quickly and made a mistake here. return 0; } -- 2.7.4 --_000_MN2PR12MB42858C745C5D0D125236BD51F6440MN2PR12MB4285namp_ Content-Type: text/html; charset="us-ascii" Content-Transfer-Encoding: quoted-printable

 

 

-----Original Message-----
From: Chen, Guchun <Guchun.Chen-5C7GfCeVMHo@public.gmane.org>
Sent: Wednesday, November 27, 2019 5:50 PM
To: Ma, Le <Le.Ma-5C7GfCeVMHo@public.gmane.org>; amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org
Cc: Zhang, Hawking <Hawking.Zhang-5C7GfCeVMHo@public.gmane.org>; Zhou1, Tao <Tao.Zhou1@= amd.com>; Li, Dennis <Dennis.Li-5C7GfCeVMHo@public.gmane.org>; Deucher, Alexander <A= lexander.Deucher-5C7GfCeVMHo@public.gmane.org>; Ma, Le <Le.Ma-5C7GfCeVMHo@public.gmane.org>
Subject: RE: [PATCH 10/10] drm/amdgpu: reduce redundant uvd context lost wa= rning message

 

[AMD Official Use Only - Internal Distribution On= ly]

 

 

 

 

-----Original Message-----

From: Le Ma <= le.ma-5C7GfCeVMHo@public.gmane.org<= /a>>

Sent: Wednesday, November 27, 2019 5:15 PM

To: amd-gfx-PD4FTy7X32mzQB+pC5nmwQ@public.gmane.org= edesktop.org

Cc: Zhang, Hawking <Hawkin= g.Zhang-5C7GfCeVMHo@public.gmane.org>; Chen, Guchun <Guchun.C= hen-5C7GfCeVMHo@public.gmane.org>; Zhou1, Tao <Tao.Zhou1-5C7GfCeVMHo@public.gmane.org>; Li, Denni= s <Dennis.Li-5C7GfCeVMHo@public.gmane.org>; Deucher, Alexander <Alexander.Deucher-5C7GfCeVMHo@public.gmane.org>; Ma, Le <Le.Ma-5C7GfCeVMHo@public.gmane.org>

Subject: [PATCH 10/10] drm/amdgpu: reduce redunda= nt uvd context lost warning message

 

Move the print out of uvd instance loop in amdgpu= _uvd_suspend

 

Change-Id: Ifad997debd84763e1b55d668e144b729598f1= 15e

Signed-off-by: Le Ma <le.ma-urvtwAKJhsc@public.gmane.org= m>

---

drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c | 5 += +++-

1 file changed, 4 insertions(+), 1 deletion(-= )

 

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_uv= d.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c

index e324bfe..ac7c7795 100644

--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c

+++ b/drivers/gpu/drm/amd/amdgpu/amdg= pu_uvd.c

@@ -377,12 +377,15 @@ int amdgpu_uvd_suspend(= struct amdgpu_device *adev)

        &= nbsp;           &nbs= p;   /* re-write 0 since err_event_athub will corrupt VCPU buffer= */

        &= nbsp;           &nbs= p;  if (amdgpu_ras_intr_triggered()) {

-        =             &nb= sp;            =   DRM_WARN("UVD VCPU state may lost due to RAS ERREVENT_ATHUB_INT= ERRUPT\n");

        &= nbsp;           &nbs= p;            &= nbsp; memset(adev->uvd.inst[j].saved_bo, 0, size);

        &= nbsp;           &nbs= p;  } else {

        &= nbsp;           &nbs= p;             = memcpy_fromio(adev->uvd.inst[j].saved_bo, ptr, size);

        &= nbsp;           &nbs= p;  }

        &= nbsp;  }

+

+       &n= bsp;  if (amdgpu_ras_intr_triggered()) {

+       &n= bsp;            = ;  DRM_WARN("UVD VCPU state may lost due to RAS ERREVENT_ATHUB_IN= TERRUPT\n");

+

[Guchun]the "{" after the if condition = needs to be removed?

[Le] Yes, sent it t= oo quickly and made a mistake here.

        &= nbsp;  return 0;

}

--

2.7.4

--_000_MN2PR12MB42858C745C5D0D125236BD51F6440MN2PR12MB4285namp_-- --===============1626797980== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Content-Disposition: inline X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KYW1kLWdmeCBt YWlsaW5nIGxpc3QKYW1kLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5m cmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9hbWQtZ2Z4 --===============1626797980==-- From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.7 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, HTML_MESSAGE,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE, SPF_PASS,T_KAM_HTML_FONT_INVALID autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B6F5CC432C0 for ; Wed, 27 Nov 2019 09:55:02 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 8E8242070A for ; Wed, 27 Nov 2019 09:55:02 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8E8242070A Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=amd.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=amd-gfx-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 2A2276E4DE; Wed, 27 Nov 2019 09:55:02 +0000 (UTC) Received: from NAM05-DM3-obe.outbound.protection.outlook.com (mail-eopbgr730073.outbound.protection.outlook.com [40.107.73.73]) by gabe.freedesktop.org (Postfix) with ESMTPS id 321946E4F4 for ; Wed, 27 Nov 2019 09:55:00 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=NOQ6GTRHik5OVEW6241RxEGH4ESl+QJyC9OKkXzHCB4+rq33g+tI2wO/6Kdoc8fGJN6g65CDc2zPC9l/fVyxFWe5V7MjcvImNozVIF/5eRUAF2lZm3YFsbDUNXTAHaLcUL6rEv9xjRi+t7lUN+VabG6FK/susrd4DggRv4qUM8D2BbJtqon+5EWSBD0Yx+abig4FzOVRK2CeFxbQB7e/2uipJrinbeAuo1hc6ob4UtaZZfCu3s16EC089GTzrV8V6nlArXxgoxTun6IHFpUxqjaQ9xdwknJ/NsrXtzgqkg3gloLprxNhlDZOLno63H84BUFxPs27+3hoq5NPhGonyw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=B1l2il6aEsx+FUx0aiozbRawhcK/VOm145aUthwvWpE=; b=QqXvg5yzxWT5+pO4XH3742XLyz616l01OBuvYcYPXCQnvaWslzw9wikzr96zwN83IVQcP5tzvvNseWea4MTSPB35uElKqRscybJeWW1TR3hy3L84zoQXnw4ZDl3/YijZ7KCiRzlb68z8B4JaBt0XGCHhAi1yQcbEBcbf010+ylA+IFL++aI1nBPajK00hcOwtc7NlLTbwV2syrJ+T8UyyfmW50lJW/tkq76EQ32yrYouTkmqBqbf5baJOyjgIxEkGpXWgH/eg5rXbClx/nkoLx0WIJgp6DIKvhtYegqvTlfteqtLAdBB6CfexrCx1bTVBqxrypQl83TH5r5zPHKNSA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=amd.com; dmarc=pass action=none header.from=amd.com; dkim=pass header.d=amd.com; arc=none Received: from MN2PR12MB4285.namprd12.prod.outlook.com (52.135.49.140) by MN2PR12MB2912.namprd12.prod.outlook.com (20.179.81.18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2474.21; Wed, 27 Nov 2019 09:54:56 +0000 Received: from MN2PR12MB4285.namprd12.prod.outlook.com ([fe80::b4d9:8cb3:3876:ed5]) by MN2PR12MB4285.namprd12.prod.outlook.com ([fe80::b4d9:8cb3:3876:ed5%6]) with mapi id 15.20.2495.014; Wed, 27 Nov 2019 09:54:56 +0000 From: "Ma, Le" To: "Chen, Guchun" , "amd-gfx@lists.freedesktop.org" Subject: RE: [PATCH 10/10] drm/amdgpu: reduce redundant uvd context lost warning message Thread-Topic: [PATCH 10/10] drm/amdgpu: reduce redundant uvd context lost warning message Thread-Index: AQHVpQNSJkgVwI5gBk2xZbbZOexldqeexeYAgAABQnA= Date: Wed, 27 Nov 2019 09:54:56 +0000 Message-ID: References: <1574846129-4826-1-git-send-email-le.ma@amd.com> <1574846129-4826-9-git-send-email-le.ma@amd.com> In-Reply-To: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: msip_labels: MSIP_Label_76546daa-41b6-470c-bb85-f6f40f044d7f_Enabled=true; MSIP_Label_76546daa-41b6-470c-bb85-f6f40f044d7f_SetDate=2019-11-27T09:49:27Z; MSIP_Label_76546daa-41b6-470c-bb85-f6f40f044d7f_Method=Standard; MSIP_Label_76546daa-41b6-470c-bb85-f6f40f044d7f_Name=Internal Use Only - Unrestricted; MSIP_Label_76546daa-41b6-470c-bb85-f6f40f044d7f_SiteId=3dd8961f-e488-4e60-8e11-a82d994e183d; MSIP_Label_76546daa-41b6-470c-bb85-f6f40f044d7f_ActionId=fd28ad11-65ce-4d69-bfb5-0000331a5625; MSIP_Label_76546daa-41b6-470c-bb85-f6f40f044d7f_ContentBits=1 x-originating-ip: [180.167.199.189] x-ms-publictraffictype: Email x-ms-office365-filtering-ht: Tenant x-ms-office365-filtering-correlation-id: c3a53736-478b-489a-f4d7-08d7731fdbfb x-ms-traffictypediagnostic: MN2PR12MB2912:|MN2PR12MB2912: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:5797; x-forefront-prvs: 023495660C x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(4636009)(39860400002)(346002)(366004)(136003)(376002)(396003)(189003)(199004)(13464003)(25786009)(53546011)(6506007)(76176011)(110136005)(446003)(66556008)(99286004)(66066001)(76116006)(52536014)(11346002)(7736002)(316002)(66946007)(66446008)(14454004)(74316002)(3846002)(6246003)(64756008)(86362001)(256004)(14444005)(186003)(33656002)(790700001)(2906002)(2420400007)(54906003)(5660300002)(6116002)(102836004)(26005)(6436002)(2501003)(9686003)(236005)(478600001)(7110500001)(6306002)(229853002)(66476007)(55016002)(15650500001)(8676002)(81156014)(81166006)(71200400001)(54896002)(7696005)(4326008)(8936002)(71190400001); DIR:OUT; SFP:1101; SCL:1; SRVR:MN2PR12MB2912; H:MN2PR12MB4285.namprd12.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; received-spf: None (protection.outlook.com: amd.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: CnbVMfBKYdm8AvDpJVF62Mw/xtlDdHq/Q9gJ3sCrsDTnRldq0pn9nyRz+OTMlReprabJQ/iJwEhD/bTZ8zmXVaR4zWKGMf4ZQVJ9mvJpEY71HzpMPdCAg6Dusi1TMzHgqlsncy5BzgoGFeExdBqbSyC2nyLQDoofBEcGemCU7LzD2JuP0lHBoy4Bp3GkkE3RMj74wujUAciOKqciTFQLobjAQgDEdJ6Rwt0nj5zKvLP9gsx8qzGK8ANqnEBVZjkwUqSipcSaifBIkgyI+orXA/JL1aN/UX1WW9Q8lrUPQ8qSiacN3hO0Hzwb/2/zyA4UPlnRyb3nyL3pI9rLgRM+WGboJ5bwgvLQZT3N5IRqrldO4x1C5vH7/Is/+7P79uUnbmSAEpZ0S3Jo7FpXBv2LpZ92bZRxw6ylRhpeq8iXAJPiWAclRTCQuQtsY2aG5vGV MIME-Version: 1.0 X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-Network-Message-Id: c3a53736-478b-489a-f4d7-08d7731fdbfb X-MS-Exchange-CrossTenant-originalarrivaltime: 27 Nov 2019 09:54:56.7271 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: 9ibPJe90zFpUU7kBCioj+jgcRtMqITbjm28Hz1Ee1PKiy85UAHzkntXGWFri/1l+ X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR12MB2912 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amdcloud.onmicrosoft.com; s=selector2-amdcloud-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=B1l2il6aEsx+FUx0aiozbRawhcK/VOm145aUthwvWpE=; b=L2fB6pwyhEVlZsi8g+SY4UqwyBm0os6txm4aQ3+Rc3rv+vix67l0Z2qs+I+/RkYL9wE3vr/Gbms7sBuE/K8AQe7qXeg5VH1d4eflrXvX2UAHpKHpcTwOkDIjDV2Cx3l/I9CUv1N57D9AS39C72/9t99E7zicWnAGwr+SVynne6s= X-Mailman-Original-Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Le.Ma@amd.com; X-BeenThere: amd-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Discussion list for AMD gfx List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "Deucher, Alexander" , "Zhou1, Tao" , "Li, Dennis" , "Zhang, Hawking" Content-Type: multipart/mixed; boundary="===============1626797980==" Errors-To: amd-gfx-bounces@lists.freedesktop.org Sender: "amd-gfx" Message-ID: <20191127095456.tbvDlpQvZg2ZzhAMNNaBB8XPOxE998LKu4-5lKtkpfk@z> --===============1626797980== Content-Language: en-US Content-Type: multipart/alternative; boundary="_000_MN2PR12MB42858C745C5D0D125236BD51F6440MN2PR12MB4285namp_" --_000_MN2PR12MB42858C745C5D0D125236BD51F6440MN2PR12MB4285namp_ Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable -----Original Message----- From: Chen, Guchun Sent: Wednesday, November 27, 2019 5:50 PM To: Ma, Le ; amd-gfx@lists.freedesktop.org Cc: Zhang, Hawking ; Zhou1, Tao ;= Li, Dennis ; Deucher, Alexander ; Ma, Le Subject: RE: [PATCH 10/10] drm/amdgpu: reduce redundant uvd context lost wa= rning message [AMD Official Use Only - Internal Distribution Only] -----Original Message----- From: Le Ma > Sent: Wednesday, November 27, 2019 5:15 PM To: amd-gfx@lists.freedesktop.org Cc: Zhang, Hawking >; C= hen, Guchun >; Zhou1, Tao <= Tao.Zhou1@amd.com>; Li, Dennis >; Deucher, Alexander >; Ma, Le > Subject: [PATCH 10/10] drm/amdgpu: reduce redundant uvd context lost warnin= g message Move the print out of uvd instance loop in amdgpu_uvd_suspend Change-Id: Ifad997debd84763e1b55d668e144b729598f115e Signed-off-by: Le Ma > --- drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c b/drivers/gpu/drm/amd/= amdgpu/amdgpu_uvd.c index e324bfe..ac7c7795 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c @@ -377,12 +377,15 @@ int amdgpu_uvd_suspend(struct amdgpu_device *adev) /* re-write 0 since err_event_athub will corrupt VC= PU buffer */ if (amdgpu_ras_intr_triggered()) { - DRM_WARN("UVD VCPU state may lost due t= o RAS ERREVENT_ATHUB_INTERRUPT\n"); memset(adev->uvd.inst[j].saved_bo, 0, si= ze); } else { memcpy_fromio(adev->uvd.inst[j].saved_bo= , ptr, size); } } + + if (amdgpu_ras_intr_triggered()) { + DRM_WARN("UVD VCPU state may lost due to RAS ERREVEN= T_ATHUB_INTERRUPT\n"); + [Guchun]the "{" after the if condition needs to be removed? [Le] Yes, sent it too quickly and made a mistake here. return 0; } -- 2.7.4 --_000_MN2PR12MB42858C745C5D0D125236BD51F6440MN2PR12MB4285namp_ Content-Type: text/html; charset="us-ascii" Content-Transfer-Encoding: quoted-printable

 

 

-----Original Message-----
From: Chen, Guchun <Guchun.Chen@amd.com>
Sent: Wednesday, November 27, 2019 5:50 PM
To: Ma, Le <Le.Ma@amd.com>; amd-gfx@lists.freedesktop.org
Cc: Zhang, Hawking <Hawking.Zhang@amd.com>; Zhou1, Tao <Tao.Zhou1@= amd.com>; Li, Dennis <Dennis.Li@amd.com>; Deucher, Alexander <A= lexander.Deucher@amd.com>; Ma, Le <Le.Ma@amd.com>
Subject: RE: [PATCH 10/10] drm/amdgpu: reduce redundant uvd context lost wa= rning message

 

[AMD Official Use Only - Internal Distribution On= ly]

 

 

 

 

-----Original Message-----

From: Le Ma <= le.ma@amd.com<= /a>>

Sent: Wednesday, November 27, 2019 5:15 PM

To: amd-gfx@lists.fre= edesktop.org

Cc: Zhang, Hawking <Hawkin= g.Zhang@amd.com>; Chen, Guchun <Guchun.C= hen@amd.com>; Zhou1, Tao <Tao.Zhou1@amd.com>; Li, Denni= s <Dennis.Li@amd.com>; Deucher, Alexander <Alexander.Deucher@amd.com>; Ma, Le <Le.Ma@amd.com>

Subject: [PATCH 10/10] drm/amdgpu: reduce redunda= nt uvd context lost warning message

 

Move the print out of uvd instance loop in amdgpu= _uvd_suspend

 

Change-Id: Ifad997debd84763e1b55d668e144b729598f1= 15e

Signed-off-by: Le Ma <le.ma@amd.co= m>

---

drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c | 5 += +++-

1 file changed, 4 insertions(+), 1 deletion(-= )

 

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_uv= d.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c

index e324bfe..ac7c7795 100644

--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c

+++ b/drivers/gpu/drm/amd/amdgpu/amdg= pu_uvd.c

@@ -377,12 +377,15 @@ int amdgpu_uvd_suspend(= struct amdgpu_device *adev)

        &= nbsp;           &nbs= p;   /* re-write 0 since err_event_athub will corrupt VCPU buffer= */

        &= nbsp;           &nbs= p;  if (amdgpu_ras_intr_triggered()) {

-        =             &nb= sp;            =   DRM_WARN("UVD VCPU state may lost due to RAS ERREVENT_ATHUB_INT= ERRUPT\n");

        &= nbsp;           &nbs= p;            &= nbsp; memset(adev->uvd.inst[j].saved_bo, 0, size);

        &= nbsp;           &nbs= p;  } else {

        &= nbsp;           &nbs= p;             = memcpy_fromio(adev->uvd.inst[j].saved_bo, ptr, size);

        &= nbsp;           &nbs= p;  }

        &= nbsp;  }

+

+       &n= bsp;  if (amdgpu_ras_intr_triggered()) {

+       &n= bsp;            = ;  DRM_WARN("UVD VCPU state may lost due to RAS ERREVENT_ATHUB_IN= TERRUPT\n");

+

[Guchun]the "{" after the if condition = needs to be removed?

[Le] Yes, sent it t= oo quickly and made a mistake here.

        &= nbsp;  return 0;

}

--

2.7.4

--_000_MN2PR12MB42858C745C5D0D125236BD51F6440MN2PR12MB4285namp_-- --===============1626797980== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Content-Disposition: inline X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KYW1kLWdmeCBt YWlsaW5nIGxpc3QKYW1kLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5m cmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9hbWQtZ2Z4 --===============1626797980==--