diff options
| author | Dave Airlie <airlied@redhat.com> | 2017-02-10 10:14:01 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2017-02-10 10:14:01 +1000 |
| commit | 811b40c83db047ba22a0c5b638186ed2b8c9810c (patch) | |
| tree | aa586d7c3da7c4a3630342c3f05d963dd5315a33 | |
| parent | 5d18a619976944dc3114bbe1525880c431196c7a (diff) | |
| parent | 49d29a077af8d2ee3b291ccd8d053541bebe09d7 (diff) | |
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
| -rw-r--r-- | drivers/gpu/drm/vc4/vc4_plane.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/vc4/vc4_plane.c b/drivers/gpu/drm/vc4/vc4_plane.c index 881bf489478b..686cdd3c86f2 100644 --- a/drivers/gpu/drm/vc4/vc4_plane.c +++ b/drivers/gpu/drm/vc4/vc4_plane.c @@ -858,7 +858,7 @@ struct drm_plane *vc4_plane_init(struct drm_device *dev, } } plane = &vc4_plane->base; - ret = drm_universal_plane_init(dev, plane, 0xff, + ret = drm_universal_plane_init(dev, plane, 0, &vc4_plane_funcs, formats, num_formats, type, NULL); |