On Tue, 13 Feb 2018, Tvrtko Ursulin <tursulin@xxxxxxxxxxx> wrote: > On 13/02/18 07:38, Rodrigo Vivi wrote: >> >> These patches failed to cherry-pick on drm-intel-fixes >> >> Please provide a backport or advise how to proceed. >> >> fd10e2ce9905 ("drm/i915/breadcrumbs: Ignore unsubmitted signalers") >> 1fe699e30113 ("drm/i915/pmu: Fix sleep under atomic in RC6 readout") > > > I'm building at the moment in order to test and then I'll send some > patches. Plural because, since drm-intel-fixes includes: > > commit 4900727d35bb20028f9bd83146ec4bf78afffe30 > Author: Chris Wilson <chris@xxxxxxxxxxxxxxxxxx> > Date: Thu Jan 11 07:30:31 2018 +0000 > > drm/i915/pmu: Reconstruct active state on starting busy-stats > > > We need to include a chain of two more fixups: > > commit 99e48bf98dd036090b480a12c39e8b971731247e > Author: Chris Wilson <chris@xxxxxxxxxxxxxxxxxx> > Date: Mon Jan 15 09:20:41 2018 +0000 > > drm/i915: Lock out execlist tasklet while peeking inside for busy-stats > > > commit b2f78cda260bc6a1a2d382b1d85a29e69b5b3724 > Author: Tvrtko Ursulin <tvrtko.ursulin@xxxxxxxxx> > Date: Mon Feb 5 09:34:48 2018 +0000 > > drm/i915/pmu: Fix PMU enable vs execlists tasklet race > > > And then the referenced fix, plus another fixup: > > commit 1fe699e30113ed6f6e853ff44710d256072ea627 > Author: Tvrtko Ursulin <tvrtko.ursulin@xxxxxxxxx> > Date: Tue Feb 6 18:33:11 2018 +0000 > > drm/i915/pmu: Fix sleep under atomic in RC6 readout > > commit 05273c950a3c93c5f96be8807eaf24f2cc9f1c1e > Author: Chris Wilson <chris@xxxxxxxxxxxxxxxxxx> > Date: Wed Feb 7 16:04:28 2018 +0000 > > drm/i915/pmu: Fix building without CONFIG_PM > > > I'll send them when I test my rebases. Please add the original dinq commit references in the format (cherry picked from commit fd10e2ce9905030d922e179a8047a4d50daffd8e) to the backports. Thanks, Jani. -- Jani Nikula, Intel Open Source Technology Center _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/intel-gfx