Subject: Re: [PATCH REGRESSION] Revert "drm/amdgpu: stop scheduler when
 calling hw_fini (v2)"
To:     "Deucher, Alexander" <Alexander.Deucher@amd.com>,
        Len Brown <lenb@kernel.org>,
        "torvalds@linux-foundation.org" <torvalds@linux-foundation.org>,
        "Chen, Guchun" <Guchun.Chen@amd.com>,
        "Grodzovsky, Andrey" <Andrey.Grodzovsky@amd.com>
Cc:     "linux-pm@vger.kernel.org" <linux-pm@vger.kernel.org>,
        "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
        Len Brown <len.brown@intel.com>,
        "stable@vger.kernel.org" <stable@vger.kernel.org>
References: <8ab406c8bb2e58969668a806a529d5988b447530.1641750730.git.len.brown@intel.com>
 <BL1PR12MB514403767AC6BC6CD617674DF7509@BL1PR12MB5144.namprd12.prod.outlook.com>
From:   =?UTF-8?Q?Christian_K=c3=b6nig?= <christian.koenig@amd.com>
Message-ID: <2e3fbfe8-e7a1-2483-dbbd-ebb3824fc886@amd.com>
Date:   Mon, 10 Jan 2022 17:16:16 +0100
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101
 Thunderbird/78.14.0
