Merge branch 'drm/next/rcar-du' of git://linuxtv.org/pinchartl/fbdev into drm-next

Browse source

rcar-du fixes
* 'drm/next/rcar-du' of git://linuxtv.org/pinchartl/fbdev:
  drm: rcar-du: Split planes pre-association 4/4 between CRTCs
  drm: rcar-du: Store the number of CRTCs per group in the group structure
  drm: rcar-du: Consider plane to CRTC associations in the plane allocator
  drm: rcar-du: Keep plane to CRTC associations when disabling a plane
  drm: rcar-du: Add plane allocation debugging
  drm: rcar-du: Rename to_rcar_du_plane_state to to_rcar_plane_state
  drm: rcar-du: Embed rcar_du_planes structure into rcar_du_group
  drm: rcar-du: Move properties from rcar_du_planes to rcar_du_device
  drm: rcar-du: Document the rcar_du_plane_state structure
  drm: rcar-du: Document the rcar_du_crtc structure

...

This commit is contained in:

Dave Airlie 2015-05-26 16:19:53 +10:00

parent bdcddf95e8 2610abfb3a

commit f025705e73

8 changed files with 195 additions and 97 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

61

drivers/gpu/drm/rcar-du/rcar_du_crtc.c

View file

14

drivers/gpu/drm/rcar-du/rcar_du_crtc.h

View file

6

drivers/gpu/drm/rcar-du/rcar_du_drv.h

View file

6

drivers/gpu/drm/rcar-du/rcar_du_group.c

View file

8

drivers/gpu/drm/rcar-du/rcar_du_group.h

View file

105

drivers/gpu/drm/rcar-du/rcar_du_kms.c

View file

71

drivers/gpu/drm/rcar-du/rcar_du_plane.c

View file

21

drivers/gpu/drm/rcar-du/rcar_du_plane.h

View file