aboutsummaryrefslogtreecommitdiff
path: root/drivers/gpu/drm/drm_plane.c
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2019-04-19 12:37:38 +0100
committerMark Brown <broonie@kernel.org>2019-04-19 12:37:38 +0100
commita48dff1bc041d1d267e7ceff1bb4cf4185c3729b (patch)
tree0b3956a2dc9d6baa31fa0c8eab6e4845774c4214 /drivers/gpu/drm/drm_plane.c
parent642f61354ac697e2127c097101c33b70c4848c45 (diff)
parent8fd8f8d65bf56aaa80c7ae5eaf26afd586139683 (diff)
Merge branch 'linux-linaro-lsk-v4.14' into linux-linaro-lsk-v4.14-rtlinux-linaro-lsk-v4.14-rt
Diffstat (limited to 'drivers/gpu/drm/drm_plane.c')
-rw-r--r--drivers/gpu/drm/drm_plane.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/gpu/drm/drm_plane.c b/drivers/gpu/drm/drm_plane.c
index 7a00351d5b5d..71186bf90760 100644
--- a/drivers/gpu/drm/drm_plane.c
+++ b/drivers/gpu/drm/drm_plane.c
@@ -203,6 +203,9 @@ int drm_universal_plane_init(struct drm_device *dev, struct drm_plane *plane,
format_modifier_count++;
}
+ if (format_modifier_count)
+ config->allow_fb_modifiers = true;
+
plane->modifier_count = format_modifier_count;
plane->modifiers = kmalloc_array(format_modifier_count,
sizeof(format_modifiers[0]),