Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4d6b7da7 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Revert "drm/panel: Add and fill drm_panel type field" 



This reverts commit 64b76abf which is
commit 9a2654c0f62a1704f36acb6329f9ccbd539f75ad upstream.

It breaks the Android abi and is not needed for any Android systems.  If
it is required in the future, it can come back in an abi-safe way.

Bug: 161946584
Change-Id: Idfbd072361ba097010fc168a3a81aa853c0b6b0e
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parent 7d6c570f

drivers/gpu/drm/drm_panel.c

+1 −4
Original line number Diff line number Diff line
@@ -46,20 +46,17 @@ static LIST_HEAD(panel_list); 
 * @panel: DRM panel

 * @dev: parent device of the panel

 * @funcs: panel operations

 * @connector_type: the connector type (DRM_MODE_CONNECTOR_*) corresponding to

 *	the panel interface

 *

 * Initialize the panel structure for subsequent registration with

 * drm_panel_add().

 */

void drm_panel_init(struct drm_panel *panel, struct device *dev,

		    const struct drm_panel_funcs *funcs, int connector_type)

		    const struct drm_panel_funcs *funcs)

{

	INIT_LIST_HEAD(&panel->list);

	BLOCKING_INIT_NOTIFIER_HEAD(&panel->nh);

	panel->dev = dev;

	panel->funcs = funcs;

	panel->connector_type = connector_type;

}

EXPORT_SYMBOL(drm_panel_init);

drivers/gpu/drm/panel/panel-arm-versatile.c

+1 −2
Original line number Diff line number Diff line
@@ -350,8 +350,7 @@ static int versatile_panel_probe(struct platform_device *pdev) 
			dev_info(dev, "panel mounted on IB2 daughterboard\n");

	}



	drm_panel_init(&vpanel->panel, dev, &versatile_panel_drm_funcs,

		       DRM_MODE_CONNECTOR_DPI);

	drm_panel_init(&vpanel->panel, dev, &versatile_panel_drm_funcs);



	return drm_panel_add(&vpanel->panel);

}

drivers/gpu/drm/panel/panel-feiyang-fy07024di26a30d.c

+1 −2
Original line number Diff line number Diff line
@@ -204,8 +204,7 @@ static int feiyang_dsi_probe(struct mipi_dsi_device *dsi) 
	mipi_dsi_set_drvdata(dsi, ctx);

	ctx->dsi = dsi;



	drm_panel_init(&ctx->panel, &dsi->dev, &feiyang_funcs,

		       DRM_MODE_CONNECTOR_DSI);

	drm_panel_init(&ctx->panel, &dsi->dev, &feiyang_funcs);



	ctx->dvdd = devm_regulator_get(&dsi->dev, "dvdd");

	if (IS_ERR(ctx->dvdd)) {

drivers/gpu/drm/panel/panel-ilitek-ili9322.c

+1 −2
Original line number Diff line number Diff line
@@ -895,8 +895,7 @@ static int ili9322_probe(struct spi_device *spi) 
		ili->input = ili->conf->input;

	}



	drm_panel_init(&ili->panel, dev, &ili9322_drm_funcs,

		       DRM_MODE_CONNECTOR_DPI);

	drm_panel_init(&ili->panel, dev, &ili9322_drm_funcs);



	return drm_panel_add(&ili->panel);

}

drivers/gpu/drm/panel/panel-ilitek-ili9881c.c

+1 −2
Original line number Diff line number Diff line
@@ -433,8 +433,7 @@ static int ili9881c_dsi_probe(struct mipi_dsi_device *dsi) 
	mipi_dsi_set_drvdata(dsi, ctx);

	ctx->dsi = dsi;



	drm_panel_init(&ctx->panel, &dsi->dev, &ili9881c_funcs,

		       DRM_MODE_CONNECTOR_DSI);

	drm_panel_init(&ctx->panel, &dsi->dev, &ili9881c_funcs);



	ctx->power = devm_regulator_get(&dsi->dev, "power");

	if (IS_ERR(ctx->power)) {