1 From 17f4de0c9daea638476ca0f80123d3523e66fdc0 Mon Sep 17 00:00:00 2001
2 From: popcornmix <popcornmix@gmail.com>
3 Date: Wed, 18 Nov 2015 18:29:58 +0000
4 Subject: [PATCH 102/232] squash: fixups
7 drivers/gpu/drm/vc4/Kconfig | 2 +-
8 drivers/gpu/drm/vc4/vc4_drv.c | 2 +-
9 drivers/gpu/drm/vc4/vc4_kms.c | 2 +-
10 3 files changed, 3 insertions(+), 3 deletions(-)
12 --- a/drivers/gpu/drm/vc4/Kconfig
13 +++ b/drivers/gpu/drm/vc4/Kconfig
16 tristate "Broadcom VC4 Graphics"
17 - depends on ARCH_BCM2835 || COMPILE_TEST
18 + depends on ARCH_BCM2835 || ARCH_BCM2708 || ARCH_BCM2709 || COMPILE_TEST
19 depends on DRM && HAVE_DMA_ATTRS
21 select DRM_KMS_CMA_HELPER
22 --- a/drivers/gpu/drm/vc4/vc4_drv.c
23 +++ b/drivers/gpu/drm/vc4/vc4_drv.c
24 @@ -127,7 +127,7 @@ static struct drm_driver vc4_drm_driver
25 .num_ioctls = ARRAY_SIZE(vc4_drm_ioctls),
26 .fops = &vc4_drm_fops,
28 - .gem_obj_size = sizeof(struct vc4_bo),
29 + //.gem_obj_size = sizeof(struct vc4_bo),
33 --- a/drivers/gpu/drm/vc4/vc4_kms.c
34 +++ b/drivers/gpu/drm/vc4/vc4_kms.c
35 @@ -45,7 +45,7 @@ vc4_atomic_complete_commit(struct vc4_co
37 drm_atomic_helper_commit_modeset_disables(dev, state);
39 - drm_atomic_helper_commit_planes(dev, state);
40 + drm_atomic_helper_commit_planes(dev, state, false);
42 drm_atomic_helper_commit_modeset_enables(dev, state);