0102-squash-fixups.patch 1.4 KB

12345678910111213141516171819202122232425262728293031323334353637383940414243
  1. From bdbaa2432c1a111c5a2fd492bb1751e4a355b16d 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/381] squash: fixups
  5. ---
  6. drivers/gpu/drm/vc4/Kconfig | 2 +-
  7. drivers/gpu/drm/vc4/vc4_drv.c | 2 +-
  8. drivers/gpu/drm/vc4/vc4_kms.c | 2 +-
  9. 3 files changed, 3 insertions(+), 3 deletions(-)
  10. --- a/drivers/gpu/drm/vc4/Kconfig
  11. +++ b/drivers/gpu/drm/vc4/Kconfig
  12. @@ -1,6 +1,6 @@
  13. config DRM_VC4
  14. tristate "Broadcom VC4 Graphics"
  15. - depends on ARCH_BCM2835 || COMPILE_TEST
  16. + depends on ARCH_BCM2835 || ARCH_BCM2708 || ARCH_BCM2709 || COMPILE_TEST
  17. depends on DRM && HAVE_DMA_ATTRS
  18. select DRM_KMS_HELPER
  19. select DRM_KMS_CMA_HELPER
  20. --- a/drivers/gpu/drm/vc4/vc4_drv.c
  21. +++ b/drivers/gpu/drm/vc4/vc4_drv.c
  22. @@ -127,7 +127,7 @@ static struct drm_driver vc4_drm_driver
  23. .num_ioctls = ARRAY_SIZE(vc4_drm_ioctls),
  24. .fops = &vc4_drm_fops,
  25. - .gem_obj_size = sizeof(struct vc4_bo),
  26. + //.gem_obj_size = sizeof(struct vc4_bo),
  27. .name = DRIVER_NAME,
  28. .desc = DRIVER_DESC,
  29. --- a/drivers/gpu/drm/vc4/vc4_kms.c
  30. +++ b/drivers/gpu/drm/vc4/vc4_kms.c
  31. @@ -45,7 +45,7 @@ vc4_atomic_complete_commit(struct vc4_co
  32. drm_atomic_helper_commit_modeset_disables(dev, state);
  33. - drm_atomic_helper_commit_planes(dev, state);
  34. + drm_atomic_helper_commit_planes(dev, state, false);
  35. drm_atomic_helper_commit_modeset_enables(dev, state);