Hi Sean
Thanks for your detailed review. I'm working to modify most of code
according to comment.
And there is reply for some comment
On 07/13/2016 09:59 PM, Sean Paul wrote:
> On Tue, Jul 12, 2016 at 8:09 AM, Chris Zhong <zyw at rock-chips.com> wrote:
>> Add support for cdn DP controller which is embedded in the rk3399
>> SoCs. The DP is compliant with DisplayPort Specification,
>> Version 1.3, This IP is compatible with the rockchip type-c PHY IP.
>> There is a uCPU in DP controller, it need a firmware to work,
>> please put the firmware file to /lib/firmware/cdn/dptx.bin. The
>> uCPU in charge of aux communication and link training, the host use
>> mailbox to communicate with the ucpu.
>> The dclk pin_pol of vop must not be invert for DP.
>>
>> Signed-off-by: Chris Zhong <zyw at rock-chips.com>
>>
>> ---
>>
>> Changes in v5:
>> - alphabetical order
>> - do not use long, use u32 or u64
>> - return MODE_CLOCK_HIGH when requested > actual
>> - Optimized Coding Style
>> - add a formula to get better tu size and symbol value.
>>
>> Changes in v4:
>> - use phy framework to control DP phy
>> - support 2 phys
>>
>> Changes in v3:
>> - use EXTCON_DISP_DP and EXTCON_DISP_DP_ALT cable to get dp port state.
>> - reset spdif before config it
>> - modify the firmware clk to 100Mhz
>> - retry load firmware if fw file is requested too early
>>
>> Changes in v2:
>> - Alphabetic order
>> - remove excess error message
>> - use define clk_rate
>> - check all return value
>> - remove dev_set_name(dp->dev, "cdn-dp");
>> - use schedule_delayed_work
>> - remove never-called functions
>> - remove some unnecessary ()
>>
>> Changes in v1:
>> - use extcon API
>> - use hdmi-codec for the DP Asoc
>> - do not initialize the "ret"
>> - printk a err log when drm_of_encoder_active_endpoint_id
>> - modify the dclk pin_pol to a single line
>>
>> drivers/gpu/drm/rockchip/Kconfig | 9 +
>> drivers/gpu/drm/rockchip/Makefile | 1 +
>> drivers/gpu/drm/rockchip/cdn-dp-core.c | 761 ++++++++++++++++++++++++++++
>> drivers/gpu/drm/rockchip/cdn-dp-core.h | 113 +++++
>> drivers/gpu/drm/rockchip/cdn-dp-reg.c | 740 +++++++++++++++++++++++++++
>> drivers/gpu/drm/rockchip/cdn-dp-reg.h | 409 +++++++++++++++
> Could you explain the file naming convention in the rk driver? We've
> got analogix_dp-rockchip.c, dw_hdmi-rockchip.c, dw-mipi-dsi.c, and now
> cdn-dp-(core|reg).[ch]. I'm honestly not sure whether these filenames
> are consistent with the rest, but bleh.
>
cdn is the IP vendor's name
dp is the controller's name.
>> drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 6 +-
>> drivers/gpu/drm/rockchip/rockchip_drm_vop.h | 2 +
>> drivers/gpu/drm/rockchip/rockchip_vop_reg.c | 2 +
>> 9 files changed, 2042 insertions(+), 1 deletion(-)
>> create mode 100644 drivers/gpu/drm/rockchip/cdn-dp-core.c
>> create mode 100644 drivers/gpu/drm/rockchip/cdn-dp-core.h
>> create mode 100644 drivers/gpu/drm/rockchip/cdn-dp-reg.c
>> create mode 100644 drivers/gpu/drm/rockchip/cdn-dp-reg.h
>>
>> diff --git a/drivers/gpu/drm/rockchip/Kconfig b/drivers/gpu/drm/rockchip/Kconfig
>> index d30bdc3..20da9a8 100644
>> --- a/drivers/gpu/drm/rockchip/Kconfig
>> +++ b/drivers/gpu/drm/rockchip/Kconfig
>> @@ -25,6 +25,15 @@ config ROCKCHIP_ANALOGIX_DP
>> for the Analogix Core DP driver. If you want to enable DP
>> on RK3288 based SoC, you should selet this option.
>>
>> +config ROCKCHIP_CDN_DP
>> + tristate "Rockchip cdn DP"
>> + depends on DRM_ROCKCHIP
>> + help
>> + This selects support for Rockchip SoC specific extensions
>> + for the cdn Dp driver. If you want to enable Dp on
> s/Dp/DP/
>
>> + RK3399 based SoC, you should selet this
> s/selet/select/
>
>> + option.
>> +
>> config ROCKCHIP_DW_HDMI
>> tristate "Rockchip specific extensions for Synopsys DW HDMI"
>> depends on DRM_ROCKCHIP
>> diff --git a/drivers/gpu/drm/rockchip/Makefile b/drivers/gpu/drm/rockchip/Makefile
>> index 05d0713..abdecd5 100644
>> --- a/drivers/gpu/drm/rockchip/Makefile
>> +++ b/drivers/gpu/drm/rockchip/Makefile
>> @@ -7,6 +7,7 @@ rockchipdrm-y := rockchip_drm_drv.o rockchip_drm_fb.o \
>> rockchipdrm-$(CONFIG_DRM_FBDEV_EMULATION) += rockchip_drm_fbdev.o
>>
>> obj-$(CONFIG_ROCKCHIP_ANALOGIX_DP) += analogix_dp-rockchip.o
>> +obj-$(CONFIG_ROCKCHIP_CDN_DP) += cdn-dp-core.o cdn-dp-reg.o
>> obj-$(CONFIG_ROCKCHIP_DW_HDMI) += dw_hdmi-rockchip.o
>> obj-$(CONFIG_ROCKCHIP_DW_MIPI_DSI) += dw-mipi-dsi.o
>> obj-$(CONFIG_ROCKCHIP_INNO_HDMI) += inno_hdmi.o
>> diff --git a/drivers/gpu/drm/rockchip/cdn-dp-core.c b/drivers/gpu/drm/rockchip/cdn-dp-core.c
>> new file mode 100644
>> index 0000000..5b8a15e
>> --- /dev/null
>> +++ b/drivers/gpu/drm/rockchip/cdn-dp-core.c
>> @@ -0,0 +1,761 @@
>> +/*
>> + * Copyright (C) Fuzhou Rockchip Electronics Co.Ltd
>> + * Author: Chris Zhong <zyw at rock-chips.com>
>> + *
>> + * This software is licensed under the terms of the GNU General Public
>> + * License version 2, as published by the Free Software Foundation, and
>> + * may be copied, distributed, and modified under those terms.
>> + *
>> + * 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.
>> + */
>> +
>> +#include <drm/drmP.h>
>> +#include <drm/drm_atomic_helper.h>
>> +#include <drm/drm_crtc_helper.h>
>> +#include <drm/drm_dp_helper.h>
>> +#include <drm/drm_edid.h>
>> +#include <drm/drm_of.h>
>> +
>> +#include <linux/clk.h>
>> +#include <linux/component.h>
>> +#include <linux/extcon.h>
>> +#include <linux/firmware.h>
>> +#include <linux/regmap.h>
>> +#include <linux/reset.h>
>> +#include <linux/mfd/syscon.h>
>> +#include <linux/phy/phy.h>
>> +
>> +#include <sound/hdmi-codec.h>
>> +
>> +#include <video/of_videomode.h>
>> +#include <video/videomode.h>
> Doesn't seem like you use these.
>
>
>> +
>> +#include "cdn-dp-core.h"
>> +#include "cdn-dp-reg.h"
>> +#include "rockchip_drm_vop.h"
>> +
>> +#define connector_to_dp(c) \
>> + container_of(c, struct cdn_dp_device, connector)
>> +
>> +#define encoder_to_dp(c) \
>> + container_of(c, struct cdn_dp_device, encoder)
>> +
>> +/* dp grf register offset */
>> +#define DP_VOP_SEL 0x6224
>> +#define DP_SEL_VOP_LIT BIT(12)
>> +#define DP_CLK_RATE 100000000
> If this clock rate never changes, it should probably live somewhere in
> the clock driver.
>
>> +#define WAIT_HPD_STABLE 300
> Encode the units in these two define names, ie: DP_CLK_RATE_HZ,
> WAIT_HPD_STABLE_MS
>
>> +
>> +static int cdn_dp_clk_enable(struct cdn_dp_device *dp)
>> +{
>> + int ret;
>> +
>> + ret = clk_prepare_enable(dp->pclk);
>> + if (ret < 0) {
>> + dev_err(dp->dev, "cannot enable dp pclk %d\n", ret);
>> + goto err_pclk;
>> + }
>> +
>> + ret = clk_prepare_enable(dp->core_clk);
>> + if (ret < 0) {
>> + dev_err(dp->dev, "cannot enable core_clk %d\n", ret);
>> + goto err_core_clk;
>> + }
>> +
>> + ret = clk_set_rate(dp->core_clk, DP_CLK_RATE);
>> + if (ret < 0) {
>> + dev_err(dp->dev, "cannot set dp core clk to %d %d\n",
>> + DP_CLK_RATE, ret);
>> + goto err_set_rate;
>> + }
>> +
>> + /* notice fw the clk freq value */
> This might be clearer if it was rephrased to "update fw with the
> current core clk frequency". I still think the rate should be set in
> the clock driver, and perhaps you can query the rate to get the
> current value.
This function is setting the controller register, it let the uCPU know
what freq it is, then the uCPU use this value to do something.
>
>> + cdn_dp_set_fw_clk(dp, DP_CLK_RATE);
>> +
>> + return 0;
>> +
>> +err_set_rate:
>> + clk_disable_unprepare(dp->core_clk);
>> +err_core_clk:
>> + clk_disable_unprepare(dp->pclk);
>> +err_pclk:
>> + return ret;
>> +}
>> +
>> +static enum drm_connector_status
>> +cdn_dp_connector_detect(struct drm_connector *connector, bool force)
>> +{
>> + struct cdn_dp_device *dp = connector_to_dp(connector);
>> +
>> + return dp->hpd_status ? connector_status_connected :
>> + connector_status_disconnected;
> If you just stored hpd_status as drm_connector_status, you could avoid
> having to translate the bool.
>
>> +}
>> +
>> +static void cdn_dp_connector_destroy(struct drm_connector *connector)
>> +{
>> + drm_connector_unregister(connector);
>> + drm_connector_cleanup(connector);
>> +}
>> +
>> +static struct drm_connector_funcs cdn_dp_atomic_connector_funcs = {
>> + .dpms = drm_atomic_helper_connector_dpms,
>> + .detect = cdn_dp_connector_detect,
>> + .destroy = cdn_dp_connector_destroy,
>> + .fill_modes = drm_helper_probe_single_connector_modes,
>> + .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 int cdn_dp_connector_get_modes(struct drm_connector *connector)
>> +{
>> + struct cdn_dp_device *dp = connector_to_dp(connector);
>> + struct edid *edid;
>> +
>> + if (!dp->fw_loaded)
> Can this actually happen? Seems like we shouldn't be returning
> connected from detect if the fw isn't loaded, so this should never be
> true. If that is the case, I think BUG_ON or WARN_ON would be more
> appropriate here.
>
>
>> + return 0;
>> +
>> + edid = drm_do_get_edid(connector, cdn_dp_get_edid_block, dp);
>> + if (edid) {
>> + dev_dbg(dp->dev, "got edid: width[%d] x height[%d]\n",
>> + edid->width_cm, edid->height_cm);
>> +
>> + dp->sink_has_audio = drm_detect_monitor_audio(edid);
>> + drm_mode_connector_update_edid_property(connector, edid);
>> + drm_add_edid_modes(connector, edid);
>> + /* Store the ELD */
> This comment isn't useful
>
>> + drm_edid_to_eld(connector, edid);
>> + kfree(edid);
>> + } else {
>> + dev_dbg(dp->dev, "failed to get edid\n");
> This seems to warrant a stronger level than dbg, perhaps warn. Also,
> should this really return success?
>
>> + }
>> +
>> + return 0;
>> +}
>> +
>> +static struct drm_encoder *
>> + cdn_dp_connector_best_encoder(struct drm_connector *connector)
>> +{
>> + struct cdn_dp_device *dp = connector_to_dp(connector);
>> +
>> + return &dp->encoder;
>> +}
>> +
>> +static int cdn_dp_connector_mode_valid(struct drm_connector *connector,
>> + struct drm_display_mode *mode)
>> +{
>> + struct cdn_dp_device *dp = connector_to_dp(connector);
>> + struct drm_display_info *display_info = &dp->connector.display_info;
>> + u32 requested = mode->clock * display_info->bpc * 3 / 1000;
>> + u32 actual, rate;
>> +
>> + rate = drm_dp_bw_code_to_link_rate(dp->link.rate);
>> + actual = rate * dp->link.num_lanes / 100;
>> +
>> + /* efficiency is about 0.8 */
>> + actual = actual * 8 / 10;
>> +
>> + if (requested > actual) {
>> + dev_dbg(dp->dev, "requested=%d, actual=%d, clock=%d\n",
>> + requested, actual, mode->clock);
>> + return MODE_CLOCK_HIGH;
>> + }
> This doesn't seem like something that is likely to happen given the
> trained rate should be a function of the display that's attached. Is
> that correct?
Yes, the link training should be a function of the display. But
sometimes the edid give
us a excess size for default resolution, it need somewhere to do this
mode valid checking.
Maybe we can do it at mode_set.
...
>
>> + hdr = (struct cdn_firmware_header *)fw->data;
>> + if (fw->size != le32_to_cpu(hdr->size_bytes))
>> + return -EINVAL;
>> +
>> + iram_data = (const u32 *)(fw->data + hdr->header_size);
>> + dram_data = (const u32 *)(fw->data + hdr->header_size + hdr->iram_size);
>> +
>> + ret = cdn_dp_load_firmware(dp, iram_data, hdr->iram_size,
>> + dram_data, hdr->dram_size);
>> + if (ret)
>> + return ret;
>> +
>> + release_firmware(fw);
> Move this out of here and into the same scope as request_firmware so
> there are no leaks.
>
>> +
>> + ret = cdn_dp_active(dp, true);
>> + if (ret) {
>> + dev_err(dp->dev, "active ucpu failed: %d\n", ret);
>> + return ret;
>> + }
>> +
>> + return cdn_dp_event_config(dp);
>> +}
>> +
>> +static int cdn_dp_init(struct cdn_dp_device *dp)
>> +{
>> + struct device *dev = dp->dev;
>> + struct device_node *np = dev->of_node;
>> + struct platform_device *pdev = to_platform_device(dev);
>> + struct resource *res;
>> + int ret;
>> +
>> + dp->grf = syscon_regmap_lookup_by_phandle(np, "rockchip,grf");
>> + if (IS_ERR(dp->grf)) {
>> + dev_err(dev, "cdn-dp needs rockchip,grf property\n");
>> + return PTR_ERR(dp->grf);
>> + }
>> +
>> + dp->irq = platform_get_irq(pdev, 0);
>> + if (dp->irq < 0) {
>> + dev_err(dev, "cdn-dp can not get irq\n");
>> + return dp->irq;
>> + }
>> +
>> + res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
>> + dp->regs = devm_ioremap_resource(dev, res);
>> + if (IS_ERR(dp->regs)) {
>> + dev_err(dev, "ioremap reg failed\n");
>> + return PTR_ERR(dp->regs);
>> + }
>> +
>> + dp->core_clk = devm_clk_get(dev, "core-clk");
>> + if (IS_ERR(dp->core_clk)) {
>> + dev_err(dev, "cannot get core_clk_dp\n");
>> + return PTR_ERR(dp->core_clk);
>> + }
>> +
>> + dp->pclk = devm_clk_get(dev, "pclk");
>> + if (IS_ERR(dp->pclk)) {
>> + dev_err(dev, "cannot get pclk\n");
>> + return PTR_ERR(dp->pclk);
>> + }
>> +
>> + dp->spdif_clk = devm_clk_get(dev, "spdif");
>> + if (IS_ERR(dp->spdif_clk)) {
>> + dev_err(dev, "cannot get spdif_clk\n");
>> + return PTR_ERR(dp->spdif_clk);
>> + }
>> +
>> + dp->spdif_rst = devm_reset_control_get(dev, "spdif");
>> + if (IS_ERR(dp->spdif_rst)) {
>> + dev_err(dev, "no spdif reset control found\n");
>> + return PTR_ERR(dp->spdif_rst);
>> + }
>> +
>> + dp->dpms_mode = DRM_MODE_DPMS_OFF;
>> +
>> + ret = cdn_dp_clk_enable(dp);
>> + if (ret < 0)
>> + return ret;
>> +
>> + dp_clock_reset_seq(dp);
>> +
>> + return 0;
>> +}
>> +
>> +static int cdn_dp_audio_hw_params(struct device *dev,
>> + struct hdmi_codec_daifmt *daifmt,
>> + struct hdmi_codec_params *params)
>> +{
>> + struct cdn_dp_device *dp = dev_get_drvdata(dev);
>> + struct audio_info audio = {
>> + .sample_width = params->sample_width,
>> + .sample_rate = params->sample_rate,
>> + .channels = params->channels,
>> + };
>> + int ret;
>> +
>> + if (!dp->encoder.crtc)
>> + return -ENODEV;
>> +
>> + switch (daifmt->fmt) {
>> + case HDMI_I2S:
>> + audio.format = AFMT_I2S;
>> + break;
>> + case HDMI_SPDIF:
>> + audio.format = AFMT_SPDIF;
>> + break;
>> + default:
>> + dev_err(dev, "%s: Invalid format %d\n", __func__, daifmt->fmt);
>> + return -EINVAL;
>> + }
>> +
>> + ret = cdn_dp_audio_config_set(dp, &audio);
>> + if (!ret)
>> + dp->audio_info = audio;
>> +
>> + return ret;
>> +}
>> +
>> +static void cdn_dp_audio_shutdown(struct device *dev)
>> +{
>> + struct cdn_dp_device *dp = dev_get_drvdata(dev);
>> + int ret = cdn_dp_audio_stop(dp, &dp->audio_info);
>> +
>> + if (!ret)
>> + dp->audio_info.format = AFMT_UNUSED;
>> +}
>> +
>> +static int cdn_dp_audio_digital_mute(struct device *dev, bool enable)
>> +{
>> + struct cdn_dp_device *dp = dev_get_drvdata(dev);
>> +
>> + return cdn_dp_audio_mute(dp, enable);
>> +}
>> +
>> +static int cdn_dp_audio_get_eld(struct device *dev, uint8_t *buf, size_t len)
>> +{
>> + struct cdn_dp_device *dp = dev_get_drvdata(dev);
>> + struct drm_mode_config *config = &dp->encoder.dev->mode_config;
>> + struct drm_connector *connector;
>> + int ret = -ENODEV;
>> +
>> + mutex_lock(&config->mutex);
>> + list_for_each_entry(connector, &config->connector_list, head) {
>> + if (&dp->encoder == connector->encoder) {
>> + memcpy(buf, connector->eld,
>> + min(sizeof(connector->eld), len));
>> + ret = 0;
>> + }
>> + }
>> + mutex_unlock(&config->mutex);
>> +
>> + return ret;
>> +}
>> +
>> +static const struct hdmi_codec_ops audio_codec_ops = {
>> + .hw_params = cdn_dp_audio_hw_params,
>> + .audio_shutdown = cdn_dp_audio_shutdown,
>> + .digital_mute = cdn_dp_audio_digital_mute,
>> + .get_eld = cdn_dp_audio_get_eld,
>> +};
>> +
>> +static int cdn_dp_audio_codec_init(struct cdn_dp_device *dp,
>> + struct device *dev)
>> +{
>> + struct hdmi_codec_pdata codec_data = {
>> + .i2s = 1,
>> + .spdif = 1,
>> + .ops = &audio_codec_ops,
>> + .max_i2s_channels = 8,
>> + };
>> +
>> + dp->audio_pdev = platform_device_register_data(
>> + dev, HDMI_CODEC_DRV_NAME, PLATFORM_DEVID_AUTO,
>> + &codec_data, sizeof(codec_data));
>> +
>> + return PTR_ERR_OR_ZERO(dp->audio_pdev);
>> +}
>> +
>> +static void cdn_dp_get_state(struct cdn_dp_device *dp, struct extcon_dev *edev)
>> +{
>> + bool dfp, dptx;
>> + u8 cap_lanes;
>> +
>> + dfp = extcon_get_cable_state_(edev, EXTCON_USB_HOST);
>> + dptx = extcon_get_cable_state_(edev, EXTCON_DISP_DP);
>> +
>> + if (dfp && dptx)
>> + cap_lanes = 2;
>> + else if (dptx)
>> + cap_lanes = 4;
>> + else
>> + cap_lanes = 0;
>> +
>> + if (cap_lanes != dp->cap_lanes) {
>> + dp->cap_lanes = cap_lanes;
>> + schedule_delayed_work(&dp->event_wq, 0);
>> + }
> A get function shouldn't be scheduling work. Keep the assignment here
> and move the schedule into the pd_event function.
>
>> +}
>> +
>> +static int cdn_dp_pd_event(struct notifier_block *nb,
>> + unsigned long event, void *priv)
>> +{
>> + struct cdn_dp_device *dp;
>> + struct extcon_dev *edev = priv;
>> + u8 i;
>> +
>> + dp = container_of(nb, struct cdn_dp_device, event_nb);
>> +
>> + for (i = 0; i < MAX_PHY; i++) {
>> + if (edev == dp->extcon[i]) {
>> + dp->port_id = i;
>> + break;
>> + }
>> + }
>> +
>> + cdn_dp_get_state(dp, edev);
> There's a race here. If the cap_lanes change in between scheduling the
> work and the work function running (ie, plug/unplug), the work
> function will have out-of-date information. You should call this from
> the work function instead.
>
>
>> +
>> + return 0;
>> +}
>> +
>> +static void cdn_dp_pd_event_wq(struct work_struct *work)
>> +{
>> + struct cdn_dp_device *dp;
>> + int ret;
>> +
>> + dp = container_of(work, struct cdn_dp_device, event_wq.work);
>> +
>> + ret = request_firmware(&dp->fw, "cdn/dptx.bin", dp->dev);
> This filename needs to be abstracted into a #define.
>
> You're also failing to call release_firmware in a bunch of cases
> below. It needs to be sorted out.
>
>
>> + if (ret == -ENOENT && !dp->fw_loaded) {
> So the case where ret == -ENOENT and dp->fw_loaded is valid? Or is that a bug?
>
> I'm not convinced you need fw_loaded stored in cdn_dp_device. It seems
> like something you could either get rid of (hopefully), or convert to
> a local.
it is not bug, "ret == -ENOENT" is for file missing, maybe user space is
not ready.
if dp->fw_loaded it means the firmware has been loaded, do not load again.
>
>> + /*
>> + * If can not find the file, retry to load the firmware in 1
>> + * second, if still failed after 1 minute, give up.
>> + */
>> + if (dp->fw_retry++ < 60) {
>> + schedule_delayed_work(&dp->event_wq,
>> + msecs_to_jiffies(HZ));
> I'd rather do this as an exponential back-off so if it doesn't find
> the file, it waits progressively longer.
>
> Perhaps something like:
>
> #define MAX_FW_WAIT_SECS 64
>
> [...]
>
> if (dp->fw_wait <= MAX_FW_WAIT_SECS) {
> schedule_delayed_work(&dp_>event_wq, msecs_to_jiffies(dp->fw_wait * HZ));
> dp->fw_wait *= 2;
> }
If so, sometimes boot with DP will later than boot and then plug DP cable.
>> + }
>> +
>> + dev_err(dp->dev, "failed to request firmware %d\n", ret);
> Print the wait/retries.
>
>> + return;
>> + }
>> +
>> + if (!dp->cap_lanes) {
>> + if (dp->phy_status[dp->port_id])
>> + phy_power_off(dp->phy[dp->port_id]);
>> + dp->phy_status[dp->port_id] = 0;
>> + dp->hpd_status = false;
>> + drm_helper_hpd_irq_event(dp->drm_dev);
>> + return;
>> + }
>> +
>> + if (!dp->phy_status[dp->port_id]) {
>> + ret = phy_power_on(dp->phy[dp->port_id]);
>> + if (ret)
> Log something in this case
>
>> + return;
>> +
>> + msleep(WAIT_HPD_STABLE);
> 300ms is a long time, do we really need to wait that long?
The 300ms is a safe value, maybe this time can be reduced
>
>> + }
>> +
>> + dp->phy_status[dp->port_id] = 1;
> Do you really need phy_status? It seems like if things are
> well-behaved you shouldn't need it. Of course, if you're turning
> on/off multiple times, perhaps there's a bug elsewhere.
This status is needed, since the phy_power_on would increase the
power_count, this status can avoid power on multiple times
>
>> +
>> + ret = cdn_dp_firmware_init(dp);
>> + if (ret)
>> + return;
>> +
>> + /* read hpd status failed, or the hpd does not exist. */
>> + ret = cdn_dp_get_hpd_status(dp);
>> + if (ret <= 0)
> Log something?
>
>> + return;
>> +
>> + /*
>> + * Set the capability and start the training process once
>> + * the hpd is detected.
>> + */
>> + ret = cdn_dp_set_host_cap(dp);
>> + if (ret) {
>> + dev_err(dp->dev, "set host capabilities failed\n");
> print ret
>
>> + return;
>> + }
>> +
>> + ret = cdn_dp_training_start(dp);
>> + if (ret) {
>> + dev_err(dp->dev, "hw lt err:%d\n", ret);
> s/lt/link training/
>
>> + return;
>> + }
>> +
>> + ret = cdn_dp_get_lt_status(dp);
> Change to cdn_dp_get_training_status
>
>> + if (ret) {
>> + dev_err(dp->dev, "hw lt get status failed\n");
> print ret
>
>> + return;
>> + }
>> +
>> + dev_info(dp->dev, "rate:%d, lanes:%d\n",
>> + dp->link.rate, dp->link.num_lanes);
>> +
> I think everything from cdn_dp_firmare_init to here should be moved
> out of the wq and deferred until modeset time. That way you're
> training the link at the same time as you're setting the mode, which
> should obviate the need to check the clocks in mode_valid.
cdn_dp_training_start and cdn_dp_get_lt_status can be move the mode_set,
but the others are need by get_modes, so stay here is better.
>
>> + dp->hpd_status = true;
>> + drm_helper_hpd_irq_event(dp->drm_dev);
>> +}
>> +
>> +static int cdn_dp_bind(struct device *dev, struct device *master,
>> + void *data)
>> +{
>> + struct cdn_dp_device *dp = dev_get_drvdata(dev);
>> + struct drm_encoder *encoder;
>> + struct drm_connector *connector;
>> + struct drm_device *drm_dev = data;
>> + int ret, i;
>> +
>> + ret = cdn_dp_init(dp);
>> + if (ret < 0)
>> + return ret;
>> +
>> + dp->drm_dev = drm_dev;
>> +
>> + encoder = &dp->encoder;
>> +
>> + encoder->possible_crtcs = drm_of_find_possible_crtcs(drm_dev,
>> + dev->of_node);
>> + DRM_DEBUG_KMS("possible_crtcs = 0x%x\n", encoder->possible_crtcs);
>> +
>> + ret = drm_encoder_init(drm_dev, encoder, &cdn_dp_encoder_funcs,
>> + DRM_MODE_ENCODER_TMDS, NULL);
>> + if (ret) {
>> + DRM_ERROR("failed to initialize encoder with drm\n");
>> + return ret;
>> + }
>> +
>> + drm_encoder_helper_add(encoder, &cdn_dp_encoder_helper_funcs);
>> +
>> + connector = &dp->connector;
>> + connector->polled = DRM_CONNECTOR_POLL_HPD;
>> + connector->dpms = DRM_MODE_DPMS_OFF;
>> +
>> + ret = drm_connector_init(drm_dev, connector,
>> + &cdn_dp_atomic_connector_funcs,
>> + DRM_MODE_CONNECTOR_DisplayPort);
>> + if (ret) {
>> + DRM_ERROR("failed to initialize connector with drm\n");
>> + goto err_free_encoder;
>> + }
>> +
>> + drm_connector_helper_add(connector, &cdn_dp_connector_helper_funcs);
>> +
>> + ret = drm_mode_connector_attach_encoder(connector, encoder);
>> + if (ret) {
>> + DRM_ERROR("failed to attach connector and encoder\n");
>> + goto err_free_connector;
>> + }
>> +
>> + cdn_dp_audio_codec_init(dp, dev);
>> +
>> + dp->event_nb.notifier_call = cdn_dp_pd_event;
>> + INIT_DELAYED_WORK(&dp->event_wq, cdn_dp_pd_event_wq);
>> +
>> + for (i = 0; i < MAX_PHY; i++) {
>> + if (IS_ERR(dp->extcon[i]))
>> + continue;
>> +
>> + ret = extcon_register_notifier(dp->extcon[i], EXTCON_DISP_DP,
>> + &dp->event_nb);
>> + if (ret) {
>> + dev_err(dev, "regitster EXTCON_DISP_DP notifier err\n");
>> + return ret;
>> + }
>> +
>> + cdn_dp_get_state(dp, dp->extcon[i]);
>> + }
>> +
>> + return 0;
>> +
>> +err_free_connector:
>> + drm_connector_cleanup(connector);
>> +err_free_encoder:
>> + drm_encoder_cleanup(encoder);
>> + return ret;
>> +}
>> +
>> +static void cdn_dp_unbind(struct device *dev, struct device *master, void *data)
>> +{
>> + struct cdn_dp_device *dp = dev_get_drvdata(dev);
>> + struct drm_encoder *encoder = &dp->encoder;
>> + int i;
>> +
>> + platform_device_unregister(dp->audio_pdev);
>> + cdn_dp_encoder_disable(encoder);
>> + encoder->funcs->destroy(encoder);
>> + drm_connector_unregister(&dp->connector);
>> + drm_connector_cleanup(&dp->connector);
> just call connector->destroy() here
>
>> + drm_encoder_cleanup(encoder);
> this is already called by encoder->destroy()
>
>> +
>> + for (i = 0; i < MAX_PHY; i++) {
>> + if (!IS_ERR(dp->extcon[i]))
>> + extcon_unregister_notifier(dp->extcon[i], EXTCON_USB,
>> + &dp->event_nb);
>> + }
>> +}
>> +
>> +static const struct component_ops cdn_dp_component_ops = {
>> + .bind = cdn_dp_bind,
>> + .unbind = cdn_dp_unbind,
>> +};
>> +
>> +static int cdn_dp_probe(struct platform_device *pdev)
>> +{
>> + struct device *dev = &pdev->dev;
>> + struct cdn_dp_device *dp;
>> + u8 count = 0;
>> + int i;
>> +
>> + dp = devm_kzalloc(dev, sizeof(*dp), GFP_KERNEL);
>> + if (!dp)
>> + return -ENOMEM;
>> + dp->dev = dev;
>> +
>> + for (i = 0; i < MAX_PHY; i++) {
>> + dp->extcon[i] = extcon_get_edev_by_phandle(dev, i);
>> + dp->phy[i] = devm_of_phy_get_by_index(dev, dev->of_node, i);
>> +
>> + if (!IS_ERR(dp->extcon[i]) && !IS_ERR(dp->phy[i]))
>> + count++;
>> +
>> + if (PTR_ERR(dp->extcon[i]) == -EPROBE_DEFER ||
>> + PTR_ERR(dp->phy[i]) == -EPROBE_DEFER)
>> + return -EPROBE_DEFER;
>> + }
>> +
>> + if (!count) {
>> + dev_err(dev, "missing extcon or phy\n");
>> + return -EINVAL;
>> + }
>> +
>> + dev_set_drvdata(dev, dp);
>> +
>> + return component_add(dev, &cdn_dp_component_ops);
>> +}
>> +
>> +static int cdn_dp_remove(struct platform_device *pdev)
>> +{
>> + component_del(&pdev->dev, &cdn_dp_component_ops);
>> +
>> + return 0;
>> +}
>> +
>> +static const struct of_device_id cdn_dp_dt_ids[] = {
>> + { .compatible = "rockchip,rk3399-cdn-dp" },
>> + {}
>> +};
>> +
>> +MODULE_DEVICE_TABLE(of, cdn_dp_dt_ids);
>> +
>> +static struct platform_driver cdn_dp_driver = {
>> + .probe = cdn_dp_probe,
>> + .remove = cdn_dp_remove,
>> + .driver = {
>> + .name = "cdn-dp",
>> + .owner = THIS_MODULE,
>> + .of_match_table = of_match_ptr(cdn_dp_dt_ids),
>> + },
>> +};
>> +
>> +module_platform_driver(cdn_dp_driver);
>> +
>> +MODULE_AUTHOR("Chris Zhong <zyw at rock-chips.com>");
>> +MODULE_DESCRIPTION("cdn DP Driver");
>> +MODULE_LICENSE("GPL v2");
>> diff --git a/drivers/gpu/drm/rockchip/cdn-dp-core.h b/drivers/gpu/drm/rockchip/cdn-dp-core.h
>> new file mode 100644
>> index 0000000..31ba22d
>> --- /dev/null
>> +++ b/drivers/gpu/drm/rockchip/cdn-dp-core.h
>> @@ -0,0 +1,113 @@
>> +/*
>> + * Copyright (C) 2016 Chris Zhong <zyw at rock-chips.com>
>> + * Copyright (C) 2016 ROCKCHIP, Inc.
>> + *
>> + * 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.
>> + *
>> + * 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.
>> + */
>> +
>> +#ifndef _ROCKCHIP_EDP_CORE_H
>> +#define _ROCKCHIP_EDP_CORE_H
> I think the include guard should match the filename
>
>> +
>> +#include <drm/drmP.h>
>> +#include <drm/drm_crtc_helper.h>
>> +#include <drm/drm_dp_helper.h>
>> +#include <drm/drm_panel.h>
>> +#include "rockchip_drm_drv.h"
>> +#include "cdn-dp-reg.h"
>> +
>> +#define MAX_PHY 2
> This should probably be stored in the .data member of of_device_id.
>
>> +
>> +enum AUDIO_FORMAT {
> enum audio_format
>
>> + AFMT_I2S = 0,
>> + AFMT_SPDIF = 1,
>> + AFMT_UNUSED,
>> +};
>> +
>> +struct audio_info {
>> + enum AUDIO_FORMAT format;
>> + int sample_rate;
>> + int channels;
>> + int sample_width;
>> +};
>> +
>> +struct video_info {
>> + bool h_sync_polarity;
>> + bool v_sync_polarity;
>> + bool interlaced;
>> + int color_depth;
>> + enum VIC_PXL_ENCODING_FORMAT color_fmt;
>> +};
>> +
>> +struct cdn_firmware_header {
>> + u32 size_bytes; /* size of the entire header+image(s) in bytes */
>> + u32 header_size; /* size of just the header in bytes */
>> + u32 iram_size; /* size of iram */
>> + u32 dram_size; /* size of dram */
>> +};
>> +
>> +struct cdn_dp_device {
>> + struct device *dev;
>> + struct drm_device *drm_dev;
>> + struct drm_connector connector;
>> + struct drm_encoder encoder;
>> + struct drm_display_mode mode;
>> + struct platform_device *audio_pdev;
>> +
>> + const struct firmware *fw; /* cdn dp firmware */
>> + unsigned int fw_version; /* cdn fw version */
>> + u32 fw_retry;
>> + bool fw_loaded;
>> + void __iomem *regs;
>> + struct regmap *grf;
>> + unsigned int irq;
>> + struct clk *core_clk;
>> + struct clk *pclk;
>> + struct clk *spdif_clk;
>> + struct reset_control *spdif_rst;
>> + struct audio_info audio_info;
>> + struct video_info video_info;
>> + struct extcon_dev *extcon[MAX_PHY];
>> + struct phy *phy[MAX_PHY];
>> + struct notifier_block event_nb;
>> + struct delayed_work event_wq;
>> +
>> + u8 port_id;
>> + u8 cap_lanes;
>> + bool hpd_status;
>> + bool phy_status[MAX_PHY];
>> +
>> + int dpms_mode;
>> + struct drm_dp_link link;
>> + bool sink_has_audio;
>> +};
>> +
>> +void dp_clock_reset_seq(struct cdn_dp_device *dp);
> cdn_ prefix here?
>
>> +
>> +void cdn_dp_set_fw_clk(struct cdn_dp_device *dp, int clk);
>> +int cdn_dp_load_firmware(struct cdn_dp_device *dp, const u32 *i_mem,
>> + u32 i_size, const u32 *d_mem, u32 d_size);
>> +int cdn_dp_active(struct cdn_dp_device *dp, bool enable);
>> +int cdn_dp_set_host_cap(struct cdn_dp_device *dp);
>> +int cdn_dp_event_config(struct cdn_dp_device *dp);
>> +int cdn_dp_get_event(struct cdn_dp_device *dp);
>> +int cdn_dp_get_hpd_status(struct cdn_dp_device *dp);
>> +int cdn_dp_dpcd_write(struct cdn_dp_device *dp, u32 addr, u8 value);
>> +int cdn_dp_dpcd_read(struct cdn_dp_device *dp, u32 addr);
>> +int cdn_dp_get_edid_block(void *dp, u8 *edid,
>> + unsigned int block, size_t length);
>> +int cdn_dp_training_start(struct cdn_dp_device *dp);
>> +int cdn_dp_get_lt_status(struct cdn_dp_device *dp);
>> +int cdn_dp_set_video_status(struct cdn_dp_device *dp, int active);
>> +int cdn_dp_config_video(struct cdn_dp_device *dp);
>> +int cdn_dp_audio_stop(struct cdn_dp_device *dp, struct audio_info *audio);
>> +int cdn_dp_audio_mute(struct cdn_dp_device *dp, bool enable);
>> +int cdn_dp_audio_config_set(struct cdn_dp_device *dp, struct audio_info *audio);
>> +
> I really don't like that you've declared these in core.h, yet defined
> them in reg.c.
>
>> +#endif /* _ROCKCHIP_EDP_CORE_H */
> Make sure you update here too
>
>
>> diff --git a/drivers/gpu/drm/rockchip/cdn-dp-reg.c b/drivers/gpu/drm/rockchip/cdn-dp-reg.c
>> new file mode 100644
>> index 0000000..8d5becd
>> --- /dev/null
>> +++ b/drivers/gpu/drm/rockchip/cdn-dp-reg.c
>> @@ -0,0 +1,740 @@
>> +/*
>> + * Copyright (C) Fuzhou Rockchip Electronics Co.Ltd
>> + * Author: Chris Zhong <zyw at rock-chips.com>
>> + *
>> + * This software is licensed under the terms of the GNU General Public
>> + * License version 2, as published by the Free Software Foundation, and
>> + * may be copied, distributed, and modified under those terms.
>> + *
>> + * 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.
>> + */
>> +
>> +#include <linux/clk.h>
>> +#include <linux/device.h>
>> +#include <linux/delay.h>
>> +#include <linux/io.h>
>> +#include <linux/iopoll.h>
>> +#include <linux/reset.h>
>> +
>> +#include "cdn-dp-core.h"
>> +#include "cdn-dp-reg.h"
>> +
>> +#define CDN_DP_SPDIF_CLK 200000000
>> +#define FW_ALIVE_TIMEOUT_US 1000000
>> +#define MAILBOX_TIMEOUT_US 5000000
>> +
>> +void cdn_dp_set_fw_clk(struct cdn_dp_device *dp, int clk)
>> +{
>> + writel(clk / 1000000, dp->regs + SW_CLK_H);
>> +}
>> +
>> +void dp_clock_reset_seq(struct cdn_dp_device *dp)
>> +{
>> + writel(0xfff, dp->regs + SOURCE_DPTX_CAR);
>> + writel(0x7, dp->regs + SOURCE_PHY_CAR);
>> + writel(0xf, dp->regs + SOURCE_PKT_CAR);
>> + writel(0xff, dp->regs + SOURCE_AIF_CAR);
>> + writel(0xf, dp->regs + SOURCE_CIPHER_CAR);
>> + writel(0x3, dp->regs + SOURCE_CRYPTO_CAR);
>> + writel(0, dp->regs + APB_INT_MASK);
> Pull these hardcoded values out into #defines
>
>> +}
>> +
>> +static int cdn_dp_mailbox_read(struct cdn_dp_device *dp)
>> +{
>> + int val, ret;
>> +
>> + if (!dp->fw_loaded)
>> + return 0;
> This seems like an error. Return -errno and log a message
The audio will call this function before firmware during probe, return
err cause audio register failed.
>
>> +
>> + ret = readx_poll_timeout(readl, dp->regs + MAILBOX_EMPTY_ADDR,
>> + val, !val, 1000, MAILBOX_TIMEOUT_US);
> Pull the 1000 out into a #define (here and below)
>
>> + if (ret < 0) {
>> + dev_err(dp->dev, "failed to read mailbox, keep alive = %x\n",
>> + readl(dp->regs + KEEP_ALIVE));
>> + return ret;
>> + }
>> +
>> + return readl(dp->regs + MAILBOX0_RD_DATA) & 0xff;
>> +}
>> +
>> +static int cdp_dp_mailbox_write(struct cdn_dp_device *dp, u8 val)
>> +{
>> + int ret, full;
>> +
>> + if (!dp->fw_loaded)
>> + return 0;
> Same here
>
>> +
>> + ret = readx_poll_timeout(readl, dp->regs + MAILBOX_FULL_ADDR,
>> + full, !full, 1000, MAILBOX_TIMEOUT_US);
>> + if (ret < 0) {
>> + dev_err(dp->dev, "mailbox is full, keep alive = %x\n",
>> + readl(dp->regs + KEEP_ALIVE));
>> + return ret;
>> + }
>> +
>> + writel(val, dp->regs + MAILBOX0_WR_DATA);
>> +
>> + return 0;
>> +}
>> +
>> +static int cdn_dp_mailbox_response(struct cdn_dp_device *dp, u8 module_id,
> I think _receive would be a better name than _response
>
>> + u8 opcode, u8 *buff, u8 buff_size)
>> +{
>> + int ret, i = 0;
>> + u8 header[4];
>> +
>> + /* read the header of the message */
>> + while (i < 4) {
> for (i = 0; i < 4; i++) {
>
>> + ret = cdn_dp_mailbox_read(dp);
>> + if (ret < 0)
>> + return ret;
>> +
>> + header[i++] = ret;
> header[i] = ret;
>
>> + }
>> +
>> + if (opcode != header[0] || module_id != header[1] ||
>> + buff_size != ((header[2] << 8) | header[3])) {
> pull header[2] << 8 | header[3] out into a local, mbox_size.
>
>> + dev_err(dp->dev, "mailbox response failed");
>> +
>> + /*
>> + * If the message in mailbox is not what we want, we need to
>> + * clear the mailbox by read.
>> + */
>> + i = (header[2] << 8) | header[3];
>> + while (i--)
> for (i = 0; i < mbox_size; i++)
>
>> + if (cdn_dp_mailbox_read(dp) < 0)
>> + break;
>> +
>> + return -EINVAL;
>> + }
>> +
>> + i = 0;
>> + while (i < buff_size) {
> for (i = 0; i < buff_size; i++) {
>
>> + ret = cdn_dp_mailbox_read(dp);
>> + if (ret < 0)
>> + return ret;
>> +
>> + buff[i++] = ret;
> buff[i] = ret;
>
>> + }
>> +
>> + return 0;
>
> Are you always guaranteed to have the entire message in the mailbox?
> If not, you might consider supporting partial messages and returning
> the length read.
>
>> +}
>> +
>> +static int cdn_dp_mailbox_send(struct cdn_dp_device *dp, u8 module_id,
>> + u8 opcode, u16 size, u8 *message)
>> +{
>> + u8 header[4];
>> + int ret, i;
>> +
>> + header[0] = opcode;
>> + header[1] = module_id;
>> + header[2] = size >> 8;
> (size >> 8) & 0xff;
>
>> + header[3] = size & 0xff;
>> +
>> + for (i = 0; i < 4; i++) {
>> + ret = cdp_dp_mailbox_write(dp, header[i]);
>> + if (ret)
>> + return ret;
>> + }
>> +
>> + while (size--) {
> for (i = 0; i < size; i++) {
>
>> + ret = cdp_dp_mailbox_write(dp, *message++);
> message[i]
>
>> + if (ret)
> Log something here?
>
>> + return ret;
>> + }
>> +
>> + return 0;
> Perhaps consider returning the number of bytes that were sent.
>
>> +}
>> +
>> +static int cdn_dp_reg_write(struct cdn_dp_device *dp, u16 addr, u32 val)
>> +{
>> + u8 msg[6];
>> +
>> + msg[0] = (addr >> 8) & 0xff;
>> + msg[1] = addr & 0xff;
>> + msg[2] = (val >> 24) & 0xff;
>> + msg[3] = (val >> 16) & 0xff;
>> + msg[4] = (val >> 8) & 0xff;
>> + msg[5] = val & 0xff;
>> + return cdn_dp_mailbox_send(dp, MB_MODULE_ID_DP_TX, DPTX_WRITE_REGISTER,
>> + ARRAY_SIZE(msg), msg);
>> +}
>> +
>> +int cdn_dp_load_firmware(struct cdn_dp_device *dp, const u32 *i_mem,
>> + u32 i_size, const u32 *d_mem, u32 d_size)
>> +{
>> + int i, reg, ret;
> reg should be u32
>
>> +
>> + /* reset ucpu before load firmware*/
>> + writel(APB_IRAM_PATH | APB_DRAM_PATH | APB_XT_RESET,
>> + dp->regs + APB_CTRL);
>> +
>> + for (i = 0; i < i_size; i += 4)
>> + writel(*i_mem++, dp->regs + ADDR_IMEM + i);
>> +
>> + for (i = 0; i < d_size; i += 4)
>> + writel(*d_mem++, dp->regs + ADDR_DMEM + i);
>> +
>> + /* un-reset ucpu */
>> + writel(0, dp->regs + APB_CTRL);
>> +
>> + /* check the keep alive register to make sure fw working */
>> + ret = readx_poll_timeout(readl, dp->regs + KEEP_ALIVE,
>> + reg, reg, 2000, FW_ALIVE_TIMEOUT_US);
>> + if (ret < 0) {
>> + dev_err(dp->dev, "failed to loaded the FW reg = %x\n", reg);
>> + return -EINVAL;
>> + }
>> +
>> + reg = readl(dp->regs + VER_L) & 0xff;
>> + dp->fw_version = reg;
>> + reg = readl(dp->regs + VER_H) & 0xff;
>> + dp->fw_version |= reg << 8;
>> + reg = readl(dp->regs + VER_LIB_L_ADDR) & 0xff;
>> + dp->fw_version |= reg << 16;
>> + reg = readl(dp->regs + VER_LIB_H_ADDR) & 0xff;
>> + dp->fw_version |= reg << 24;
>> +
> Are there any sanity checks you can do on the fw_version before returning?
This is first version of firmware, so do not nedd check the number, But
I think adding a dev_dbg log here is better.
>
>> + dp->fw_loaded = 1;
>> +
>> + return 0;
>> +}
>> +
>> +int cdn_dp_reg_write_bit(struct cdn_dp_device *dp, u16 addr, u8 start_bit,
>> + u8 bits_no, u32 val)
>> +{
>> + u8 field[8];
>> +
>> + field[0] = (addr >> 8) & 0xff;
>> + field[1] = addr & 0xff;
>> + field[2] = start_bit;
>> + field[3] = bits_no;
>> + field[4] = (val >> 24) & 0xff;
>> + field[5] = (val >> 16) & 0xff;
>> + field[6] = (val >> 8) & 0xff;
>> + field[7] = val & 0xff;
>> +
>> + return cdn_dp_mailbox_send(dp, MB_MODULE_ID_DP_TX, DPTX_WRITE_FIELD,
>> + sizeof(field), field);
>> +}
>> +
>> +int cdn_dp_active(struct cdn_dp_device *dp, bool enable)
>> +{
>> + u8 active = enable ? 1 : 0;
>> + u8 resp;
>> + int ret;
>> +
>> + /* set firmware status, 1: avtive; 0: standby */
> s/avtive/active/
>
>> + ret = cdn_dp_mailbox_send(dp, MB_MODULE_ID_GENERAL,
>> + GENERAL_MAIN_CONTROL, 1, &active);
>> + if (ret)
>> + return ret;
>> +
>> + ret = cdn_dp_mailbox_response(dp, MB_MODULE_ID_GENERAL,
>> + GENERAL_MAIN_CONTROL, &resp, 1);
>> + if (ret)
>> + return ret;
>> +
>> + return resp ? 0 : -EINVAL;
>> +}
>> +
>> +int cdn_dp_set_host_cap(struct cdn_dp_device *dp)
>> +{
>> + u8 msg[8];
>> + int ret;
>> +
>> + msg[0] = DP_LINK_BW_5_4;
> Why is this always 5.4GHz? Does the hw support any other rates?
It is setting the max rate to 5.4G, not all support rate.
>
>> + msg[1] = dp->cap_lanes;
>> + msg[2] = VOLTAGE_LEVEL_2;
>> + msg[3] = PRE_EMPHASIS_LEVEL_3;
>> + msg[4] = PRBS7 | D10_2 | TRAINING_PTN1 | TRAINING_PTN2;
> You don't need to use training pattern 3 for hbr modes?
This is the fault of pattern name, it should be:
msg[4] = TPS1 | TPS2 | TPS3 | TPS4;
>
>> + msg[5] = FAST_LT_NOT_SUPPORT;
>> + msg[6] = LANE_MAPPING_NORMAL;
>> + msg[7] = ENHANCED;
>> +
>> + ret = cdn_dp_mailbox_send(dp, MB_MODULE_ID_DP_TX,
>> + DPTX_SET_HOST_CAPABILITIES,
>> + ARRAY_SIZE(msg), msg);
> ARRAY_SIZE counts the number of elements, not the size, so I think
> you're better off using sizeof instead. This applies to the rest of
> the dp_mailbox_send instances as well.
>
>> + if (ret)
>> + return ret;
>> +
>> + ret = cdn_dp_reg_write(dp, DP_AUX_SWAP_INVERSION_CONTROL,
>> + AUX_HOST_INVERT);
>> + if (ret)
>> + return ret;
>> +
>> + return 0;
>> +}
>> +
>> +int cdn_dp_event_config(struct cdn_dp_device *dp)
>> +{
>> + u8 msg[5] = {0, 0, 0, 0, 0};
> memset(msg, 0, sizeof(msg));
>
>> +
>> + msg[0] = DPTX_EVENT_ENABLE_HPD | DPTX_EVENT_ENABLE_TRAINING;
>> +
>> + return cdn_dp_mailbox_send(dp, MB_MODULE_ID_DP_TX, DPTX_ENABLE_EVENT,
>> + ARRAY_SIZE(msg), msg);
>> +}
>> +
>> +int cdn_dp_get_event(struct cdn_dp_device *dp)
> Should return u32
>
>> +{
>> + return readl(dp->regs + SW_EVENTS0);
>> +}
>> +
>> +int cdn_dp_get_hpd_status(struct cdn_dp_device *dp)
>> +{
>> + u8 status;
>> + int ret;
>> +
>> + ret = cdn_dp_mailbox_send(dp, MB_MODULE_ID_DP_TX, DPTX_HPD_STATE,
>> + 0, NULL);
>> + if (ret)
>> + return ret;
>> +
>> + ret = cdn_dp_mailbox_response(dp, MB_MODULE_ID_DP_TX,
>> + DPTX_HPD_STATE, &status, 1);
>> + if (ret)
>> + return ret;
>> +
>> + return status;
>> +}
>> +
>> +int cdn_dp_get_edid_block(void *data, u8 *edid,
>> + unsigned int block, size_t length)
>> +{
>> + struct cdn_dp_device *dp = data;
>> + u8 msg[2], reg[EDID_DATA + EDID_BLOCK_SIZE];
>> + int ret;
>> +
>> + if (length != EDID_BLOCK_SIZE)
>> + return -EINVAL;
>> +
>> + msg[0] = block / 2;
>> + msg[1] = block % 2;
>> +
>> + ret = cdn_dp_mailbox_send(dp, MB_MODULE_ID_DP_TX, DPTX_GET_EDID,
>> + 2, msg);
> sizeof(msg), msg);
>
>> + if (ret)
>> + return ret;
>> +
>> + ret = cdn_dp_mailbox_response(dp, MB_MODULE_ID_DP_TX,
>> + DPTX_GET_EDID, reg,
>> + EDID_DATA + EDID_BLOCK_SIZE);
>> + if (ret)
>> + return ret;
>> +
>> + if (reg[EDID_LENGTH_BYTE] != EDID_BLOCK_SIZE ||
>> + reg[EDID_SEGMENT_BUMBER] != block / 2) {
>> + dev_err(dp->dev, "edid block size err\n");
>> + return -EINVAL;
>> + }
>> +
>> + memcpy(edid, ®[EDID_DATA], EDID_BLOCK_SIZE);
> You can avoid the intermediate reg[] buffer if you restructure the
> _response/_receive mailbox function. I'd suggest splitting it into a
> _validate_response() function that reads the header and makes sure the
> lengths match. The second part would be a _read_response() which
> simply reads the specified number of bytes from the mailbox. For
> convenience, you could make cdn_dp_mailbox_receive() a helper which
> calls both validate and read for times when you're reading the same
> number as you're validating.
>
> So in this function, you'd validate the response has EDID_DATA +
> EDID_BLOCK_SIZE bytes, then read the EDID_DATA prefix into a local,
> then read EDID_BLOCK_DATA directly into edid.
>
> I think you'll also need a _drain function to clear out the mailbox in
> case of error (otherwise the next read will fail).
>
>> +
>> + return 0;
>> +}
>> +
>> +int cdn_dp_training_start(struct cdn_dp_device *dp)
>> +{
>> + u8 msg, event[2];
>> + unsigned long timeout;
>> + int ret;
>> +
>> + msg = LINK_TRAINING_RUN;
>> +
>> + /* start training */
>> + ret = cdn_dp_mailbox_send(dp, MB_MODULE_ID_DP_TX, DPTX_TRAINING_CONTROL,
>> + 1, &msg);
>> + if (ret)
>> + return ret;
>> +
>> + /* the whole training should finish in 500ms */
>> + timeout = jiffies + msecs_to_jiffies(500);
> Pull 500 out into a #define
>
>> + while (1) {
> while(time_before(jiffies, timeout))
>
>> + msleep(20);
> Pull 20 out into a #define
>
>> + ret = cdn_dp_mailbox_send(dp, MB_MODULE_ID_DP_TX,
>> + DPTX_READ_EVENT, 0, NULL);
>> + if (ret)
>> + return ret;
>> +
>> + ret = cdn_dp_mailbox_response(dp, MB_MODULE_ID_DP_TX,
>> + DPTX_READ_EVENT, event, 2);
>> + if (ret)
>> + return ret;
>> +
>> + if (event[1] & EQ_PHASE_FINISHED)
>> + break;
> return 0
>
>> +
>> + if (time_after(jiffies, timeout))
>> + return -ETIMEDOUT;
>> + }
>> +
>> + return 0;
> return -ETIMEDOUT
>
>> +}
>> +
>> +int cdn_dp_get_lt_status(struct cdn_dp_device *dp)
> s/lt/training/
>
>> +{
>> + u8 status[10];
>> + int ret;
>> +
>> + ret = cdn_dp_mailbox_send(dp, MB_MODULE_ID_DP_TX, DPTX_READ_LINK_STAT,
>> + 0, NULL);
>> + if (ret)
>> + return ret;
>> +
>> + ret = cdn_dp_mailbox_response(dp, MB_MODULE_ID_DP_TX,
>> + DPTX_READ_LINK_STAT, status, 10);
> s/10/sizeof(status)/
>
>> + if (ret)
>> + return ret;
>> +
>> + dp->link.rate = status[0];
>> + dp->link.num_lanes = status[1];
>> +
>> + return 0;
>> +}
>> +
>> +int cdn_dp_set_video_status(struct cdn_dp_device *dp, int active)
>> +{
>> + u8 msg;
>> +
>> + msg = !!active;
>> +
>> + return cdn_dp_mailbox_send(dp, MB_MODULE_ID_DP_TX, DPTX_SET_VIDEO,
>> + 1, &msg);
> s/1/sizeof(msg)/
>
>> +}
>> +
>> +static int cdn_dp_get_msa_misc(struct video_info *video,
>> + struct drm_display_mode *mode)
>> +{
>> + u8 val0, val1;
> u8 val[2];
>
>> + u32 msa_misc;
>> +
>> + switch (video->color_fmt) {
>> + case PXL_RGB:
>> + case Y_ONLY:
>> + val0 = 0;
>> + break;
> Perhaps this would be better as listed under the default case.
>
>> + case YCBCR_4_4_4:
>> + /* set default color space conversion to BT601 */
>> + val0 = 6 + BT_601 * 8;
>> + break;
>> + case YCBCR_4_2_2:
>> + /* set default color space conversion to BT601 */
>> + val0 = 5 + BT_601 * 8;
>> + break;
>> + case YCBCR_4_2_0:
>> + val0 = 5;
>> + break;
>> + };
>> +
>> + switch (video->color_depth) {
>> + case 6:
>> + val1 = 0;
>> + break;
>> + case 8:
>> + val1 = 1;
>> + break;
>> + case 10:
>> + val1 = 2;
>> + break;
>> + case 12:
>> + val1 = 3;
>> + break;
>> + case 16:
>> + val1 = 4;
>> + break;
>> + };
>> +
>> + msa_misc = 2 * val0 + 32 * val1 +
>> + ((video->color_fmt == Y_ONLY) ? (1 << 14) : 0);
> Perhaps a stupid question, but is this documented anywhere? If not,
> could you add a comment describing what you're doing?
>
>> +
>> + return msa_misc;
>> +}
>> +
>> +int cdn_dp_config_video(struct cdn_dp_device *dp)
>> +{
>> + struct video_info *video = &dp->video_info;
>> + struct drm_display_mode *mode = &dp->mode;
>> + u64 symbol;
>> + u32 val, link_rate;
>> + u8 bit_per_pix;
>> + u8 tu_size_reg = TU_SIZE;
>> + int ret;
>> +
>> + bit_per_pix = (video->color_fmt == YCBCR_4_2_2) ?
>> + (video->color_depth * 2) : (video->color_depth * 3);
>> +
>> + link_rate = drm_dp_bw_code_to_link_rate(dp->link.rate);
>> +
>> + val = VIF_BYPASS_INTERLACE;
>> +
> remove extra line
>
>> + ret = cdn_dp_reg_write(dp, BND_HSYNC2VSYNC, val);
>> + if (ret)
>> + return ret;
>> +
>> + ret = cdn_dp_reg_write(dp, HSYNC2VSYNC_POL_CTRL, 0);
>> + if (ret)
>> + return ret;
>> +
>> + /* get a best tu_size and symbol */
>> + do {
>> + tu_size_reg += 2;
>> + symbol = tu_size_reg * mode->clock * bit_per_pix;
>> + symbol /= dp->link.num_lanes * link_rate * 8;
>> + } while ((symbol == 1) || (tu_size_reg - symbol < 4));
>> +
>> + val = symbol + (tu_size_reg << 8);
>> +
> remove extra line
>
>> + ret = cdn_dp_reg_write(dp, DP_FRAMER_TU, val);
>> + if (ret)
>> + return ret;
>> +
>> + switch (video->color_depth) {
>> + case 6:
>> + val = BCS_6;
>> + break;
>> + case 8:
>> + val = BCS_8;
>> + break;
>> + case 10:
>> + val = BCS_10;
>> + break;
>> + case 12:
>> + val = BCS_12;
>> + break;
>> + case 16:
>> + val = BCS_16;
>> + break;
>> + };
>> +
>> + val += video->color_fmt << 8;
>> + ret = cdn_dp_reg_write(dp, DP_FRAMER_PXL_REPR, val);
>> + if (ret)
>> + return ret;
>> +
>> + val = video->h_sync_polarity ? DP_FRAMER_SP_HSP : 0;
>> + val |= video->v_sync_polarity ? DP_FRAMER_SP_VSP : 0;
>> + ret = cdn_dp_reg_write(dp, DP_FRAMER_SP, val);
>> + if (ret)
>> + return ret;
>> +
>> + val = (mode->hsync_start - mode->hdisplay) << 16;
>> + val |= mode->htotal - mode->hsync_end;
>> + ret = cdn_dp_reg_write(dp, DP_FRONT_BACK_PORCH, val);
>> + if (ret)
>> + return ret;
>> +
>> + val = mode->hdisplay * bit_per_pix / 8;
>> + ret = cdn_dp_reg_write(dp, DP_BYTE_COUNT, val);
>> + if (ret)
>> + return ret;
>> +
>> + val = mode->htotal | ((mode->htotal - mode->hsync_start) << 16);
>> + ret = cdn_dp_reg_write(dp, MSA_HORIZONTAL_0, val);
>> + if (ret)
>> + return ret;
>> +
>> + val = mode->hsync_end - mode->hsync_start;
>> + val |= (mode->hdisplay << 16) | (video->h_sync_polarity << 15);
>> + ret = cdn_dp_reg_write(dp, MSA_HORIZONTAL_1, val);
>> + if (ret)
>> + return ret;
>> +
>> + val = mode->vtotal;
>> + val |= ((mode->vtotal - mode->vsync_start) << 16);
>> +
> remove extra line
>
>> + ret = cdn_dp_reg_write(dp, MSA_VERTICAL_0, val);
>> + if (ret)
>> + return ret;
>> +
>> + val = mode->vsync_end - mode->vsync_start;
>> + val |= mode->vdisplay << 16;
>> + val |= (video->v_sync_polarity << 15);
> Make this consistent with how you assigned val for MSA_HORIZONTAL_1
> (ie: split both or combine both)
>
>> + ret = cdn_dp_reg_write(dp, MSA_VERTICAL_1, val);
>> + if (ret)
>> + return ret;
>> +
>> + val = cdn_dp_get_msa_misc(video, mode);
>> + ret = cdn_dp_reg_write(dp, MSA_MISC, val);
>> + if (ret)
>> + return ret;
>> +
>> + ret = cdn_dp_reg_write(dp, STREAM_CONFIG, 1);
>> + if (ret)
>> + return ret;
>> +
>> + val = mode->hsync_end - mode->hsync_start;
>> + val |= (mode->hdisplay << 16);
>> + ret = cdn_dp_reg_write(dp, DP_HORIZONTAL, val);
>> + if (ret)
>> + return ret;
>> +
>> + val = mode->vtotal;
>> + val -= (mode->vtotal - mode->vdisplay);
>> + val |= (mode->vtotal - mode->vsync_start) << 16;
>> +
> extra line
>
>> + ret = cdn_dp_reg_write(dp, DP_VERTICAL_0, val);
>> + if (ret)
>> + return ret;
>> +
>> + val = mode->vtotal;
>> + ret = cdn_dp_reg_write(dp, DP_VERTICAL_1, val);
>> + if (ret)
>> + return ret;
>> +
>> + val = 0;
>> + return cdn_dp_reg_write_bit(dp, DP_VB_ID, 2, 1, val);
>> +}
>> +
>> +int cdn_dp_audio_stop(struct cdn_dp_device *dp, struct audio_info *audio)
>> +{
>> + int ret = cdn_dp_reg_write(dp, AUDIO_PACK_CONTROL, AUDIO_PACK_EN(0));
>> +
> remove this empty line
>
>> + if (ret)
>> + return ret;
> insert empy line
>
>> + writel(0x1F0707, dp->regs + SPDIF_CTRL_ADDR);
> pull this magic value into a #define
>
>> + writel(0, dp->regs + AUDIO_SRC_CNTL);
>> + writel(0, dp->regs + AUDIO_SRC_CNFG);
>> + writel(1, dp->regs + AUDIO_SRC_CNTL);
>> + writel(0, dp->regs + AUDIO_SRC_CNTL);
>> +
>> + writel(0, dp->regs + SMPL2PKT_CNTL);
>> + writel(1, dp->regs + SMPL2PKT_CNTL);
>> + writel(0, dp->regs + SMPL2PKT_CNTL);
>> +
>> + writel(1, dp->regs + FIFO_CNTL);
>> + writel(0, dp->regs + FIFO_CNTL);
> Can you document why you need to toggle these bits as opposed to just
> setting them to 0?
>
>> +
>> + if (audio->format == AFMT_SPDIF)
>> + clk_disable_unprepare(dp->spdif_clk);
>> +
>> + return 0;
>> +}
>> +
>> +int cdn_dp_audio_mute(struct cdn_dp_device *dp, bool enable)
>> +{
>> + return cdn_dp_reg_write_bit(dp, DP_VB_ID, 4, 1, enable);
>> +}
>> +
>> +int cdn_dp_audio_config_set(struct cdn_dp_device *dp, struct audio_info *audio)
>> +{
>> + int lanes_param, i2s_port_en_val, val, i;
> int lanes_param = 3, i2s_port_en_val = 0xf, i;
>
>> + int ret;
>> +
>> + if (audio->channels == 2 && dp->link.num_lanes == 1)
>> + lanes_param = 1;
>> + else if (audio->channels == 2)
>> + lanes_param = 3;
>> + else
>> + lanes_param = 0;
>> +
>> + if (audio->channels == 2)
>> + i2s_port_en_val = 1;
>> + else if (audio->channels == 4)
>> + i2s_port_en_val = 3;
>> + else
>> + i2s_port_en_val = 0xf;
>
> I think with the above initialization values, you can replace these 2
> conditionals with:
>
> if (audio->channels == 2) {
> if (dp->link.num_lanes == 1)
> lanes_param = 3;
> i2s_port_en_val = 1;
> } else if (audio->channels == 4) {
> i2s_port_en_val = 3;
> }
>
>
>> +
>> + if (audio->format == AFMT_SPDIF) {
>> + reset_control_assert(dp->spdif_rst);
>> + reset_control_deassert(dp->spdif_rst);
>> + }
>> +
>> + ret = cdn_dp_reg_write(dp, CM_LANE_CTRL, 0x8000);
> pull value out into #define (and use BIT(15) if appropriate)
>
>> + if (ret)
>> + return ret;
>> +
>> + ret = cdn_dp_reg_write(dp, CM_CTRL, 0);
>> + if (ret)
>> + return ret;
>> +
>> + if (audio->format == AFMT_I2S) {
>> + writel(0x0, dp->regs + SPDIF_CTRL_ADDR);
>> +
>> + writel(SYNC_WR_TO_CH_ZERO, dp->regs + FIFO_CNTL);
>> +
>> + val = audio->channels - 1;
>> + val |= (audio->channels / 2 - 1) << 5;
>> + val |= BIT(8);
>> + val |= lanes_param << 11;
>> + writel(val, dp->regs + SMPL2PKT_CNFG);
>> +
>> + if (audio->sample_width == 16)
>> + val = 0;
>> + else if (audio->sample_width == 24)
>> + val = 1 << 9;
>> + else
>> + val = 2 << 9;
>> +
>> + val |= (audio->channels - 1) << 2;
>> + val |= i2s_port_en_val << 17;
>> + val |= 2 << 11;
>> + writel(val, dp->regs + AUDIO_SRC_CNFG);
>> +
>> + for (i = 0; i < (audio->channels + 1) / 2; i++) {
>> + if (audio->sample_width == 16)
>> + val = (0x08 << 8) | (0x08 << 20);
>> + else if (audio->sample_width == 24)
>> + val = (0x0b << 8) | (0x0b << 20);
>> +
>> + val |= ((2 * i) << 4) | ((2 * i + 1) << 16);
>> + writel(val, dp->regs + STTS_BIT_CH(i));
>> + }
>> +
>> + switch (audio->sample_rate) {
>> + case 32000:
>> + val = SAMPLING_FREQ(3) |
>> + ORIGINAL_SAMP_FREQ(0xc);
>> + break;
>> + case 44100:
>> + val = SAMPLING_FREQ(0) |
>> + ORIGINAL_SAMP_FREQ(0xf);
>> + break;
>> + case 48000:
>> + val = SAMPLING_FREQ(2) |
>> + ORIGINAL_SAMP_FREQ(0xd);
>> + break;
>> + case 88200:
>> + val = SAMPLING_FREQ(8) |
>> + ORIGINAL_SAMP_FREQ(0x7);
>> + break;
>> + case 96000:
>> + val = SAMPLING_FREQ(0xa) |
>> + ORIGINAL_SAMP_FREQ(5);
>> + break;
>> + case 176400:
>> + val = SAMPLING_FREQ(0xc) |
>> + ORIGINAL_SAMP_FREQ(3);
>> + break;
>> + case 192000:
>> + val = SAMPLING_FREQ(0xe) |
>> + ORIGINAL_SAMP_FREQ(1);
>> + break;
>> + }
>> + val |= 4;
>> + writel(val, dp->regs + COM_CH_STTS_BITS);
>> +
>> + writel(2, dp->regs + SMPL2PKT_CNTL);
>> + writel(2, dp->regs + AUDIO_SRC_CNTL);
> Pull all of this code into a new cdn_dp_audio_config_i2s() function
> (with the lane_param and i2s_port_en_val assignments) and call it from
> here
>
>> + } else {
>> + val = 0x1F0707;
> Magic values need to be in #defines
>
>> + writel(val, dp->regs + SPDIF_CTRL_ADDR);
>> +
>> + writel(SYNC_WR_TO_CH_ZERO, dp->regs + FIFO_CNTL);
>> +
>> + val = 0x101 | (3 << 11);
> Same here, these mean nothing.
>
>> + writel(val, dp->regs + SMPL2PKT_CNFG);
>> + writel(2, dp->regs + SMPL2PKT_CNTL);
>> +
>> + val = 0x3F0707;
> And here. And anywhere else I missed.
>
>> + writel(val, dp->regs + SPDIF_CTRL_ADDR);
>> +
>> + clk_prepare_enable(dp->spdif_clk);
>> + clk_set_rate(dp->spdif_clk, CDN_DP_SPDIF_CLK);
>> + }
>> +
>> + return cdn_dp_reg_write(dp, AUDIO_PACK_CONTROL, AUDIO_PACK_EN(1));
>> +}
>> diff --git a/drivers/gpu/drm/rockchip/cdn-dp-reg.h b/drivers/gpu/drm/rockchip/cdn-dp-reg.h
>> new file mode 100644
>> index 0000000..b33793e
>> --- /dev/null
>> +++ b/drivers/gpu/drm/rockchip/cdn-dp-reg.h
>> @@ -0,0 +1,409 @@
>> +/*
>> + * Copyright (C) Fuzhou Rockchip Electronics Co.Ltd
>> + * Author: Chris Zhong <zyw at rock-chips.com>
>> + *
>> + * This software is licensed under the terms of the GNU General Public
>> + * License version 2, as published by the Free Software Foundation, and
>> + * may be copied, distributed, and modified under those terms.
>> + *
>> + * 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.
>> + */
>> +
>> +#ifndef _CDN_DP_REG_H
>> +#define _CDN_DP_REG_H
>> +
>> +#include <linux/bitops.h>
>> +
>> +#define ADDR_IMEM 0x10000
>> +#define ADDR_DMEM 0x20000
>> +
>> +/* APB CFG addr */
>> +#define APB_CTRL 0
>> +#define XT_INT_CTRL 0x04
>> +#define MAILBOX_FULL_ADDR 0x08
>> +#define MAILBOX_EMPTY_ADDR 0x0c
>> +#define MAILBOX0_WR_DATA 0x10
>> +#define MAILBOX0_RD_DATA 0x14
>> +#define KEEP_ALIVE 0x18
>> +#define VER_L 0x1c
>> +#define VER_H 0x20
>> +#define VER_LIB_L_ADDR 0x24
>> +#define VER_LIB_H_ADDR 0x28
>> +#define SW_DEBUG_L 0x2c
>> +#define SW_DEBUG_H 0x30
>> +#define MAILBOX_INT_MASK 0x34
>> +#define MAILBOX_INT_STATUS 0x38
>> +#define SW_CLK_L 0x3c
>> +#define SW_CLK_H 0x40
>> +#define SW_EVENTS0 0x44
>> +#define SW_EVENTS1 0x48
>> +#define SW_EVENTS2 0x4c
>> +#define SW_EVENTS3 0x50
>> +#define XT_OCD_CTRL 0x60
>> +#define APB_INT_MASK 0x6c
>> +#define APB_STATUS_MASK 0x70
>> +
>> +/* audio decoder addr */
>> +#define AUDIO_SRC_CNTL 0x30000
>> +#define AUDIO_SRC_CNFG 0x30004
>> +#define COM_CH_STTS_BITS 0x30008
> Can you split these up into individual bits?
>
>> +#define STTS_BIT_CH(x) (0x3000c + ((x) << 2))
>> +#define SPDIF_CTRL_ADDR 0x3004c
>> +#define SPDIF_CH1_CS_3100_ADDR 0x30050
>> +#define SPDIF_CH1_CS_6332_ADDR 0x30054
>> +#define SPDIF_CH1_CS_9564_ADDR 0x30058
>> +#define SPDIF_CH1_CS_12796_ADDR 0x3005c
>> +#define SPDIF_CH1_CS_159128_ADDR 0x30060
>> +#define SPDIF_CH1_CS_191160_ADDR 0x30064
>> +#define SPDIF_CH2_CS_3100_ADDR 0x30068
>> +#define SPDIF_CH2_CS_6332_ADDR 0x3006c
>> +#define SPDIF_CH2_CS_9564_ADDR 0x30070
>> +#define SPDIF_CH2_CS_12796_ADDR 0x30074
>> +#define SPDIF_CH2_CS_159128_ADDR 0x30078
>> +#define SPDIF_CH2_CS_191160_ADDR 0x3007c
>> +#define SMPL2PKT_CNTL 0x30080
>> +#define SMPL2PKT_CNFG 0x30084
>> +#define FIFO_CNTL 0x30088
>> +#define FIFO_STTS 0x3008c
> These cntl and cnfig values should be split up so we know what the
> individual bits do
>
>> +
>> +/* source pif addr */
>> +#define SOURCE_PIF_WR_ADDR 0x30800
>> +#define SOURCE_PIF_WR_REQ 0x30804
>> +#define SOURCE_PIF_RD_ADDR 0x30808
>> +#define SOURCE_PIF_RD_REQ 0x3080c
>> +#define SOURCE_PIF_DATA_WR 0x30810
>> +#define SOURCE_PIF_DATA_RD 0x30814
>> +#define SOURCE_PIF_FIFO1_FLUSH 0x30818
>> +#define SOURCE_PIF_FIFO2_FLUSH 0x3081c
>> +#define SOURCE_PIF_STATUS 0x30820
>> +#define SOURCE_PIF_INTERRUPT_SOURCE 0x30824
>> +#define SOURCE_PIF_INTERRUPT_MASK 0x30828
> Same here, split these up! Everywhere else applicable too.
>
>> +#define SOURCE_PIF_PKT_ALLOC_REG 0x3082c
>> +#define SOURCE_PIF_PKT_ALLOC_WR_EN 0x30830
>> +#define SOURCE_PIF_SW_RESET 0x30834
>> +
>> +/* bellow registers need access by mailbox */
>> +/* source car addr */
>> +#define SOURCE_HDTX_CAR 0x0900
>> +#define SOURCE_DPTX_CAR 0x0904
>> +#define SOURCE_PHY_CAR 0x0908
>> +#define SOURCE_CEC_CAR 0x090c
>> +#define SOURCE_CBUS_CAR 0x0910
>> +#define SOURCE_PKT_CAR 0x0918
>> +#define SOURCE_AIF_CAR 0x091c
>> +#define SOURCE_CIPHER_CAR 0x0920
>> +#define SOURCE_CRYPTO_CAR 0x0924
>> +
>> +/* clock meters addr */
>> +#define CM_CTRL 0x0a00
>> +#define CM_I2S_CTRL 0x0a04
>> +#define CM_SPDIF_CTRL 0x0a08
>> +#define CM_VID_CTRL 0x0a0c
>> +#define CM_LANE_CTRL 0x0a10
>> +#define I2S_NM_STABLE 0x0a14
>> +#define I2S_NCTS_STABLE 0x0a18
>> +#define SPDIF_NM_STABLE 0x0a1c
>> +#define SPDIF_NCTS_STABLE 0x0a20
>> +#define NMVID_MEAS_STABLE 0x0a24
>> +#define I2S_MEAS 0x0a40
>> +#define SPDIF_MEAS 0x0a80
>> +#define NMVID_MEAS 0x0ac0
>> +
>> +/* source vif addr */
>> +#define BND_HSYNC2VSYNC 0x0b00
>> +#define HSYNC2VSYNC_F1_L1 0x0b04
>> +#define HSYNC2VSYNC_F2_L1 0x0b08
>> +#define HSYNC2VSYNC_STATUS 0x0b0c
>> +#define HSYNC2VSYNC_POL_CTRL 0x0b10
>> +
>> +/* dptx phy addr */
>> +#define DP_TX_PHY_CONFIG_REG 0x2000
>> +#define DP_TX_PHY_STATUS_REG 0x2004
>> +#define DP_TX_PHY_SW_RESET 0x2008
>> +#define DP_TX_PHY_SCRAMBLER_SEED 0x200c
>> +#define DP_TX_PHY_TRAINING_01_04 0x2010
>> +#define DP_TX_PHY_TRAINING_05_08 0x2014
>> +#define DP_TX_PHY_TRAINING_09_10 0x2018
>> +#define TEST_COR 0x23fc
>> +
>> +/* dptx hpd addr */
>> +#define HPD_IRQ_DET_MIN_TIMER 0x2100
>> +#define HPD_IRQ_DET_MAX_TIMER 0x2104
>> +#define HPD_UNPLGED_DET_MIN_TIMER 0x2108
>> +#define HPD_STABLE_TIMER 0x210c
>> +#define HPD_FILTER_TIMER 0x2110
>> +#define HPD_EVENT_MASK 0x211c
>> +#define HPD_EVENT_DET 0x2120
>> +
>> +/* dpyx framer addr */
>> +#define DP_FRAMER_GLOBAL_CONFIG 0x2200
>> +#define DP_SW_RESET 0x2204
>> +#define DP_FRAMER_TU 0x2208
>> +#define DP_FRAMER_PXL_REPR 0x220c
>> +#define DP_FRAMER_SP 0x2210
>> +#define AUDIO_PACK_CONTROL 0x2214
>> +#define DP_VC_TABLE(x) (0x2218 + ((x) << 2))
>> +#define DP_VB_ID 0x2258
>> +#define DP_MTPH_LVP_CONTROL 0x225c
>> +#define DP_MTPH_SYMBOL_VALUES 0x2260
>> +#define DP_MTPH_ECF_CONTROL 0x2264
>> +#define DP_MTPH_ACT_CONTROL 0x2268
>> +#define DP_MTPH_STATUS 0x226c
>> +#define DP_INTERRUPT_SOURCE 0x2270
>> +#define DP_INTERRUPT_MASK 0x2274
>> +#define DP_FRONT_BACK_PORCH 0x2278
>> +#define DP_BYTE_COUNT 0x227c
>> +
>> +/* dptx stream addr */
>> +#define MSA_HORIZONTAL_0 0x2280
>> +#define MSA_HORIZONTAL_1 0x2284
>> +#define MSA_VERTICAL_0 0x2288
>> +#define MSA_VERTICAL_1 0x228c
>> +#define MSA_MISC 0x2290
>> +#define STREAM_CONFIG 0x2294
>> +#define AUDIO_PACK_STATUS 0x2298
>> +#define VIF_STATUS 0x229c
>> +#define PCK_STUFF_STATUS_0 0x22a0
>> +#define PCK_STUFF_STATUS_1 0x22a4
>> +#define INFO_PACK_STATUS 0x22a8
>> +#define RATE_GOVERNOR_STATUS 0x22ac
>> +#define DP_HORIZONTAL 0x22b0
>> +#define DP_VERTICAL_0 0x22b4
>> +#define DP_VERTICAL_1 0x22b8
>> +#define DP_BLOCK_SDP 0x22bc
>> +
>> +/* dptx glbl addr */
>> +#define DPTX_LANE_EN 0x2300
>> +#define DPTX_ENHNCD 0x2304
>> +#define DPTX_INT_MASK 0x2308
>> +#define DPTX_INT_STATUS 0x230c
>> +
>> +/* dp aux addr */
>> +#define DP_AUX_HOST_CONTROL 0x2800
>> +#define DP_AUX_INTERRUPT_SOURCE 0x2804
>> +#define DP_AUX_INTERRUPT_MASK 0x2808
>> +#define DP_AUX_SWAP_INVERSION_CONTROL 0x280c
>> +#define DP_AUX_SEND_NACK_TRANSACTION 0x2810
>> +#define DP_AUX_CLEAR_RX 0x2814
>> +#define DP_AUX_CLEAR_TX 0x2818
>> +#define DP_AUX_TIMER_STOP 0x281c
>> +#define DP_AUX_TIMER_CLEAR 0x2820
>> +#define DP_AUX_RESET_SW 0x2824
>> +#define DP_AUX_DIVIDE_2M 0x2828
>> +#define DP_AUX_TX_PREACHARGE_LENGTH 0x282c
>> +#define DP_AUX_FREQUENCY_1M_MAX 0x2830
>> +#define DP_AUX_FREQUENCY_1M_MIN 0x2834
>> +#define DP_AUX_RX_PRE_MIN 0x2838
>> +#define DP_AUX_RX_PRE_MAX 0x283c
>> +#define DP_AUX_TIMER_PRESET 0x2840
>> +#define DP_AUX_NACK_FORMAT 0x2844
>> +#define DP_AUX_TX_DATA 0x2848
>> +#define DP_AUX_RX_DATA 0x284c
>> +#define DP_AUX_TX_STATUS 0x2850
>> +#define DP_AUX_RX_STATUS 0x2854
>> +#define DP_AUX_RX_CYCLE_COUNTER 0x2858
>> +#define DP_AUX_MAIN_STATES 0x285c
>> +#define DP_AUX_MAIN_TIMER 0x2860
>> +#define DP_AUX_AFE_OUT 0x2864
>> +
>> +/* crypto addr */
>> +#define CRYPTO_HDCP_REVISION 0x5800
>> +#define HDCP_CRYPTO_CONFIG 0x5804
>> +#define CRYPTO_INTERRUPT_SOURCE 0x5808
>> +#define CRYPTO_INTERRUPT_MASK 0x580c
>> +#define CRYPTO22_CONFIG 0x5818
>> +#define CRYPTO22_STATUS 0x581c
>> +#define SHA_256_DATA_IN 0x583c
>> +#define SHA_256_DATA_OUT_(x) (0x5850 + ((x) << 2))
>> +#define AES_32_KEY_(x) (0x5870 + ((x) << 2))
>> +#define AES_32_DATA_IN 0x5880
>> +#define AES_32_DATA_OUT_(x) (0x5884 + ((x) << 2))
>> +#define CRYPTO14_CONFIG 0x58a0
>> +#define CRYPTO14_STATUS 0x58a4
>> +#define CRYPTO14_PRNM_OUT 0x58a8
>> +#define CRYPTO14_KM_0 0x58ac
>> +#define CRYPTO14_KM_1 0x58b0
>> +#define CRYPTO14_AN_0 0x58b4
>> +#define CRYPTO14_AN_1 0x58b8
>> +#define CRYPTO14_YOUR_KSV_0 0x58bc
>> +#define CRYPTO14_YOUR_KSV_1 0x58c0
>> +#define CRYPTO14_MI_0 0x58c4
>> +#define CRYPTO14_MI_1 0x58c8
>> +#define CRYPTO14_TI_0 0x58cc
>> +#define CRYPTO14_KI_0 0x58d0
>> +#define CRYPTO14_KI_1 0x58d4
>> +#define CRYPTO14_BLOCKS_NUM 0x58d8
>> +#define CRYPTO14_KEY_MEM_DATA_0 0x58dc
>> +#define CRYPTO14_KEY_MEM_DATA_1 0x58e0
>> +#define CRYPTO14_SHA1_MSG_DATA 0x58e4
>> +#define CRYPTO14_SHA1_V_VALUE_(x) (0x58e8 + ((x) << 2))
>> +#define TRNG_CTRL 0x58fc
>> +#define TRNG_DATA_RDY 0x5900
>> +#define TRNG_DATA 0x5904
>> +
>> +/* cipher addr */
>> +#define HDCP_REVISION 0x60000
>> +#define INTERRUPT_SOURCE 0x60004
>> +#define INTERRUPT_MASK 0x60008
>> +#define HDCP_CIPHER_CONFIG 0x6000c
>> +#define AES_128_KEY_0 0x60010
>> +#define AES_128_KEY_1 0x60014
>> +#define AES_128_KEY_2 0x60018
>> +#define AES_128_KEY_3 0x6001c
>> +#define AES_128_RANDOM_0 0x60020
>> +#define AES_128_RANDOM_1 0x60024
>> +#define CIPHER14_KM_0 0x60028
>> +#define CIPHER14_KM_1 0x6002c
>> +#define CIPHER14_STATUS 0x60030
>> +#define CIPHER14_RI_PJ_STATUS 0x60034
>> +#define CIPHER_MODE 0x60038
>> +#define CIPHER14_AN_0 0x6003c
>> +#define CIPHER14_AN_1 0x60040
>> +#define CIPHER22_AUTH 0x60044
>> +#define CIPHER14_R0_DP_STATUS 0x60048
>> +#define CIPHER14_BOOTSTRAP 0x6004c
>> +
>> +#define APB_IRAM_PATH BIT(2)
>> +#define APB_DRAM_PATH BIT(1)
>> +#define APB_XT_RESET BIT(0)
>> +
>> +/* mailbox */
>> +#define MB_OPCODE_ID 0
>> +#define MB_MODULE_ID 1
>> +#define MB_SIZE_MSB_ID 2
>> +#define MB_SIZE_LSB_ID 3
>> +#define MB_DATA_ID 4
>> +
>> +#define MB_MODULE_ID_DP_TX 0x01
>> +#define MB_MODULE_ID_HDCP_TX 0x07
>> +#define MB_MODULE_ID_HDCP_RX 0x08
>> +#define MB_MODULE_ID_HDCP_GENERAL 0x09
>> +#define MB_MODULE_ID_GENERAL 0x0a
>> +
>> +/* general opcode */
>> +#define GENERAL_MAIN_CONTROL 0x01
>> +#define GENERAL_TEST_ECHO 0x02
>> +#define GENERAL_BUS_SETTINGS 0x03
>> +#define GENERAL_TEST_ACCESS 0x04
>> +
>> +#define DPTX_SET_POWER_MNG 0x00
>> +#define DPTX_SET_HOST_CAPABILITIES 0x01
>> +#define DPTX_GET_EDID 0x02
>> +#define DPTX_READ_DPCD 0x03
>> +#define DPTX_WRITE_DPCD 0x04
>> +#define DPTX_ENABLE_EVENT 0x05
>> +#define DPTX_WRITE_REGISTER 0x06
>> +#define DPTX_READ_REGISTER 0x07
>> +#define DPTX_WRITE_FIELD 0x08
>> +#define DPTX_TRAINING_CONTROL 0x09
>> +#define DPTX_READ_EVENT 0x0a
>> +#define DPTX_READ_LINK_STAT 0x0b
>> +#define DPTX_SET_VIDEO 0x0c
>> +#define DPTX_SET_AUDIO 0x0d
>> +#define DPTX_GET_LAST_AUX_STAUS 0x0e
>> +#define DPTX_SET_LINK_BREAK_POINT 0x0f
>> +#define DPTX_FORCE_LANES 0x10
>> +#define DPTX_HPD_STATE 0x11
>> +
>> +#define DPTX_EVENT_ENABLE_HPD BIT(0)
>> +#define DPTX_EVENT_ENABLE_TRAINING BIT(1)
>> +
>> +#define LINK_TRAINING_NOT_ACTIVE 0
>> +#define LINK_TRAINING_RUN 1
>> +#define LINK_TRAINING_RESTART 2
>> +
>> +#define CONTROL_VIDEO_IDLE 0
>> +#define CONTROL_VIDEO_VALID 1
>> +
>> +#define VIF_BYPASS_INTERLACE BIT(13)
>> +#define INTERLACE_FMT_DET BIT(12)
>> +#define INTERLACE_DTCT_WIN 0x20
>> +
>> +#define DP_FRAMER_SP_INTERLACE_EN BIT(2)
>> +#define DP_FRAMER_SP_HSP BIT(1)
>> +#define DP_FRAMER_SP_VSP BIT(0)
>> +
>> +/* capability */
>> +#define AUX_HOST_INVERT 3
>> +#define FAST_LT_SUPPORT 1
>> +#define FAST_LT_NOT_SUPPORT 0
>> +#define LANE_MAPPING_NORMAL 0xe4
>> +#define LANE_MAPPING_FLIPPED 0x1b
>> +#define ENHANCED 1
>> +
>> +#define FULL_LT_STARTED BIT(0)
>> +#define FASE_LT_STARTED BIT(1)
>> +#define CLK_RECOVERY_FINISHED BIT(2)
>> +#define EQ_PHASE_FINISHED BIT(3)
>> +#define FASE_LT_START_FINISHED BIT(4)
>> +#define CLK_RECOVERY_FAILED BIT(5)
>> +#define EQ_PHASE_FAILED BIT(6)
>> +#define FASE_LT_FAILED BIT(7)
>> +
>> +#define DPTX_HPD_EVENT BIT(0)
>> +#define DPTX_TRAINING_EVENT BIT(1)
>> +#define HDCP_TX_STATUS_EVENT BIT(4)
>> +#define HDCP2_TX_IS_KM_STORED_EVENT BIT(5)
>> +#define HDCP2_TX_STORE_KM_EVENT BIT(6)
>> +#define HDCP_TX_IS_RECEIVER_ID_VALID_EVENT BIT(7)
>> +
>> +#define EDID_LENGTH_BYTE 0
>> +#define EDID_SEGMENT_BUMBER 1
>> +#define EDID_DATA 2
>> +#define EDID_BLOCK_SIZE 128
>> +
>> +#define TU_SIZE 30
>> +
>> +/* audio */
>> +#define AUDIO_PACK_EN(x) ((x) << 8)
>> +#define SAMPLING_FREQ(x) ((x) << 16)
>> +#define ORIGINAL_SAMP_FREQ(x) ((x) << 24)
>> +#define SYNC_WR_TO_CH_ZERO BIT(1)
>> +
>> +enum voltage_swing_level {
>> + VOLTAGE_LEVEL_0,
>> + VOLTAGE_LEVEL_1,
>> + VOLTAGE_LEVEL_2,
>> + VOLTAGE_LEVEL_3,
>> +};
>> +
>> +enum pre_emphasis_level {
>> + PRE_EMPHASIS_LEVEL_0,
>> + PRE_EMPHASIS_LEVEL_1,
>> + PRE_EMPHASIS_LEVEL_2,
>> + PRE_EMPHASIS_LEVEL_3,
>> +};
>> +
>> +enum pattern_set {
>> + PRBS7 = BIT(0),
>> + D10_2 = BIT(1),
>> + TRAINING_PTN1 = BIT(2),
>> + TRAINING_PTN2 = BIT(3),
>> + DP_NONE = BIT(4)
>> +};
>> +
>> +enum VIC_PXL_ENCODING_FORMAT {
> lowercase name
>
>> + PXL_RGB = 0x1,
>> + YCBCR_4_4_4 = 0x2,
>> + YCBCR_4_2_2 = 0x4,
>> + YCBCR_4_2_0 = 0x8,
>> + Y_ONLY = 0x10,
>> +};
>> +
>> +enum VIC_COLOR_DEPTH {
> and here
>
>> + BCS_6 = 0x1,
>> + BCS_8 = 0x2,
>> + BCS_10 = 0x4,
>> + BCS_12 = 0x8,
>> + BCS_16 = 0x10,
>> +};
>> +
>> +enum VIC_BT_TYPE {
> and here
>
>> + BT_601 = 0x0,
>> + BT_709 = 0x1,
>> +};
>> +
>> +#endif /* _CDN_DP_REG_H */
>> diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c
>> index edd7ec2..98302b3 100644
>> --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c
>> +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c
>> @@ -969,7 +969,7 @@ static void vop_crtc_enable(struct drm_crtc *crtc)
>> vop_dsp_hold_valid_irq_disable(vop);
>> }
>>
>> - pin_pol = 0x8;
>> + pin_pol = (s->output_type == DRM_MODE_CONNECTOR_DisplayPort) ? 0 : 0x8;
> There's no sense checking output_type here and then again in the
> switch statement. Instead, pull 0x8 into a #define and only assign it
> to pin_pol in the individual case statements below.
>
>> pin_pol |= (adjusted_mode->flags & DRM_MODE_FLAG_NHSYNC) ? 0 : 1;
>> pin_pol |= (adjusted_mode->flags & DRM_MODE_FLAG_NVSYNC) ? 0 : (1 << 1);
>> VOP_CTRL_SET(vop, pin_pol, pin_pol);
>> @@ -991,6 +991,10 @@ static void vop_crtc_enable(struct drm_crtc *crtc)
>> VOP_CTRL_SET(vop, mipi_pin_pol, pin_pol);
>> VOP_CTRL_SET(vop, mipi_en, 1);
>> break;
>> + case DRM_MODE_CONNECTOR_DisplayPort:
>> + VOP_CTRL_SET(vop, dp_pin_pol, pin_pol);
>> + VOP_CTRL_SET(vop, dp_en, 1);
>> + break;
>> default:
>> DRM_ERROR("unsupport connector_type[%d]\n", s->output_type);
>> }
>> diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop.h b/drivers/gpu/drm/rockchip/rockchip_drm_vop.h
>> index ff4f52e..50a045c 100644
>> --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop.h
>> +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop.h
>> @@ -45,6 +45,7 @@ struct vop_ctrl {
>> struct vop_reg edp_en;
>> struct vop_reg hdmi_en;
>> struct vop_reg mipi_en;
>> + struct vop_reg dp_en;
>> struct vop_reg out_mode;
>> struct vop_reg dither_down;
>> struct vop_reg dither_up;
>> @@ -53,6 +54,7 @@ struct vop_ctrl {
>> struct vop_reg hdmi_pin_pol;
>> struct vop_reg edp_pin_pol;
>> struct vop_reg mipi_pin_pol;
>> + struct vop_reg dp_pin_pol;
>>
>> struct vop_reg htotal_pw;
>> struct vop_reg hact_st_end;
>> diff --git a/drivers/gpu/drm/rockchip/rockchip_vop_reg.c b/drivers/gpu/drm/rockchip/rockchip_vop_reg.c
>> index 5b1ae1f..dcf172e 100644
>> --- a/drivers/gpu/drm/rockchip/rockchip_vop_reg.c
>> +++ b/drivers/gpu/drm/rockchip/rockchip_vop_reg.c
>> @@ -281,6 +281,7 @@ static const struct vop_data rk3288_vop = {
>> static const struct vop_ctrl rk3399_ctrl_data = {
>> .standby = VOP_REG(RK3399_SYS_CTRL, 0x1, 22),
>> .gate_en = VOP_REG(RK3399_SYS_CTRL, 0x1, 23),
>> + .dp_en = VOP_REG(RK3399_SYS_CTRL, 0x1, 11),
>> .rgb_en = VOP_REG(RK3399_SYS_CTRL, 0x1, 12),
>> .hdmi_en = VOP_REG(RK3399_SYS_CTRL, 0x1, 13),
>> .edp_en = VOP_REG(RK3399_SYS_CTRL, 0x1, 14),
>> @@ -290,6 +291,7 @@ static const struct vop_ctrl rk3399_ctrl_data = {
>> .data_blank = VOP_REG(RK3399_DSP_CTRL0, 0x1, 19),
>> .out_mode = VOP_REG(RK3399_DSP_CTRL0, 0xf, 0),
>> .rgb_pin_pol = VOP_REG(RK3399_DSP_CTRL1, 0xf, 16),
>> + .dp_pin_pol = VOP_REG(RK3399_DSP_CTRL1, 0xf, 16),
>> .hdmi_pin_pol = VOP_REG(RK3399_DSP_CTRL1, 0xf, 20),
>> .edp_pin_pol = VOP_REG(RK3399_DSP_CTRL1, 0xf, 24),
>> .mipi_pin_pol = VOP_REG(RK3399_DSP_CTRL1, 0xf, 28),
>> --
>> 2.6.3
>>
>> _______________________________________________
>> dri-devel mailing list
>> dri-devel at lists.freedesktop.org
>> https://lists.freedesktop.org/mailman/listinfo/dri-devel
>
>
