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

Browse source

This branch includes 6 minor fixes mainly for udl. Everything non-trivial was
reviewed by Daniel and the patches have been on the list for quite some time.

* 'drm-fixes' of git://people.freedesktop.org/~dvdhrm/linux:
  drm/gem: dont init "ret" in drm_gem_mmap()
  drm/crtc: add sanity checks to create_dumb()
  drm/gem: free vma-node during object-cleanup
  drm/gem: fix indentation
  drm/udl: fix Bpp calculation in dumb_create()
  drm/udl: fix error-path when damage-req fails

...

This commit is contained in:

Dave Airlie 2014-03-17 10:42:58 +10:00

parent 786a7828bc a8469aa81d

commit 28b90a9e7f

4 changed files with 24 additions and 5 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

17

drivers/gpu/drm/drm_crtc.c

View file

8

drivers/gpu/drm/drm_gem.c

View file

2

drivers/gpu/drm/udl/udl_fb.c

View file

2

drivers/gpu/drm/udl/udl_gem.c

View file