Commit fd7ee85c authored by Daniel Vetter's avatar Daniel Vetter
Browse files

drm/mcde: Don't use drm_device->dev_private 



Upcasting using a container_of macro is more typesafe, faster and
easier for the compiler to optimize.

v2: Move misplaced removal of double-assignment to this patch (Sam)

Reviewed-by: Linus Walleij <linus.walleij@linaro.org> (v1)
Acked-by: default avatarSam Ravnborg <sam@ravnborg.org>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@intel.com>
Cc: Linus Walleij <linus.walleij@linaro.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20200415074034.175360-30-daniel.vetter@ffwll.ch
parent 6ff71edf

drivers/gpu/drm/mcde/mcde_display.c

+5 −5
Original line number Diff line number Diff line
@@ -948,7 +948,7 @@ static void mcde_display_disable(struct drm_simple_display_pipe *pipe) 
{

	struct drm_crtc *crtc = &pipe->crtc;

	struct drm_device *drm = crtc->dev;

	struct mcde *mcde = drm->dev_private;

	struct mcde *mcde = to_mcde(drm);

	struct drm_pending_vblank_event *event;



	drm_crtc_vblank_off(crtc);
@@ -1020,7 +1020,7 @@ static void mcde_display_update(struct drm_simple_display_pipe *pipe, 
{

	struct drm_crtc *crtc = &pipe->crtc;

	struct drm_device *drm = crtc->dev;

	struct mcde *mcde = drm->dev_private;

	struct mcde *mcde = to_mcde(drm);

	struct drm_pending_vblank_event *event = crtc->state->event;

	struct drm_plane *plane = &pipe->plane;

	struct drm_plane_state *pstate = plane->state;
@@ -1078,7 +1078,7 @@ static int mcde_display_enable_vblank(struct drm_simple_display_pipe *pipe) 
{

	struct drm_crtc *crtc = &pipe->crtc;

	struct drm_device *drm = crtc->dev;

	struct mcde *mcde = drm->dev_private;

	struct mcde *mcde = to_mcde(drm);

	u32 val;



	/* Enable all VBLANK IRQs */
@@ -1097,7 +1097,7 @@ static void mcde_display_disable_vblank(struct drm_simple_display_pipe *pipe) 
{

	struct drm_crtc *crtc = &pipe->crtc;

	struct drm_device *drm = crtc->dev;

	struct mcde *mcde = drm->dev_private;

	struct mcde *mcde = to_mcde(drm);



	/* Disable all VBLANK IRQs */

	writel(0, mcde->regs + MCDE_IMSCPP);
@@ -1117,7 +1117,7 @@ static struct drm_simple_display_pipe_funcs mcde_display_funcs = { 


int mcde_display_init(struct drm_device *drm)

{

	struct mcde *mcde = drm->dev_private;

	struct mcde *mcde = to_mcde(drm);

	int ret;

	static const u32 formats[] = {

		DRM_FORMAT_ARGB8888,

drivers/gpu/drm/mcde/mcde_drm.h

+2 −0
Original line number Diff line number Diff line
@@ -34,6 +34,8 @@ struct mcde { 
	struct regulator *vana;

};



#define to_mcde(dev) container_of(dev, struct mcde, drm)



bool mcde_dsi_irq(struct mipi_dsi_device *mdsi);

void mcde_dsi_te_request(struct mipi_dsi_device *mdsi);

extern struct platform_driver mcde_dsi_driver;

drivers/gpu/drm/mcde/mcde_drv.c

+2 −4
Original line number Diff line number Diff line
@@ -164,7 +164,7 @@ static irqreturn_t mcde_irq(int irq, void *data) 
static int mcde_modeset_init(struct drm_device *drm)

{

	struct drm_mode_config *mode_config;

	struct mcde *mcde = drm->dev_private;

	struct mcde *mcde = to_mcde(drm);

	int ret;



	if (!mcde->bridge) {
@@ -311,13 +311,11 @@ static int mcde_probe(struct platform_device *pdev) 
	if (IS_ERR(mcde))

		return PTR_ERR(mcde);

	drm = &mcde->drm;

	drm->dev_private = mcde;

	mcde->dev = dev;

	platform_set_drvdata(pdev, drm);



	/* Enable continuous updates: this is what Linux' framebuffer expects */

	mcde->oneshot_mode = false;

	drm->dev_private = mcde;



	/* First obtain and turn on the main power */

	mcde->epod = devm_regulator_get(dev, "epod");
@@ -487,7 +485,7 @@ regulator_epod_off: 
static int mcde_remove(struct platform_device *pdev)

{

	struct drm_device *drm = platform_get_drvdata(pdev);

	struct mcde *mcde = drm->dev_private;

	struct mcde *mcde = to_mcde(drm);



	component_master_del(&pdev->dev, &mcde_drm_comp_ops);

	clk_disable_unprepare(mcde->mcde_clk);

drivers/gpu/drm/mcde/mcde_dsi.c

+1 −1
Original line number Diff line number Diff line
@@ -1020,7 +1020,7 @@ static int mcde_dsi_bind(struct device *dev, struct device *master, 
			 void *data)

{

	struct drm_device *drm = data;

	struct mcde *mcde = drm->dev_private;

	struct mcde *mcde = to_mcde(drm);

	struct mcde_dsi *d = dev_get_drvdata(dev);

	struct device_node *child;

	struct drm_panel *panel = NULL;

CRA Git | Maintained and supported by SUSTech CRA and CCSE