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

Commit 6978f123 authored by Laurent Pinchart's avatar Laurent Pinchart
Browse files

drm/rcar-du: Merge LVDS and VGA encoder code 



Create a single rcar_du_encoder structure that implements a KMS encoder.
The current implementation is straightforward and only configures CRTC
output routing.

Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
parent 9e8be272

drivers/gpu/drm/rcar-du/Makefile

+1 −2
Original line number Diff line number Diff line 
rcar-du-drm-y := rcar_du_crtc.o \

		 rcar_du_drv.o \

		 rcar_du_encoder.o \

		 rcar_du_kms.o \

		 rcar_du_lvds.o \

		 rcar_du_lvdscon.o \

		 rcar_du_plane.o \

		 rcar_du_vga.o \

		 rcar_du_vgacon.o



obj-$(CONFIG_DRM_RCAR_DU)	+= rcar-du-drm.o

drivers/gpu/drm/rcar-du/rcar_du_crtc.c

+0 −2
Original line number Diff line number Diff line
@@ -23,10 +23,8 @@ 
#include "rcar_du_crtc.h"

#include "rcar_du_drv.h"

#include "rcar_du_kms.h"

#include "rcar_du_lvds.h"

#include "rcar_du_plane.h"

#include "rcar_du_regs.h"

#include "rcar_du_vga.h"



#define to_rcar_crtc(c)	container_of(c, struct rcar_du_crtc, crtc)

drivers/gpu/drm/rcar-du/rcar_du_lvds.c→drivers/gpu/drm/rcar-du/rcar_du_encoder.c

+61 −13
Original line number Diff line number Diff line 
/*

 * rcar_du_lvds.c  --  R-Car Display Unit LVDS Encoder

 * rcar_du_encoder.c  --  R-Car Display Unit Encoder

 *

 * Copyright (C) 2013 Renesas Corporation

 *
@@ -16,15 +16,32 @@ 
#include <drm/drm_crtc_helper.h>



#include "rcar_du_drv.h"

#include "rcar_du_encoder.h"

#include "rcar_du_kms.h"

#include "rcar_du_lvds.h"

#include "rcar_du_lvdscon.h"

#include "rcar_du_vgacon.h"



static void rcar_du_lvds_encoder_dpms(struct drm_encoder *encoder, int mode)

/* -----------------------------------------------------------------------------

 * Common connector functions

 */



struct drm_encoder *

rcar_du_connector_best_encoder(struct drm_connector *connector)

{

	struct rcar_du_connector *rcon = to_rcar_connector(connector);



	return &rcon->encoder->encoder;

}



/* -----------------------------------------------------------------------------

 * Encoder

 */



static void rcar_du_encoder_dpms(struct drm_encoder *encoder, int mode)

{

}



