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

Commit 1d926114 authored by Archit Taneja's avatar Archit Taneja
Browse files

drm: rcar-du: Remove i2c slave encoder interface for hdmi encoder 



The hdmi output in rcar-du uses the i2c slave encoder interface to link
to the adv7511 encoder chip. The kms driver creates encoder and connector
entities that internally uses the drm_encoder_slave_funcs ops provided by
the slave encoder driver.

Change the driver such that it expects a bridge entity instead of a slave
encoder. The hdmi connector code isn't needed anymore as we expect the
adv7511 bridge driver to create/manage the connector.

Note that the kms driver still expects a connector node for hdmi to be
present in DT. This node has no connection to the connector created
by the bridge driver.

Tested-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: default avatarArchit Taneja <architt@codeaurora.org>
parent 7caff0fc

drivers/gpu/drm/rcar-du/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -7,8 +7,8 @@ rcar-du-drm-y := rcar_du_crtc.o \ 
		 rcar_du_plane.o \

		 rcar_du_vgacon.o



rcar-du-drm-$(CONFIG_DRM_RCAR_HDMI)	+= rcar_du_hdmicon.o \

					   rcar_du_hdmienc.o

rcar-du-drm-$(CONFIG_DRM_RCAR_HDMI)	+= rcar_du_hdmienc.o



rcar-du-drm-$(CONFIG_DRM_RCAR_LVDS)	+= rcar_du_lvdsenc.o



rcar-du-drm-$(CONFIG_DRM_RCAR_VSP)	+= rcar_du_vsp.o

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

+1 −2
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ 


#include "rcar_du_drv.h"

#include "rcar_du_encoder.h"

#include "rcar_du_hdmicon.h"

#include "rcar_du_hdmienc.h"

#include "rcar_du_kms.h"

