On Wed, Mar 25, 2015 at 10:04:09AM +1000, Dave Airlie wrote: > On 25 March 2015 at 09:48, Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx> wrote: > > drm/i915: Don't try to reference the fb in get_initial_plane_config() > > > > On Mon, Mar 23, 2015 at 7:11 PM, Dave Airlie <airlied@xxxxxxxx> wrote: > >> > >> a few people reported an oops that looks to be fixed in drm-next already, > >> so I've pulled the patch back. > > > > Hmm. At least from Josh's report, he also needs > > > > drm/i915: Don't try to reference the fb in get_initial_plane_config() > > > > in addition to the commit you have. > > > > Should I perhaps wait for that one too? Daniel? > > Yes, Daniel indicated to Jani this morning we should pull this, so > I'll sidestep the middle man here for expediency. There's going to be one more (waiting for confirmation since I can't repro here). But with these I think we have at least the oopses under control, the remaining one is just paranoid state self-checks. I hope ;-) And since this is all a bit unpleasant for -rc5 I've thought a bit about what needs to be improved: - I'll be more broken record about correctly referencing commits that have introduced an issue. Some of the fixes in -next didn't have these references, so when we cherry-picked the first one it was hard to find the follow-up fixups. - I'm stitching together a short scriptlet for cherry-picking to make sure we don't forget to look for all the fixup commits next time around. - I'll start a drm-fixes branch to make sure drm core fixes don't get lost when I "temporarily" stash them in my drm-misc -next branch. Cheers, Daniel > > updated pull: > > The following changes since commit 90a5a895cc8b284ac522757a01de15e36710c2b9: > > Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net > (2015-03-23 10:16:13 -0700) > > are available in the git repository at: > > git://people.freedesktop.org/~airlied/linux drm-fixes > > for you to fetch changes up to 59a58cb34d3fe73e6c899cc5d9a87428ca662925: > > drm/i915: Don't try to reference the fb in > get_initial_plane_config() (2015-03-25 10:01:46 +1000) > > ---------------------------------------------------------------- > Damien Lespiau (1): > drm/i915: Don't try to reference the fb in get_initial_plane_config() > > Daniel Vetter (1): > drm: Fixup racy refcounting in plane_force_disable > > drivers/gpu/drm/drm_crtc.c | 13 +------------ > drivers/gpu/drm/i915/intel_display.c | 7 +++---- > 2 files changed, 4 insertions(+), 16 deletions(-) > > > Dave. -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ dri-devel mailing list dri-devel@xxxxxxxxxxxxxxxxxxxxx http://lists.freedesktop.org/mailman/listinfo/dri-devel
