0466-drm-vc4-Drop-firmware-node-getting-now-that-we-use-t.patch 1.5 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354
  1. From 264c236d49fb92d3d1e47a2a246f92c94be8a9c7 Mon Sep 17 00:00:00 2001
  2. From: Eric Anholt <eric@anholt.net>
  3. Date: Fri, 12 Aug 2016 10:45:04 -0700
  4. Subject: [PATCH] drm/vc4: Drop firmware node getting now that we use the power
  5. domain.
  6. ---
  7. drivers/gpu/drm/vc4/vc4_drv.c | 10 ----------
  8. drivers/gpu/drm/vc4/vc4_drv.h | 1 -
  9. 2 files changed, 11 deletions(-)
  10. --- a/drivers/gpu/drm/vc4/vc4_drv.c
  11. +++ b/drivers/gpu/drm/vc4/vc4_drv.c
  12. @@ -15,7 +15,6 @@
  13. #include <linux/module.h>
  14. #include <linux/of_platform.h>
  15. #include <linux/platform_device.h>
  16. -#include <soc/bcm2835/raspberrypi-firmware.h>
  17. #include "drm_fb_cma_helper.h"
  18. #include "uapi/drm/vc4_drm.h"
  19. @@ -204,7 +203,6 @@ static int vc4_drm_bind(struct device *d
  20. struct drm_device *drm;
  21. struct drm_connector *connector;
  22. struct vc4_dev *vc4;
  23. - struct device_node *firmware_node;
  24. int ret = 0;
  25. dev->coherent_dma_mask = DMA_BIT_MASK(32);
  26. @@ -213,14 +211,6 @@ static int vc4_drm_bind(struct device *d
  27. if (!vc4)
  28. return -ENOMEM;
  29. - firmware_node = of_parse_phandle(dev->of_node, "firmware", 0);
  30. - vc4->firmware = rpi_firmware_get(firmware_node);
  31. - if (!vc4->firmware) {
  32. - DRM_DEBUG("Failed to get Raspberry Pi firmware reference.\n");
  33. - return -EPROBE_DEFER;
  34. - }
  35. - of_node_put(firmware_node);
  36. -
  37. drm = drm_dev_alloc(&vc4_drm_driver, dev);
  38. if (!drm)
  39. return -ENOMEM;
  40. --- a/drivers/gpu/drm/vc4/vc4_drv.h
  41. +++ b/drivers/gpu/drm/vc4/vc4_drv.h
  42. @@ -23,7 +23,6 @@ struct vc4_dev {
  43. struct vc4_dsi *dsi1;
  44. struct drm_fbdev_cma *fbdev;
  45. - struct rpi_firmware *firmware;
  46. struct vc4_hang_state *hang_state;