Dylan Baker <dy...@pnwbakers.com> writes: > I have both pulled into the 18.1-proposed tree now. I think we need to have a > wider discussion about better ways to propose patches to stable after the fact > like ea1fff4416036066cff51826f95b4703d7211008. Thanks for helping get this > resolved so quickly.
We have to expect that stable annotations will be missed for some patches. No one is perfect. The patch author could help a lot by making sure the commit gets into the correct stable branches, because they are the ones with the most awareness of the situation. > Dylan > > Quoting Jan Vesely (2018-05-08 10:24:53) >> Hi, >> >> the code_bo line was added in ea1fff4416036066cff51826f95b4703d7211008 >> Which was also requested for stable [0]. >> sorry for the confusion. Is there a way to indicate dependencies that I >> missed? >> >> regards, >> Jan >> >> [0] https://lists.freedesktop.org/archives/mesa-stable/2018-May/008249. >> html >> >> On Tue, 2018-05-08 at 10:10 -0700, Dylan Baker wrote: >> > Indeed. This is currently not queued for 18.1 as it doesn't apply cleanly. >> > The >> > 18.1-proposed branch at git://people.freedesktop.org/~dbaker/mesa is where >> > it >> > needs to apply if that's what needs to happen. >> > >> > Thanks, >> > Dylan >> > >> > Quoting Mark Janes (2018-05-08 09:28:24) >> > > Hi Jan, >> > > >> > > >> > > Jan Vesely <jan.ves...@rutgers.edu> writes: >> > > >> > > > CC: <mesa-sta...@lists.freedesktop.org> >> > > > Signed-off-by: Jan Vesely <jan.ves...@rutgers.edu> >> > > > --- >> > > > src/gallium/drivers/r600/evergreen_compute.c | 1 + >> > > > 1 file changed, 1 insertion(+) >> > > > >> > > > diff --git a/src/gallium/drivers/r600/evergreen_compute.c >> > > > b/src/gallium/drivers/r600/evergreen_compute.c >> > > > index 027930b586..5070243914 100644 >> > > > --- a/src/gallium/drivers/r600/evergreen_compute.c >> > > > +++ b/src/gallium/drivers/r600/evergreen_compute.c >> > > > @@ -463,6 +463,7 @@ static void evergreen_delete_compute_state(struct >> > > > pipe_context *ctx, void *state >> > > > #ifdef HAVE_OPENCL >> > > > radeon_shader_binary_clean(&shader->binary); >> > > > pipe_resource_reference(&shader->code_bo, NULL); >> > > >> > > The stable branches do not have this ^^^ pipe_resource_reference call, >> > > so the patch does not apply. Can you make a proper backport of the fix >> > > to clarify your intentions for stable? >> > > >> > > > + pipe_resource_reference(&shader->kernel_param, NULL); >> > > > #endif >> > > > r600_destroy_shader(&shader->bc); >> > > > } >> > > > -- >> > > > 2.17.0 >> > > > >> > > > _______________________________________________ >> > > > mesa-stable mailing list >> > > > mesa-sta...@lists.freedesktop.org >> > > > https://lists.freedesktop.org/mailman/listinfo/mesa-stable >> > > >> > > _______________________________________________ >> > > mesa-stable mailing list >> > > mesa-sta...@lists.freedesktop.org >> > > https://lists.freedesktop.org/mailman/listinfo/mesa-stable > _______________________________________________ > mesa-stable mailing list > mesa-sta...@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/mesa-stable _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev
