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

Commit 1277f802 authored by Stefan Agner's avatar Stefan Agner
Browse files

drm/fsl-dcu: move layer initialization to plane file 



Move the initialization code for layers into a separate function
in the plane file. This allows to reuse the function on resume.
Also move it at the very beginning which may not matter but makes
logically much more sense.

Signed-off-by: default avatarStefan Agner <stefan@agner.ch>
parent 6aaf5a49

drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_crtc.c

+2 −11
Original line number Diff line number Diff line
@@ -138,9 +138,10 @@ int fsl_dcu_drm_crtc_create(struct fsl_dcu_drm_device *fsl_dev) 
{

	struct drm_plane *primary;

	struct drm_crtc *crtc = &fsl_dev->crtc;

	unsigned int i, j;

	int ret;



	fsl_dcu_drm_init_planes(fsl_dev->drm);



	primary = fsl_dcu_drm_primary_create_plane(fsl_dev->drm);

	if (!primary)

		return -ENOMEM;
@@ -154,15 +155,5 @@ int fsl_dcu_drm_crtc_create(struct fsl_dcu_drm_device *fsl_dev) 


	drm_crtc_helper_add(crtc, &fsl_dcu_drm_crtc_helper_funcs);



	for (i = 0; i < fsl_dev->soc->total_layer; i++) {

		for (j = 1; j <= fsl_dev->soc->layer_regs; j++)

			regmap_write(fsl_dev->regmap, DCU_CTRLDESCLN(i, j), 0);

	}

	regmap_update_bits(fsl_dev->regmap, DCU_DCU_MODE,

			   DCU_MODE_DCU_MODE_MASK,

			   DCU_MODE_DCU_MODE(DCU_MODE_OFF));

	regmap_write(fsl_dev->regmap, DCU_UPDATE_MODE,

		     DCU_UPDATE_MODE_READREG);



	return 0;

}

drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_plane.c

+16 −0
Original line number Diff line number Diff line
@@ -217,6 +217,22 @@ static const u32 fsl_dcu_drm_plane_formats[] = { 
	DRM_FORMAT_YUV422,

};



void fsl_dcu_drm_init_planes(struct drm_device *dev)

{

	struct fsl_dcu_drm_device *fsl_dev = dev->dev_private;

	int i, j;



	for (i = 0; i < fsl_dev->soc->total_layer; i++) {

		for (j = 1; j <= fsl_dev->soc->layer_regs; j++)

			regmap_write(fsl_dev->regmap, DCU_CTRLDESCLN(i, j), 0);

	}

	regmap_update_bits(fsl_dev->regmap, DCU_DCU_MODE,

			   DCU_MODE_DCU_MODE_MASK,

			   DCU_MODE_DCU_MODE(DCU_MODE_OFF));

	regmap_write(fsl_dev->regmap, DCU_UPDATE_MODE,

		     DCU_UPDATE_MODE_READREG);

}



struct drm_plane *fsl_dcu_drm_primary_create_plane(struct drm_device *dev)

{

	struct drm_plane *primary;

drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_plane.h

+1 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ 
#ifndef __FSL_DCU_DRM_PLANE_H__

#define __FSL_DCU_DRM_PLANE_H__



void fsl_dcu_drm_init_planes(struct drm_device *dev);

struct drm_plane *fsl_dcu_drm_primary_create_plane(struct drm_device *dev);



#endif /* __FSL_DCU_DRM_PLANE_H__ */