drm/rcar-du: Split VGA encoder and connector (9e8be272) · Commits · e / devices / android_kernel_fairphone_FP5

drivers/gpu/drm/rcar-du/Makefile

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -4,6 +4,7 @@ rcar-du-drm-y := rcar_du_crtc.o \
	rcar_du_lvds.o \		rcar_du_lvds.o \
	rcar_du_lvdscon.o \		rcar_du_lvdscon.o \
	rcar_du_plane.o \		rcar_du_plane.o \
	rcar_du_vga.o		rcar_du_vga.o \
			rcar_du_vgacon.o

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

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

+2 −84

Original line number	Original line	Diff line number	Diff line
	/*		/*
	* rcar_du_vga.c -- R-Car Display Unit VGA DAC and Connector		* rcar_du_vga.c -- R-Car Display Unit VGA DAC
	*		*
	* Copyright (C) 2013 Renesas Corporation		* Copyright (C) 2013 Renesas Corporation
	*		*
	@@ -18,89 +18,7 @@
	#include "rcar_du_drv.h"		#include "rcar_du_drv.h"
	#include "rcar_du_kms.h"		#include "rcar_du_kms.h"
	#include "rcar_du_vga.h"		#include "rcar_du_vga.h"
			#include "rcar_du_vgacon.h"
	/* -----------------------------------------------------------------------------
	* Connector
	*/

	static int rcar_du_vga_connector_get_modes(struct drm_connector *connector)
	{
	return 0;
	}

	static int rcar_du_vga_connector_mode_valid(struct drm_connector *connector,
	struct drm_display_mode *mode)
	{
	return MODE_OK;
	}

	static const struct drm_connector_helper_funcs connector_helper_funcs = {
	.get_modes = rcar_du_vga_connector_get_modes,
	.mode_valid = rcar_du_vga_connector_mode_valid,
	.best_encoder = rcar_du_connector_best_encoder,
	};

	static void rcar_du_vga_connector_destroy(struct drm_connector *connector)
	{
	drm_sysfs_connector_remove(connector);
	drm_connector_cleanup(connector);
	}

	static enum drm_connector_status
	rcar_du_vga_connector_detect(struct drm_connector *connector, bool force)
	{
	return connector_status_unknown;
	}

	static const struct drm_connector_funcs connector_funcs = {
	.dpms = drm_helper_connector_dpms,
	.detect = rcar_du_vga_connector_detect,
	.fill_modes = drm_helper_probe_single_connector_modes,
	.destroy = rcar_du_vga_connector_destroy,
	};

	static int rcar_du_vga_connector_init(struct rcar_du_device *rcdu,
	struct rcar_du_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;

	ret = drm_connector_init(rcdu->ddev, connector, &connector_funcs,
	DRM_MODE_CONNECTOR_VGA);
	if (ret < 0)
	return ret;

	drm_connector_helper_add(connector, &connector_helper_funcs);
	ret = drm_sysfs_connector_add(connector);
	if (ret < 0)
	return ret;

	drm_helper_connector_dpms(connector, 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, &renc->encoder);
	if (ret < 0)
	return ret;

	connector->encoder = &renc->encoder;
	rcon->encoder = renc;

	return 0;
	}

	/* -----------------------------------------------------------------------------
	* Encoder
	*/

	static void rcar_du_vga_encoder_dpms(struct drm_encoder *encoder, int mode)		static void rcar_du_vga_encoder_dpms(struct drm_encoder *encoder, int mode)
	{		{

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

+1 −1

Original line number	Original line	Diff line number	Diff line
	/*		/*
	* rcar_du_vga.h -- R-Car Display Unit VGA DAC and Connector		* rcar_du_vga.h -- R-Car Display Unit VGA DAC
	*		*
	* Copyright (C) 2013 Renesas Corporation		* Copyright (C) 2013 Renesas Corporation
	*		*

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

0 → 100644

+95 −0

Original line number	Original line	Diff line number	Diff line
			/*
			* rcar_du_vgacon.c -- R-Car Display Unit VGA Connector
			*
			* Copyright (C) 2013 Renesas 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_crtc.h>
			#include <drm/drm_crtc_helper.h>

			#include "rcar_du_drv.h"
			#include "rcar_du_kms.h"
			#include "rcar_du_vgacon.h"

			static int rcar_du_vga_connector_get_modes(struct drm_connector *connector)
			{
			return 0;
			}

			static int rcar_du_vga_connector_mode_valid(struct drm_connector *connector,
			struct drm_display_mode *mode)
			{
			return MODE_OK;
			}

			static const struct drm_connector_helper_funcs connector_helper_funcs = {
			.get_modes = rcar_du_vga_connector_get_modes,
			.mode_valid = rcar_du_vga_connector_mode_valid,
			.best_encoder = rcar_du_connector_best_encoder,
			};

			static void rcar_du_vga_connector_destroy(struct drm_connector *connector)
			{
			drm_sysfs_connector_remove(connector);
			drm_connector_cleanup(connector);
			}

			static enum drm_connector_status
			rcar_du_vga_connector_detect(struct drm_connector *connector, bool force)
			{
			return connector_status_unknown;
			}

			static const struct drm_connector_funcs connector_funcs = {
			.dpms = drm_helper_connector_dpms,
			.detect = rcar_du_vga_connector_detect,
			.fill_modes = drm_helper_probe_single_connector_modes,
			.destroy = rcar_du_vga_connector_destroy,
			};

			int rcar_du_vga_connector_init(struct rcar_du_device *rcdu,
			struct rcar_du_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;

			ret = drm_connector_init(rcdu->ddev, connector, &connector_funcs,
			DRM_MODE_CONNECTOR_VGA);
			if (ret < 0)
			return ret;

			drm_connector_helper_add(connector, &connector_helper_funcs);
			ret = drm_sysfs_connector_add(connector);
			if (ret < 0)
			return ret;

			drm_helper_connector_dpms(connector, 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, &renc->encoder);
			if (ret < 0)
			return ret;

			connector->encoder = &renc->encoder;
			rcon->encoder = renc;

			return 0;
			}

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

0 → 100644

+23 −0

Original line number	Original line	Diff line number	Diff line
			/*
			* rcar_du_vgacon.h -- R-Car Display Unit VGA Connector
			*
			* Copyright (C) 2013 Renesas 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_VGACON_H__
			#define __RCAR_DU_VGACON_H__

			struct rcar_du_device;
			struct rcar_du_encoder;

			int rcar_du_vga_connector_init(struct rcar_du_device *rcdu,
			struct rcar_du_encoder *renc);

			#endif /* __RCAR_DU_VGACON_H__ */