Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
Date:   Mon, 10 Jun 2019 16:41:41 +0200
From:   Greg Kroah-Hartman <gregkh@linuxfoundation.org>
To:     Pavel Machek <pavel@denx.de>
Cc:     linux-kernel@vger.kernel.org, stable@vger.kernel.org,
        Amber Lin <Amber.Lin@amd.com>,
        Alex Deucher <alexander.deucher@amd.com>
Subject: Re: [PATCH 4.19 46/51] drm/amdgpu/soc15: skip reset on init
Message-ID: <20190610144141.GB31086@kroah.com>
References: <20190609164127.123076536@linuxfoundation.org>
 <20190609164130.489004849@linuxfoundation.org>
 <20190610143146.GA19565@amd>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20190610143146.GA19565@amd>
User-Agent: Mutt/1.12.0 (2019-05-25)
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

On Mon, Jun 10, 2019 at 04:31:46PM +0200, Pavel Machek wrote:
> Hi!
> 
> > From: Alex Deucher <alexander.deucher@amd.com>
> > 
> > commit 5887a59961e2295c5b02f39dbc0ecf9212709b7b upstream.
> > 
> > Not necessary on soc15 and breaks driver reload on server cards.
> 
> > --- a/drivers/gpu/drm/amd/amdgpu/soc15.c
> > +++ b/drivers/gpu/drm/amd/amdgpu/soc15.c
> > @@ -495,6 +495,11 @@ int soc15_set_ip_blocks(struct amdgpu_de
> >  		return -EINVAL;
> >  	}
> >  
> > +	/* Just return false for soc15 GPUs.  Reset does not seem to
> > +	 * be necessary.
> > +	 */
> > +	return false;
> > +
> >  	if (adev->flags & AMD_IS_APU)
> >  		adev->nbio_funcs = &nbio_v7_0_funcs;
> >  	else if (adev->asic_type == CHIP_VEGA20)
> 
> Something is seriously wrong here.
> 
> Upstream commit goes to soc15_need_reset_on_init() and creates dead
> variable and quite a bit of dead code. Is that intended?
> 
> But this stable version... goes to different function, and returns
> false in function returning 0/-EINVAL, simulating success. New place
> does not seem right; it seems like patch misplaced it.

Ah, good catch!  This happened in the 4.14.y tree, so I had to drop the
patch from there, for some reason I missed checking the 4.19.y backport
(I had validated that 5.1.y got it right.)

Now dropped from the queue, thanks!

greg k-h