#include "rcar_du_lvdscon.h"
@@ -174,7 +173,7 @@ int rcar_du_encoder_init(struct rcar_du_device *rcdu, 
		break;



	case DRM_MODE_ENCODER_TMDS:

		ret = rcar_du_hdmi_connector_init(rcdu, renc);

		/* connector managed by the bridge driver */

		break;



	default:

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

+3 −4
Original line number Diff line number Diff line
@@ -15,7 +15,6 @@ 
#define __RCAR_DU_ENCODER_H__



#include <drm/drm_crtc.h>

#include <drm/drm_encoder_slave.h>



struct rcar_du_device;

struct rcar_du_hdmienc;
@@ -30,16 +29,16 @@ enum rcar_du_encoder_type { 
};



struct rcar_du_encoder {

	struct drm_encoder_slave slave;

	struct drm_encoder base;

	enum rcar_du_output output;

	struct rcar_du_hdmienc *hdmi;

	struct rcar_du_lvdsenc *lvds;

};



#define to_rcar_encoder(e) \

	container_of(e, struct rcar_du_encoder, slave.base)

	container_of(e, struct rcar_du_encoder, base)



#define rcar_encoder_to_drm_encoder(e)	(&(e)->slave.base)

#define rcar_encoder_to_drm_encoder(e)	(&(e)->base)



struct rcar_du_connector {

	struct drm_connector connector;

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

deleted100644 → 0
+0 −116
Original line number Diff line number Diff line 
/*

 * R-Car Display Unit HDMI Connector

 *

 * Copyright (C) 2014 Renesas Electronics Corporation

 *

 * Contact: Laurent Pinchart (laurent.pinchart@ideasonboard.com)

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License as published by

 * the Free Software Foundation; either version 2 of the License, or

 * (at your option) any later version.

 */



#include <drm/drmP.h>

#include <drm/drm_atomic_helper.h>

#include <drm/drm_crtc.h>

#include <drm/drm_crtc_helper.h>

#include <drm/drm_encoder_slave.h>



#include "rcar_du_drv.h"

#include "rcar_du_encoder.h"

#include "rcar_du_hdmicon.h"

#include "rcar_du_kms.h"



#define to_slave_funcs(e)	(to_rcar_encoder(e)->slave.slave_funcs)



static int rcar_du_hdmi_connector_get_modes(struct drm_connector *connector)

{

	struct rcar_du_connector *con = to_rcar_connector(connector);

	struct drm_encoder *encoder = rcar_encoder_to_drm_encoder(con->encoder);

	const struct drm_encoder_slave_funcs *sfuncs = to_slave_funcs(encoder);



	if (sfuncs->get_modes == NULL)

		return 0;



	return sfuncs->get_modes(encoder, connector);

}



static int rcar_du_hdmi_connector_mode_valid(struct drm_connector *connector,

					     struct drm_display_mode *mode)

{

	struct rcar_du_connector *con = to_rcar_connector(connector);

	struct drm_encoder *encoder = rcar_encoder_to_drm_encoder(con->encoder);

	const struct drm_encoder_slave_funcs *sfuncs = to_slave_funcs(encoder);



	if (sfuncs->mode_valid == NULL)

		return MODE_OK;



	return sfuncs->mode_valid(encoder, mode);

}



static const struct drm_connector_helper_funcs connector_helper_funcs = {

	.get_modes = rcar_du_hdmi_connector_get_modes,

	.mode_valid = rcar_du_hdmi_connector_mode_valid,

};



static enum drm_connector_status

rcar_du_hdmi_connector_detect(struct drm_connector *connector, bool force)

{

	struct rcar_du_connector *con = to_rcar_connector(connector);

	struct drm_encoder *encoder = rcar_encoder_to_drm_encoder(con->encoder);

	const struct drm_encoder_slave_funcs *sfuncs = to_slave_funcs(encoder);



	if (sfuncs->detect == NULL)

		return connector_status_unknown;



	return sfuncs->detect(encoder, connector);

}



static const struct drm_connector_funcs connector_funcs = {

	.dpms = drm_atomic_helper_connector_dpms,

	.reset = drm_atomic_helper_connector_reset,

	.detect = rcar_du_hdmi_connector_detect,

	.fill_modes = drm_helper_probe_single_connector_modes,

	.destroy = drm_connector_cleanup,

	.atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state,

	.atomic_destroy_state = drm_atomic_helper_connector_destroy_state,

};



int rcar_du_hdmi_connector_init(struct rcar_du_device *rcdu,

				struct rcar_du_encoder *renc)

{

	struct drm_encoder *encoder = rcar_encoder_to_drm_encoder(renc);

	struct rcar_du_connector *rcon;

	struct drm_connector *connector;

	int ret;



	rcon = devm_kzalloc(rcdu->dev, sizeof(*rcon), GFP_KERNEL);

	if (rcon == NULL)

		return -ENOMEM;



	connector = &rcon->connector;

	connector->display_info.width_mm = 0;

	connector->display_info.height_mm = 0;

	connector->interlace_allowed = true;

	connector->polled = DRM_CONNECTOR_POLL_HPD;



	ret = drm_connector_init(rcdu->ddev, connector, &connector_funcs,

				 DRM_MODE_CONNECTOR_HDMIA);

	if (ret < 0)

		return ret;



	drm_connector_helper_add(connector, &connector_helper_funcs);



	connector->dpms = DRM_MODE_DPMS_OFF;

	drm_object_property_set_value(&connector->base,

		rcdu->ddev->mode_config.dpms_property, DRM_MODE_DPMS_OFF);



	ret = drm_mode_connector_attach_encoder(connector, encoder);

	if (ret < 0)

		return ret;



	rcon->encoder = renc;



	return 0;

}

drivers/gpu/drm/rcar-du/rcar_du_hdmicon.h

deleted100644 → 0
+0 −31
Original line number Diff line number Diff line 
/*

 * R-Car Display Unit HDMI Connector

 *

 * Copyright (C) 2014 Renesas Electronics Corporation

 *

 * Contact: Laurent Pinchart (laurent.pinchart@ideasonboard.com)

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License as published by

 * the Free Software Foundation; either version 2 of the License, or

 * (at your option) any later version.

 */



#ifndef __RCAR_DU_HDMICON_H__

#define __RCAR_DU_HDMICON_H__



struct rcar_du_device;

struct rcar_du_encoder;



#if IS_ENABLED(CONFIG_DRM_RCAR_HDMI)

int rcar_du_hdmi_connector_init(struct rcar_du_device *rcdu,

				struct rcar_du_encoder *renc);

#else

static inline int rcar_du_hdmi_connector_init(struct rcar_du_device *rcdu,

					      struct rcar_du_encoder *renc)

{

	return -ENOSYS;

}

#endif



#endif /* __RCAR_DU_HDMICON_H__ */