Linux kernel -stable discussions
 help / color / mirror / Atom feed
From: Greg KH <gregkh@linuxfoundation.org>
To: Ed Tomlinson <edt@aei.ca>
Cc: "Greg KH <gregkh@linuxfoundation.org>,
	Zhang, Jerry" <Jerry.Zhang@amd.com>,
	linux-kernel@vger.kernel.org,
	Andrew Morton <akpm@linux-foundation.org>,
	torvalds@linux-foundation.org, stable@vger.kernel.org,
	lwn@lwn.net, Jiri Slaby <jslaby@suse.cz>
Subject: Re: Linux 4.13.4
Date: Sat, 30 Sep 2017 17:31:06 +0200	[thread overview]
Message-ID: <20170930153106.GA26862@kroah.com> (raw)
In-Reply-To: <b6b41c30-8cdd-42e3-a229-d07a9e519815@aei.ca>

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

  reply	other threads:[~2017-09-30 15:30 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-09-28  8:33 Linux 4.13.4 Greg KH
2017-09-28  8:33 ` Greg KH
2017-09-30 13:49 ` Ed Tomlinson
2017-09-30 14:24   ` Greg KH
2017-09-30 15:14     ` Ed Tomlinson
2017-09-30 15:31       ` Greg KH [this message]
2017-09-30 15:48         ` Ed Tomlinson
2017-09-30 16:37           ` Ed Tomlinson

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20170930153106.GA26862@kroah.com \
    --to=gregkh@linuxfoundation.org \
    --cc=Jerry.Zhang@amd.com \
    --cc=akpm@linux-foundation.org \
    --cc=edt@aei.ca \
    --cc=jslaby@suse.cz \
    --cc=linux-kernel@vger.kernel.org \
    --cc=lwn@lwn.net \
    --cc=stable@vger.kernel.org \
    --cc=torvalds@linux-foundation.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox