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=-5.0 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,MSGID_FROM_MTA_HEADER, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 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 C92F3C43603 for ; Thu, 19 Dec 2019 23:25:20 +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 98FAE24676 for ; Thu, 19 Dec 2019 23:25:20 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=amdcloud.onmicrosoft.com header.i=@amdcloud.onmicrosoft.com header.b="phKtV7Np" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 98FAE24676 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 52CDC6E3FB; Thu, 19 Dec 2019 23:25:20 +0000 (UTC) Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10on2066.outbound.protection.outlook.com [40.107.94.66]) by gabe.freedesktop.org (Postfix) with ESMTPS id AFCA46E3FB for ; Thu, 19 Dec 2019 23:25:18 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=NlB55Dsbw1lTxAMK/pIdGupaXqH1HZnQ8WjuzE+5slnKvg5tzwCawEp0L7z7geySHBc9Rng4QSpX/jm0BZvNMeGLf93CrOZUlmjsJXwjXfxmTgtODl3afheBMrRrU9UHYNOsBSm8+UzIpgzbFhhdeky7Bk68ca1xvOkdP8C93b7SurMAQCWSDewsMgARdp+P1d7EZuOUZtRH9h7oSzvFC1MHmd1u0K9zx9USW8qzjXGIAOD2XuE6Lb5Peg9Oq1bjhjam0E5w7LM/pYDHnRbyEOG4wWp81jAFp2EbLXQyLnAnlPb+hyhDHEw9mu60//e1kykBW4CxvyPW1DEBbK/Trw== 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=fUgtYUb0LPuw3v/I6evBIYmIaJpUI/zNWDaDhMGLwCY=; b=WkKOp22TJ3Y/cDOiHO0u2yMPZvoVvY4ieEIqhgB5+MBSgP73lEA43YgFFLbdIyV8lxzkWbjbVwLZd33NwDUtwTYzRxdseipokCGgtqlz506E+69ZEuhSHyVDxUrzucQx2O54YM4kzNzD3OfCBdyay+M6FybYrJWjxvKmZGj/HBwvjLSbMYlhTbC4JPQMFz0JKoOUwVWdB25qRwQleuAw+hF2kzwPS2KOkDg5HeW59bKlMB9Zeest1qlLMc9UfHzQ5sHJr7sQa7P+H+TYUDRn8fYZwLe6fBSVuhJlSlIZGDlz+DrRdzl2HlDifyzKma4xSZmDjr6IgJWKxHtuTIABhA== 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 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=fUgtYUb0LPuw3v/I6evBIYmIaJpUI/zNWDaDhMGLwCY=; b=phKtV7NpMEd2ClsTX3feWFX4DO8t9NUEySbT5i4QE4BEB+LTAEzHOxfSss96icK1/Pm44LM+L3HM+grd2S8DSXG9BdgAIa9lPx/j6cbgEiMU5c/arvm0DjWFdK+T+LaFVjJ9Aukg0tGcQ9a2N5sOetl+ld7fn1ZswbZzNsdXyIw= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Shaoyun.Liu@amd.com; Received: from DM6PR12MB3241.namprd12.prod.outlook.com (20.179.105.153) by DM6PR12MB3580.namprd12.prod.outlook.com (20.178.31.144) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2559.15; Thu, 19 Dec 2019 23:25:12 +0000 Received: from DM6PR12MB3241.namprd12.prod.outlook.com ([fe80::e9a0:2dda:d7b9:9a10]) by DM6PR12MB3241.namprd12.prod.outlook.com ([fe80::e9a0:2dda:d7b9:9a10%5]) with mapi id 15.20.2559.016; Thu, 19 Dec 2019 23:25:12 +0000 Subject: Re: [PATCwH 2/2] drm/amdgpu: fix KIQ ring test fail in TDR of SRIOV To: Felix Kuehling , "Liu, Monk" , "amd-gfx@lists.freedesktop.org" References: <1576577994-12874-1-git-send-email-Monk.Liu@amd.com> <1576577994-12874-2-git-send-email-Monk.Liu@amd.com> From: shaoyunl Message-ID: <9ac1611b-df06-fb6f-ff63-e2c16fddb3ae@amd.com> Date: Thu, 19 Dec 2019 18:25:10 -0500 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.9.0 In-Reply-To: Content-Language: en-US X-ClientProxiedBy: YTBPR01CA0024.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:b01:14::37) To DM6PR12MB3241.namprd12.prod.outlook.com (2603:10b6:5:186::25) MIME-Version: 1.0 Received: from [10.1.38.28] (165.204.55.250) by YTBPR01CA0024.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:b01:14::37) with Microsoft SMTP Server (version=TLS1_2, cipher=) via Frontend Transport; Thu, 19 Dec 2019 23:25:11 +0000 X-Originating-IP: [165.204.55.250] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: b3c92fed-76c9-4b6a-4b99-08d784dab202 X-MS-TrafficTypeDiagnostic: DM6PR12MB3580:|DM6PR12MB3580: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:10000; X-Forefront-PRVS: 0256C18696 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(4636009)(39850400004)(366004)(136003)(396003)(376002)(346002)(13464003)(51914003)(199004)(189003)(53546011)(2616005)(956004)(478600001)(26005)(16526019)(31686004)(186003)(36756003)(66946007)(66476007)(6486002)(86362001)(31696002)(66556008)(4001150100001)(5660300002)(2906002)(52116002)(8676002)(81166006)(81156014)(8936002)(30864003)(110136005)(16576012)(316002)(966005)(43062003); DIR:OUT; SFP:1101; SCL:1; SRVR:DM6PR12MB3580; H:DM6PR12MB3241.namprd12.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX: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: /9kFsyFOYNMjqsMFhfyChhMQ6obFHYKU6ocLkszgYwel9/53BaZWmZ1F8HYiAGBV8TlryWkV/4YXB1UA5eEIWkxtf/WWWnCQ62LUOtCsl6qw0F28KAL2brZN5szZb6jPHffQXKjWn+f0gDsAQowEIYWM4uJ5fhcd3dQf6+OO7/piczyY5qYvyaq5VHyHdE0RJG9f4BbEm3azcfWaUOFDw+WzRh+JJD1iX8Q86/ndHu8ULY4pEHKXASMJ/LULTLwNrJwWjzU/ZE80J+/F3zxa5ZR9ny6sdtEM1rITA/lq1/gYy/SQMzlVDJeDV5/xMYVse3XqEPkCeZmRHXfn51LLfYEqHn/Lz8MSRpDqM7A0CM88TwLlLhzE7FSC2qPog4xQ+LS1bzK9gs0OXmpQyhZhUl3ZorlLPleF/q76DU7AfLv4aA6YiVBj3AAgVom/16U4uWcPlQ/dc0fJfgwxk1UT2ZPacH8OXHFEou0dfTEdZ0PQj1VTrhDFQ45XcxxJihD6Puxh0pStu39sPInXQ0rKqBA+busb0o0BMVWaHg8coSYRspdLYB+IJcgbxwM6RNA3x5/hG+qyTy4DhUoFGu5xYA== X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-Network-Message-Id: b3c92fed-76c9-4b6a-4b99-08d784dab202 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Dec 2019 23:25:12.3014 (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: 0GX7L3LoXMwl11YQYNTrtnnJFln/E0YsPMlvr4mj62a9xGGS5ISZ0SjKBlqRFQjM7t76ubL5gb+wd2fwi+eD4g== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB3580 X-BeenThere: amd-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion list for AMD gfx List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="windows-1252"; Format="flowed" Errors-To: amd-gfx-bounces@lists.freedesktop.org Sender: "amd-gfx" How we prevent the=A0 user queue from submitting on the=A0 following FLR=A0= if = we didn't unmap the=A0 user queues . It's possible that CP still not hang = when other part HW get hang and=A0 need a reset . Om, but probably it's ok since after FLR , all the hqd will be reset to = unmapped by default by HW=A0 and existing user queue need to be re-created = anyway ... I think i'm ok with your proposal . Can KFD team prepare the change ? Regards shaoyun.liu On 2019-12-19 5:44 p.m., Felix Kuehling wrote: > I'm thinking, if we know we're preparing for a GPU reset, maybe we = > shouldn't even try to suspend processes and stop the HIQ. = > kfd_suspend_all_processes, stop_cpsch and other functions up that call = > chain up to kgd2kfd_suspend could have a parameter (bool pre_reset) = > that would update the driver state but not touch the hardware. That = > avoids unnecessary timeouts on things that aren't expected to complete = > anyway. > > Regards, > =A0 Felix > > > On 2019-12-19 11:59 a.m., shaoyunl wrote: >> >> After check the code , in KFD side , should be simple just add the = >> check in stop_cpsch code . For kiq, there is no return for WREG32 , = >> so no easy way to check the return value . Maybe we can add = >> kiq_status in struct amdgpu_kiq=A0 to indicate the kiq is hang or not = >> ,=A0 in hdq_destroy function check this=A0 kiq_status after acquire_queu= e = >> , finish the destroy function is kiq is hang for SRIOV only . >> >> Any comments ? >> >> >> shaoyun.liu >> >> >> On 2019-12-19 9:51 a.m., Liu, Shaoyun wrote: >> >>> I see, thanks for the detail information. >>> Normally when CP is hang, the hiq access to unmap the queue will = >>> failed before driver call to the hqd_destroy. I think driver should = >>> add the code to check the return value=A0 and directly finish the = >>> pre_reset in this case . If the hiq does not hang but kiq hang. We = >>> can use the same logic in hqd_destroy function, return in first = >>> access failure instead go further.=A0 With this change we probably can = >>> move the pre_reset function back to normal . >>> Felix, do you have any concerns or comments for the change. >>> >>> Regards >>> Shaoyun.liu >>> -----------------------------------------------------------------------= - = >>> >>> *From:* Liu, Monk >>> *Sent:* December 19, 2019 1:13:24 AM >>> *To:* Liu, Shaoyun ; = >>> amd-gfx@lists.freedesktop.org >>> *Subject:* RE: [PATCH 2/2] drm/amdgpu: fix KIQ ring test fail in TDR = >>> of SRIOV >>> >>> >>> I would like to check why we need a special sequences for sriov = >>> on this pre_reset. If possible, make it the same as bare metal mode = >>> sounds better solution. >>> >>> Because before VF FLR calling function would lead to register access = >>> through KIQ, =A0which will not complete because KIQ/GFX already hang = >>> by that time >>> >>> >>> I don't remember any register access by amdkfd_pre_reset call,=A0= =A0 = >>> please let me know if this assumption is wrong . >>> >>> Please check =93void pm_uninit(struct packet_manager *pm)=94 which is = >>> invoked inside of amdkfd_pre_reset() : >>> >>> It will call uninitialized() in kfd_kernel_queue.c file >>> >>> And then go to the path of =93kq->mqd_mgr->destroy_mqd(=85)=94 >>> >>> And finally it calls =93static int kgd_hqd_destroy(=85)=94 in = >>> amdgpu_amdkfd_gfx_v10.c >>> >>> 539 { >>> >>> 540=A0=A0=A0=A0 struct amdgpu_device *adev =3D get_amdgpu_device(kgd); >>> >>> 541=A0=A0=A0=A0 enum hqd_dequeue_request_type type; >>> >>> 542=A0=A0=A0=A0 unsigned long end_jiffies; >>> >>> 543=A0=A0=A0=A0 uint32_t temp; >>> >>> 544=A0=A0=A0=A0 struct v10_compute_mqd *m =3D get_mqd(mqd); >>> >>> 545 >>> >>> 546 #if 0 >>> >>> 547=A0=A0=A0=A0 unsigned long flags; >>> >>> 548=A0=A0=A0=A0 int retry; >>> >>> 549 #endif >>> >>> 550 >>> >>> 551=A0=A0=A0=A0 acquire_queue(kgd, pipe_id, queue_id); //this introduce = >>> register access via KIQ >>> >>> 552 >>> >>> 553=A0=A0=A0=A0 if (m->cp_hqd_vmid =3D=3D 0) >>> >>> 554=A0=A0=A0=A0=A0=A0=A0=A0 WREG32_FIELD15(GC, 0, RLC_CP_SCHEDULERS, sc= heduler1, 0); = >>> //this introduce register access via KIQ >>> >>> 555 >>> >>> 556=A0=A0=A0=A0 switch (reset_type) { >>> >>> 557=A0=A0=A0=A0 case KFD_PREEMPT_TYPE_WAVEFRONT_DRAIN: >>> >>> 558=A0=A0=A0=A0=A0=A0=A0=A0 type =3D DRAIN_PIPE; >>> >>> 559=A0=A0=A0=A0=A0=A0=A0=A0 break; >>> >>> 560=A0=A0=A0=A0 case KFD_PREEMPT_TYPE_WAVEFRONT_RESET: >>> >>> 561=A0=A0=A0=A0=A0=A0=A0=A0 type =3D RESET_WAVES; >>> >>> 562=A0=A0=A0=A0=A0=A0=A0=A0 break; >>> >>> 563=A0=A0=A0=A0 default: >>> >>> 564=A0=A0=A0=A0=A0=A0=A0=A0 type =3D DRAIN_PIPE; >>> >>> 565=A0=A0=A0=A0=A0=A0=A0=A0 break; >>> >>> 566=A0=A0=A0=A0 } >>> >>> 624=A0=A0=A0=A0 WREG32(SOC15_REG_OFFSET(GC, 0, mmCP_HQD_DEQUEUE_REQUEST= ), = >>> type); //this introduce register access via KIQ >>> >>> 625 >>> >>> 626=A0=A0=A0=A0 end_jiffies =3D (utimeout * HZ / 1000) + jiffies; >>> >>> 627=A0=A0=A0=A0 while (true) { >>> >>> 628=A0=A0=A0=A0=A0=A0=A0=A0 temp =3D RREG32(SOC15_REG_OFFSET(GC, 0, mmC= P_HQD_ACTIVE)); = >>> //this introduce register access via KIQ >>> >>> 629=A0=A0=A0=A0=A0=A0=A0=A0 if (!(temp & CP_HQD_ACTIVE__ACTIVE_MASK)) >>> >>> 630=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 break; >>> >>> 631=A0=A0=A0=A0=A0=A0=A0=A0 if (time_after(jiffies, end_jiffies)) { >>> >>> 632=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 pr_err("cp queue preemption tim= e out.\n"); >>> >>> 633=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 release_queue(kgd); >>> >>> 634=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 return -ETIME; >>> >>> 635=A0=A0=A0=A0=A0=A0=A0=A0 } >>> >>> 636=A0=A0=A0=A0=A0=A0=A0=A0 usleep_range(500, 1000); >>> >>> 637=A0=A0=A0=A0 } >>> >>> 638 >>> >>> 639=A0=A0=A0=A0 release_queue(kgd); >>> >>> 640=A0=A0=A0=A0 return 0; >>> >>> If we use the sequence from bare-metal, all above highlighted = >>> register access will not work because KIQ/GFX already died by that = >>> time which means the amdkfd_pre_reset() is actually=A0 not working as = >>> expected. >>> >>> _____________________________________ >>> >>> Monk Liu|GPU Virtualization Team |AMD >>> >>> sig-cloud-gpu >>> >>> *From:* Liu, Shaoyun >>> *Sent:* Thursday, December 19, 2019 12:30 PM >>> *To:* Liu, Monk ; amd-gfx@lists.freedesktop.org >>> *Subject:* Re: [PATCH 2/2] drm/amdgpu: fix KIQ ring test fail in TDR = >>> of SRIOV >>> >>> I don't remember any register access by amdkfd_pre_reset call,=A0=A0 = >>> please let me know if this assumption is wrong . >>> This function will use hiq to access CP, in case CP already hang, we = >>> might not able to get the response from hw and will got a timeout. I = >>> think kfd internal should handle this. Felix already have some = >>> comments on that. >>> I would like to check why we need a special sequences for sriov on = >>> this pre_reset. If possible, make it the same as bare metal mode = >>> sounds better solution. >>> >>> Regards >>> Shaoyun.liu >>> >>> -----------------------------------------------------------------------= - = >>> >>> >>> *From:*Liu, Monk > >>> *Sent:* December 18, 2019 10:52:47 PM >>> *To:* Liu, Shaoyun >> >; amd-gfx@lists.freedesktop.org = >>> = >>> > >>> *Subject:* RE: [PATCH 2/2] drm/amdgpu: fix KIQ ring test fail in TDR = >>> of SRIOV >>> >>> Oh, by the way >>> >>> >>> Do we know the root cause why this function would ruin MEC ? >>> >>> Only we call this function right after VF FLR will ruin MEC and lead = >>> to following KIQ ring test fail , and on bare-metal it is called = >>> before gpu rest , so that's why on bare-metal we don't have this issue >>> >>> But the reason we cannot call it before VF FLR on SRIOV case was = >>> already stated in this thread >>> >>> Thanks >>> _____________________________________ >>> Monk Liu|GPU Virtualization Team |AMD >>> >>> >>> -----Original Message----- >>> From: Liu, Monk >>> Sent: Thursday, December 19, 2019 11:49 AM >>> To: shaoyunl >; = >>> amd-gfx@lists.freedesktop.org >>> Subject: RE: [PATCH 2/2] drm/amdgpu: fix KIQ ring test fail in TDR = >>> of SRIOV >>> >>> Hi Shaoyun >>> >>> >>> Do we know the root cause why this function would ruin MEC ? = >>> From the logic, I think this function should be called before FLR = >>> since we need to disable the user queue submission first. >>> Right now I don't know which detail step lead to KIQ ring test fail, = >>> I totally agree with you that this func should be called before VF = >>> FLR, but we cannot do it and the reason is described in The comment: >>> >>> > if we do pre_reset() before VF FLR, it would go KIQ way to do = >>> register >>> > access and stuck there, because KIQ probably won't work by that time >>> > (e.g. you already made GFX hang) >>> >>> >>> >>> I remembered the function should use hiq to communicate with HW = >>> , shouldn't use kiq to access HW registerm,=A0 has this been changed ? >>> Tis function use WREG32/RREG32 to do register access, like all other = >>> functions in KMD,=A0 and WREG32/RREG32 will let KIQ to do the register = >>> access If we are under dynamic SRIOV=A0 mode (means we are SRIOV VF = >>> and isn't under full exclusive mode) >>> >>> You see that if you call this func before EVENT_5 (event 5 triggers = >>> VF FLR) then it will run under dynamic mode and KIQ will handle the = >>> register access, which is not an option Since ME/MEC probably = >>> already hang ( if we are testing quark on gfx/compute rings) >>> >>> Do you have a good suggestion ? >>> >>> thanks >>> _____________________________________ >>> Monk Liu|GPU Virtualization Team |AMD >>> >>> >>> -----Original Message----- >>> From: amd-gfx >> > On Behalf Of shaoyunl >>> Sent: Tuesday, December 17, 2019 11:38 PM >>> To: amd-gfx@lists.freedesktop.org = >>> >>> Subject: Re: [PATCH 2/2] drm/amdgpu: fix KIQ ring test fail in TDR = >>> of SRIOV >>> >>> I think amdkfd side depends on this call to stop the user queue, = >>> without this call, the user queue can submit to HW during the reset = >>> which could cause hang again ... >>> Do we know the root cause why this function would ruin MEC ? From = >>> the logic, I think this function should be called before FLR since = >>> we need to disable the user queue submission first. >>> I remembered the function should use hiq to communicate with HW , = >>> shouldn't use kiq to access HW registerm,=A0 has this been changed ? >>> >>> >>> Regards >>> shaoyun.liu >>> >>> >>> On 2019-12-17 5:19 a.m., Monk Liu wrote: >>> > issues: >>> > MEC is ruined by the amdkfd_pre_reset after VF FLR done >>> > >>> > fix: >>> > amdkfd_pre_reset() would ruin MEC after hypervisor finished the VF >>> > FLR, the correct sequence is do amdkfd_pre_reset before VF FLR but >>> > there is a limitation to block this sequence: >>> > if we do pre_reset() before VF FLR, it would go KIQ way to do = >>> register >>> > access and stuck there, because KIQ probably won't work by that time >>> > (e.g. you already made GFX hang) >>> > >>> > so the best way right now is to simply remove it. >>> > >>> > Signed-off-by: Monk Liu > >>> > --- >>> >=A0=A0 drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 2 -- >>> >=A0=A0 1 file changed, 2 deletions(-) >>> > >>> > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c >>> > b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c >>> > index 605cef6..ae962b9 100644 >>> > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c >>> > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c >>> > @@ -3672,8 +3672,6 @@ static int amdgpu_device_reset_sriov(struct = >>> amdgpu_device *adev, >>> >=A0=A0=A0=A0=A0=A0=A0 if (r) >>> >=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 return r; >>> > >>> > -=A0=A0=A0=A0 amdgpu_amdkfd_pre_reset(adev); >>> > - >>> >=A0=A0=A0=A0=A0=A0=A0 /* Resume IP prior to SMC */ >>> >=A0=A0=A0=A0=A0=A0=A0 r =3D amdgpu_device_ip_reinit_early_sriov(adev); >>> >=A0=A0=A0=A0=A0=A0=A0 if (r) >>> _______________________________________________ >>> amd-gfx mailing list >>> amd-gfx@lists.freedesktop.org >>> https://lists.freedesktop.org/mailman/listinfo/amd-gfx >>> >>> >>> _______________________________________________ >>> amd-gfx mailing list >>> amd-gfx@lists.freedesktop.org >>> https://lists.freedesktop.org/mailman/listinfo/amd-gfx >> >> _______________________________________________ >> amd-gfx mailing list >> amd-gfx@lists.freedesktop.org >> https://lists.freedesktop.org/mailman/listinfo/amd-gfx _______________________________________________ amd-gfx mailing list amd-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/amd-gfx