[git pull] drm urgent fix

Dave Airlie airlied at gmail.com
Tue Mar 24 17:04:09 PDT 2015


On 25 March 2015 at 09:48, Linus Torvalds <torvalds at linux-foundation.org> 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 at linux.ie> 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.

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.


More information about the dri-devel mailing list