55 lines
1.5 KiB
Diff
55 lines
1.5 KiB
Diff
From 264c236d49fb92d3d1e47a2a246f92c94be8a9c7 Mon Sep 17 00:00:00 2001
|
|
From: Eric Anholt <eric@anholt.net>
|
|
Date: Fri, 12 Aug 2016 10:45:04 -0700
|
|
Subject: [PATCH] drm/vc4: Drop firmware node getting now that we use the power
|
|
domain.
|
|
|
|
---
|
|
drivers/gpu/drm/vc4/vc4_drv.c | 10 ----------
|
|
drivers/gpu/drm/vc4/vc4_drv.h | 1 -
|
|
2 files changed, 11 deletions(-)
|
|
|
|
--- a/drivers/gpu/drm/vc4/vc4_drv.c
|
|
+++ b/drivers/gpu/drm/vc4/vc4_drv.c
|
|
@@ -15,7 +15,6 @@
|
|
#include <linux/module.h>
|
|
#include <linux/of_platform.h>
|
|
#include <linux/platform_device.h>
|
|
-#include <soc/bcm2835/raspberrypi-firmware.h>
|
|
#include "drm_fb_cma_helper.h"
|
|
|
|
#include "uapi/drm/vc4_drm.h"
|
|
@@ -204,7 +203,6 @@ static int vc4_drm_bind(struct device *d
|
|
struct drm_device *drm;
|
|
struct drm_connector *connector;
|
|
struct vc4_dev *vc4;
|
|
- struct device_node *firmware_node;
|
|
int ret = 0;
|
|
|
|
dev->coherent_dma_mask = DMA_BIT_MASK(32);
|
|
@@ -213,14 +211,6 @@ static int vc4_drm_bind(struct device *d
|
|
if (!vc4)
|
|
return -ENOMEM;
|
|
|
|
- firmware_node = of_parse_phandle(dev->of_node, "firmware", 0);
|
|
- vc4->firmware = rpi_firmware_get(firmware_node);
|
|
- if (!vc4->firmware) {
|
|
- DRM_DEBUG("Failed to get Raspberry Pi firmware reference.\n");
|
|
- return -EPROBE_DEFER;
|
|
- }
|
|
- of_node_put(firmware_node);
|
|
-
|
|
drm = drm_dev_alloc(&vc4_drm_driver, dev);
|
|
if (!drm)
|
|
return -ENOMEM;
|
|
--- a/drivers/gpu/drm/vc4/vc4_drv.h
|
|
+++ b/drivers/gpu/drm/vc4/vc4_drv.h
|
|
@@ -23,7 +23,6 @@ struct vc4_dev {
|
|
struct vc4_dsi *dsi1;
|
|
|
|
struct drm_fbdev_cma *fbdev;
|
|
- struct rpi_firmware *firmware;
|
|
|
|
struct vc4_hang_state *hang_state;
|
|
|