mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-31 16:38:12 +00:00
949f08862d
Many drivers (21 to be exact) create connectors that are always connected (for instance to an LVDS or DSI panel). Instead of forcing them to implement a dummy .detect() handler, make the callback optional and consider the connector as always connected in that case. Reviewed-by: Alex Deucher <alexander.deucher@amd.com> Acked-by: Maxime Ripard <maxime.ripard@free-electrons.com> Acked-by: Jyri Sarha <jsarha@ti.com> Acked-by: Jani Nikula <jani.nikula@intel.com> Acked-by: Philipp Zabel <p.zabel@pengutronix.de> Acked-by: Vincent Abriou <vincent.abriou@st.com> Acked-by: Alexey Brodkin <abrodkin@synopsys.com> Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> [seanpaul fixed small conflict in rcar-du/rcar_du_lvdscon.c] Signed-off-by: Sean Paul <seanpaul@chromium.org>
118 lines
3.3 KiB
C
118 lines
3.3 KiB
C
/*
|
|
* rcar_du_lvdscon.c -- R-Car Display Unit LVDS Connector
|
|
*
|
|
* Copyright (C) 2013-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 <video/display_timing.h>
|
|
#include <video/of_display_timing.h>
|
|
#include <video/videomode.h>
|
|
|
|
#include "rcar_du_drv.h"
|
|
#include "rcar_du_encoder.h"
|
|
#include "rcar_du_kms.h"
|
|
#include "rcar_du_lvdscon.h"
|
|
|
|
struct rcar_du_lvds_connector {
|
|
struct rcar_du_connector connector;
|
|
|
|
struct {
|
|
unsigned int width_mm; /* Panel width in mm */
|
|
unsigned int height_mm; /* Panel height in mm */
|
|
struct videomode mode;
|
|
} 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;
|
|
|
|
drm_display_mode_from_videomode(&lvdscon->panel.mode, mode);
|
|
|
|
drm_mode_probed_add(connector, mode);
|
|
|
|
return 1;
|
|
}
|
|
|
|
static const struct drm_connector_helper_funcs connector_helper_funcs = {
|
|
.get_modes = rcar_du_lvds_connector_get_modes,
|
|
};
|
|
|
|
static const struct drm_connector_funcs connector_funcs = {
|
|
.dpms = drm_atomic_helper_connector_dpms,
|
|
.reset = drm_atomic_helper_connector_reset,
|
|
.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_lvds_connector_init(struct rcar_du_device *rcdu,
|
|
struct rcar_du_encoder *renc,
|
|
const struct device_node *np)
|
|
{
|
|
struct drm_encoder *encoder = rcar_encoder_to_drm_encoder(renc);
|
|
struct rcar_du_lvds_connector *lvdscon;
|
|
struct drm_connector *connector;
|
|
struct display_timing timing;
|
|
int ret;
|
|
|
|
lvdscon = devm_kzalloc(rcdu->dev, sizeof(*lvdscon), GFP_KERNEL);
|
|
if (lvdscon == NULL)
|
|
return -ENOMEM;
|
|
|
|
ret = of_get_display_timing(np, "panel-timing", &timing);
|
|
if (ret < 0)
|
|
return ret;
|
|
|
|
videomode_from_timing(&timing, &lvdscon->panel.mode);
|
|
|
|
of_property_read_u32(np, "width-mm", &lvdscon->panel.width_mm);
|
|
of_property_read_u32(np, "height-mm", &lvdscon->panel.height_mm);
|
|
|
|
connector = &lvdscon->connector.connector;
|
|
connector->display_info.width_mm = lvdscon->panel.width_mm;
|
|
connector->display_info.height_mm = lvdscon->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);
|
|
|
|
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;
|
|
|
|
lvdscon->connector.encoder = renc;
|
|
|
|
return 0;
|
|
}
|