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

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

Revert "drm/panel: Initialise panel dev and funcs through drm_panel_init()" 



This reverts commit 362940f8 which is
commit 6dbe0c4b0fc0646442b2b1580d022404e582fd7b 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: I4df07557f05d05ef1d0762a5392ed7203894fb56
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parent 4d6b7da7

drivers/gpu/drm/drm_panel.c

+3 −8
Original line number Diff line number Diff line
@@ -44,19 +44,14 @@ static LIST_HEAD(panel_list); 
/**

 * drm_panel_init - initialize a panel

 * @panel: DRM panel

 * @dev: parent device of the panel

 * @funcs: panel operations

 *

 * Initialize the panel structure for subsequent registration with

 * drm_panel_add().

 * Sets up internal fields of the panel so that it can subsequently be added

 * to the registry.

 */

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

		    const struct drm_panel_funcs *funcs)

void drm_panel_init(struct drm_panel *panel)

{

	INIT_LIST_HEAD(&panel->list);

	BLOCKING_INIT_NOTIFIER_HEAD(&panel->nh);

	panel->dev = dev;

	panel->funcs = funcs;

}

EXPORT_SYMBOL(drm_panel_init);

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

+3 −1
Original line number Diff line number Diff line
@@ -350,7 +350,9 @@ 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_panel_init(&vpanel->panel);

	vpanel->panel.dev = dev;

	vpanel->panel.funcs = &versatile_panel_drm_funcs;



	return drm_panel_add(&vpanel->panel);

}

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

+3 −1
Original line number Diff line number Diff line
@@ -204,7 +204,9 @@ 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_panel_init(&ctx->panel);

	ctx->panel.dev = &dsi->dev;

	ctx->panel.funcs = &feiyang_funcs;



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

	if (IS_ERR(ctx->dvdd)) {

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

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

	}



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

	drm_panel_init(&ili->panel);

	ili->panel.dev = dev;

	ili->panel.funcs = &ili9322_drm_funcs;



	return drm_panel_add(&ili->panel);

}

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

+3 −1
Original line number Diff line number Diff line
@@ -433,7 +433,9 @@ 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_panel_init(&ctx->panel);

	ctx->panel.dev = &dsi->dev;

	ctx->panel.funcs = &ili9881c_funcs;



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

	if (IS_ERR(ctx->power)) {