Commit 3ea66a79 authored by Daniel Vetter's avatar Daniel Vetter
Browse files

drm/arc: Inline arcpgu_drm_hdmi_init 



Really not worth the function, much less the separate file now that
almost all the code is gone.

Acked-by: default avatarThomas Zimmermann <tzimmermann@suse.de>
Cc: Eugeniy Paltsev <Eugeniy.Paltsev@synopsys.com>
Cc: Alexey Brodkin <abrodkin@synopsys.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210112084358.2771527-12-daniel.vetter@ffwll.ch
parent e2c406ea

drivers/gpu/drm/arc/Makefile

+1 −1
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0-only

arcpgu-y := arcpgu_hdmi.o arcpgu_sim.o arcpgu_drv.o

arcpgu-y := arcpgu_sim.o arcpgu_drv.o

obj-$(CONFIG_DRM_ARCPGU) += arcpgu.o

drivers/gpu/drm/arc/arcpgu.h

+0 −1
Original line number Diff line number Diff line
@@ -34,7 +34,6 @@ static inline u32 arc_pgu_read(struct arcpgu_drm_private *arcpgu, 
	return ioread32(arcpgu->regs + reg);

}



int arcpgu_drm_hdmi_init(struct drm_device *drm, struct device_node *np);

int arcpgu_drm_sim_init(struct drm_device *drm, struct device_node *np);



#endif

drivers/gpu/drm/arc/arcpgu_drv.c

+9 −3
Original line number Diff line number Diff line
@@ -221,9 +221,15 @@ static int arcpgu_load(struct arcpgu_drm_private *arcpgu) 
	}



	if (encoder_node) {

		ret = arcpgu_drm_hdmi_init(drm, encoder_node);

		of_node_put(encoder_node);

		if (ret < 0)

		struct drm_bridge *bridge;



		/* Locate drm bridge from the hdmi encoder DT node */

		bridge = of_drm_find_bridge(encoder_node);

		if (!bridge)

			return -EPROBE_DEFER;



		ret = drm_simple_display_pipe_attach_bridge(&arcpgu->pipe, bridge);

		if (ret)

			return ret;

	} else {

		dev_info(drm->dev, "no encoder found. Assumed virtual LCD on simulation platform\n");

drivers/gpu/drm/arc/arcpgu_hdmi.c

deleted100644 → 0
+0 −27
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-only

/*

 * ARC PGU DRM driver.

 *

 * Copyright (C) 2016 Synopsys, Inc. (www.synopsys.com)

 */



#include <drm/drm_bridge.h>

#include <drm/drm_crtc.h>

#include <drm/drm_encoder.h>

#include <drm/drm_device.h>



#include "arcpgu.h"



int arcpgu_drm_hdmi_init(struct drm_device *drm, struct device_node *np)

{

	struct arcpgu_drm_private *arcpgu = dev_to_arcpgu(drm);

	struct drm_bridge *bridge;



	/* Locate drm bridge from the hdmi encoder DT node */

	bridge = of_drm_find_bridge(np);

	if (!bridge)

		return -EPROBE_DEFER;



	/* Link drm_bridge to encoder */

	return drm_simple_display_pipe_attach_bridge(&arcpgu->pipe, bridge);

}