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

Commit 6cf27275 authored by Gustavo Padovan's avatar Gustavo Padovan Committed by Inki Dae
Browse files

drm/exynos: fold encoder setup into exynos_drm_load() 



As we are removing the exynos encoder move the encoder setup operation
directly inside the exynos_drm_load()

Signed-off-by: default avatarGustavo Padovan <gustavo.padovan@collabora.co.uk>
Signed-off-by: default avatarInki Dae <inki.dae@samsung.com>
parent a2986e80

drivers/gpu/drm/exynos/exynos_drm_drv.c

+10 −2
Original line number Diff line number Diff line
@@ -41,7 +41,9 @@ 
static int exynos_drm_load(struct drm_device *dev, unsigned long flags)

{

	struct exynos_drm_private *private;

	int ret;

	struct drm_encoder *encoder;

	unsigned int clone_mask;

	int cnt, ret;



	private = kzalloc(sizeof(struct exynos_drm_private), GFP_KERNEL);

	if (!private)
@@ -67,7 +69,13 @@ static int exynos_drm_load(struct drm_device *dev, unsigned long flags) 
	exynos_drm_mode_config_init(dev);



	/* setup possible_clones. */

	exynos_drm_encoder_setup(dev);

	cnt = 0;

	clone_mask = 0;

	list_for_each_entry(encoder, &dev->mode_config.encoder_list, head)

		clone_mask |= (1 << (cnt++));



	list_for_each_entry(encoder, &dev->mode_config.encoder_list, head)

		encoder->possible_clones = clone_mask;



	platform_set_drvdata(dev->platformdev, dev);

drivers/gpu/drm/exynos/exynos_drm_encoder.c

+0 −13
Original line number Diff line number Diff line
@@ -78,19 +78,6 @@ static struct drm_encoder_funcs exynos_encoder_funcs = { 
	.destroy = drm_encoder_cleanup,

};



void exynos_drm_encoder_setup(struct drm_device *dev)

{

	struct drm_encoder *encoder;

	unsigned int clone_mask = 0;

	int cnt = 0;



	list_for_each_entry(encoder, &dev->mode_config.encoder_list, head)

		clone_mask |= (1 << (cnt++));



	list_for_each_entry(encoder, &dev->mode_config.encoder_list, head)

		encoder->possible_clones = clone_mask;

}



int exynos_drm_encoder_create(struct drm_device *dev,

			      struct exynos_drm_encoder *exynos_encoder,

			      enum exynos_drm_output_type type)

drivers/gpu/drm/exynos/exynos_drm_encoder.h

+0 −1
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ 


#include "exynos_drm_drv.h"



void exynos_drm_encoder_setup(struct drm_device *dev);

int exynos_drm_encoder_create(struct drm_device *dev, struct exynos_drm_encoder

			      *encoder, enum exynos_drm_output_type type);