mirror of
https://github.com/Fishwaldo/build.git
synced 2025-03-28 09:41:41 +00:00
68 lines
2.3 KiB
Diff
68 lines
2.3 KiB
Diff
From 9fef18b9a29bb46c33bd724b1f66296b69fa65df Mon Sep 17 00:00:00 2001
|
|
From: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
|
|
Date: Tue, 17 Jan 2017 10:28:55 +0200
|
|
Subject: [PATCH 15/93] drm: bridge: dw-hdmi: Remove encoder field from struct
|
|
dw_hdmi
|
|
|
|
The field isn't needed, remove it.
|
|
|
|
Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
|
|
Reviewed-by: Jose Abreu <joabreu@synopsys.com>
|
|
Signed-off-by: Archit Taneja <architt@codeaurora.org>
|
|
Link: http://patchwork.freedesktop.org/patch/msgid/20170117082910.27023-6-laurent.pinchart+renesas@ideasonboard.com
|
|
---
|
|
drivers/gpu/drm/bridge/dw-hdmi.c | 9 +++------
|
|
1 file changed, 3 insertions(+), 6 deletions(-)
|
|
|
|
diff --git a/drivers/gpu/drm/bridge/dw-hdmi.c b/drivers/gpu/drm/bridge/dw-hdmi.c
|
|
index 2c85b6c..ef10bb8 100644
|
|
--- a/drivers/gpu/drm/bridge/dw-hdmi.c
|
|
+++ b/drivers/gpu/drm/bridge/dw-hdmi.c
|
|
@@ -115,7 +115,6 @@ struct dw_hdmi_i2c {
|
|
|
|
struct dw_hdmi {
|
|
struct drm_connector connector;
|
|
- struct drm_encoder *encoder;
|
|
struct drm_bridge bridge;
|
|
|
|
struct platform_device *audio;
|
|
@@ -1816,9 +1815,8 @@ static irqreturn_t dw_hdmi_irq(int irq, void *dev_id)
|
|
return IRQ_HANDLED;
|
|
}
|
|
|
|
-static int dw_hdmi_register(struct drm_device *drm, struct dw_hdmi *hdmi)
|
|
+static int dw_hdmi_register(struct drm_encoder *encoder, struct dw_hdmi *hdmi)
|
|
{
|
|
- struct drm_encoder *encoder = hdmi->encoder;
|
|
struct drm_bridge *bridge = &hdmi->bridge;
|
|
int ret;
|
|
|
|
@@ -1835,7 +1833,7 @@ static int dw_hdmi_register(struct drm_device *drm, struct dw_hdmi *hdmi)
|
|
drm_connector_helper_add(&hdmi->connector,
|
|
&dw_hdmi_connector_helper_funcs);
|
|
|
|
- drm_connector_init(drm, &hdmi->connector,
|
|
+ drm_connector_init(encoder->dev, &hdmi->connector,
|
|
&dw_hdmi_connector_funcs,
|
|
DRM_MODE_CONNECTOR_HDMIA);
|
|
|
|
@@ -1867,7 +1865,6 @@ int dw_hdmi_bind(struct device *dev, struct drm_encoder *encoder,
|
|
hdmi->dev = dev;
|
|
hdmi->dev_type = plat_data->dev_type;
|
|
hdmi->sample_rate = 48000;
|
|
- hdmi->encoder = encoder;
|
|
hdmi->disabled = true;
|
|
hdmi->rxsense = true;
|
|
hdmi->phy_mask = (u8)~(HDMI_PHY_HPD | HDMI_PHY_RX_SENSE);
|
|
@@ -1980,7 +1977,7 @@ int dw_hdmi_bind(struct device *dev, struct drm_encoder *encoder,
|
|
if (ret)
|
|
goto err_iahb;
|
|
|
|
- ret = dw_hdmi_register(encoder->dev, hdmi);
|
|
+ ret = dw_hdmi_register(encoder, hdmi);
|
|
if (ret)
|
|
goto err_iahb;
|
|
|
|
--
|
|
1.9.1
|
|
|