Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751467AbdI3Pa7 (ORCPT ); Sat, 30 Sep 2017 11:30:59 -0400 Received: from mail.linuxfoundation.org ([140.211.169.12]:44880 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751119AbdI3Pa5 (ORCPT ); Sat, 30 Sep 2017 11:30:57 -0400 Date: Sat, 30 Sep 2017 17:31:06 +0200 From: Greg KH To: Ed Tomlinson Cc: "Greg KH , Zhang, Jerry" , linux-kernel@vger.kernel.org, Andrew Morton , torvalds@linux-foundation.org, stable@vger.kernel.org, lwn@lwn.net, Jiri Slaby Subject: Re: Linux 4.13.4 Message-ID: <20170930153106.GA26862@kroah.com> References: <20170928083302.GA11022@kroah.com> <79eb01dc-9f92-42fd-85c1-e4dcb2d5de4c@aei.ca> <20170930142417.GA10658@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.9.1 (2017-09-22) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1593 Lines: 52 On Sat, Sep 30, 2017 at 11:14:42AM -0400, Ed Tomlinson wrote: > Hi > > I did things old school via patch -R. This is what I reverted: > > --- > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c > b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c > index 4083be61b328..6417febe18b9 100644 > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c > @@ -95,9 +95,8 @@ int psp_wait_for(struct psp_context *psp, uint32_t > reg_index, > int i; > struct amdgpu_device *adev = psp->adev; > > - val = RREG32(reg_index); > - > for (i = 0; i < adev->usec_timeout; i++) { > + val = RREG32(reg_index); > if (check_changed) { > if (val != reg_val) > return 0; > diff --git a/drivers/gpu/drm/amd/amdgpu/psp_v3_1.c > b/drivers/gpu/drm/amd/amdgpu/psp_v3_1.c > index c98d77d0c8f8..6f80ad8f588b 100644 > --- a/drivers/gpu/drm/amd/amdgpu/psp_v3_1.c > +++ b/drivers/gpu/drm/amd/amdgpu/psp_v3_1.c > @@ -237,11 +237,9 @@ int psp_v3_1_bootloader_load_sos(struct psp_context > *psp) > > /* there might be handshake issue with hardware which needs delay */ > mdelay(20); > -#if 0 > ret = psp_wait_for(psp, SOC15_REG_OFFSET(MP0, 0, > mmMP0_SMN_C2PMSG_81), > RREG32_SOC15(MP0, 0, mmMP0_SMN_C2PMSG_81), > 0, true); > -#endif > > return ret; > } > --- Any chance to dig out _which_ patch this was? I don't have access to my tree at the moment... And what about 4.14-rc2? thanks, greg k-h