mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-23 07:22:33 +00:00
67 lines
2.2 KiB
Diff
67 lines
2.2 KiB
Diff
|
From f9211d36925dac42f910d7d2e4c370e414fd24d2 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Maxime Ripard <maxime@cerno.tech>
|
||
|
|
Date: Thu, 3 Dec 2020 14:25:36 +0100
|
||
|
|
Subject: [PATCH] drm/vc4: drv: Remove the DSI pointer in vc4_drv
|
||
|
|
|
||
|
|
Commit 51f4fcd9c4ea867c3b4fe58111f342ad0e80642a upstream.
|
||
|
|
|
||
|
|
That pointer isn't used anywhere, so there's no point in keeping it.
|
||
|
|
|
||
|
|
Reviewed-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
|
||
|
|
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
|
||
|
|
Link: https://patchwork.freedesktop.org/patch/msgid/20201203132543.861591-2-maxime@cerno.tech
|
||
|
|
---
|
||
|
|
drivers/gpu/drm/vc4/vc4_drv.h | 1 -
|
||
|
|
drivers/gpu/drm/vc4/vc4_dsi.c | 9 ---------
|
||
|
|
2 files changed, 10 deletions(-)
|
||
|
|
|
||
|
|
--- a/drivers/gpu/drm/vc4/vc4_drv.h
|
||
|
|
+++ b/drivers/gpu/drm/vc4/vc4_drv.h
|
||
|
|
@@ -81,7 +81,6 @@ struct vc4_dev {
|
||
|
|
struct vc4_hvs *hvs;
|
||
|
|
struct vc4_v3d *v3d;
|
||
|
|
struct vc4_dpi *dpi;
|
||
|
|
- struct vc4_dsi *dsi1;
|
||
|
|
struct vc4_vec *vec;
|
||
|
|
struct vc4_txp *txp;
|
||
|
|
struct vc4_fkms *fkms;
|
||
|
|
--- a/drivers/gpu/drm/vc4/vc4_dsi.c
|
||
|
|
+++ b/drivers/gpu/drm/vc4/vc4_dsi.c
|
||
|
|
@@ -1451,7 +1451,6 @@ static int vc4_dsi_bind(struct device *d
|
||
|
|
{
|
||
|
|
struct platform_device *pdev = to_platform_device(dev);
|
||
|
|
struct drm_device *drm = dev_get_drvdata(master);
|
||
|
|
- struct vc4_dev *vc4 = to_vc4_dev(drm);
|
||
|
|
struct vc4_dsi *dsi = dev_get_drvdata(dev);
|
||
|
|
struct vc4_dsi_encoder *vc4_dsi_encoder;
|
||
|
|
struct drm_panel *panel;
|
||
|
|
@@ -1604,9 +1603,6 @@ static int vc4_dsi_bind(struct device *d
|
||
|
|
if (ret)
|
||
|
|
return ret;
|
||
|
|
|
||
|
|
- if (dsi->port == 1)
|
||
|
|
- vc4->dsi1 = dsi;
|
||
|
|
-
|
||
|
|
drm_simple_encoder_init(drm, dsi->encoder, DRM_MODE_ENCODER_DSI);
|
||
|
|
drm_encoder_helper_add(dsi->encoder, &vc4_dsi_encoder_helper_funcs);
|
||
|
|
|
||
|
|
@@ -1635,8 +1631,6 @@ static int vc4_dsi_bind(struct device *d
|
||
|
|
static void vc4_dsi_unbind(struct device *dev, struct device *master,
|
||
|
|
void *data)
|
||
|
|
{
|
||
|
|
- struct drm_device *drm = dev_get_drvdata(master);
|
||
|
|
- struct vc4_dev *vc4 = to_vc4_dev(drm);
|
||
|
|
struct vc4_dsi *dsi = dev_get_drvdata(dev);
|
||
|
|
|
||
|
|
if (dsi->bridge)
|
||
|
|
@@ -1648,9 +1642,6 @@ static void vc4_dsi_unbind(struct device
|
||
|
|
*/
|
||
|
|
list_splice_init(&dsi->bridge_chain, &dsi->encoder->bridge_chain);
|
||
|
|
drm_encoder_cleanup(dsi->encoder);
|
||
|
|
-
|
||
|
|
- if (dsi->port == 1)
|
||
|
|
- vc4->dsi1 = NULL;
|
||
|
|
}
|
||
|
|
|
||
|
|
static const struct component_ops vc4_dsi_ops = {
|