lkml.org 
[lkml]   [2021]   [Dec]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
From
Date
SubjectRe: [PATCH v6 7/7] drm/mediatek: Add mt8195 DisplayPort driver
Hi Chun-Kuang.

Quoting Guillaume Ranquet (2021-12-02 16:31:03)
> Hi Chun-Kuang.
>
> Quoting Chun-Kuang Hu (2021-11-25 16:27:45)
> > Hi, Guillaume:
> >
> > This is a big patch, so I give some comment first.
> >
> > Guillaume Ranquet <granquet@baylibre.com> 於 2021年11月10日 週三 下午9:06寫道:
> > >
> > > From: Markus Schneider-Pargmann <msp@baylibre.com>
> > >
> > > This patch adds a DisplayPort driver for the Mediatek mt8195 SoC and a
> > > according phy driver mediatek-dp-phy.
> > >
> > > It supports both functional units on the mt8195, the embedded
> > > DisplayPort as well as the external DisplayPort units. It offers
> > > hot-plug-detection, audio up to 8 channels, and DisplayPort 1.4 with up
> > > to 4 lanes.
> > >
> > > The driver creates a child device for the phy. The child device will
> > > never exist without the parent being active. As they are sharing a
> > > register range, the parent passes a regmap pointer to the child so that
> > > both can work with the same register range. The phy driver sets device
> > > data that is read by the parent to get the phy device that can be used
> > > to control the phy properties.
> > >
> > > This driver is based on an initial version by
> > > Jason-JH.Lin <jason-jh.lin@mediatek.com>.
> > >
> > > Signed-off-by: Markus Schneider-Pargmann <msp@baylibre.com>
> > > Signed-off-by: Guillaume Ranquet <granquet@baylibre.com>
> > > Reported-by: kernel test robot <lkp@intel.com>
> > > ---
> > > drivers/gpu/drm/drm_edid.c | 2 +-
> >
> > Separate this to another patch.
> >
> > > drivers/gpu/drm/mediatek/Kconfig | 7 +
> > > drivers/gpu/drm/mediatek/Makefile | 2 +
> > > drivers/gpu/drm/mediatek/mtk_dp.c | 3094 +++++++++++++++++++++++
> > > drivers/gpu/drm/mediatek/mtk_dp_reg.h | 568 +++++
> > > drivers/gpu/drm/mediatek/mtk_dpi.c | 111 +-
> >
> > Ditto.
> >
> > > drivers/gpu/drm/mediatek/mtk_dpi_regs.h | 26 +
> >
> > Ditto.
> >
> > > drivers/gpu/drm/mediatek/mtk_drm_drv.c | 1 +
> >
> > Ditto
> >
> > > drivers/gpu/drm/mediatek/mtk_drm_drv.h | 1 +
> >
> > Ditto
> >
> yes my bad, I've made a bunch of fixup which ended up in the wrong place.
> It will be fixed for the next version.
>
> > > 9 files changed, 3799 insertions(+), 13 deletions(-)
> > > create mode 100644 drivers/gpu/drm/mediatek/mtk_dp.c
> > > create mode 100644 drivers/gpu/drm/mediatek/mtk_dp_reg.h
> > >
> > > diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c
> > > index 500279a82167a..bfd98b50ceb5b 100644
> > > --- a/drivers/gpu/drm/drm_edid.c
> > > +++ b/drivers/gpu/drm/drm_edid.c
> > > @@ -5183,7 +5183,7 @@ static void drm_parse_hdmi_deep_color_info(struct drm_connector *connector,
> > > * modes and forbids YCRCB422 support for all video modes per
> > > * HDMI 1.3 spec.
> > > */
> > > - info->color_formats = DRM_COLOR_FORMAT_RGB444;
> > > + info->color_formats |= DRM_COLOR_FORMAT_RGB444;
> > >
> > > /* YCRCB444 is optional according to spec. */
> > > if (hdmi[6] & DRM_EDID_HDMI_DC_Y444) {
> > > diff --git a/drivers/gpu/drm/mediatek/Kconfig b/drivers/gpu/drm/mediatek/Kconfig
> > > index 2976d21e9a34a..029b94c716131 100644
> > > --- a/drivers/gpu/drm/mediatek/Kconfig
> > > +++ b/drivers/gpu/drm/mediatek/Kconfig
> > > @@ -28,3 +28,10 @@ config DRM_MEDIATEK_HDMI
> > > select PHY_MTK_HDMI
> > > help
> > > DRM/KMS HDMI driver for Mediatek SoCs
> > > +
> > > +config MTK_DPTX_SUPPORT
> > > + tristate "DRM DPTX Support for Mediatek SoCs"
> > > + depends on DRM_MEDIATEK
> > > + select PHY_MTK_DP
> > > + help
> > > + DRM/KMS Display Port driver for Mediatek SoCs.
> > > diff --git a/drivers/gpu/drm/mediatek/Makefile b/drivers/gpu/drm/mediatek/Makefile
> > > index 29098d7c8307c..d86a6406055e6 100644
> > > --- a/drivers/gpu/drm/mediatek/Makefile
> > > +++ b/drivers/gpu/drm/mediatek/Makefile
> > > @@ -21,3 +21,5 @@ mediatek-drm-hdmi-objs := mtk_cec.o \
> > > mtk_hdmi_ddc.o
> > >
> > > obj-$(CONFIG_DRM_MEDIATEK_HDMI) += mediatek-drm-hdmi.o
> > > +
> > > +obj-$(CONFIG_MTK_DPTX_SUPPORT) += mtk_dp.o
> > > diff --git a/drivers/gpu/drm/mediatek/mtk_dp.c b/drivers/gpu/drm/mediatek/mtk_dp.c
> > > new file mode 100644
> > > index 0000000000000..83087219d5a5e
> > > --- /dev/null
> > > +++ b/drivers/gpu/drm/mediatek/mtk_dp.c
> > > @@ -0,0 +1,3094 @@
> > > +// SPDX-License-Identifier: GPL-2.0
> > > +/*
> > > + * Copyright (c) 2019 MediaTek Inc.
> > > + * Copyright (c) 2021 BayLibre
> > > + */
> > > +
> > > +#include <drm/drm_atomic_helper.h>
> > > +#include <drm/drm_bridge.h>
> > > +#include <drm/drm_crtc.h>
> > > +#include <drm/drm_dp_helper.h>
> > > +#include <drm/drm_edid.h>
> > > +#include <drm/drm_of.h>
> > > +#include <drm/drm_panel.h>
> > > +#include <drm/drm_print.h>
> > > +#include <drm/drm_probe_helper.h>
> > > +#include <linux/arm-smccc.h>
> > > +#include <linux/clk.h>
> > > +#include <linux/delay.h>
> > > +#include <linux/errno.h>
> > > +#include <linux/kernel.h>
> > > +#include <linux/nvmem-consumer.h>
> > > +#include <linux/of.h>
> > > +#include <linux/of_irq.h>
> > > +#include <linux/of_platform.h>
> > > +#include <linux/phy/phy.h>
> > > +#include <linux/platform_device.h>
> > > +#include <linux/pm_runtime.h>
> > > +#include <linux/regmap.h>
> > > +#include <sound/hdmi-codec.h>
> > > +#include <video/videomode.h>
> > > +
> > > +#include "mtk_dp_reg.h"
> > > +
> > > +#define MTK_DP_AUX_WAIT_REPLY_COUNT 20
> > > +#define MTK_DP_CHECK_SINK_CAP_TIMEOUT_COUNT 3
> > > +
> > > +#define MTK_DP_MAX_LANES 4
> > > +#define MTK_DP_MAX_LINK_RATE MTK_DP_LINKRATE_HBR3
> > > +
> > > +#define MTK_DP_TBC_BUF_READ_START_ADDR 0x08
> > > +
> > > +#define MTK_DP_TRAIN_RETRY_LIMIT 8
> > > +#define MTK_DP_TRAIN_MAX_ITERATIONS 5
> > > +
> > > +#define MTK_DP_AUX_WRITE_READ_WAIT_TIME_US 20
> > > +
> > > +#define MTK_DP_DP_VERSION_11 0x11
> > > +
> > > +enum mtk_dp_state {
> > > + MTK_DP_STATE_INITIAL,
> > > + MTK_DP_STATE_IDLE,
> > > + MTK_DP_STATE_PREPARE,
> > > + MTK_DP_STATE_NORMAL,
> > > +};
> > > +
> > > +enum mtk_dp_train_state {
> > > + MTK_DP_TRAIN_STATE_STARTUP = 0,
> > > + MTK_DP_TRAIN_STATE_CHECKCAP,
> > > + MTK_DP_TRAIN_STATE_CHECKEDID,
> > > + MTK_DP_TRAIN_STATE_TRAINING_PRE,
> > > + MTK_DP_TRAIN_STATE_TRAINING,
> > > + MTK_DP_TRAIN_STATE_CHECKTIMING,
> > > + MTK_DP_TRAIN_STATE_NORMAL,
> > > + MTK_DP_TRAIN_STATE_POWERSAVE,
> > > + MTK_DP_TRAIN_STATE_DPIDLE,
> > > +};
> > > +
> > > +struct mtk_dp_timings {
> > > + struct videomode vm;
> > > +
> > > + u16 htotal;
> > > + u16 vtotal;
> > > + u8 frame_rate;
> > > + u32 pix_rate_khz;
> > > +};
> > > +
> > > +struct mtk_dp_train_info {
> > > + bool tps3;
> > > + bool tps4;
> > > + bool sink_ssc;
> > > + bool cable_plugged_in;
> > > + bool cable_state_change;
> > > + bool cr_done;
> > > + bool eq_done;
> > > +
> > > + // link_rate is in multiple of 0.27Gbps
> > > + int link_rate;
> > > + int lane_count;
> > > +
> > > + int irq_status;
> > > + int check_cap_count;
> > > +};
> > > +
> > > +// Same values as used by the DP Spec for MISC0 bits 1 and 2
> > > +enum mtk_dp_color_format {
> > > + MTK_DP_COLOR_FORMAT_RGB_444 = 0,
> > > + MTK_DP_COLOR_FORMAT_YUV_422 = 1,
> > > + MTK_DP_COLOR_FORMAT_YUV_444 = 2,
> > > + MTK_DP_COLOR_FORMAT_YUV_420 = 3,
> > > + MTK_DP_COLOR_FORMAT_YONLY = 4,
> > > + MTK_DP_COLOR_FORMAT_RAW = 5,
> > > + MTK_DP_COLOR_FORMAT_RESERVED = 6,
> > > + MTK_DP_COLOR_FORMAT_DEFAULT = MTK_DP_COLOR_FORMAT_RGB_444,
> > > + MTK_DP_COLOR_FORMAT_UNKNOWN = 15,
> > > +};
> > > +
> > > +// Multiple of 0.27Gbps
> > > +enum mtk_dp_linkrate {
> > > + MTK_DP_LINKRATE_RBR = 0x6,
> > > + MTK_DP_LINKRATE_HBR = 0xA,
> > > + MTK_DP_LINKRATE_HBR2 = 0x14,
> > > + MTK_DP_LINKRATE_HBR25 = 0x19,
> > > + MTK_DP_LINKRATE_HBR3 = 0x1E,
> > > +};
> > > +
> > > +// Same values as used for DP Spec MISC0 bits 5,6,7
> > > +enum mtk_dp_color_depth {
> > > + MTK_DP_COLOR_DEPTH_6BIT = 0,
> > > + MTK_DP_COLOR_DEPTH_8BIT = 1,
> > > + MTK_DP_COLOR_DEPTH_10BIT = 2,
> > > + MTK_DP_COLOR_DEPTH_12BIT = 3,
> > > + MTK_DP_COLOR_DEPTH_16BIT = 4,
> > > + MTK_DP_COLOR_DEPTH_UNKNOWN = 5,
> > > +};
> > > +
> > > +struct mtk_dp_audio_cfg {
> > > + int sample_rate;
> > > + int word_length_bits;
> > > + int channels;
> > > +};
> > > +
> > > +struct mtk_dp_info {
> > > + enum mtk_dp_color_depth depth;
> > > + enum mtk_dp_color_format format;
> > > + struct mtk_dp_audio_cfg audio_caps;
> > > + struct mtk_dp_timings timings;
> > > +};
> > > +
> > > +struct dp_cal_data {
> > > + unsigned int glb_bias_trim;
> > > + unsigned int clktx_impse;
> > > +
> > > + unsigned int ln0_tx_impsel_pmos;
> > > + unsigned int ln0_tx_impsel_nmos;
> > > + unsigned int ln1_tx_impsel_pmos;
> > > + unsigned int ln1_tx_impsel_nmos;
> > > + unsigned int ln2_tx_impsel_pmos;
> > > + unsigned int ln2_tx_impsel_nmos;
> > > + unsigned int ln3_tx_impsel_pmos;
> > > + unsigned int ln3_tx_impsel_nmos;
> > > +};
> > > +
> > > +struct mtk_dp {
> > > + struct device *dev;
> > > + struct platform_device *phy_dev;
> > > + struct phy *phy;
> > > + struct dp_cal_data cal_data;
> > > +
> > > + struct drm_device *drm_dev;
> > > + struct drm_bridge bridge;
> > > + struct drm_bridge *next_bridge;
> > > + struct drm_dp_aux aux;
> > > +
> > > + struct mutex edid_lock;
> > > + struct edid *edid;
> > > +
> > > + u8 rx_cap[DP_RECEIVER_CAP_SIZE];
> > > +
> > > + struct mtk_dp_info info;
> > > + enum mtk_dp_state state;
> > > +
> > > + struct mtk_dp_train_info train_info;
> > > + enum mtk_dp_train_state train_state;
> > > + unsigned int input_fmt;
> > > +
> > > + struct regmap *regs;
> > > + struct clk *dp_tx_clk;
> > > +
> > > + bool enabled;
> > > + bool audio_enable;
> > > +
> > > + bool has_fec;
> > > + struct mutex dp_lock;
> > > +
> > > + struct mutex update_plugged_status_lock;
> > > +
> > > + hdmi_codec_plugged_cb plugged_cb;
> > > + struct device *codec_dev;
> > > + u8 connector_eld[MAX_ELD_BYTES];
> > > +};
> > > +
> > > +enum mtk_dp_sdp_type {
> > > + MTK_DP_SDP_NONE = 0x00,
> > > + MTK_DP_SDP_ACM = 0x01,
> > > + MTK_DP_SDP_ISRC = 0x02,
> > > + MTK_DP_SDP_AVI = 0x03,
> > > + MTK_DP_SDP_AUI = 0x04,
> > > + MTK_DP_SDP_SPD = 0x05,
> > > + MTK_DP_SDP_MPEG = 0x06,
> > > + MTK_DP_SDP_NTSC = 0x07,
> > > + MTK_DP_SDP_VSP = 0x08,
> > > + MTK_DP_SDP_VSC = 0x09,
> > > + MTK_DP_SDP_EXT = 0x0A,
> > > + MTK_DP_SDP_PPS0 = 0x0B,
> > > + MTK_DP_SDP_PPS1 = 0x0C,
> > > + MTK_DP_SDP_PPS2 = 0x0D,
> > > + MTK_DP_SDP_PPS3 = 0x0E,
> > > + MTK_DP_SDP_DRM = 0x10,
> > > + MTK_DP_SDP_MAX_NUM
> > > +};
> > > +
> > > +struct mtk_dp_sdp_packet {
> > > + enum mtk_dp_sdp_type type;
> > > + struct dp_sdp sdp;
> > > +};
> > > +
> > > +#define MTK_DP_IEC_CHANNEL_STATUS_LEN 5
> > > +union mtk_dp_audio_channel_status {
> > > + struct {
> > > + u8 rev : 1;
> > > + u8 is_lpcm : 1;
> > > + u8 copy_right : 1;
> > > + u8 additional_format_info : 3;
> > > + u8 channel_status_mode : 2;
> > > + u8 category_code;
> > > + u8 src_num : 4;
> > > + u8 channel_num : 4;
> > > + u8 sampling_freq : 4;
> > > + u8 clk_accuracy : 2;
> > > + u8 rev2 : 2;
> > > + u8 word_len : 4;
> > > + u8 original_sampling_freq : 4;
> > > + } iec;
> > > +
> > > + u8 buf[MTK_DP_IEC_CHANNEL_STATUS_LEN];
> > > +};
> > > +
> > > +static struct regmap_config mtk_dp_regmap_config = {
> > > + .reg_bits = 32,
> > > + .val_bits = 32,
> > > + .reg_stride = 4,
> > > + .max_register = SEC_OFFSET + 0x90,
> > > + .name = "mtk-dp-registers",
> > > +};
> > > +
> > > +static bool mtk_dp_is_edp(struct mtk_dp *mtk_dp)
> >
> > Separate edp and displayport into two patches. For example, the first
> > patch support edp only, and the second patch add displayport function.
> >
> I have made the opposite as it seemed a bit more logical from how it's coded
> now.
> I've made a single patch with DP and a new one adding eDP support on top of it.
> The change is quite small, adding the eDP on top of DP:
> drivers/gpu/drm/mediatek/mtk_dp.c | 103 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-----------------------------
> 1 file changed, 74 insertions(+), 29 deletions(-)
> > > +{
> > > + return mtk_dp->next_bridge != NULL;
> > > +}
> > > +
> >
> > [snip]
> >
> > > +
> > > +static struct edid *mtk_dp_get_edid(struct drm_bridge *bridge,
> > > + struct drm_connector *connector)
> > > +{
> > > + struct mtk_dp *mtk_dp = mtk_dp_from_bridge(bridge);
> > > + bool enabled = mtk_dp->enabled;
> > > + struct edid *new_edid = NULL;
> > > +
> > > + if (!enabled)
> > > + drm_bridge_chain_pre_enable(bridge);
> >
> > In mtk_hdmi_bridge_get_edid(), there does not check the power. Why in
> > this function need this?
> > Does mtk hdmi driver has a bug?
> >
> I don't know, but I will be asking around.
In short, no, the hdmi driver does not have a bug.
We have to check power here as this driver handles both a DP and an eDP panel.

As the power is controlled by the panel driver in the case of eDP, we have
to make sure the bridge is enabled before trying to read the edid.

Hope this answers the question.

> > > +
> > > + drm_dp_dpcd_writeb(&mtk_dp->aux, DP_SET_POWER, DP_SET_POWER_D0);
> > > + usleep_range(2000, 5000);
> > > +
> > > + if (mtk_dp_plug_state(mtk_dp))
> > > + new_edid = drm_get_edid(connector, &mtk_dp->aux.ddc);
> > > +
> > > + if (!enabled)
> > > + drm_bridge_chain_post_disable(bridge);
> > > +
> > > + mutex_lock(&mtk_dp->edid_lock);
> > > + kfree(mtk_dp->edid);
> > > + mtk_dp->edid = NULL;
> > > +
> > > + if (!new_edid) {
> > > + mutex_unlock(&mtk_dp->edid_lock);
> > > + return NULL;
> > > + }
> > > +
> > > + mtk_dp->edid = drm_edid_duplicate(new_edid);
> > > + mutex_unlock(&mtk_dp->edid_lock);
> > > +
> > > + return new_edid;
> > > +}
> > > +
> > > +static ssize_t mtk_dp_aux_transfer(struct drm_dp_aux *mtk_aux,
> > > + struct drm_dp_aux_msg *msg)
> > > +{
> > > + ssize_t err = -EAGAIN;
> > > + struct mtk_dp *mtk_dp;
> > > + bool is_read;
> > > + u8 request;
> > > + size_t accessed_bytes = 0;
> > > + int retry = 3, ret = 0;
> > > +
> > > + mtk_dp = container_of(mtk_aux, struct mtk_dp, aux);
> > > +
> > > + if (!mtk_dp->train_info.cable_plugged_in ||
> > > + mtk_dp->train_info.irq_status & MTK_DP_HPD_DISCONNECT) {
> > > + mtk_dp->train_state = MTK_DP_TRAIN_STATE_CHECKCAP;
> > > + err = -EAGAIN;
> > > + goto err;
> > > + }
> > > +
> > > + switch (msg->request) {
> > > + case DP_AUX_I2C_MOT:
> > > + case DP_AUX_I2C_WRITE:
> > > + case DP_AUX_NATIVE_WRITE:
> > > + case DP_AUX_I2C_WRITE_STATUS_UPDATE:
> > > + case DP_AUX_I2C_WRITE_STATUS_UPDATE | DP_AUX_I2C_MOT:
> > > + request = msg->request & ~DP_AUX_I2C_WRITE_STATUS_UPDATE;
> > > + is_read = false;
> > > + break;
> > > + case DP_AUX_I2C_READ:
> > > + case DP_AUX_NATIVE_READ:
> > > + case DP_AUX_I2C_READ | DP_AUX_I2C_MOT:
> > > + request = msg->request;
> > > + is_read = true;
> > > + break;
> > > + default:
> > > + drm_err(mtk_aux->drm_dev, "invalid aux cmd = %d\n",
> > > + msg->request);
> > > + err = -EINVAL;
> > > + goto err;
> >
> > Directly return here.
> >
> Hmm, not sure yet, it seems I still need to prime msg->reply anyway.
> Though the error handling can be simplified a bit.
>
> > > + }
> > > +
> > > + if (msg->size == 0) {
> > > + mtk_dp_aux_do_transfer(mtk_dp, is_read, request,
> > > + msg->address + accessed_bytes,
> > > + msg->buffer + accessed_bytes, 0);
> > > + } else {
> > > + while (accessed_bytes < msg->size) {
> > > + size_t to_access =
> > > + min_t(size_t, DP_AUX_MAX_PAYLOAD_BYTES,
> > > + msg->size - accessed_bytes);
> > > + retry = 3;
> > > + while (retry--) {
> > > + ret = mtk_dp_aux_do_transfer(
> > > + mtk_dp, is_read, request,
> > > + msg->address + accessed_bytes,
> > > + msg->buffer + accessed_bytes,
> > > + to_access);
> > > + if (ret == 0)
> > > + break;
> > > + udelay(50);
> > > + }
> > > + if (!retry && ret) {
> > > + drm_info(mtk_dp->drm_dev,
> > > + "Failed to do AUX transfer: %d\n",
> > > + ret);
> > > + break;
> > > + }
> > > + accessed_bytes += to_access;
> > > + }
> > > + }
> > > +err:
> > > + if (!ret) {
> > > + msg->reply = DP_AUX_NATIVE_REPLY_ACK | DP_AUX_I2C_REPLY_ACK;
> > > + ret = msg->size;
> > > + } else {
> > > + msg->reply = DP_AUX_NATIVE_REPLY_NACK | DP_AUX_I2C_REPLY_NACK;
> > > + return err;
> > > + }
> > > +
> > > + msg->reply = DP_AUX_NATIVE_REPLY_ACK | DP_AUX_I2C_REPLY_ACK;
> > > + return msg->size;
> > > +}
> > > +
> > > +static void mtk_dp_aux_init(struct mtk_dp *mtk_dp)
> > > +{
> > > + drm_dp_aux_init(&mtk_dp->aux);
> > > + mtk_dp->aux.name = "aux_mtk_dp";
> > > + mtk_dp->aux.transfer = mtk_dp_aux_transfer;
> > > +}
> > > +
> > > +static void mtk_dp_poweroff(struct mtk_dp *mtk_dp)
> > > +{
> > > + mutex_lock(&mtk_dp->dp_lock);
> > > +
> > > + mtk_dp_hwirq_enable(mtk_dp, false);
> > > + mtk_dp_power_disable(mtk_dp);
> > > + phy_exit(mtk_dp->phy);
> > > + clk_disable_unprepare(mtk_dp->dp_tx_clk);
> > > +
> > > + mutex_unlock(&mtk_dp->dp_lock);
> > > +}
> > > +
> > > +static int mtk_dp_poweron(struct mtk_dp *mtk_dp)
> > > +{
> > > + int ret = 0;
> > > +
> > > + mutex_lock(&mtk_dp->dp_lock);
> > > +
> > > + ret = clk_prepare_enable(mtk_dp->dp_tx_clk);
> > > + if (ret < 0) {
> > > + dev_err(mtk_dp->dev, "Fail to enable clock: %d\n", ret);
> > > + goto err;
> > > + }
> > > + ret = phy_init(mtk_dp->phy);
> > > + if (ret) {
> > > + dev_err(mtk_dp->dev, "Failed to initialize phy: %d\n", ret);
> > > + goto err_phy_init;
> > > + }
> > > + ret = mtk_dp_phy_configure(mtk_dp, MTK_DP_LINKRATE_RBR, 1);
> > > + if (ret) {
> > > + dev_err(mtk_dp->dev, "Failed to configure phy: %d\n", ret);
> > > + goto err_phy_config;
> > > + }
> > > +
> > > + mtk_dp_init_port(mtk_dp);
> > > + mtk_dp_power_enable(mtk_dp);
> > > + mtk_dp_hwirq_enable(mtk_dp, true);
> > > +
> > > +err_phy_config:
> > > + phy_exit(mtk_dp->phy);
> > > +err_phy_init:
> > > + clk_disable_unprepare(mtk_dp->dp_tx_clk);
> > > +err:
> > > + mutex_unlock(&mtk_dp->dp_lock);
> > > + return ret;
> > > +}
> > > +
> > > +static int mtk_dp_bridge_attach(struct drm_bridge *bridge,
> > > + enum drm_bridge_attach_flags flags)
> > > +{
> > > + struct mtk_dp *mtk_dp = mtk_dp_from_bridge(bridge);
> > > + int ret;
> > > +
> > > + if (!(flags & DRM_BRIDGE_ATTACH_NO_CONNECTOR)) {
> > > + dev_err(mtk_dp->dev, "Driver does not provide a connector!");
> > > + return -EINVAL;
> > > + }
> > > +
> > > + ret = mtk_dp_poweron(mtk_dp);
> >
> > Move the power on to mtk_dp_bridge_atomic_enable().
> >
Moving the power-on sequence to the mtk_dp_bridge_atoimc_enable()
breaks the eDP functionality.
For the time being (ie: v7), the power on will stay in the
bridge_attach() callback, sorry.

> > > + if (ret)
> > > + return ret;
> > > +
> > > + if (mtk_dp->next_bridge) {
> > > + ret = drm_bridge_attach(bridge->encoder, mtk_dp->next_bridge,
> > > + &mtk_dp->bridge, flags);
> > > + if (ret) {
> > > + drm_warn(mtk_dp->drm_dev,
> > > + "Failed to attach external bridge: %d\n", ret);
> > > + goto err_bridge_attach;
> > > + }
> > > + }
> > > +
> > > + mtk_dp->drm_dev = bridge->dev;
> > > +
> > > + return 0;
> > > +
> > > +err_bridge_attach:
> > > + mtk_dp_poweroff(mtk_dp);
> > > + return ret;
> > > +}
> > > +
> > > +static void mtk_dp_bridge_detach(struct drm_bridge *bridge)
> > > +{
> > > + struct mtk_dp *mtk_dp = mtk_dp_from_bridge(bridge);
> > > +
> > > + mtk_dp->drm_dev = NULL;
> > > +
> > > + mtk_dp_poweroff(mtk_dp);
> > > +}
> > > +
> > > +static void mtk_dp_bridge_atomic_disable(struct drm_bridge *bridge,
> > > + struct drm_bridge_state *old_state)
> > > +{
> > > + struct mtk_dp *mtk_dp = mtk_dp_from_bridge(bridge);
> > > +
> > > + mtk_dp_video_mute(mtk_dp, true);
> > > + mtk_dp_audio_mute(mtk_dp, true);
> > > + mtk_dp->state = MTK_DP_STATE_IDLE;
> > > + mtk_dp->train_state = MTK_DP_TRAIN_STATE_STARTUP;
> > > +
> > > + mtk_dp->enabled = false;
> > > + msleep(100);
> > > +}
> > > +
> > > +static void mtk_dp_parse_drm_mode_timings(struct mtk_dp *mtk_dp,
> > > + struct drm_display_mode *mode)
> > > +{
> > > + struct mtk_dp_timings *timings = &mtk_dp->info.timings;
> > > +
> > > + drm_display_mode_to_videomode(mode, &timings->vm);
> > > + timings->frame_rate = mode->clock * 1000 / mode->htotal / mode->vtotal;
> > > + timings->htotal = mode->htotal;
> > > + timings->vtotal = mode->vtotal;
> > > +}
> > > +
> > > +static void mtk_dp_bridge_atomic_enable(struct drm_bridge *bridge,
> > > + struct drm_bridge_state *old_state)
> > > +{
> > > + struct mtk_dp *mtk_dp = mtk_dp_from_bridge(bridge);
> > > + struct drm_connector *conn;
> > > + struct drm_connector_state *conn_state;
> > > + struct drm_crtc *crtc;
> > > + struct drm_crtc_state *crtc_state;
> > > + int ret = 0;
> > > + int i;
> > > +
> > > + conn = drm_atomic_get_new_connector_for_encoder(old_state->base.state,
> > > + bridge->encoder);
> >
> > mtk_dp->conn = drm_atomic_get_new_connector_for_encoder(old_state->base.state,
> > bridge->encoder);
> >
> The connector doesn't seem to be used anywhere else in the driver.
> Though I can add a drm_connector in the mtk_dp struct.
>
> > > + if (!conn) {
> > > + drm_err(mtk_dp->drm_dev,
> > > + "Can't enable bridge as connector is missing\n");
> > > + return;
> > > + }
> > > +
> > > + memcpy(mtk_dp->connector_eld, conn->eld, MAX_ELD_BYTES);
> > > +
> > > + conn_state =
> > > + drm_atomic_get_new_connector_state(old_state->base.state, conn);
> > > + if (!conn_state) {
> > > + drm_err(mtk_dp->drm_dev,
> > > + "Can't enable bridge as connector state is missing\n");
> > > + return;
> > > + }
> > > +
> > > + crtc = conn_state->crtc;
> > > + if (!crtc) {
> > > + drm_err(mtk_dp->drm_dev,
> > > + "Can't enable bridge as connector state doesn't have a crtc\n");
> > > + return;
> > > + }
> > > +
> > > + crtc_state = drm_atomic_get_new_crtc_state(old_state->base.state, crtc);
> > > + if (!crtc_state) {
> > > + drm_err(mtk_dp->drm_dev,
> > > + "Can't enable bridge as crtc state is missing\n");
> > > + return;
> > > + }
> > > +
> > > + mtk_dp_parse_drm_mode_timings(mtk_dp, &crtc_state->adjusted_mode);
> >
> > Refer to mtk_hdmi_bridge_atomic_enable() for getting the mode.
> >
> I'm sorry, I don't understand what I'm supposed to do here.
> Could you elaborate?
>
> > > + if (!mtk_dp_parse_capabilities(mtk_dp)) {
> > > + drm_err(mtk_dp->drm_dev,
> > > + "Can't enable bridge as nothing is plugged in\n");
> > > + return;
> > > + }
> > > +
> > > + //training
> >
> > Run checkpatch first.
> >
> > Regards,
> > Chun-Kuang.
> >
> > > + for (i = 0; i < 50; i++) {
> > > + ret = mtk_dp_train_handler(mtk_dp);
> > > + if (ret) {
> > > + drm_err(mtk_dp->drm_dev, "Train handler failed %d\n",
> > > + ret);
> > > + return;
> > > + }
> > > +
> > > + ret = mtk_dp_state_handler(mtk_dp);
> > > + if (ret) {
> > > + drm_err(mtk_dp->drm_dev, "State handler failed %d\n",
> > > + ret);
> > > + return;
> > > + }
> > > + }
> > > +
> > > + mtk_dp->enabled = true;
> > > + mtk_dp_update_plugged_status(mtk_dp);
> > > +}
> > > +
> >
> >
> >
> > > --
> > > 2.32.0
> > >

Thx,
Guillaume.

\
 
 \ /
  Last update: 2021-12-15 15:14    [W:1.729 / U:0.832 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site