aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2017-02-09 19:14:01 -0500
committerDave Airlie <airlied@redhat.com>2017-02-09 19:14:01 -0500
commit811b40c83db047ba22a0c5b638186ed2b8c9810c (patch)
treeaa586d7c3da7c4a3630342c3f05d963dd5315a33
parent5d18a619976944dc3114bbe1525880c431196c7a (diff)
parent49d29a077af8d2ee3b291ccd8d053541bebe09d7 (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.c2
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,
858 } 858 }
859 } 859 }
860 plane = &vc4_plane->base; 860 plane = &vc4_plane->base;
861 ret = drm_universal_plane_init(dev, plane, 0xff, 861 ret = drm_universal_plane_init(dev, plane, 0,
862 &vc4_plane_funcs, 862 &vc4_plane_funcs,
863 formats, num_formats, 863 formats, num_formats,
864 type, NULL); 864 type, NULL);