mirror of
https://github.com/torvalds/linux.git
synced 2024-12-27 13:22:23 +00:00
9e9ac89666
* Much better HDMI infoframe support for OMAP * Cirrus Logic CLPS711X framebuffer driver * DT support for PL11x CLCD driver * Various small fixes -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIcBAABAgAGBQJT5LUrAAoJEPo9qoy8lh71G2kP/RyomOV8mOPErkVgslJukMlW iJO/Y47GcnHzosKK+7u8MUXlpbBdZjyoaKJxuh+D1OL0vc/LrSar4IwicqqGcD2C l5N8b9NytOf+sjtYuD24xkGo9bLr8vkaVNC3cgPNjE/x1kgRrtHoap1NOlv8vvuT OnbSkRdg/oENrdzwWjwJeayvT5a3TxLJY5JM9IMTzw6CKROIYScEmHUsy0jH2h/g 60OrGPdzmPPutUKA/ZWe8Nu0Mhf4GcOeIl8CZ/u7ZyME7NKezyF0iATpMzn3+ylf 9GafGbsxwgNW2KwoF379w6CV49UNyQhx4qxlkg8/N2km6ot6s1WoJrb/32qPu05J Wydfbovxo9elM/144m47a89TR4xV6Ia35kbSDmwrR7gmKjIDUE34Ruc7RdCLdO8n SxIG5724pktKlP1bdOT6gCLFnDq6vFK0gNnWwlCRKWnwg0H+Cyg5S07BNEF7/dvO gOkRPuyWz3m4rlpl9dL+TW+jaQR/FQAAgf8pUdjBeUTogUTvWf2NBb3H1bKoAnaE 4fhLwE1qUxep3rhOqOpLbGzDmpvt0ebcNJzseypaSTO9c8QNbZJkxLLC1jchUjPj 6FP4/SocuySik3on6Qulj6xGrp4zskBnjsTXOIZzxXjByX6uf/DNWPHEcEM9zIEk u0trGuXxlx8JkRkV/7aE =gXX+ -----END PGP SIGNATURE----- Merge tag 'fbdev-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux Pull fbdev updates from Tomi Valkeinen: - much better HDMI infoframe support for OMAP - Cirrus Logic CLPS711X framebuffer driver - DT support for PL11x CLCD driver - various small fixes * tag 'fbdev-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux: (35 commits) OMAPDSS: DSI: fix depopulating dsi peripherals video: hyperv: hyperv_fb: refresh the VM screen by force on VM panic video: ARM CLCD: Fix DT-related build problems drivers: video: fbdev: atmel_lcdfb.c: Add ability to inverted backlight PWM. video: ARM CLCD: Add DT support drm/omap: Add infoframe & dvi/hdmi mode support OMAPDSS: HDMI: remove the unused code OMAPDSS: HDMI5: add support to set infoframe & HDMI mode OMAPDSS: HDMI4: add support to set infoframe & HDMI mode OMAPDSS: HDMI: add infoframe and hdmi_dvi_mode fields OMAPDSS: add hdmi ops to hdmi-connector and tpd12s015 OMAPDSS: add hdmi ops to hdmi_ops and omap_dss_driver OMAPDSS: HDMI: remove custom avi infoframe OMAPDSS: HDMI5: use common AVI infoframe support OMAPDSS: HDMI4: use common AVI infoframe support OMAPDSS: Kconfig: select HDMI OMAPDSS: HDMI: fix name conflict OMAPDSS: DISPC: clean up dispc_mgr_timings_ok OMAPDSS: DISPC: reject interlace for lcd out OMAPDSS: DISPC: fix debugfs reg dump ...
332 lines
9.2 KiB
C
332 lines
9.2 KiB
C
/*
|
|
* drivers/gpu/drm/omapdrm/omap_connector.c
|
|
*
|
|
* Copyright (C) 2011 Texas Instruments
|
|
* Author: Rob Clark <rob@ti.com>
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify it
|
|
* under the terms of the GNU General Public License version 2 as published by
|
|
* the Free Software Foundation.
|
|
*
|
|
* This program is distributed in the hope that it will be useful, but WITHOUT
|
|
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
|
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
|
|
* more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License along with
|
|
* this program. If not, see <http://www.gnu.org/licenses/>.
|
|
*/
|
|
|
|
#include "omap_drv.h"
|
|
|
|
#include "drm_crtc.h"
|
|
#include "drm_crtc_helper.h"
|
|
|
|
/*
|
|
* connector funcs
|
|
*/
|
|
|
|
#define to_omap_connector(x) container_of(x, struct omap_connector, base)
|
|
|
|
struct omap_connector {
|
|
struct drm_connector base;
|
|
struct omap_dss_device *dssdev;
|
|
struct drm_encoder *encoder;
|
|
bool hdmi_mode;
|
|
};
|
|
|
|
bool omap_connector_get_hdmi_mode(struct drm_connector *connector)
|
|
{
|
|
struct omap_connector *omap_connector = to_omap_connector(connector);
|
|
|
|
return omap_connector->hdmi_mode;
|
|
}
|
|
|
|
void copy_timings_omap_to_drm(struct drm_display_mode *mode,
|
|
struct omap_video_timings *timings)
|
|
{
|
|
mode->clock = timings->pixelclock / 1000;
|
|
|
|
mode->hdisplay = timings->x_res;
|
|
mode->hsync_start = mode->hdisplay + timings->hfp;
|
|
mode->hsync_end = mode->hsync_start + timings->hsw;
|
|
mode->htotal = mode->hsync_end + timings->hbp;
|
|
|
|
mode->vdisplay = timings->y_res;
|
|
mode->vsync_start = mode->vdisplay + timings->vfp;
|
|
mode->vsync_end = mode->vsync_start + timings->vsw;
|
|
mode->vtotal = mode->vsync_end + timings->vbp;
|
|
|
|
mode->flags = 0;
|
|
|
|
if (timings->interlace)
|
|
mode->flags |= DRM_MODE_FLAG_INTERLACE;
|
|
|
|
if (timings->hsync_level == OMAPDSS_SIG_ACTIVE_HIGH)
|
|
mode->flags |= DRM_MODE_FLAG_PHSYNC;
|
|
else
|
|
mode->flags |= DRM_MODE_FLAG_NHSYNC;
|
|
|
|
if (timings->vsync_level == OMAPDSS_SIG_ACTIVE_HIGH)
|
|
mode->flags |= DRM_MODE_FLAG_PVSYNC;
|
|
else
|
|
mode->flags |= DRM_MODE_FLAG_NVSYNC;
|
|
}
|
|
|
|
void copy_timings_drm_to_omap(struct omap_video_timings *timings,
|
|
struct drm_display_mode *mode)
|
|
{
|
|
timings->pixelclock = mode->clock * 1000;
|
|
|
|
timings->x_res = mode->hdisplay;
|
|
timings->hfp = mode->hsync_start - mode->hdisplay;
|
|
timings->hsw = mode->hsync_end - mode->hsync_start;
|
|
timings->hbp = mode->htotal - mode->hsync_end;
|
|
|
|
timings->y_res = mode->vdisplay;
|
|
timings->vfp = mode->vsync_start - mode->vdisplay;
|
|
timings->vsw = mode->vsync_end - mode->vsync_start;
|
|
timings->vbp = mode->vtotal - mode->vsync_end;
|
|
|
|
timings->interlace = !!(mode->flags & DRM_MODE_FLAG_INTERLACE);
|
|
|
|
if (mode->flags & DRM_MODE_FLAG_PHSYNC)
|
|
timings->hsync_level = OMAPDSS_SIG_ACTIVE_HIGH;
|
|
else
|
|
timings->hsync_level = OMAPDSS_SIG_ACTIVE_LOW;
|
|
|
|
if (mode->flags & DRM_MODE_FLAG_PVSYNC)
|
|
timings->vsync_level = OMAPDSS_SIG_ACTIVE_HIGH;
|
|
else
|
|
timings->vsync_level = OMAPDSS_SIG_ACTIVE_LOW;
|
|
|
|
timings->data_pclk_edge = OMAPDSS_DRIVE_SIG_RISING_EDGE;
|
|
timings->de_level = OMAPDSS_SIG_ACTIVE_HIGH;
|
|
timings->sync_pclk_edge = OMAPDSS_DRIVE_SIG_OPPOSITE_EDGES;
|
|
}
|
|
|
|
static enum drm_connector_status omap_connector_detect(
|
|
struct drm_connector *connector, bool force)
|
|
{
|
|
struct omap_connector *omap_connector = to_omap_connector(connector);
|
|
struct omap_dss_device *dssdev = omap_connector->dssdev;
|
|
struct omap_dss_driver *dssdrv = dssdev->driver;
|
|
enum drm_connector_status ret;
|
|
|
|
if (dssdrv->detect) {
|
|
if (dssdrv->detect(dssdev))
|
|
ret = connector_status_connected;
|
|
else
|
|
ret = connector_status_disconnected;
|
|
} else if (dssdev->type == OMAP_DISPLAY_TYPE_DPI ||
|
|
dssdev->type == OMAP_DISPLAY_TYPE_DBI ||
|
|
dssdev->type == OMAP_DISPLAY_TYPE_SDI ||
|
|
dssdev->type == OMAP_DISPLAY_TYPE_DSI) {
|
|
ret = connector_status_connected;
|
|
} else {
|
|
ret = connector_status_unknown;
|
|
}
|
|
|
|
VERB("%s: %d (force=%d)", omap_connector->dssdev->name, ret, force);
|
|
|
|
return ret;
|
|
}
|
|
|
|
static void omap_connector_destroy(struct drm_connector *connector)
|
|
{
|
|
struct omap_connector *omap_connector = to_omap_connector(connector);
|
|
struct omap_dss_device *dssdev = omap_connector->dssdev;
|
|
|
|
DBG("%s", omap_connector->dssdev->name);
|
|
drm_connector_unregister(connector);
|
|
drm_connector_cleanup(connector);
|
|
kfree(omap_connector);
|
|
|
|
omap_dss_put_device(dssdev);
|
|
}
|
|
|
|
#define MAX_EDID 512
|
|
|
|
static int omap_connector_get_modes(struct drm_connector *connector)
|
|
{
|
|
struct omap_connector *omap_connector = to_omap_connector(connector);
|
|
struct omap_dss_device *dssdev = omap_connector->dssdev;
|
|
struct omap_dss_driver *dssdrv = dssdev->driver;
|
|
struct drm_device *dev = connector->dev;
|
|
int n = 0;
|
|
|
|
DBG("%s", omap_connector->dssdev->name);
|
|
|
|
/* if display exposes EDID, then we parse that in the normal way to
|
|
* build table of supported modes.. otherwise (ie. fixed resolution
|
|
* LCD panels) we just return a single mode corresponding to the
|
|
* currently configured timings:
|
|
*/
|
|
if (dssdrv->read_edid) {
|
|
void *edid = kzalloc(MAX_EDID, GFP_KERNEL);
|
|
|
|
if ((dssdrv->read_edid(dssdev, edid, MAX_EDID) > 0) &&
|
|
drm_edid_is_valid(edid)) {
|
|
drm_mode_connector_update_edid_property(
|
|
connector, edid);
|
|
n = drm_add_edid_modes(connector, edid);
|
|
|
|
omap_connector->hdmi_mode =
|
|
drm_detect_hdmi_monitor(edid);
|
|
} else {
|
|
drm_mode_connector_update_edid_property(
|
|
connector, NULL);
|
|
}
|
|
|
|
kfree(edid);
|
|
} else {
|
|
struct drm_display_mode *mode = drm_mode_create(dev);
|
|
struct omap_video_timings timings = {0};
|
|
|
|
dssdrv->get_timings(dssdev, &timings);
|
|
|
|
copy_timings_omap_to_drm(mode, &timings);
|
|
|
|
mode->type = DRM_MODE_TYPE_DRIVER | DRM_MODE_TYPE_PREFERRED;
|
|
drm_mode_set_name(mode);
|
|
drm_mode_probed_add(connector, mode);
|
|
|
|
n = 1;
|
|
}
|
|
|
|
return n;
|
|
}
|
|
|
|
static int omap_connector_mode_valid(struct drm_connector *connector,
|
|
struct drm_display_mode *mode)
|
|
{
|
|
struct omap_connector *omap_connector = to_omap_connector(connector);
|
|
struct omap_dss_device *dssdev = omap_connector->dssdev;
|
|
struct omap_dss_driver *dssdrv = dssdev->driver;
|
|
struct omap_video_timings timings = {0};
|
|
struct drm_device *dev = connector->dev;
|
|
struct drm_display_mode *new_mode;
|
|
int r, ret = MODE_BAD;
|
|
|
|
copy_timings_drm_to_omap(&timings, mode);
|
|
mode->vrefresh = drm_mode_vrefresh(mode);
|
|
|
|
/*
|
|
* if the panel driver doesn't have a check_timings, it's most likely
|
|
* a fixed resolution panel, check if the timings match with the
|
|
* panel's timings
|
|
*/
|
|
if (dssdrv->check_timings) {
|
|
r = dssdrv->check_timings(dssdev, &timings);
|
|
} else {
|
|
struct omap_video_timings t = {0};
|
|
|
|
dssdrv->get_timings(dssdev, &t);
|
|
|
|
if (memcmp(&timings, &t, sizeof(struct omap_video_timings)))
|
|
r = -EINVAL;
|
|
else
|
|
r = 0;
|
|
}
|
|
|
|
if (!r) {
|
|
/* check if vrefresh is still valid */
|
|
new_mode = drm_mode_duplicate(dev, mode);
|
|
new_mode->clock = timings.pixelclock / 1000;
|
|
new_mode->vrefresh = 0;
|
|
if (mode->vrefresh == drm_mode_vrefresh(new_mode))
|
|
ret = MODE_OK;
|
|
drm_mode_destroy(dev, new_mode);
|
|
}
|
|
|
|
DBG("connector: mode %s: "
|
|
"%d:\"%s\" %d %d %d %d %d %d %d %d %d %d 0x%x 0x%x",
|
|
(ret == MODE_OK) ? "valid" : "invalid",
|
|
mode->base.id, mode->name, mode->vrefresh, mode->clock,
|
|
mode->hdisplay, mode->hsync_start,
|
|
mode->hsync_end, mode->htotal,
|
|
mode->vdisplay, mode->vsync_start,
|
|
mode->vsync_end, mode->vtotal, mode->type, mode->flags);
|
|
|
|
return ret;
|
|
}
|
|
|
|
struct drm_encoder *omap_connector_attached_encoder(
|
|
struct drm_connector *connector)
|
|
{
|
|
struct omap_connector *omap_connector = to_omap_connector(connector);
|
|
return omap_connector->encoder;
|
|
}
|
|
|
|
static const struct drm_connector_funcs omap_connector_funcs = {
|
|
.dpms = drm_helper_connector_dpms,
|
|
.detect = omap_connector_detect,
|
|
.fill_modes = drm_helper_probe_single_connector_modes,
|
|
.destroy = omap_connector_destroy,
|
|
};
|
|
|
|
static const struct drm_connector_helper_funcs omap_connector_helper_funcs = {
|
|
.get_modes = omap_connector_get_modes,
|
|
.mode_valid = omap_connector_mode_valid,
|
|
.best_encoder = omap_connector_attached_encoder,
|
|
};
|
|
|
|
/* flush an area of the framebuffer (in case of manual update display that
|
|
* is not automatically flushed)
|
|
*/
|
|
void omap_connector_flush(struct drm_connector *connector,
|
|
int x, int y, int w, int h)
|
|
{
|
|
struct omap_connector *omap_connector = to_omap_connector(connector);
|
|
|
|
/* TODO: enable when supported in dss */
|
|
VERB("%s: %d,%d, %dx%d", omap_connector->dssdev->name, x, y, w, h);
|
|
}
|
|
|
|
/* initialize connector */
|
|
struct drm_connector *omap_connector_init(struct drm_device *dev,
|
|
int connector_type, struct omap_dss_device *dssdev,
|
|
struct drm_encoder *encoder)
|
|
{
|
|
struct drm_connector *connector = NULL;
|
|
struct omap_connector *omap_connector;
|
|
|
|
DBG("%s", dssdev->name);
|
|
|
|
omap_dss_get_device(dssdev);
|
|
|
|
omap_connector = kzalloc(sizeof(struct omap_connector), GFP_KERNEL);
|
|
if (!omap_connector)
|
|
goto fail;
|
|
|
|
omap_connector->dssdev = dssdev;
|
|
omap_connector->encoder = encoder;
|
|
|
|
connector = &omap_connector->base;
|
|
|
|
drm_connector_init(dev, connector, &omap_connector_funcs,
|
|
connector_type);
|
|
drm_connector_helper_add(connector, &omap_connector_helper_funcs);
|
|
|
|
#if 0 /* enable when dss2 supports hotplug */
|
|
if (dssdev->caps & OMAP_DSS_DISPLAY_CAP_HPD)
|
|
connector->polled = 0;
|
|
else
|
|
#endif
|
|
connector->polled = DRM_CONNECTOR_POLL_CONNECT |
|
|
DRM_CONNECTOR_POLL_DISCONNECT;
|
|
|
|
connector->interlace_allowed = 1;
|
|
connector->doublescan_allowed = 0;
|
|
|
|
drm_connector_register(connector);
|
|
|
|
return connector;
|
|
|
|
fail:
|
|
if (connector)
|
|
omap_connector_destroy(connector);
|
|
|
|
return NULL;
|
|
}
|