mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-31 00:17:44 +00:00
0425662fdf
Get rid of mode->vrefresh and just calculate it on demand. Saves a bit of space and avoids the cached value getting out of sync with reality. Mostly done with cocci, with the following manual fixups: - Remove the now empty loop in drm_helper_probe_single_connector_modes() - Fix __MODE() macro in ch7006_mode.c - Fix DRM_MODE_ARG() macro in drm_modes.h - Remove leftover comment from samsung_s6d16d0_mode - Drop the TODO @@ @@ struct drm_display_mode { ... - int vrefresh; ... }; @@ identifier N; expression E; @@ struct drm_display_mode N = { - .vrefresh = E }; @@ identifier N; expression E; @@ struct drm_display_mode N[...] = { ..., { - .vrefresh = E } ,... }; @@ expression E; @@ { DRM_MODE(...), - .vrefresh = E, } @@ identifier M, R; @@ int drm_mode_vrefresh(const struct drm_display_mode *M) { ... - if (M->vrefresh > 0) - R = M->vrefresh; - else if (...) { ... } ... } @@ struct drm_display_mode *p; expression E; @@ ( - p->vrefresh = E; | - p->vrefresh + drm_mode_vrefresh(p) ) @@ struct drm_display_mode s; expression E; @@ ( - s.vrefresh = E; | - s.vrefresh + drm_mode_vrefresh(&s) ) @@ expression E; @@ - drm_mode_vrefresh(E) ? drm_mode_vrefresh(E) : drm_mode_vrefresh(E) + drm_mode_vrefresh(E) @find_substruct@ identifier X; identifier S; @@ struct X { ... struct drm_display_mode S; ... }; @@ identifier find_substruct.S; expression E; identifier I; @@ { .S = { - .vrefresh = E } } @@ identifier find_substruct.S; identifier find_substruct.X; expression E; identifier I; @@ struct X I[...] = { ..., .S = { - .vrefresh = E } ,... }; v2: Drop TODO v3: Rebase v4: Rebase Cc: Andrzej Hajda <a.hajda@samsung.com> Cc: Neil Armstrong <narmstrong@baylibre.com> Cc: Laurent Pinchart <Laurent.pinchart@ideasonboard.com> Cc: Jonas Karlman <jonas@kwiboo.se> Cc: Jernej Skrabec <jernej.skrabec@siol.net> Cc: Inki Dae <inki.dae@samsung.com> Cc: Joonyoung Shim <jy0922.shim@samsung.com> Cc: Seung-Woo Kim <sw0312.kim@samsung.com> Cc: Kyungmin Park <kyungmin.park@samsung.com> Cc: Linus Walleij <linus.walleij@linaro.org> Cc: CK Hu <ck.hu@mediatek.com> Cc: Philipp Zabel <p.zabel@pengutronix.de> Cc: Ben Skeggs <bskeggs@redhat.com> Cc: Thierry Reding <thierry.reding@gmail.com> Cc: Sam Ravnborg <sam@ravnborg.org> Cc: Jerry Han <hanxu5@huaqin.corp-partner.google.com> Cc: Icenowy Zheng <icenowy@aosc.io> Cc: Jagan Teki <jagan@amarulasolutions.com> Cc: Stefan Mavrodiev <stefan@olimex.com> Cc: Robert Chiras <robert.chiras@nxp.com> Cc: "Guido Günther" <agx@sigxcpu.org> Cc: Purism Kernel Team <kernel@puri.sm> Cc: Benjamin Gaignard <benjamin.gaignard@linaro.org> Cc: Vincent Abriou <vincent.abriou@st.com> Cc: VMware Graphics <linux-graphics-maintainer@vmware.com> Cc: Thomas Hellstrom <thellstrom@vmware.com> Cc: linux-amlogic@lists.infradead.org Cc: nouveau@lists.freedesktop.org Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Reviewed-by: Emil Velikov <emil.velikov@collabora.com> Reviewed-by: Sam Ravnborg <sam@ravnborg.org> Acked-by: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20200428171940.19552-4-ville.syrjala@linux.intel.com
293 lines
8 KiB
C
293 lines
8 KiB
C
// SPDX-License-Identifier: GPL-2.0-or-later
|
|
/*
|
|
* Copyright (C) 2016 BayLibre, SAS
|
|
* Author: Neil Armstrong <narmstrong@baylibre.com>
|
|
* Copyright (C) 2015 Amlogic, Inc. All rights reserved.
|
|
* Copyright (C) 2014 Endless Mobile
|
|
*
|
|
* Written by:
|
|
* Jasper St. Pierre <jstpierre@mecheye.net>
|
|
*/
|
|
|
|
#include <linux/export.h>
|
|
#include <linux/of_graph.h>
|
|
|
|
#include <drm/drm_atomic_helper.h>
|
|
#include <drm/drm_device.h>
|
|
#include <drm/drm_edid.h>
|
|
#include <drm/drm_probe_helper.h>
|
|
#include <drm/drm_print.h>
|
|
|
|
#include "meson_registers.h"
|
|
#include "meson_vclk.h"
|
|
#include "meson_venc_cvbs.h"
|
|
|
|
/* HHI VDAC Registers */
|
|
#define HHI_VDAC_CNTL0 0x2F4 /* 0xbd offset in data sheet */
|
|
#define HHI_VDAC_CNTL0_G12A 0x2EC /* 0xbd offset in data sheet */
|
|
#define HHI_VDAC_CNTL1 0x2F8 /* 0xbe offset in data sheet */
|
|
#define HHI_VDAC_CNTL1_G12A 0x2F0 /* 0xbe offset in data sheet */
|
|
|
|
struct meson_venc_cvbs {
|
|
struct drm_encoder encoder;
|
|
struct drm_connector connector;
|
|
struct meson_drm *priv;
|
|
};
|
|
#define encoder_to_meson_venc_cvbs(x) \
|
|
container_of(x, struct meson_venc_cvbs, encoder)
|
|
|
|
#define connector_to_meson_venc_cvbs(x) \
|
|
container_of(x, struct meson_venc_cvbs, connector)
|
|
|
|
/* Supported Modes */
|
|
|
|
struct meson_cvbs_mode meson_cvbs_modes[MESON_CVBS_MODES_COUNT] = {
|
|
{ /* PAL */
|
|
.enci = &meson_cvbs_enci_pal,
|
|
.mode = {
|
|
DRM_MODE("720x576i", DRM_MODE_TYPE_DRIVER, 13500,
|
|
720, 732, 795, 864, 0, 576, 580, 586, 625, 0,
|
|
DRM_MODE_FLAG_INTERLACE),
|
|
.picture_aspect_ratio = HDMI_PICTURE_ASPECT_4_3,
|
|
},
|
|
},
|
|
{ /* NTSC */
|
|
.enci = &meson_cvbs_enci_ntsc,
|
|
.mode = {
|
|
DRM_MODE("720x480i", DRM_MODE_TYPE_DRIVER, 13500,
|
|
720, 739, 801, 858, 0, 480, 488, 494, 525, 0,
|
|
DRM_MODE_FLAG_INTERLACE),
|
|
.picture_aspect_ratio = HDMI_PICTURE_ASPECT_4_3,
|
|
},
|
|
},
|
|
};
|
|
|
|
static const struct meson_cvbs_mode *
|
|
meson_cvbs_get_mode(const struct drm_display_mode *req_mode)
|
|
{
|
|
int i;
|
|
|
|
for (i = 0; i < MESON_CVBS_MODES_COUNT; ++i) {
|
|
struct meson_cvbs_mode *meson_mode = &meson_cvbs_modes[i];
|
|
|
|
if (drm_mode_match(req_mode, &meson_mode->mode,
|
|
DRM_MODE_MATCH_TIMINGS |
|
|
DRM_MODE_MATCH_CLOCK |
|
|
DRM_MODE_MATCH_FLAGS |
|
|
DRM_MODE_MATCH_3D_FLAGS))
|
|
return meson_mode;
|
|
}
|
|
|
|
return NULL;
|
|
}
|
|
|
|
/* Connector */
|
|
|
|
static void meson_cvbs_connector_destroy(struct drm_connector *connector)
|
|
{
|
|
drm_connector_cleanup(connector);
|
|
}
|
|
|
|
static enum drm_connector_status
|
|
meson_cvbs_connector_detect(struct drm_connector *connector, bool force)
|
|
{
|
|
/* FIXME: Add load-detect or jack-detect if possible */
|
|
return connector_status_connected;
|
|
}
|
|
|
|
static int meson_cvbs_connector_get_modes(struct drm_connector *connector)
|
|
{
|
|
struct drm_device *dev = connector->dev;
|
|
struct drm_display_mode *mode;
|
|
int i;
|
|
|
|
for (i = 0; i < MESON_CVBS_MODES_COUNT; ++i) {
|
|
struct meson_cvbs_mode *meson_mode = &meson_cvbs_modes[i];
|
|
|
|
mode = drm_mode_duplicate(dev, &meson_mode->mode);
|
|
if (!mode) {
|
|
DRM_ERROR("Failed to create a new display mode\n");
|
|
return 0;
|
|
}
|
|
|
|
drm_mode_probed_add(connector, mode);
|
|
}
|
|
|
|
return i;
|
|
}
|
|
|
|
static int meson_cvbs_connector_mode_valid(struct drm_connector *connector,
|
|
struct drm_display_mode *mode)
|
|
{
|
|
/* Validate the modes added in get_modes */
|
|
return MODE_OK;
|
|
}
|
|
|
|
static const struct drm_connector_funcs meson_cvbs_connector_funcs = {
|
|
.detect = meson_cvbs_connector_detect,
|
|
.fill_modes = drm_helper_probe_single_connector_modes,
|
|
.destroy = meson_cvbs_connector_destroy,
|
|
.reset = drm_atomic_helper_connector_reset,
|
|
.atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state,
|
|
.atomic_destroy_state = drm_atomic_helper_connector_destroy_state,
|
|
};
|
|
|
|
static const
|
|
struct drm_connector_helper_funcs meson_cvbs_connector_helper_funcs = {
|
|
.get_modes = meson_cvbs_connector_get_modes,
|
|
.mode_valid = meson_cvbs_connector_mode_valid,
|
|
};
|
|
|
|
/* Encoder */
|
|
|
|
static void meson_venc_cvbs_encoder_destroy(struct drm_encoder *encoder)
|
|
{
|
|
drm_encoder_cleanup(encoder);
|
|
}
|
|
|
|
static const struct drm_encoder_funcs meson_venc_cvbs_encoder_funcs = {
|
|
.destroy = meson_venc_cvbs_encoder_destroy,
|
|
};
|
|
|
|
static int meson_venc_cvbs_encoder_atomic_check(struct drm_encoder *encoder,
|
|
struct drm_crtc_state *crtc_state,
|
|
struct drm_connector_state *conn_state)
|
|
{
|
|
if (meson_cvbs_get_mode(&crtc_state->mode))
|
|
return 0;
|
|
|
|
return -EINVAL;
|
|
}
|
|
|
|
static void meson_venc_cvbs_encoder_disable(struct drm_encoder *encoder)
|
|
{
|
|
struct meson_venc_cvbs *meson_venc_cvbs =
|
|
encoder_to_meson_venc_cvbs(encoder);
|
|
struct meson_drm *priv = meson_venc_cvbs->priv;
|
|
|
|
/* Disable CVBS VDAC */
|
|
if (meson_vpu_is_compatible(priv, VPU_COMPATIBLE_G12A)) {
|
|
regmap_write(priv->hhi, HHI_VDAC_CNTL0_G12A, 0);
|
|
regmap_write(priv->hhi, HHI_VDAC_CNTL1_G12A, 0);
|
|
} else {
|
|
regmap_write(priv->hhi, HHI_VDAC_CNTL0, 0);
|
|
regmap_write(priv->hhi, HHI_VDAC_CNTL1, 8);
|
|
}
|
|
}
|
|
|
|
static void meson_venc_cvbs_encoder_enable(struct drm_encoder *encoder)
|
|
{
|
|
struct meson_venc_cvbs *meson_venc_cvbs =
|
|
encoder_to_meson_venc_cvbs(encoder);
|
|
struct meson_drm *priv = meson_venc_cvbs->priv;
|
|
|
|
/* VDAC0 source is not from ATV */
|
|
writel_bits_relaxed(VENC_VDAC_SEL_ATV_DMD, 0,
|
|
priv->io_base + _REG(VENC_VDAC_DACSEL0));
|
|
|
|
if (meson_vpu_is_compatible(priv, VPU_COMPATIBLE_GXBB)) {
|
|
regmap_write(priv->hhi, HHI_VDAC_CNTL0, 1);
|
|
regmap_write(priv->hhi, HHI_VDAC_CNTL1, 0);
|
|
} else if (meson_vpu_is_compatible(priv, VPU_COMPATIBLE_GXM) ||
|
|
meson_vpu_is_compatible(priv, VPU_COMPATIBLE_GXL)) {
|
|
regmap_write(priv->hhi, HHI_VDAC_CNTL0, 0xf0001);
|
|
regmap_write(priv->hhi, HHI_VDAC_CNTL1, 0);
|
|
} else if (meson_vpu_is_compatible(priv, VPU_COMPATIBLE_G12A)) {
|
|
regmap_write(priv->hhi, HHI_VDAC_CNTL0_G12A, 0x906001);
|
|
regmap_write(priv->hhi, HHI_VDAC_CNTL1_G12A, 0);
|
|
}
|
|
}
|
|
|
|
static void meson_venc_cvbs_encoder_mode_set(struct drm_encoder *encoder,
|
|
struct drm_display_mode *mode,
|
|
struct drm_display_mode *adjusted_mode)
|
|
{
|
|
const struct meson_cvbs_mode *meson_mode = meson_cvbs_get_mode(mode);
|
|
struct meson_venc_cvbs *meson_venc_cvbs =
|
|
encoder_to_meson_venc_cvbs(encoder);
|
|
struct meson_drm *priv = meson_venc_cvbs->priv;
|
|
|
|
if (meson_mode) {
|
|
meson_venci_cvbs_mode_set(priv, meson_mode->enci);
|
|
|
|
/* Setup 27MHz vclk2 for ENCI and VDAC */
|
|
meson_vclk_setup(priv, MESON_VCLK_TARGET_CVBS,
|
|
MESON_VCLK_CVBS, MESON_VCLK_CVBS,
|
|
MESON_VCLK_CVBS, MESON_VCLK_CVBS,
|
|
true);
|
|
}
|
|
}
|
|
|
|
static const struct drm_encoder_helper_funcs
|
|
meson_venc_cvbs_encoder_helper_funcs = {
|
|
.atomic_check = meson_venc_cvbs_encoder_atomic_check,
|
|
.disable = meson_venc_cvbs_encoder_disable,
|
|
.enable = meson_venc_cvbs_encoder_enable,
|
|
.mode_set = meson_venc_cvbs_encoder_mode_set,
|
|
};
|
|
|
|
static bool meson_venc_cvbs_connector_is_available(struct meson_drm *priv)
|
|
{
|
|
struct device_node *remote;
|
|
|
|
remote = of_graph_get_remote_node(priv->dev->of_node, 0, 0);
|
|
if (!remote)
|
|
return false;
|
|
|
|
of_node_put(remote);
|
|
return true;
|
|
}
|
|
|
|
int meson_venc_cvbs_create(struct meson_drm *priv)
|
|
{
|
|
struct drm_device *drm = priv->drm;
|
|
struct meson_venc_cvbs *meson_venc_cvbs;
|
|
struct drm_connector *connector;
|
|
struct drm_encoder *encoder;
|
|
int ret;
|
|
|
|
if (!meson_venc_cvbs_connector_is_available(priv)) {
|
|
dev_info(drm->dev, "CVBS Output connector not available\n");
|
|
return 0;
|
|
}
|
|
|
|
meson_venc_cvbs = devm_kzalloc(priv->dev, sizeof(*meson_venc_cvbs),
|
|
GFP_KERNEL);
|
|
if (!meson_venc_cvbs)
|
|
return -ENOMEM;
|
|
|
|
meson_venc_cvbs->priv = priv;
|
|
encoder = &meson_venc_cvbs->encoder;
|
|
connector = &meson_venc_cvbs->connector;
|
|
|
|
/* Connector */
|
|
|
|
drm_connector_helper_add(connector,
|
|
&meson_cvbs_connector_helper_funcs);
|
|
|
|
ret = drm_connector_init(drm, connector, &meson_cvbs_connector_funcs,
|
|
DRM_MODE_CONNECTOR_Composite);
|
|
if (ret) {
|
|
dev_err(priv->dev, "Failed to init CVBS connector\n");
|
|
return ret;
|
|
}
|
|
|
|
connector->interlace_allowed = 1;
|
|
|
|
/* Encoder */
|
|
|
|
drm_encoder_helper_add(encoder, &meson_venc_cvbs_encoder_helper_funcs);
|
|
|
|
ret = drm_encoder_init(drm, encoder, &meson_venc_cvbs_encoder_funcs,
|
|
DRM_MODE_ENCODER_TVDAC, "meson_venc_cvbs");
|
|
if (ret) {
|
|
dev_err(priv->dev, "Failed to init CVBS encoder\n");
|
|
return ret;
|
|
}
|
|
|
|
encoder->possible_crtcs = BIT(0);
|
|
|
|
drm_connector_attach_encoder(connector, encoder);
|
|
|
|
return 0;
|
|
}
|