In-Reply-To: <BL1PR12MB514403767AC6BC6CD617674DF7509@BL1PR12MB5144.namprd12.prod.outlook.com>
Content-Type: text/plain; charset=utf-8; format=flowed
Content-Transfer-Encoding: 7bit
Content-Language: en-US
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?ZmlNRzVDSWgweXZJeXIreGlGS2VmVnczU0RkVWZ1d1VVU3RjaVZpb0Y3SVZn?=
 =?utf-8?B?ai9TM1F6QzdCT1pGc3hFMEFPc3FOc3FpOXlsMmdzcFVaazR0KzRISCtNS3A5?=
 =?utf-8?B?bldFNmR6NXViY2pXdnVCeDVYbjVhbjJNaytLcTNtNHZER05QSGlvRUJFZHNV?=
 =?utf-8?B?TjRlZWV0NDFnVmJzd3IveXVGMGNYcUo2anVGamdUYlVKYU42RjN1N3ByYlIx?=
 =?utf-8?B?YkVBWEdmOTY0NlZBcnZDM2lINlFGNnVjN1JiNDQ5UlFodkFGb0I4TlVudTZ4?=
 =?utf-8?B?ckFhZ2JaQWhURFFUQk8wOXV6NFFBRjZvQW8rbFZvQlpENTV0eVJRTmtHU09Y?=
 =?utf-8?B?ZUwvcUFlcjQzWnYrUFlmdTRwT0RBa05qQkhjaTZUYUozdHJYVVdTUS9id0ZV?=
 =?utf-8?B?Szl3bkJRcEFqWWljdDRuTEswQjRoZ25BMXZuZE0wT0FtV2NOSDdMajRuU0U2?=
 =?utf-8?B?emVNbml5dzhnV243eEdkMzlMcmJVaTRteFQzaGtNdHFueWJ2QXBFL0xDWXdy?=
 =?utf-8?B?TGYvMjVHSzM2QkN0Q1FZMHBpQUJwMUovbmpFME1ydFovMjNScXo1dS8weENR?=
 =?utf-8?B?Ung5djFxV2tlMThFSUowd1RwNXYxeGllcHBWVlZvMXJKdFpucTRmK0c4dDkz?=
 =?utf-8?B?dGZNYkFhWkJOMmlQNGJVQWZSelA0bzdOa1poQ3NKNStXbWlFb3hBL0ZwV0sz?=
 =?utf-8?B?OVBSMWpLL0ZTckZqTGZxWFhWbm5hUEN4VVVhck5ROUdmNE1sdGFLNnVnQ01S?=
 =?utf-8?B?dXpEZndWQ01MdFd4M1ZxOEN5aS91QnI3aWRjVkhXZTZSdGVSbXd4cnVjUVFP?=
 =?utf-8?B?OXh6Z3FFV054bEgvRjF2UVZ6dlFWN2ViQjM2dTVKQTNZWlhaV0FpdklFZTZI?=
 =?utf-8?B?a01HNUg2UzVMSUFlUnpJQW1ORjlJMm4wZXE2dklPNDRwM3Vrdmo4WjdjaEhw?=
 =?utf-8?B?V0hEdmdIbFFTRkRvUml6TUhaZHMxOW9VQkZCblRqaUlSUU1aa05icHpWa0w4?=
 =?utf-8?B?V1ZDSUdyN2VpV0JrQURtai91SzBNU1RoMVZFZDVYeHh3Z3pLS1d3VS91WXMz?=
 =?utf-8?B?b0twYlBuUUZwRGNoZml5S29qcisveEJQL25jbldpV2swQ2pCaWxTSXkzTS9X?=
 =?utf-8?B?Q2krakNrcUVqSzQwVDdvTUhMWW1oeWh2ODZrU1NTYmVpSGNUUjE4aEk5ajVu?=
 =?utf-8?B?THREZzEvNXprQlE3RE83VlAvMndKcm0yL0NoZjFEQkhnTWlEK3N3VE11Yldv?=
 =?utf-8?B?eVRPVVJnQ0x6QW1ST3lrck1SWUlnU1ROUi9nTVUzdkJXQ0prU0VKTzdKZGRp?=
 =?utf-8?B?am5pejRJVUEzdXpBK21JRjdBSHlqcUU3ZXZIQ3pjUmdEV3hzQUEybVRUdWJt?=
 =?utf-8?B?aTBzVWsrL0poeEFOYkwrcmZMVGQ5eEtHS0QvYXNEcXcwRTJGVG5QZU04Q3Rw?=
 =?utf-8?B?Uk9LVUtLZXNIUzFyc1hmMEJSeFlydytSWGVWKzdVc2g1QnZxa05Kckt3OFNl?=
 =?utf-8?B?M3dLbFpWSFBnSngrblNlZjFGMDFhU25mNVpGV2Q4M3VtckRUb3ljWExDVTAr?=
 =?utf-8?B?NE95ZDdlakpYNGRKNWxXcWpyMFZzUnNVQlFjUXVYcFpPeU95V0VNcXVzNWNT?=
 =?utf-8?B?dytzZVBTWlVIc2NmakJGakt2TWFFOEtISzVwTUsyMThtUEZkYWpKOWUveXRM?=
 =?utf-8?B?Wko5Ums1THdySzRTYldLZW5VcGJDSWZkYTFBUnhTRE5TRmI3ZmV0eU9LRVZY?=
 =?utf-8?B?K0FKQUNQRDg3TzZ2OUZtSm1ySDlMNGR1RExFMTV3bzc2aVlUMFlPYndjOVFI?=
 =?utf-8?B?RVJ0ZDEzcG5VQ0h5byttN2Mwd0ZNaS9lYVd0dnpQZGM1QlJHUVNuREwwOGhv?=
 =?utf-8?B?TEVtNlR0VmVnZ2VrMGg2NXREeVMzOFFESXFkcTNQL2p4bmQvNitiYUpqM0RK?=
 =?utf-8?B?OUk3WTZjWUNMcmRLNyt6N0tUcWhZSy9KcVBLU1BJazhKY05XbENMNUUzNXpa?=
 =?utf-8?B?amNFMDFhZy8yTHJiSjNkMjVwTVlYbjVJS2hDZ3RxTWEyQmdMRmJIQjZHQzUz?=
 =?utf-8?B?WW5LT2lHOEMydWJrQVpaYTQ3QXRrMG5oeUgwQlk2bGhjQk5vd21XVkowaDR0?=
 =?utf-8?B?STZieWIzcFA4WXNhbnFsQXFqNnJmcTI5ejJjUmRxNGxJdnpQYmVOTVFHRTVs?=
 =?utf-8?Q?SeXuJCGi4j93O6i2Q+HZJww=3D?=
