[Intel-gfx] [PATCH 3.16.y-ckt 030/168] drm/i915: Handle failure to kick out a conflicting fb driver

[Ben Hutchings]

On Mon, 2015-01-12 at 18:20 +0100, Daniel Vetter wrote:
> On Sun, Jan 11, 2015 at 10:49 PM, Ben Hutchings <ben at decadent.org.uk> wrote:
> > On Mon, 2014-12-15 at 14:24 +0000, Luis Henriques wrote:
> >> 3.16.7-ckt3 -stable review patch.  If anyone has any objections, please let me know.
> >>
> >> ------------------
> >>
> >> From: Chris Wilson <chris at chris-wilson.co.uk>
> >>
> >> commit f96de58fc7e7d3d717c7c63975c3b896c906b5e3 upstream.
> >>
> >> Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
> >> Reviewed-by: Jani Nikula <jani.nikula at intel.com>
> >> Signed-off-by: Daniel Vetter <daniel.vetter at ffwll.ch>
> >> Signed-off-by: Luis Henriques <luis.henriques at canonical.com>
> >
> > Should this also be applied to any older stable branches?
> >
> > i915_kick_out_firmware_fb() was introduced in 3.6 and it has always been
> > possible for the alloc_apertures() call to fail.
> >
> > remove_conflicting_framebuffers() has returned an error code since 3.14
> > (but could silently fail before then!) so this should be applicable to
> > the 3.14 stable branch too.
> 
> tbh I don't know why this patch ended up in a stable kernel, at least
> I didn't find anything where we (drm/i915 maintainers) marked it as
> such. And there's no bugzilla references added either. Imo the patch
> doesn't qualify for stable (it's not a real-world bug afaik).
[...]

It seems to be a dependency of:

commit 0485c9dc24ec0939b42ca5104c0373297506b555
Author: Daniel Vetter <daniel.vetter at ffwll.ch>
Date:   Fri Nov 14 10:09:49 2014 +0100

    drm/i915: Kick fbdev before vgacon

which was requested for 3.16+.

So, neither of these is needed for earlier versions.  Sorry for the
noise.

Ben.

-- 
Ben Hutchings
The world is coming to an end.	Please log off.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 811 bytes
Desc: This is a digitally signed message part
URL: <http://lists.freedesktop.org/archives/intel-gfx/attachments/20150112/3eeefb85/attachment.sig>