Merge tag 'drm-misc-fixes-2017-02-09' of git://anongit.freedesktop.org/git/drm-misc into drm-fixes

Last-minute vc4 fix for 4.10.

* tag 'drm-misc-fixes-2017-02-09' of git://anongit.freedesktop.org/git/drm-misc:
  drm: vc4: adapt to new behaviour of drm_crtc.c
This commit is contained in:
Dave Airlie 2017-02-10 10:14:01 +10:00
commit 811b40c83d

View File

@ -858,7 +858,7 @@ struct drm_plane *vc4_plane_init(struct drm_device *dev,
} }
} }
plane = &vc4_plane->base; plane = &vc4_plane->base;
ret = drm_universal_plane_init(dev, plane, 0xff, ret = drm_universal_plane_init(dev, plane, 0,
&vc4_plane_funcs, &vc4_plane_funcs,
formats, num_formats, formats, num_formats,
type, NULL); type, NULL);