X-OriginatorOrg: amd.com
X-MS-Exchange-CrossTenant-Network-Message-Id: fcbe571b-175d-460d-533f-08d9d4548bd7
X-MS-Exchange-CrossTenant-AuthSource: MWHPR1201MB0192.namprd12.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Jan 2022 16:16:24.0465
 (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: Llu2K+HeYkQQXkJ67C37fed4/enWeVrX4LCUdEPnuNIkSWQ6MQqSZwRM1wlnf3vv
X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW3PR12MB4474
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Am 10.01.22 um 17:08 schrieb Deucher, Alexander:
> [Public]
>
>> -----Original Message-----
>> From: Len Brown <lenb417@gmail.com> On Behalf Of Len Brown
>> Sent: Sunday, January 9, 2022 1:12 PM
>> To: torvalds@linux-foundation.org
>> Cc: linux-pm@vger.kernel.org; linux-kernel@vger.kernel.org; Len Brown
>> <len.brown@intel.com>; Chen, Guchun <Guchun.Chen@amd.com>;
>> Grodzovsky, Andrey <Andrey.Grodzovsky@amd.com>; Koenig, Christian
>> <Christian.Koenig@amd.com>; Deucher, Alexander
>> <Alexander.Deucher@amd.com>; stable@vger.kernel.org
>> Subject: [PATCH REGRESSION] Revert "drm/amdgpu: stop scheduler when
>> calling hw_fini (v2)"
>>
>> From: Len Brown <len.brown@intel.com>
>>
>> This reverts commit f7d6779df642720e22bffd449e683bb8690bd3bf.
>>
>> This bisected regression has impacted suspend-resume stability since 5.15-
>> rc1. It regressed -stable via 5.14.10.
>>
>> https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Fbugz
>> illa.kernel.org%2Fshow_bug.cgi%3Fid%3D215315&amp;data=04%7C01%7Cal
>> exander.deucher%40amd.com%7Ccf790be4827f4df9f2d808d9d39b81af%7C3
>> dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C637773487569442716%7C
>> Unknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJB
>> TiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3000&amp;sdata=AX0TXkyoMhy%2BZqE
>> VgRSWMkKd5nPa4WOv%2B1FZHLSErSw%3D&amp;reserved=0
>>
>> Fixes: f7d6779df64 ("drm/amdgpu: stop scheduler when calling hw_fini (v2)")
>> Cc: Guchun Chen <guchun.chen@amd.com>
>> Cc: Andrey Grodzovsky <andrey.grodzovsky@amd.com>
>> Cc: Christian Koenig <christian.koenig@amd.com>
>> Cc: Alex Deucher <alexander.deucher@amd.com>
>> Cc: <stable@vger.kernel.org> # 5.14+
>> Signed-off-by: Len Brown <len.brown@intel.com>
> @Chen, Guchun, @Grodzovsky, Andrey, @Koenig, Christian
>
> Any ideas?  What's the consequence of reverting this patch?  Didn't this patch fix another suspend/resume issue?

I think Guchun was just trying to adapt that we removed the scheduler 
stop from the fence driver hw fini path.

Not sure if that actually fixed something or was just a precaution.

Regards,
Christian.

>
> Alex
>
>> ---
>>   drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c | 8 --------
>>   1 file changed, 8 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c
>> b/drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c
>> index 9afd11ca2709..45977a72b5dd 100644
>> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c
>> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c
>> @@ -547,9 +547,6 @@ void amdgpu_fence_driver_hw_fini(struct
>> amdgpu_device *adev)
>>   		if (!ring || !ring->fence_drv.initialized)
>>   			continue;
>>
>> -		if (!ring->no_scheduler)
>> -			drm_sched_stop(&ring->sched, NULL);
>> -
>>   		/* You can't wait for HW to signal if it's gone */
>>   		if (!drm_dev_is_unplugged(adev_to_drm(adev)))
>>   			r = amdgpu_fence_wait_empty(ring);
>> @@ -609,11 +606,6 @@ void amdgpu_fence_driver_hw_init(struct
>> amdgpu_device *adev)
>>   		if (!ring || !ring->fence_drv.initialized)
>>   			continue;
>>
>> -		if (!ring->no_scheduler) {
>> -			drm_sched_resubmit_jobs(&ring->sched);
>> -			drm_sched_start(&ring->sched, true);
>> -		}
>> -
>>   		/* enable the interrupt */
>>   		if (ring->fence_drv.irq_src)
>>   			amdgpu_irq_get(adev, ring->fence_drv.irq_src,
>> --
>> 2.25.1