Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux

Browse source

Pull DRM fixes from Dave Airlie:
 "Two core fixes, both regressions, along with some intel and some
  nouveau fixes for regressions and oopses"

* 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
  drm: correctly restore mappings if drm_open fails
  drm/nouveau: fix NULL ptr dereference from nv50_disp_intr()
  drm/nouveau: fix handling empty channel list in ioctl's
  drm: don't unlock in the addfb error paths
  drm/i915: Fix build failure
  drm/i915: Be sure to turn hsync/vsync back on at crt enable (v2)
  drm/i915: duct-tape locking when eDP init fails

...

This commit is contained in:

Linus Torvalds 2013-04-02 18:52:24 -07:00

parent aea7fab8ba a8ec3a6629

commit bd709bd027

8 changed files with 56 additions and 49 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

2

drivers/gpu/drm/drm_crtc.c

View file

6

drivers/gpu/drm/drm_fops.c

View file

2

drivers/gpu/drm/i915/i915_gem_execbuffer.c

View file

40

drivers/gpu/drm/i915/intel_crt.c

View file

3

drivers/gpu/drm/i915/intel_dp.c

View file

18

drivers/gpu/drm/nouveau/nouveau_abi16.c

View file

32

drivers/gpu/drm/nouveau/nouveau_drm.c

View file

2

drivers/gpu/drm/nouveau/nouveau_drm.h

View file