static bool rcar_du_lvds_encoder_mode_fixup(struct drm_encoder *encoder,

static bool rcar_du_encoder_mode_fixup(struct drm_encoder *encoder,

				       const struct drm_display_mode *mode,

				       struct drm_display_mode *adjusted_mode)

{
@@ -33,6 +50,10 @@ static bool rcar_du_lvds_encoder_mode_fixup(struct drm_encoder *encoder, 
	struct drm_connector *connector;

	bool found = false;



	/* DAC encoders have currently no restriction on the mode. */

	if (encoder->encoder_type == DRM_MODE_ENCODER_DAC)

		return true;



	list_for_each_entry(connector, &dev->mode_config.connector_list, head) {

		if (connector->encoder == encoder) {

			found = true;
@@ -64,9 +85,26 @@ static bool rcar_du_lvds_encoder_mode_fixup(struct drm_encoder *encoder, 
	return true;

}



static void rcar_du_encoder_mode_prepare(struct drm_encoder *encoder)

{

}



static void rcar_du_encoder_mode_commit(struct drm_encoder *encoder)

{

}



static void rcar_du_encoder_mode_set(struct drm_encoder *encoder,

				     struct drm_display_mode *mode,

				     struct drm_display_mode *adjusted_mode)

{

	struct rcar_du_encoder *renc = to_rcar_encoder(encoder);



	rcar_du_crtc_route_output(encoder->crtc, renc->output);

}



static const struct drm_encoder_helper_funcs encoder_helper_funcs = {

	.dpms = rcar_du_lvds_encoder_dpms,

	.mode_fixup = rcar_du_lvds_encoder_mode_fixup,

	.dpms = rcar_du_encoder_dpms,

	.mode_fixup = rcar_du_encoder_mode_fixup,

	.prepare = rcar_du_encoder_mode_prepare,

	.commit = rcar_du_encoder_mode_commit,

	.mode_set = rcar_du_encoder_mode_set,
@@ -76,9 +114,9 @@ static const struct drm_encoder_funcs encoder_funcs = { 
	.destroy = drm_encoder_cleanup,

};



int rcar_du_lvds_init(struct rcar_du_device *rcdu,

		      const struct rcar_du_encoder_lvds_data *data,

		      unsigned int output)

int rcar_du_encoder_init(struct rcar_du_device *rcdu,

			 enum rcar_du_encoder_type type, unsigned int output,

			 const struct rcar_du_encoder_data *data)

{

	struct rcar_du_encoder *renc;

	int ret;
@@ -90,11 +128,21 @@ int rcar_du_lvds_init(struct rcar_du_device *rcdu, 
	renc->output = output;



	ret = drm_encoder_init(rcdu->ddev, &renc->encoder, &encoder_funcs,

			       DRM_MODE_ENCODER_LVDS);

			       type);

	if (ret < 0)

		return ret;



	drm_encoder_helper_add(&renc->encoder, &encoder_helper_funcs);



	return rcar_du_lvds_connector_init(rcdu, renc, &data->panel);

	switch (type) {

	case RCAR_DU_ENCODER_LVDS:

		return rcar_du_lvds_connector_init(rcdu, renc,

						   &data->u.lvds.panel);



	case RCAR_DU_ENCODER_VGA:

		return rcar_du_vga_connector_init(rcdu, renc);



	default:

		return -EINVAL;

	}

}

drivers/gpu/drm/rcar-du/rcar_du_lvds.h→drivers/gpu/drm/rcar-du/rcar_du_encoder.h

+45 −0
Original line number Diff line number Diff line 
/*

 * rcar_du_lvds.h  --  R-Car Display Unit LVDS Encoder and Connector

 * rcar_du_encoder.h  --  R-Car Display Unit Encoder

 *

 * Copyright (C) 2013 Renesas Corporation

 *
@@ -11,14 +11,35 @@ 
 * (at your option) any later version.

 */



#ifndef __RCAR_DU_LVDS_H__

#define __RCAR_DU_LVDS_H__

#ifndef __RCAR_DU_ENCODER_H__

#define __RCAR_DU_ENCODER_H__



#include <drm/drm_crtc.h>



struct rcar_du_device;

struct rcar_du_encoder_lvds_data;

struct rcar_du_encoder_data;



struct rcar_du_encoder {

	struct drm_encoder encoder;

	unsigned int output;

};



#define to_rcar_encoder(e) \

	container_of(e, struct rcar_du_encoder, encoder)



struct rcar_du_connector {

	struct drm_connector connector;

	struct rcar_du_encoder *encoder;

};



#define to_rcar_connector(c) \

	container_of(c, struct rcar_du_connector, connector)



struct drm_encoder *

rcar_du_connector_best_encoder(struct drm_connector *connector);



int rcar_du_lvds_init(struct rcar_du_device *rcdu,

		      const struct rcar_du_encoder_lvds_data *data,

		      unsigned int output);

int rcar_du_encoder_init(struct rcar_du_device *rcdu,

			 enum rcar_du_encoder_type type, unsigned int output,

			 const struct rcar_du_encoder_data *data);



#endif /* __RCAR_DU_LVDS_H__ */
 
#endif /* __RCAR_DU_ENCODER_H__ */

drivers/gpu/drm/rcar-du/rcar_du_kms.c

+6 −43
Original line number Diff line number Diff line
@@ -19,10 +19,9 @@ 


#include "rcar_du_crtc.h"

#include "rcar_du_drv.h"

#include "rcar_du_encoder.h"

#include "rcar_du_kms.h"

#include "rcar_du_lvds.h"

#include "rcar_du_regs.h"

#include "rcar_du_vga.h"



/* -----------------------------------------------------------------------------

 * Format helpers
@@ -105,35 +104,6 @@ const struct rcar_du_format_info *rcar_du_format_info(u32 fourcc) 
	return NULL;

}



/* -----------------------------------------------------------------------------

 * Common connector and encoder functions

 */



struct drm_encoder *

rcar_du_connector_best_encoder(struct drm_connector *connector)

{

	struct rcar_du_connector *rcon = to_rcar_connector(connector);



	return &rcon->encoder->encoder;

}



void rcar_du_encoder_mode_prepare(struct drm_encoder *encoder)

{

}



void rcar_du_encoder_mode_set(struct drm_encoder *encoder,

			      struct drm_display_mode *mode,

			      struct drm_display_mode *adjusted_mode)

{

	struct rcar_du_encoder *renc = to_rcar_encoder(encoder);



	rcar_du_crtc_route_output(encoder->crtc, renc->output);

}



void rcar_du_encoder_mode_commit(struct drm_encoder *encoder)

{

}



/* -----------------------------------------------------------------------------

 * Frame buffer

 */
@@ -221,6 +191,9 @@ int rcar_du_modeset_init(struct rcar_du_device *rcdu) 
		const struct rcar_du_encoder_data *pdata =

			&rcdu->pdata->encoders[i];



		if (pdata->encoder == RCAR_DU_ENCODER_UNUSED)

			continue;



		if (pdata->output >= ARRAY_SIZE(rcdu->crtcs)) {

			dev_warn(rcdu->dev,

				 "encoder %u references unexisting output %u, skipping\n",
@@ -228,18 +201,8 @@ int rcar_du_modeset_init(struct rcar_du_device *rcdu) 
			continue;

		}



		switch (pdata->encoder) {

		case RCAR_DU_ENCODER_VGA:

			rcar_du_vga_init(rcdu, &pdata->u.vga, pdata->output);

			break;



		case RCAR_DU_ENCODER_LVDS:

			rcar_du_lvds_init(rcdu, &pdata->u.lvds, pdata->output);

			break;



		default:

			break;

		}

		rcar_du_encoder_init(rcdu, pdata->encoder, pdata->output,

				     pdata);

	}



	/* Set the possible CRTCs and possible clones. All encoders can be