Hi! > From: Alex Deucher <alexander.deucher@xxxxxxx> > > 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. Best regards, Pavel -- (english) http://www.livejournal.com/~pavelmachek (cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
Attachment:
signature.asc
Description: Digital signature