drm/rcar-du: Split LVDS encoder and connector
This prepares for the encoders rework. Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
This commit is contained in:
Laurent Pinchart
parent
9e7db06d3a
commit
56c5dd00f8
4 changed files with 158 additions and 118 deletions
|
|
@ -2,6 +2,7 @@ rcar-du-drm-y := rcar_du_crtc.o \
|
|||
rcar_du_drv.o \
|
||||
rcar_du_kms.o \
|
||||
rcar_du_lvds.o \
|
||||
rcar_du_lvdscon.o \
|
||||
rcar_du_plane.o \
|
||||
rcar_du_vga.o
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* rcar_du_lvds.c -- R-Car Display Unit LVDS Encoder and Connector
|
||||
* rcar_du_lvds.c -- R-Car Display Unit LVDS Encoder
|
||||
*
|
||||
* Copyright (C) 2013 Renesas Corporation
|
||||
*
|
||||
|
|
@ -18,123 +18,7 @@
|
|||
#include "rcar_du_drv.h"
|
||||
#include "rcar_du_kms.h"
|
||||
#include "rcar_du_lvds.h"
|
||||
|
||||
struct rcar_du_lvds_connector {
|
||||
struct rcar_du_connector connector;
|
||||
|
||||
const struct rcar_du_panel_data *panel;
|
||||
};
|
||||
|
||||
#define to_rcar_lvds_connector(c) \
|
||||
container_of(c, struct rcar_du_lvds_connector, connector.connector)
|
||||
|
||||
/* -----------------------------------------------------------------------------
|
||||
* Connector
|
||||
*/
|
||||
|
||||
static int rcar_du_lvds_connector_get_modes(struct drm_connector *connector)
|
||||
{
|
||||
struct rcar_du_lvds_connector *lvdscon = to_rcar_lvds_connector(connector);
|
||||
struct drm_display_mode *mode;
|
||||
|
||||
mode = drm_mode_create(connector->dev);
|
||||
if (mode == NULL)
|
||||
return 0;
|
||||
|
||||
mode->type = DRM_MODE_TYPE_PREFERRED | DRM_MODE_TYPE_DRIVER;
|
||||
mode->clock = lvdscon->panel->mode.clock;
|
||||
mode->hdisplay = lvdscon->panel->mode.hdisplay;
|
||||
mode->hsync_start = lvdscon->panel->mode.hsync_start;
|
||||
mode->hsync_end = lvdscon->panel->mode.hsync_end;
|
||||
mode->htotal = lvdscon->panel->mode.htotal;
|
||||
mode->vdisplay = lvdscon->panel->mode.vdisplay;
|
||||
mode->vsync_start = lvdscon->panel->mode.vsync_start;
|
||||
mode->vsync_end = lvdscon->panel->mode.vsync_end;
|
||||
mode->vtotal = lvdscon->panel->mode.vtotal;
|
||||
mode->flags = lvdscon->panel->mode.flags;
|
||||
|
||||
drm_mode_set_name(mode);
|
||||
drm_mode_probed_add(connector, mode);
|
||||
|
||||
return 1;
|
||||
}
|
||||
|
||||
static int rcar_du_lvds_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_lvds_connector_get_modes,
|
||||
.mode_valid = rcar_du_lvds_connector_mode_valid,
|
||||
.best_encoder = rcar_du_connector_best_encoder,
|
||||
};
|
||||
|
||||
static void rcar_du_lvds_connector_destroy(struct drm_connector *connector)
|
||||
{
|
||||
drm_sysfs_connector_remove(connector);
|
||||
drm_connector_cleanup(connector);
|
||||
}
|
||||
|
||||
static enum drm_connector_status
|
||||
rcar_du_lvds_connector_detect(struct drm_connector *connector, bool force)
|
||||
{
|
||||
return connector_status_connected;
|
||||
}
|
||||
|
||||
static const struct drm_connector_funcs connector_funcs = {
|
||||
.dpms = drm_helper_connector_dpms,
|
||||
.detect = rcar_du_lvds_connector_detect,
|
||||
.fill_modes = drm_helper_probe_single_connector_modes,
|
||||
.destroy = rcar_du_lvds_connector_destroy,
|
||||
};
|
||||
|
||||
static int rcar_du_lvds_connector_init(struct rcar_du_device *rcdu,
|
||||
struct rcar_du_encoder *renc,
|
||||
const struct rcar_du_panel_data *panel)
|
||||
{
|
||||
struct rcar_du_lvds_connector *lvdscon;
|
||||
struct drm_connector *connector;
|
||||
int ret;
|
||||
|
||||
lvdscon = devm_kzalloc(rcdu->dev, sizeof(*lvdscon), GFP_KERNEL);
|
||||
if (lvdscon == NULL)
|
||||
return -ENOMEM;
|
||||
|
||||
lvdscon->panel = panel;
|
||||
|
||||
connector = &lvdscon->connector.connector;
|
||||
connector->display_info.width_mm = panel->width_mm;
|
||||
connector->display_info.height_mm = panel->height_mm;
|
||||
|
||||
ret = drm_connector_init(rcdu->ddev, connector, &connector_funcs,
|
||||
DRM_MODE_CONNECTOR_LVDS);
|
||||
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;
|
||||
lvdscon->connector.encoder = renc;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
/* -----------------------------------------------------------------------------
|
||||
* Encoder
|
||||
*/
|
||||
#include "rcar_du_lvdscon.h"
|
||||
|
||||
static void rcar_du_lvds_encoder_dpms(struct drm_encoder *encoder, int mode)
|
||||
{
|
||||
|
|
|
|||
130
drivers/gpu/drm/rcar-du/rcar_du_lvdscon.c
Normal file
130
drivers/gpu/drm/rcar-du/rcar_du_lvdscon.c
Normal file
|
|
@ -0,0 +1,130 @@
|
|||
/*
|
||||
* rcar_du_lvdscon.c -- R-Car Display Unit LVDS 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_lvdscon.h"
|
||||
|
||||
struct rcar_du_lvds_connector {
|
||||
struct rcar_du_connector connector;
|
||||
|
||||
const struct rcar_du_panel_data *panel;
|
||||
};
|
||||
|
||||
#define to_rcar_lvds_connector(c) \
|
||||
container_of(c, struct rcar_du_lvds_connector, connector.connector)
|
||||
|
||||
static int rcar_du_lvds_connector_get_modes(struct drm_connector *connector)
|
||||
{
|
||||
struct rcar_du_lvds_connector *lvdscon =
|
||||
to_rcar_lvds_connector(connector);
|
||||
struct drm_display_mode *mode;
|
||||
|
||||
mode = drm_mode_create(connector->dev);
|
||||
if (mode == NULL)
|
||||
return 0;
|
||||
|
||||
mode->type = DRM_MODE_TYPE_PREFERRED | DRM_MODE_TYPE_DRIVER;
|
||||
mode->clock = lvdscon->panel->mode.clock;
|
||||
mode->hdisplay = lvdscon->panel->mode.hdisplay;
|
||||
mode->hsync_start = lvdscon->panel->mode.hsync_start;
|
||||
mode->hsync_end = lvdscon->panel->mode.hsync_end;
|
||||
mode->htotal = lvdscon->panel->mode.htotal;
|
||||
mode->vdisplay = lvdscon->panel->mode.vdisplay;
|
||||
mode->vsync_start = lvdscon->panel->mode.vsync_start;
|
||||
mode->vsync_end = lvdscon->panel->mode.vsync_end;
|
||||
mode->vtotal = lvdscon->panel->mode.vtotal;
|
||||
mode->flags = lvdscon->panel->mode.flags;
|
||||
|
||||
drm_mode_set_name(mode);
|
||||
drm_mode_probed_add(connector, mode);
|
||||
|
||||
return 1;
|
||||
}
|
||||
|
||||
static int rcar_du_lvds_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_lvds_connector_get_modes,
|
||||
.mode_valid = rcar_du_lvds_connector_mode_valid,
|
||||
.best_encoder = rcar_du_connector_best_encoder,
|
||||
};
|
||||
|
||||
static void rcar_du_lvds_connector_destroy(struct drm_connector *connector)
|
||||
{
|
||||
drm_sysfs_connector_remove(connector);
|
||||
drm_connector_cleanup(connector);
|
||||
}
|
||||
|
||||
static enum drm_connector_status
|
||||
rcar_du_lvds_connector_detect(struct drm_connector *connector, bool force)
|
||||
{
|
||||
return connector_status_connected;
|
||||
}
|
||||
|
||||
static const struct drm_connector_funcs connector_funcs = {
|
||||
.dpms = drm_helper_connector_dpms,
|
||||
.detect = rcar_du_lvds_connector_detect,
|
||||
.fill_modes = drm_helper_probe_single_connector_modes,
|
||||
.destroy = rcar_du_lvds_connector_destroy,
|
||||
};
|
||||
|
||||
int rcar_du_lvds_connector_init(struct rcar_du_device *rcdu,
|
||||
struct rcar_du_encoder *renc,
|
||||
const struct rcar_du_panel_data *panel)
|
||||
{
|
||||
struct rcar_du_lvds_connector *lvdscon;
|
||||
struct drm_connector *connector;
|
||||
int ret;
|
||||
|
||||
lvdscon = devm_kzalloc(rcdu->dev, sizeof(*lvdscon), GFP_KERNEL);
|
||||
if (lvdscon == NULL)
|
||||
return -ENOMEM;
|
||||
|
||||
lvdscon->panel = panel;
|
||||
|
||||
connector = &lvdscon->connector.connector;
|
||||
connector->display_info.width_mm = panel->width_mm;
|
||||
connector->display_info.height_mm = panel->height_mm;
|
||||
|
||||
ret = drm_connector_init(rcdu->ddev, connector, &connector_funcs,
|
||||
DRM_MODE_CONNECTOR_LVDS);
|
||||
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;
|
||||
lvdscon->connector.encoder = renc;
|
||||
|
||||
return 0;
|
||||
}
|
||||
25
drivers/gpu/drm/rcar-du/rcar_du_lvdscon.h
Normal file
25
drivers/gpu/drm/rcar-du/rcar_du_lvdscon.h
Normal file
|
|
@ -0,0 +1,25 @@
|
|||
/*
|
||||
* rcar_du_lvdscon.h -- R-Car Display Unit LVDS 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_LVDSCON_H__
|
||||
#define __RCAR_DU_LVDSCON_H__
|
||||
|
||||
struct rcar_du_device;
|
||||
struct rcar_du_encoder;
|
||||
struct rcar_du_panel_data;
|
||||
|
||||
int rcar_du_lvds_connector_init(struct rcar_du_device *rcdu,
|
||||
struct rcar_du_encoder *renc,
|
||||
const struct rcar_du_panel_data *panel);
|
||||
|
||||
#endif /* __RCAR_DU_LVDSCON_H__ */
|
||||
Loading…
Reference in a new issue