* [PATCH v6 0/6] drm: add support for Cadence MHDP DPI/DP bridge.
@ 2018-10-08 21:42 ` Damian Kos
0 siblings, 0 replies; 45+ messages in thread
From: Damian Kos @ 2018-10-08 21:42 UTC (permalink / raw)
To: David Airlie, Rob Herring, Mark Rutland, Archit Taneja,
Andrzej Hajda, Laurent Pinchart, Gustavo Padovan,
Maarten Lankhorst, Sean Paul, Sandy Huang, Heiko Stübner,
Quentin Schulz, Damian Kos, Piotr Sroka, dri-devel, devicetree,
linux-kernel, linux-arm-kernel, linux-rockchip
Cc: rafalc, quentin.schulz, jbergsagel
Hello!
This is the series of patches that will add support for the Cadence's DPI/DP
bridge. Please note that this is a preliminary version of the driver and there
will be more patches in the future with updates, fixes and improvements.
Please keep that in mind when looking at FIXME/TODO/XXX comments.
Initially, MHDP driver was developed as a DRM bridge driver and was planed to
be placed in drivers/gpu/drm/bridge/mhdp.c. However, there was already
a driver for Cadence's DP controller developed by RockChip, but that driver
uses the different DRM framework and looks like a part of a bigger system.
Both controllers (including firmware) are quite different internally
(MST/FEC/DSC support, link training done by driver, additional commands, IRQ's
etc.) but they have similar register map, except for Framer/Streamer (which is
noticeably different), so they appear similar.
The following patches contain:
- Moving common code to drivers/gpu/drm/bridge/cdns-mhdp-common.* and
modifying it a bit (mostly new prefixes for functions and data types) so it
can be used by two, higher level, drivers.
- Modifying existing RockChip's DP driver to use the common code after changes
made to it (use the new cdns_mhdp_device structure and new function names).
- Modifying DRM helpers a bit. Some are required for new driver, some are
updates from DP 1.2 to 1.3 or 1.4.
- Adding documentation for device tree bindings.
- Adding preliminary Cadence DPI/DP bridge driver.
Some of the things that will be added later on include (but are not limited
to):
- DSC support
- FEC support
- HDCP support
Changes in v2:
- Added actual description of what the patch contains, what is it for and
what's going on here in general.
- New structure. Now we have one common low level driver + two high level
drivers - one for RockChip with minimum changes and one, more general, for
Cadence.
- Dropped some changes made to DRM helpers.
- Updated the device tree bindings document.
Changes in v3:
- Corrected dt-bindings document
- Enabled some clocks at startup (since FW doesn't do that anymore).
- Changed Firmware file name to match the file on Linux Firmware repo.
- Added SST audio support
- Made common functions (in cdns-mhdp-common.*) public.
Changes in v4:
- Fixed Kconfig in drm/rockchip
- Fixed Signed-offs
- dp_link_status() is no longer public since it's used only in drm_dp_helper.c
- Replaced EXTRA_CFLAGS with ccflags-y in drm/rockchip Makefile
Changes in v5:
- Fixed Kconfig in drm/rockchip again
- Moved cdn-dp-reg.h (cdns-mhdp-common.h) to include/drm/bridge instead of
drivers/gpu/drm/bridge/
- Updated the mhdp_validate_cr function
Changes in v6:
- Added Reviewed-bys for already reviewed patches
- Dropped patch v5-0003 (that made dp_get_lane_status helper public)
- Added patch with MST support
- Added patch with Cadence SD0801 PHY init
Damian Kos (2):
drm/rockchip: prepare common code for cdns and rk dpi/dp driver
drm/bridge: add PHY initialization in mhdp8546 driver.
Piotr Sroka (1):
drm/bridge: add support for MST in mhdp8546 driver
Quentin Schulz (3):
drm/dp: fix link probing for devices supporting DP 1.4+
dt-bindings: drm/bridge: Document Cadence MHDP bridge bindings
drm: bridge: add support for Cadence MHDP DPI/DP bridge
.../bindings/display/bridge/cdns,mhdp.txt | 43 +
drivers/gpu/drm/bridge/Kconfig | 9 +
drivers/gpu/drm/bridge/Makefile | 3 +
drivers/gpu/drm/bridge/cdns-mhdp-common.c | 1107 +++++++++++++
drivers/gpu/drm/bridge/cdns-mhdp-mst.c | 594 +++++++
drivers/gpu/drm/bridge/cdns-mhdp.c | 1371 +++++++++++++++++
drivers/gpu/drm/bridge/cdns-mhdp.h | 209 +++
drivers/gpu/drm/drm_dp_helper.c | 30 +-
drivers/gpu/drm/rockchip/Kconfig | 4 +-
drivers/gpu/drm/rockchip/Makefile | 2 +-
drivers/gpu/drm/rockchip/cdn-dp-core.c | 234 +--
drivers/gpu/drm/rockchip/cdn-dp-core.h | 43 +-
drivers/gpu/drm/rockchip/cdn-dp-reg.c | 969 ------------
include/drm/bridge/cdns-mhdp-cbs.h | 27 +
.../drm/bridge/cdns-mhdp-common.h | 174 ++-
15 files changed, 3669 insertions(+), 1150 deletions(-)
create mode 100644 Documentation/devicetree/bindings/display/bridge/cdns,mhdp.txt
create mode 100644 drivers/gpu/drm/bridge/cdns-mhdp-common.c
create mode 100644 drivers/gpu/drm/bridge/cdns-mhdp-mst.c
create mode 100644 drivers/gpu/drm/bridge/cdns-mhdp.c
create mode 100644 drivers/gpu/drm/bridge/cdns-mhdp.h
delete mode 100644 drivers/gpu/drm/rockchip/cdn-dp-reg.c
create mode 100644 include/drm/bridge/cdns-mhdp-cbs.h
rename drivers/gpu/drm/rockchip/cdn-dp-reg.h => include/drm/bridge/cdns-mhdp-common.h (77%)
--
2.17.1
^ permalink raw reply [flat|nested] 45+ messages in thread
* [PATCH v6 0/6] drm: add support for Cadence MHDP DPI/DP bridge.
@ 2018-10-08 21:42 ` Damian Kos
0 siblings, 0 replies; 45+ messages in thread
From: Damian Kos @ 2018-10-08 21:42 UTC (permalink / raw)
To: David Airlie, Rob Herring, Mark Rutland, Archit Taneja,
Andrzej Hajda, Laurent Pinchart, Gustavo Padovan,
Maarten Lankhorst, Sean Paul, Sandy Huang, Heiko Stübner,
Quentin Schulz, Damian Kos, Piotr Sroka,
dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW,
devicetree-u79uwXL29TY76Z2rM5mHXA,
linux-kernel-u79uwXL29TY76Z2rM5mHXA,
linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
linux-rockchip-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r
Cc: jbergsagel-l0cyMroinI0, rafalc-vna1KIf7WgpBDgjK7y7TUQ,
quentin.schulz-LDxbnhwyfcJBDgjK7y7TUQ
Hello!
This is the series of patches that will add support for the Cadence's DPI/DP
bridge. Please note that this is a preliminary version of the driver and there
will be more patches in the future with updates, fixes and improvements.
Please keep that in mind when looking at FIXME/TODO/XXX comments.
Initially, MHDP driver was developed as a DRM bridge driver and was planed to
be placed in drivers/gpu/drm/bridge/mhdp.c. However, there was already
a driver for Cadence's DP controller developed by RockChip, but that driver
uses the different DRM framework and looks like a part of a bigger system.
Both controllers (including firmware) are quite different internally
(MST/FEC/DSC support, link training done by driver, additional commands, IRQ's
etc.) but they have similar register map, except for Framer/Streamer (which is
noticeably different), so they appear similar.
The following patches contain:
- Moving common code to drivers/gpu/drm/bridge/cdns-mhdp-common.* and
modifying it a bit (mostly new prefixes for functions and data types) so it
can be used by two, higher level, drivers.
- Modifying existing RockChip's DP driver to use the common code after changes
made to it (use the new cdns_mhdp_device structure and new function names).
- Modifying DRM helpers a bit. Some are required for new driver, some are
updates from DP 1.2 to 1.3 or 1.4.
- Adding documentation for device tree bindings.
- Adding preliminary Cadence DPI/DP bridge driver.
Some of the things that will be added later on include (but are not limited
to):
- DSC support
- FEC support
- HDCP support
Changes in v2:
- Added actual description of what the patch contains, what is it for and
what's going on here in general.
- New structure. Now we have one common low level driver + two high level
drivers - one for RockChip with minimum changes and one, more general, for
Cadence.
- Dropped some changes made to DRM helpers.
- Updated the device tree bindings document.
Changes in v3:
- Corrected dt-bindings document
- Enabled some clocks at startup (since FW doesn't do that anymore).
- Changed Firmware file name to match the file on Linux Firmware repo.
- Added SST audio support
- Made common functions (in cdns-mhdp-common.*) public.
Changes in v4:
- Fixed Kconfig in drm/rockchip
- Fixed Signed-offs
- dp_link_status() is no longer public since it's used only in drm_dp_helper.c
- Replaced EXTRA_CFLAGS with ccflags-y in drm/rockchip Makefile
Changes in v5:
- Fixed Kconfig in drm/rockchip again
- Moved cdn-dp-reg.h (cdns-mhdp-common.h) to include/drm/bridge instead of
drivers/gpu/drm/bridge/
- Updated the mhdp_validate_cr function
Changes in v6:
- Added Reviewed-bys for already reviewed patches
- Dropped patch v5-0003 (that made dp_get_lane_status helper public)
- Added patch with MST support
- Added patch with Cadence SD0801 PHY init
Damian Kos (2):
drm/rockchip: prepare common code for cdns and rk dpi/dp driver
drm/bridge: add PHY initialization in mhdp8546 driver.
Piotr Sroka (1):
drm/bridge: add support for MST in mhdp8546 driver
Quentin Schulz (3):
drm/dp: fix link probing for devices supporting DP 1.4+
dt-bindings: drm/bridge: Document Cadence MHDP bridge bindings
drm: bridge: add support for Cadence MHDP DPI/DP bridge
.../bindings/display/bridge/cdns,mhdp.txt | 43 +
drivers/gpu/drm/bridge/Kconfig | 9 +
drivers/gpu/drm/bridge/Makefile | 3 +
drivers/gpu/drm/bridge/cdns-mhdp-common.c | 1107 +++++++++++++
drivers/gpu/drm/bridge/cdns-mhdp-mst.c | 594 +++++++
drivers/gpu/drm/bridge/cdns-mhdp.c | 1371 +++++++++++++++++
drivers/gpu/drm/bridge/cdns-mhdp.h | 209 +++
drivers/gpu/drm/drm_dp_helper.c | 30 +-
drivers/gpu/drm/rockchip/Kconfig | 4 +-
drivers/gpu/drm/rockchip/Makefile | 2 +-
drivers/gpu/drm/rockchip/cdn-dp-core.c | 234 +--
drivers/gpu/drm/rockchip/cdn-dp-core.h | 43 +-
drivers/gpu/drm/rockchip/cdn-dp-reg.c | 969 ------------
include/drm/bridge/cdns-mhdp-cbs.h | 27 +
.../drm/bridge/cdns-mhdp-common.h | 174 ++-
15 files changed, 3669 insertions(+), 1150 deletions(-)
create mode 100644 Documentation/devicetree/bindings/display/bridge/cdns,mhdp.txt
create mode 100644 drivers/gpu/drm/bridge/cdns-mhdp-common.c
create mode 100644 drivers/gpu/drm/bridge/cdns-mhdp-mst.c
create mode 100644 drivers/gpu/drm/bridge/cdns-mhdp.c
create mode 100644 drivers/gpu/drm/bridge/cdns-mhdp.h
delete mode 100644 drivers/gpu/drm/rockchip/cdn-dp-reg.c
create mode 100644 include/drm/bridge/cdns-mhdp-cbs.h
rename drivers/gpu/drm/rockchip/cdn-dp-reg.h => include/drm/bridge/cdns-mhdp-common.h (77%)
--
2.17.1
^ permalink raw reply [flat|nested] 45+ messages in thread
* [PATCH v6 0/6] drm: add support for Cadence MHDP DPI/DP bridge.
@ 2018-10-08 21:42 ` Damian Kos
0 siblings, 0 replies; 45+ messages in thread
From: Damian Kos @ 2018-10-08 21:42 UTC (permalink / raw)
To: linux-arm-kernel
Hello!
This is the series of patches that will add support for the Cadence's DPI/DP
bridge. Please note that this is a preliminary version of the driver and there
will be more patches in the future with updates, fixes and improvements.
Please keep that in mind when looking at FIXME/TODO/XXX comments.
Initially, MHDP driver was developed as a DRM bridge driver and was planed to
be placed in drivers/gpu/drm/bridge/mhdp.c. However, there was already
a driver for Cadence's DP controller developed by RockChip, but that driver
uses the different DRM framework and looks like a part of a bigger system.
Both controllers (including firmware) are quite different internally
(MST/FEC/DSC support, link training done by driver, additional commands, IRQ's
etc.) but they have similar register map, except for Framer/Streamer (which is
noticeably different), so they appear similar.
The following patches contain:
- Moving common code to drivers/gpu/drm/bridge/cdns-mhdp-common.* and
modifying it a bit (mostly new prefixes for functions and data types) so it
can be used by two, higher level, drivers.
- Modifying existing RockChip's DP driver to use the common code after changes
made to it (use the new cdns_mhdp_device structure and new function names).
- Modifying DRM helpers a bit. Some are required for new driver, some are
updates from DP 1.2 to 1.3 or 1.4.
- Adding documentation for device tree bindings.
- Adding preliminary Cadence DPI/DP bridge driver.
Some of the things that will be added later on include (but are not limited
to):
- DSC support
- FEC support
- HDCP support
Changes in v2:
- Added actual description of what the patch contains, what is it for and
what's going on here in general.
- New structure. Now we have one common low level driver + two high level
drivers - one for RockChip with minimum changes and one, more general, for
Cadence.
- Dropped some changes made to DRM helpers.
- Updated the device tree bindings document.
Changes in v3:
- Corrected dt-bindings document
- Enabled some clocks at startup (since FW doesn't do that anymore).
- Changed Firmware file name to match the file on Linux Firmware repo.
- Added SST audio support
- Made common functions (in cdns-mhdp-common.*) public.
Changes in v4:
- Fixed Kconfig in drm/rockchip
- Fixed Signed-offs
- dp_link_status() is no longer public since it's used only in drm_dp_helper.c
- Replaced EXTRA_CFLAGS with ccflags-y in drm/rockchip Makefile
Changes in v5:
- Fixed Kconfig in drm/rockchip again
- Moved cdn-dp-reg.h (cdns-mhdp-common.h) to include/drm/bridge instead of
drivers/gpu/drm/bridge/
- Updated the mhdp_validate_cr function
Changes in v6:
- Added Reviewed-bys for already reviewed patches
- Dropped patch v5-0003 (that made dp_get_lane_status helper public)
- Added patch with MST support
- Added patch with Cadence SD0801 PHY init
Damian Kos (2):
drm/rockchip: prepare common code for cdns and rk dpi/dp driver
drm/bridge: add PHY initialization in mhdp8546 driver.
Piotr Sroka (1):
drm/bridge: add support for MST in mhdp8546 driver
Quentin Schulz (3):
drm/dp: fix link probing for devices supporting DP 1.4+
dt-bindings: drm/bridge: Document Cadence MHDP bridge bindings
drm: bridge: add support for Cadence MHDP DPI/DP bridge
.../bindings/display/bridge/cdns,mhdp.txt | 43 +
drivers/gpu/drm/bridge/Kconfig | 9 +
drivers/gpu/drm/bridge/Makefile | 3 +
drivers/gpu/drm/bridge/cdns-mhdp-common.c | 1107 +++++++++++++
drivers/gpu/drm/bridge/cdns-mhdp-mst.c | 594 +++++++
drivers/gpu/drm/bridge/cdns-mhdp.c | 1371 +++++++++++++++++
drivers/gpu/drm/bridge/cdns-mhdp.h | 209 +++
drivers/gpu/drm/drm_dp_helper.c | 30 +-
drivers/gpu/drm/rockchip/Kconfig | 4 +-
drivers/gpu/drm/rockchip/Makefile | 2 +-
drivers/gpu/drm/rockchip/cdn-dp-core.c | 234 +--
drivers/gpu/drm/rockchip/cdn-dp-core.h | 43 +-
drivers/gpu/drm/rockchip/cdn-dp-reg.c | 969 ------------
include/drm/bridge/cdns-mhdp-cbs.h | 27 +
.../drm/bridge/cdns-mhdp-common.h | 174 ++-
15 files changed, 3669 insertions(+), 1150 deletions(-)
create mode 100644 Documentation/devicetree/bindings/display/bridge/cdns,mhdp.txt
create mode 100644 drivers/gpu/drm/bridge/cdns-mhdp-common.c
create mode 100644 drivers/gpu/drm/bridge/cdns-mhdp-mst.c
create mode 100644 drivers/gpu/drm/bridge/cdns-mhdp.c
create mode 100644 drivers/gpu/drm/bridge/cdns-mhdp.h
delete mode 100644 drivers/gpu/drm/rockchip/cdn-dp-reg.c
create mode 100644 include/drm/bridge/cdns-mhdp-cbs.h
rename drivers/gpu/drm/rockchip/cdn-dp-reg.h => include/drm/bridge/cdns-mhdp-common.h (77%)
--
2.17.1
^ permalink raw reply [flat|nested] 45+ messages in thread
* [PATCH v6 1/6] drm/rockchip: prepare common code for cdns and rk dpi/dp driver
2018-10-08 21:42 ` Damian Kos
(?)
@ 2018-10-08 21:42 ` Damian Kos
-1 siblings, 0 replies; 45+ messages in thread
From: Damian Kos @ 2018-10-08 21:42 UTC (permalink / raw)
To: David Airlie, Rob Herring, Mark Rutland, Archit Taneja,
Andrzej Hajda, Laurent Pinchart, Gustavo Padovan,
Maarten Lankhorst, Sean Paul, Sandy Huang, Heiko Stübner,
Quentin Schulz, Damian Kos, Piotr Sroka, dri-devel, devicetree,
linux-kernel, linux-arm-kernel, linux-rockchip
Cc: rafalc, quentin.schulz, jbergsagel
- Extracted common fields from cdn_dp_device to a new cdns_mhdp_device
structure which will be used by two separate drivers later on.
- Moved some datatypes (audio_format, audio_info, vic_pxl_encoding_format,
video_info) from cdn-dp-core.c to cdn-dp-reg.h.
- Changed prefixes from cdn_dp to cdns_mhdp
cdn -> cdns to match the other Cadence's drivers
dp -> mhdp to distinguish it from a "just a DP" as the IP underneath
this registers map can be a HDMI (which is internally different,
but the interface for commands, events is pretty much the same).
- Modified cdn-dp-core.c to use the new driver structure and new function
names.
Signed-off-by: Damian Kos <dkos@cadence.com>
Reviewed-by: Andrzej Hajda <a.hajda@samsung.com>
---
drivers/gpu/drm/rockchip/cdn-dp-core.c | 220 +++++++------
drivers/gpu/drm/rockchip/cdn-dp-core.h | 40 +--
drivers/gpu/drm/rockchip/cdn-dp-reg.c | 428 +++++++++++++------------
drivers/gpu/drm/rockchip/cdn-dp-reg.h | 114 +++++--
4 files changed, 431 insertions(+), 371 deletions(-)
diff --git a/drivers/gpu/drm/rockchip/cdn-dp-core.c b/drivers/gpu/drm/rockchip/cdn-dp-core.c
index 8ad0d773dc33..bf7e206326f0 100644
--- a/drivers/gpu/drm/rockchip/cdn-dp-core.c
+++ b/drivers/gpu/drm/rockchip/cdn-dp-core.c
@@ -31,11 +31,10 @@
#include <sound/hdmi-codec.h>
#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)
+ container_of(c, struct cdn_dp_device, mhdp.connector)
#define encoder_to_dp(c) \
container_of(c, struct cdn_dp_device, encoder)
@@ -70,17 +69,18 @@ MODULE_DEVICE_TABLE(of, cdn_dp_dt_ids);
static int cdn_dp_grf_write(struct cdn_dp_device *dp,
unsigned int reg, unsigned int val)
{
+ struct device *dev = dp->mhdp.dev;
int ret;
ret = clk_prepare_enable(dp->grf_clk);
if (ret) {
- DRM_DEV_ERROR(dp->dev, "Failed to prepare_enable grf clock\n");
+ DRM_DEV_ERROR(dev, "Failed to prepare_enable grf clock\n");
return ret;
}
ret = regmap_write(dp->grf, reg, val);
if (ret) {
- DRM_DEV_ERROR(dp->dev, "Could not write to GRF: %d\n", ret);
+ DRM_DEV_ERROR(dev, "Could not write to GRF: %d\n", ret);
return ret;
}
@@ -91,24 +91,25 @@ static int cdn_dp_grf_write(struct cdn_dp_device *dp,
static int cdn_dp_clk_enable(struct cdn_dp_device *dp)
{
+ struct device *dev = dp->mhdp.dev;
int ret;
unsigned long rate;
ret = clk_prepare_enable(dp->pclk);
if (ret < 0) {
- DRM_DEV_ERROR(dp->dev, "cannot enable dp pclk %d\n", ret);
+ DRM_DEV_ERROR(dev, "cannot enable dp pclk %d\n", ret);
goto err_pclk;
}
ret = clk_prepare_enable(dp->core_clk);
if (ret < 0) {
- DRM_DEV_ERROR(dp->dev, "cannot enable core_clk %d\n", ret);
+ DRM_DEV_ERROR(dev, "cannot enable core_clk %d\n", ret);
goto err_core_clk;
}
- ret = pm_runtime_get_sync(dp->dev);
+ ret = pm_runtime_get_sync(dev);
if (ret < 0) {
- DRM_DEV_ERROR(dp->dev, "cannot get pm runtime %d\n", ret);
+ DRM_DEV_ERROR(dev, "cannot get pm runtime %d\n", ret);
goto err_pm_runtime_get;
}
@@ -121,18 +122,18 @@ static int cdn_dp_clk_enable(struct cdn_dp_device *dp)
rate = clk_get_rate(dp->core_clk);
if (!rate) {
- DRM_DEV_ERROR(dp->dev, "get clk rate failed\n");
+ DRM_DEV_ERROR(dev, "get clk rate failed\n");
ret = -EINVAL;
goto err_set_rate;
}
- cdn_dp_set_fw_clk(dp, rate);
- cdn_dp_clock_reset(dp);
+ cdns_mhdp_set_fw_clk(&dp->mhdp, rate);
+ cdns_mhdp_clock_reset(&dp->mhdp);
return 0;
err_set_rate:
- pm_runtime_put(dp->dev);
+ pm_runtime_put(dev);
err_pm_runtime_get:
clk_disable_unprepare(dp->core_clk);
err_core_clk:
@@ -143,7 +144,7 @@ static int cdn_dp_clk_enable(struct cdn_dp_device *dp)
static void cdn_dp_clk_disable(struct cdn_dp_device *dp)
{
- pm_runtime_put_sync(dp->dev);
+ pm_runtime_put_sync(dp->mhdp.dev);
clk_disable_unprepare(dp->pclk);
clk_disable_unprepare(dp->core_clk);
}
@@ -176,7 +177,7 @@ static int cdn_dp_get_sink_count(struct cdn_dp_device *dp, u8 *sink_count)
u8 value;
*sink_count = 0;
- ret = cdn_dp_dpcd_read(dp, DP_SINK_COUNT, &value, 1);
+ ret = cdns_mhdp_dpcd_read(&dp->mhdp, DP_SINK_COUNT, &value, 1);
if (ret)
return ret;
@@ -200,12 +201,13 @@ static struct cdn_dp_port *cdn_dp_connected_port(struct cdn_dp_device *dp)
static bool cdn_dp_check_sink_connection(struct cdn_dp_device *dp)
{
+ struct device *dev = dp->mhdp.dev;
unsigned long timeout = jiffies + msecs_to_jiffies(CDN_DPCD_TIMEOUT_MS);
struct cdn_dp_port *port;
u8 sink_count = 0;
if (dp->active_port < 0 || dp->active_port >= dp->ports) {
- DRM_DEV_ERROR(dp->dev, "active_port is wrong!\n");
+ DRM_DEV_ERROR(dev, "active_port is wrong!\n");
return false;
}
@@ -227,7 +229,7 @@ static bool cdn_dp_check_sink_connection(struct cdn_dp_device *dp)
usleep_range(5000, 10000);
}
- DRM_DEV_ERROR(dp->dev, "Get sink capability timed out\n");
+ DRM_DEV_ERROR(dev, "Get sink capability timed out\n");
return false;
}
@@ -269,7 +271,8 @@ static int cdn_dp_connector_get_modes(struct drm_connector *connector)
mutex_lock(&dp->lock);
edid = dp->edid;
if (edid) {
- DRM_DEV_DEBUG_KMS(dp->dev, "got edid: width[%d] x height[%d]\n",
+ DRM_DEV_DEBUG_KMS(dp->mhdp.dev,
+ "got edid: width[%d] x height[%d]\n",
edid->width_cm, edid->height_cm);
dp->sink_has_audio = drm_detect_monitor_audio(edid);
@@ -287,7 +290,8 @@ 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;
+ struct drm_display_info *display_info =
+ &dp->mhdp.connector.display_info;
u32 requested, actual, rate, sink_max, source_max = 0;
u8 lanes, bpc;
@@ -313,7 +317,7 @@ static int cdn_dp_connector_mode_valid(struct drm_connector *connector,
sink_max = drm_dp_max_lane_count(dp->dpcd);
lanes = min(source_max, sink_max);
- source_max = drm_dp_bw_code_to_link_rate(CDN_DP_MAX_LINK_RATE);
+ source_max = drm_dp_bw_code_to_link_rate(CDNS_DP_MAX_LINK_RATE);
sink_max = drm_dp_max_link_rate(dp->dpcd);
rate = min(source_max, sink_max);
@@ -323,7 +327,7 @@ static int cdn_dp_connector_mode_valid(struct drm_connector *connector,
actual = actual * 8 / 10;
if (requested > actual) {
- DRM_DEV_DEBUG_KMS(dp->dev,
+ DRM_DEV_DEBUG_KMS(dp->mhdp.dev,
"requested=%d, actual=%d, clock=%d\n",
requested, actual, mode->clock);
return MODE_CLOCK_HIGH;
@@ -343,28 +347,29 @@ static int cdn_dp_firmware_init(struct cdn_dp_device *dp)
const u32 *iram_data, *dram_data;
const struct firmware *fw = dp->fw;
const struct cdn_firmware_header *hdr;
+ struct device *dev = dp->mhdp.dev;
hdr = (struct cdn_firmware_header *)fw->data;
if (fw->size != le32_to_cpu(hdr->size_bytes)) {
- DRM_DEV_ERROR(dp->dev, "firmware is invalid\n");
+ DRM_DEV_ERROR(dev, "firmware is invalid\n");
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);
+ ret = cdns_mhdp_load_firmware(&dp->mhdp, iram_data, hdr->iram_size,
+ dram_data, hdr->dram_size);
if (ret)
return ret;
- ret = cdn_dp_set_firmware_active(dp, true);
+ ret = cdns_mhdp_set_firmware_active(&dp->mhdp, true);
if (ret) {
- DRM_DEV_ERROR(dp->dev, "active ucpu failed: %d\n", ret);
+ DRM_DEV_ERROR(dev, "active ucpu failed: %d\n", ret);
return ret;
}
- return cdn_dp_event_config(dp);
+ return cdns_mhdp_event_config(&dp->mhdp);
}
static int cdn_dp_get_sink_capability(struct cdn_dp_device *dp)
@@ -374,28 +379,29 @@ static int cdn_dp_get_sink_capability(struct cdn_dp_device *dp)
if (!cdn_dp_check_sink_connection(dp))
return -ENODEV;
- ret = cdn_dp_dpcd_read(dp, DP_DPCD_REV, dp->dpcd,
- DP_RECEIVER_CAP_SIZE);
+ ret = cdns_mhdp_dpcd_read(&dp->mhdp, DP_DPCD_REV, dp->dpcd,
+ DP_RECEIVER_CAP_SIZE);
if (ret) {
- DRM_DEV_ERROR(dp->dev, "Failed to get caps %d\n", ret);
+ DRM_DEV_ERROR(dp->mhdp.dev, "Failed to get caps %d\n", ret);
return ret;
}
kfree(dp->edid);
- dp->edid = drm_do_get_edid(&dp->connector,
- cdn_dp_get_edid_block, dp);
+ dp->edid = drm_do_get_edid(&dp->mhdp.connector,
+ cdns_mhdp_get_edid_block, &dp->mhdp);
return 0;
}
static int cdn_dp_enable_phy(struct cdn_dp_device *dp, struct cdn_dp_port *port)
{
+ struct device *dev = dp->mhdp.dev;
union extcon_property_value property;
int ret;
if (!port->phy_enabled) {
ret = phy_power_on(port->phy);
if (ret) {
- DRM_DEV_ERROR(dp->dev, "phy power on failed: %d\n",
+ DRM_DEV_ERROR(dev, "phy power on failed: %d\n",
ret);
goto err_phy;
}
@@ -405,28 +411,28 @@ static int cdn_dp_enable_phy(struct cdn_dp_device *dp, struct cdn_dp_port *port)
ret = cdn_dp_grf_write(dp, GRF_SOC_CON26,
DPTX_HPD_SEL_MASK | DPTX_HPD_SEL);
if (ret) {
- DRM_DEV_ERROR(dp->dev, "Failed to write HPD_SEL %d\n", ret);
+ DRM_DEV_ERROR(dev, "Failed to write HPD_SEL %d\n", ret);
goto err_power_on;
}
- ret = cdn_dp_get_hpd_status(dp);
+ ret = cdns_mhdp_get_hpd_status(&dp->mhdp);
if (ret <= 0) {
if (!ret)
- DRM_DEV_ERROR(dp->dev, "hpd does not exist\n");
+ DRM_DEV_ERROR(dev, "hpd does not exist\n");
goto err_power_on;
}
ret = extcon_get_property(port->extcon, EXTCON_DISP_DP,
EXTCON_PROP_USB_TYPEC_POLARITY, &property);
if (ret) {
- DRM_DEV_ERROR(dp->dev, "get property failed\n");
+ DRM_DEV_ERROR(dev, "get property failed\n");
goto err_power_on;
}
port->lanes = cdn_dp_get_port_lanes(port);
- ret = cdn_dp_set_host_cap(dp, port->lanes, property.intval);
+ ret = cdns_mhdp_set_host_cap(&dp->mhdp, port->lanes, property.intval);
if (ret) {
- DRM_DEV_ERROR(dp->dev, "set host capabilities failed: %d\n",
+ DRM_DEV_ERROR(dev, "set host capabilities failed: %d\n",
ret);
goto err_power_on;
}
@@ -436,7 +442,7 @@ static int cdn_dp_enable_phy(struct cdn_dp_device *dp, struct cdn_dp_port *port)
err_power_on:
if (phy_power_off(port->phy))
- DRM_DEV_ERROR(dp->dev, "phy power off failed: %d", ret);
+ DRM_DEV_ERROR(dev, "phy power off failed: %d", ret);
else
port->phy_enabled = false;
@@ -454,7 +460,8 @@ static int cdn_dp_disable_phy(struct cdn_dp_device *dp,
if (port->phy_enabled) {
ret = phy_power_off(port->phy);
if (ret) {
- DRM_DEV_ERROR(dp->dev, "phy power off failed: %d", ret);
+ DRM_DEV_ERROR(dp->mhdp.dev,
+ "phy power off failed: %d", ret);
return ret;
}
}
@@ -478,16 +485,16 @@ static int cdn_dp_disable(struct cdn_dp_device *dp)
ret = cdn_dp_grf_write(dp, GRF_SOC_CON26,
DPTX_HPD_SEL_MASK | DPTX_HPD_DEL);
if (ret) {
- DRM_DEV_ERROR(dp->dev, "Failed to clear hpd sel %d\n",
+ DRM_DEV_ERROR(dp->mhdp.dev, "Failed to clear hpd sel %d\n",
ret);
return ret;
}
- cdn_dp_set_firmware_active(dp, false);
+ cdns_mhdp_set_firmware_active(&dp->mhdp, false);
cdn_dp_clk_disable(dp);
dp->active = false;
- dp->link.rate = 0;
- dp->link.num_lanes = 0;
+ dp->mhdp.link.rate = 0;
+ dp->mhdp.link.num_lanes = 0;
if (!dp->connected) {
kfree(dp->edid);
dp->edid = NULL;
@@ -500,11 +507,11 @@ static int cdn_dp_enable(struct cdn_dp_device *dp)
{
int ret, i, lanes;
struct cdn_dp_port *port;
+ struct device *dev = dp->mhdp.dev;
port = cdn_dp_connected_port(dp);
if (!port) {
- DRM_DEV_ERROR(dp->dev,
- "Can't enable without connection\n");
+ DRM_DEV_ERROR(dev, "Can't enable without connection\n");
return -ENODEV;
}
@@ -517,7 +524,7 @@ static int cdn_dp_enable(struct cdn_dp_device *dp)
ret = cdn_dp_firmware_init(dp);
if (ret) {
- DRM_DEV_ERROR(dp->dev, "firmware init failed: %d", ret);
+ DRM_DEV_ERROR(dp->mhdp.dev, "firmware init failed: %d", ret);
goto err_clk_disable;
}
@@ -551,8 +558,9 @@ static void cdn_dp_encoder_mode_set(struct drm_encoder *encoder,
struct drm_display_mode *adjusted)
{
struct cdn_dp_device *dp = encoder_to_dp(encoder);
- struct drm_display_info *display_info = &dp->connector.display_info;
- struct video_info *video = &dp->video_info;
+ struct drm_display_info *display_info =
+ &dp->mhdp.connector.display_info;
+ struct video_info *video = &dp->mhdp.video_info;
switch (display_info->bpc) {
case 10:
@@ -570,7 +578,7 @@ static void cdn_dp_encoder_mode_set(struct drm_encoder *encoder,
video->v_sync_polarity = !!(mode->flags & DRM_MODE_FLAG_NVSYNC);
video->h_sync_polarity = !!(mode->flags & DRM_MODE_FLAG_NHSYNC);
- memcpy(&dp->mode, adjusted, sizeof(*mode));
+ memcpy(&dp->mhdp.mode, adjusted, sizeof(*mode));
}
static bool cdn_dp_check_link_status(struct cdn_dp_device *dp)
@@ -579,11 +587,11 @@ static bool cdn_dp_check_link_status(struct cdn_dp_device *dp)
struct cdn_dp_port *port = cdn_dp_connected_port(dp);
u8 sink_lanes = drm_dp_max_lane_count(dp->dpcd);
- if (!port || !dp->link.rate || !dp->link.num_lanes)
+ if (!port || !dp->mhdp.link.rate || !dp->mhdp.link.num_lanes)
return false;
- if (cdn_dp_dpcd_read(dp, DP_LANE0_1_STATUS, link_status,
- DP_LINK_STATUS_SIZE)) {
+ if (cdns_mhdp_dpcd_read(&dp->mhdp, DP_LANE0_1_STATUS, link_status,
+ DP_LINK_STATUS_SIZE)) {
DRM_ERROR("Failed to get link status\n");
return false;
}
@@ -595,15 +603,16 @@ static bool cdn_dp_check_link_status(struct cdn_dp_device *dp)
static void cdn_dp_encoder_enable(struct drm_encoder *encoder)
{
struct cdn_dp_device *dp = encoder_to_dp(encoder);
+ struct device *dev = dp->mhdp.dev;
int ret, val;
- ret = drm_of_encoder_active_endpoint_id(dp->dev->of_node, encoder);
+ ret = drm_of_encoder_active_endpoint_id(dev->of_node, encoder);
if (ret < 0) {
- DRM_DEV_ERROR(dp->dev, "Could not get vop id, %d", ret);
+ DRM_DEV_ERROR(dev, "Could not get vop id, %d", ret);
return;
}
- DRM_DEV_DEBUG_KMS(dp->dev, "vop %s output to cdn-dp\n",
+ DRM_DEV_DEBUG_KMS(dev, "vop %s output to cdn-dp\n",
(ret) ? "LIT" : "BIG");
if (ret)
val = DP_SEL_VOP_LIT | (DP_SEL_VOP_LIT << 16);
@@ -618,33 +627,33 @@ static void cdn_dp_encoder_enable(struct drm_encoder *encoder)
ret = cdn_dp_enable(dp);
if (ret) {
- DRM_DEV_ERROR(dp->dev, "Failed to enable encoder %d\n",
+ DRM_DEV_ERROR(dev, "Failed to enable encoder %d\n",
ret);
goto out;
}
if (!cdn_dp_check_link_status(dp)) {
- ret = cdn_dp_train_link(dp);
+ ret = cdns_mhdp_train_link(&dp->mhdp);
if (ret) {
- DRM_DEV_ERROR(dp->dev, "Failed link train %d\n", ret);
+ DRM_DEV_ERROR(dev, "Failed link train %d\n", ret);
goto out;
}
}
- ret = cdn_dp_set_video_status(dp, CONTROL_VIDEO_IDLE);
+ ret = cdns_mhdp_set_video_status(&dp->mhdp, CONTROL_VIDEO_IDLE);
if (ret) {
- DRM_DEV_ERROR(dp->dev, "Failed to idle video %d\n", ret);
+ DRM_DEV_ERROR(dev, "Failed to idle video %d\n", ret);
goto out;
}
- ret = cdn_dp_config_video(dp);
+ ret = cdns_mhdp_config_video(&dp->mhdp);
if (ret) {
- DRM_DEV_ERROR(dp->dev, "Failed to config video %d\n", ret);
+ DRM_DEV_ERROR(dev, "Failed to config video %d\n", ret);
goto out;
}
- ret = cdn_dp_set_video_status(dp, CONTROL_VIDEO_VALID);
+ ret = cdns_mhdp_set_video_status(&dp->mhdp, CONTROL_VIDEO_VALID);
if (ret) {
- DRM_DEV_ERROR(dp->dev, "Failed to valid video %d\n", ret);
+ DRM_DEV_ERROR(dev, "Failed to valid video %d\n", ret);
goto out;
}
out:
@@ -660,7 +669,8 @@ static void cdn_dp_encoder_disable(struct drm_encoder *encoder)
if (dp->active) {
ret = cdn_dp_disable(dp);
if (ret) {
- DRM_DEV_ERROR(dp->dev, "Failed to disable encoder %d\n",
+ DRM_DEV_ERROR(dp->mhdp.dev,
+ "Failed to disable encoder %d\n",
ret);
}
}
@@ -704,7 +714,7 @@ static const struct drm_encoder_funcs cdn_dp_encoder_funcs = {
static int cdn_dp_parse_dt(struct cdn_dp_device *dp)
{
- struct device *dev = dp->dev;
+ struct device *dev = dp->mhdp.dev;
struct device_node *np = dev->of_node;
struct platform_device *pdev = to_platform_device(dev);
struct resource *res;
@@ -716,10 +726,10 @@ static int cdn_dp_parse_dt(struct cdn_dp_device *dp)
}
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
- dp->regs = devm_ioremap_resource(dev, res);
- if (IS_ERR(dp->regs)) {
+ dp->mhdp.regs = devm_ioremap_resource(dev, res);
+ if (IS_ERR(dp->mhdp.regs)) {
DRM_DEV_ERROR(dev, "ioremap reg failed\n");
- return PTR_ERR(dp->regs);
+ return PTR_ERR(dp->mhdp.regs);
}
dp->core_clk = devm_clk_get(dev, "core-clk");
@@ -734,10 +744,10 @@ static int cdn_dp_parse_dt(struct cdn_dp_device *dp)
return PTR_ERR(dp->pclk);
}
- dp->spdif_clk = devm_clk_get(dev, "spdif");
- if (IS_ERR(dp->spdif_clk)) {
+ dp->mhdp.spdif_clk = devm_clk_get(dev, "spdif");
+ if (IS_ERR(dp->mhdp.spdif_clk)) {
DRM_DEV_ERROR(dev, "cannot get spdif_clk\n");
- return PTR_ERR(dp->spdif_clk);
+ return PTR_ERR(dp->mhdp.spdif_clk);
}
dp->grf_clk = devm_clk_get(dev, "grf");
@@ -746,10 +756,10 @@ static int cdn_dp_parse_dt(struct cdn_dp_device *dp)
return PTR_ERR(dp->grf_clk);
}
- dp->spdif_rst = devm_reset_control_get(dev, "spdif");
- if (IS_ERR(dp->spdif_rst)) {
+ dp->mhdp.spdif_rst = devm_reset_control_get(dev, "spdif");
+ if (IS_ERR(dp->mhdp.spdif_rst)) {
DRM_DEV_ERROR(dev, "no spdif reset control found\n");
- return PTR_ERR(dp->spdif_rst);
+ return PTR_ERR(dp->mhdp.spdif_rst);
}
dp->dptx_rst = devm_reset_control_get(dev, "dptx");
@@ -804,7 +814,7 @@ static int cdn_dp_audio_hw_params(struct device *dev, void *data,
goto out;
}
- ret = cdn_dp_audio_config(dp, &audio);
+ ret = cdns_mhdp_audio_config(&dp->mhdp, &audio);
if (!ret)
dp->audio_info = audio;
@@ -822,7 +832,7 @@ static void cdn_dp_audio_shutdown(struct device *dev, void *data)
if (!dp->active)
goto out;
- ret = cdn_dp_audio_stop(dp, &dp->audio_info);
+ ret = cdns_mhdp_audio_stop(&dp->mhdp, &dp->audio_info);
if (!ret)
dp->audio_info.format = AFMT_UNUSED;
out:
@@ -841,7 +851,7 @@ static int cdn_dp_audio_digital_mute(struct device *dev, void *data,
goto out;
}
- ret = cdn_dp_audio_mute(dp, enable);
+ ret = cdns_mhdp_audio_mute(&dp->mhdp, enable);
out:
mutex_unlock(&dp->lock);
@@ -853,7 +863,8 @@ static int cdn_dp_audio_get_eld(struct device *dev, void *data,
{
struct cdn_dp_device *dp = dev_get_drvdata(dev);
- memcpy(buf, dp->connector.eld, min(sizeof(dp->connector.eld), len));
+ memcpy(buf, dp->mhdp.connector.eld,
+ min(sizeof(dp->mhdp.connector.eld), len));
return 0;
}
@@ -887,6 +898,7 @@ static int cdn_dp_request_firmware(struct cdn_dp_device *dp)
int ret;
unsigned long timeout = jiffies + msecs_to_jiffies(CDN_FW_TIMEOUT_MS);
unsigned long sleep = 1000;
+ struct device *dev = dp->mhdp.dev;
WARN_ON(!mutex_is_locked(&dp->lock));
@@ -897,13 +909,13 @@ static int cdn_dp_request_firmware(struct cdn_dp_device *dp)
mutex_unlock(&dp->lock);
while (time_before(jiffies, timeout)) {
- ret = request_firmware(&dp->fw, CDN_DP_FIRMWARE, dp->dev);
+ ret = request_firmware(&dp->fw, CDN_DP_FIRMWARE, dev);
if (ret == -ENOENT) {
msleep(sleep);
sleep *= 2;
continue;
} else if (ret) {
- DRM_DEV_ERROR(dp->dev,
+ DRM_DEV_ERROR(dev,
"failed to request firmware: %d\n", ret);
goto out;
}
@@ -913,7 +925,7 @@ static int cdn_dp_request_firmware(struct cdn_dp_device *dp)
goto out;
}
- DRM_DEV_ERROR(dp->dev, "Timed out trying to load firmware\n");
+ DRM_DEV_ERROR(dev, "Timed out trying to load firmware\n");
ret = -ETIMEDOUT;
out:
mutex_lock(&dp->lock);
@@ -924,8 +936,9 @@ static void cdn_dp_pd_event_work(struct work_struct *work)
{
struct cdn_dp_device *dp = container_of(work, struct cdn_dp_device,
event_work);
- struct drm_connector *connector = &dp->connector;
+ struct drm_connector *connector = &dp->mhdp.connector;
enum drm_connector_status old_status;
+ struct device *dev = dp->mhdp.dev;
int ret;
@@ -942,44 +955,45 @@ static void cdn_dp_pd_event_work(struct work_struct *work)
/* Not connected, notify userspace to disable the block */
if (!cdn_dp_connected_port(dp)) {
- DRM_DEV_INFO(dp->dev, "Not connected. Disabling cdn\n");
+ DRM_DEV_INFO(dev, "Not connected. Disabling cdn\n");
dp->connected = false;
/* Connected but not enabled, enable the block */
} else if (!dp->active) {
- DRM_DEV_INFO(dp->dev, "Connected, not enabled. Enabling cdn\n");
+ DRM_DEV_INFO(dev, "Connected, not enabled. Enabling cdn\n");
ret = cdn_dp_enable(dp);
if (ret) {
- DRM_DEV_ERROR(dp->dev, "Enable dp failed %d\n", ret);
+ DRM_DEV_ERROR(dev, "Enable dp failed %d\n", ret);
dp->connected = false;
}
/* Enabled and connected to a dongle without a sink, notify userspace */
} else if (!cdn_dp_check_sink_connection(dp)) {
- DRM_DEV_INFO(dp->dev, "Connected without sink. Assert hpd\n");
+ DRM_DEV_INFO(dev, "Connected without sink. Assert hpd\n");
dp->connected = false;
/* Enabled and connected with a sink, re-train if requested */
} else if (!cdn_dp_check_link_status(dp)) {
- unsigned int rate = dp->link.rate;
- unsigned int lanes = dp->link.num_lanes;
- struct drm_display_mode *mode = &dp->mode;
+ unsigned int rate = dp->mhdp.link.rate;
+ unsigned int lanes = dp->mhdp.link.num_lanes;
+ struct drm_display_mode *mode = &dp->mhdp.mode;
- DRM_DEV_INFO(dp->dev, "Connected with sink. Re-train link\n");
- ret = cdn_dp_train_link(dp);
+ DRM_DEV_INFO(dev, "Connected with sink. Re-train link\n");
+ ret = cdns_mhdp_train_link(&dp->mhdp);
if (ret) {
dp->connected = false;
- DRM_DEV_ERROR(dp->dev, "Train link failed %d\n", ret);
+ DRM_DEV_ERROR(dev, "Train link failed %d\n", ret);
goto out;
}
/* If training result is changed, update the video config */
if (mode->clock &&
- (rate != dp->link.rate || lanes != dp->link.num_lanes)) {
- ret = cdn_dp_config_video(dp);
+ (rate != dp->mhdp.link.rate ||
+ lanes != dp->mhdp.link.num_lanes)) {
+ ret = cdns_mhdp_config_video(&dp->mhdp);
if (ret) {
dp->connected = false;
- DRM_DEV_ERROR(dp->dev,
+ DRM_DEV_ERROR(dev,
"Failed to config video %d\n",
ret);
}
@@ -1048,7 +1062,7 @@ static int cdn_dp_bind(struct device *dev, struct device *master, void *data)
drm_encoder_helper_add(encoder, &cdn_dp_encoder_helper_funcs);
- connector = &dp->connector;
+ connector = &dp->mhdp.connector;
connector->polled = DRM_CONNECTOR_POLL_HPD;
connector->dpms = DRM_MODE_DPMS_OFF;
@@ -1072,7 +1086,7 @@ static int cdn_dp_bind(struct device *dev, struct device *master, void *data)
port = dp->port[i];
port->event_nb.notifier_call = cdn_dp_pd_event;
- ret = devm_extcon_register_notifier(dp->dev, port->extcon,
+ ret = devm_extcon_register_notifier(dp->mhdp.dev, port->extcon,
EXTCON_DISP_DP,
&port->event_nb);
if (ret) {
@@ -1099,7 +1113,7 @@ 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;
- struct drm_connector *connector = &dp->connector;
+ struct drm_connector *connector = &dp->mhdp.connector;
cancel_work_sync(&dp->event_work);
cdn_dp_encoder_disable(encoder);
@@ -1159,7 +1173,7 @@ static int cdn_dp_probe(struct platform_device *pdev)
dp = devm_kzalloc(dev, sizeof(*dp), GFP_KERNEL);
if (!dp)
return -ENOMEM;
- dp->dev = dev;
+ dp->mhdp.dev = dev;
match = of_match_node(cdn_dp_dt_ids, pdev->dev.of_node);
dp_data = (struct cdn_dp_data *)match->data;
@@ -1204,7 +1218,7 @@ static int cdn_dp_remove(struct platform_device *pdev)
struct cdn_dp_device *dp = platform_get_drvdata(pdev);
platform_device_unregister(dp->audio_pdev);
- cdn_dp_suspend(dp->dev);
+ cdn_dp_suspend(dp->mhdp.dev);
component_del(&pdev->dev, &cdn_dp_component_ops);
return 0;
@@ -1214,7 +1228,7 @@ static void cdn_dp_shutdown(struct platform_device *pdev)
{
struct cdn_dp_device *dp = platform_get_drvdata(pdev);
- cdn_dp_suspend(dp->dev);
+ cdn_dp_suspend(dp->mhdp.dev);
}
static const struct dev_pm_ops cdn_dp_pm_ops = {
diff --git a/drivers/gpu/drm/rockchip/cdn-dp-core.h b/drivers/gpu/drm/rockchip/cdn-dp-core.h
index f57e296401b8..bad65c2fe610 100644
--- a/drivers/gpu/drm/rockchip/cdn-dp-core.h
+++ b/drivers/gpu/drm/rockchip/cdn-dp-core.h
@@ -20,38 +20,10 @@
#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
-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;
-};
-
-enum vic_pxl_encoding_format {
- PXL_RGB = 0x1,
- YCBCR_4_4_4 = 0x2,
- YCBCR_4_2_2 = 0x4,
- YCBCR_4_2_0 = 0x8,
- Y_ONLY = 0x10,
-};
-
-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 */
@@ -70,11 +42,9 @@ struct cdn_dp_port {
};
struct cdn_dp_device {
- struct device *dev;
+ struct cdns_mhdp_device mhdp;
struct drm_device *drm_dev;
- struct drm_connector connector;
struct drm_encoder encoder;
- struct drm_display_mode mode;
struct platform_device *audio_pdev;
struct work_struct event_work;
struct edid *edid;
@@ -85,22 +55,16 @@ struct cdn_dp_device {
bool suspended;
const struct firmware *fw; /* cdn dp firmware */
- unsigned int fw_version; /* cdn fw version */
bool fw_loaded;
- void __iomem *regs;
struct regmap *grf;
struct clk *core_clk;
struct clk *pclk;
- struct clk *spdif_clk;
struct clk *grf_clk;
- struct reset_control *spdif_rst;
struct reset_control *dptx_rst;
struct reset_control *apb_rst;
struct reset_control *core_rst;
struct audio_info audio_info;
- struct video_info video_info;
- struct drm_dp_link link;
struct cdn_dp_port *port[MAX_PHY];
u8 ports;
u8 lanes;
diff --git a/drivers/gpu/drm/rockchip/cdn-dp-reg.c b/drivers/gpu/drm/rockchip/cdn-dp-reg.c
index 3105965fc260..c1a76e6fff88 100644
--- a/drivers/gpu/drm/rockchip/cdn-dp-reg.c
+++ b/drivers/gpu/drm/rockchip/cdn-dp-reg.c
@@ -22,19 +22,19 @@
#include "cdn-dp-core.h"
#include "cdn-dp-reg.h"
-#define CDN_DP_SPDIF_CLK 200000000
+#define CDNS_DP_SPDIF_CLK 200000000
#define FW_ALIVE_TIMEOUT_US 1000000
#define MAILBOX_RETRY_US 1000
#define MAILBOX_TIMEOUT_US 5000000
#define LINK_TRAINING_RETRY_MS 20
#define LINK_TRAINING_TIMEOUT_MS 500
-void cdn_dp_set_fw_clk(struct cdn_dp_device *dp, unsigned long clk)
+void cdns_mhdp_set_fw_clk(struct cdns_mhdp_device *mhdp, unsigned long clk)
{
- writel(clk / 1000000, dp->regs + SW_CLK_H);
+ writel(clk / 1000000, mhdp->regs + SW_CLK_H);
}
-void cdn_dp_clock_reset(struct cdn_dp_device *dp)
+void cdns_mhdp_clock_reset(struct cdns_mhdp_device *mhdp)
{
u32 val;
@@ -50,16 +50,16 @@ void cdn_dp_clock_reset(struct cdn_dp_device *dp)
DPTX_SYS_CLK_EN |
CFG_DPTX_VIF_CLK_RSTN_EN |
CFG_DPTX_VIF_CLK_EN;
- writel(val, dp->regs + SOURCE_DPTX_CAR);
+ writel(val, mhdp->regs + SOURCE_DPTX_CAR);
val = SOURCE_PHY_RSTN_EN | SOURCE_PHY_CLK_EN;
- writel(val, dp->regs + SOURCE_PHY_CAR);
+ writel(val, mhdp->regs + SOURCE_PHY_CAR);
val = SOURCE_PKT_SYS_RSTN_EN |
SOURCE_PKT_SYS_CLK_EN |
SOURCE_PKT_DATA_RSTN_EN |
SOURCE_PKT_DATA_CLK_EN;
- writel(val, dp->regs + SOURCE_PKT_CAR);
+ writel(val, mhdp->regs + SOURCE_PKT_CAR);
val = SPDIF_CDR_CLK_RSTN_EN |
SPDIF_CDR_CLK_EN |
@@ -67,53 +67,53 @@ void cdn_dp_clock_reset(struct cdn_dp_device *dp)
SOURCE_AIF_SYS_CLK_EN |
SOURCE_AIF_CLK_RSTN_EN |
SOURCE_AIF_CLK_EN;
- writel(val, dp->regs + SOURCE_AIF_CAR);
+ writel(val, mhdp->regs + SOURCE_AIF_CAR);
val = SOURCE_CIPHER_SYSTEM_CLK_RSTN_EN |
SOURCE_CIPHER_SYS_CLK_EN |
SOURCE_CIPHER_CHAR_CLK_RSTN_EN |
SOURCE_CIPHER_CHAR_CLK_EN;
- writel(val, dp->regs + SOURCE_CIPHER_CAR);
+ writel(val, mhdp->regs + SOURCE_CIPHER_CAR);
val = SOURCE_CRYPTO_SYS_CLK_RSTN_EN |
SOURCE_CRYPTO_SYS_CLK_EN;
- writel(val, dp->regs + SOURCE_CRYPTO_CAR);
+ writel(val, mhdp->regs + SOURCE_CRYPTO_CAR);
/* enable Mailbox and PIF interrupt */
- writel(0, dp->regs + APB_INT_MASK);
+ writel(0, mhdp->regs + APB_INT_MASK);
}
-static int cdn_dp_mailbox_read(struct cdn_dp_device *dp)
+static int cdns_mhdp_mailbox_read(struct cdns_mhdp_device *mhdp)
{
int val, ret;
- ret = readx_poll_timeout(readl, dp->regs + MAILBOX_EMPTY_ADDR,
+ ret = readx_poll_timeout(readl, mhdp->regs + MAILBOX_EMPTY_ADDR,
val, !val, MAILBOX_RETRY_US,
MAILBOX_TIMEOUT_US);
if (ret < 0)
return ret;
- return readl(dp->regs + MAILBOX0_RD_DATA) & 0xff;
+ return readl(mhdp->regs + MAILBOX0_RD_DATA) & 0xff;
}
-static int cdp_dp_mailbox_write(struct cdn_dp_device *dp, u8 val)
+static int cdp_dp_mailbox_write(struct cdns_mhdp_device *mhdp, u8 val)
{
int ret, full;
- ret = readx_poll_timeout(readl, dp->regs + MAILBOX_FULL_ADDR,
+ ret = readx_poll_timeout(readl, mhdp->regs + MAILBOX_FULL_ADDR,
full, !full, MAILBOX_RETRY_US,
MAILBOX_TIMEOUT_US);
if (ret < 0)
return ret;
- writel(val, dp->regs + MAILBOX0_WR_DATA);
+ writel(val, mhdp->regs + MAILBOX0_WR_DATA);
return 0;
}
-static int cdn_dp_mailbox_validate_receive(struct cdn_dp_device *dp,
- u8 module_id, u8 opcode,
- u8 req_size)
+static int cdns_mhdp_mailbox_validate_receive(struct cdns_mhdp_device *mhdp,
+ u8 module_id, u8 opcode,
+ u8 req_size)
{
u32 mbox_size, i;
u8 header[4];
@@ -121,7 +121,7 @@ static int cdn_dp_mailbox_validate_receive(struct cdn_dp_device *dp,
/* read the header of the message */
for (i = 0; i < 4; i++) {
- ret = cdn_dp_mailbox_read(dp);
+ ret = cdns_mhdp_mailbox_read(mhdp);
if (ret < 0)
return ret;
@@ -137,7 +137,7 @@ static int cdn_dp_mailbox_validate_receive(struct cdn_dp_device *dp,
* clear the mailbox by reading its contents.
*/
for (i = 0; i < mbox_size; i++)
- if (cdn_dp_mailbox_read(dp) < 0)
+ if (cdns_mhdp_mailbox_read(mhdp) < 0)
break;
return -EINVAL;
@@ -146,14 +146,14 @@ static int cdn_dp_mailbox_validate_receive(struct cdn_dp_device *dp,
return 0;
}
-static int cdn_dp_mailbox_read_receive(struct cdn_dp_device *dp,
- u8 *buff, u8 buff_size)
+static int cdns_mhdp_mailbox_read_receive(struct cdns_mhdp_device *mhdp,
+ u8 *buff, u8 buff_size)
{
u32 i;
int ret;
for (i = 0; i < buff_size; i++) {
- ret = cdn_dp_mailbox_read(dp);
+ ret = cdns_mhdp_mailbox_read(mhdp);
if (ret < 0)
return ret;
@@ -163,8 +163,8 @@ static int cdn_dp_mailbox_read_receive(struct cdn_dp_device *dp,
return 0;
}
-static int cdn_dp_mailbox_send(struct cdn_dp_device *dp, u8 module_id,
- u8 opcode, u16 size, u8 *message)
+static int cdns_mhdp_mailbox_send(struct cdns_mhdp_device *mhdp, u8 module_id,
+ u8 opcode, u16 size, u8 *message)
{
u8 header[4];
int ret, i;
@@ -175,13 +175,13 @@ static int cdn_dp_mailbox_send(struct cdn_dp_device *dp, u8 module_id,
header[3] = size & 0xff;
for (i = 0; i < 4; i++) {
- ret = cdp_dp_mailbox_write(dp, header[i]);
+ ret = cdp_dp_mailbox_write(mhdp, header[i]);
if (ret)
return ret;
}
for (i = 0; i < size; i++) {
- ret = cdp_dp_mailbox_write(dp, message[i]);
+ ret = cdp_dp_mailbox_write(mhdp, message[i]);
if (ret)
return ret;
}
@@ -189,7 +189,7 @@ static int cdn_dp_mailbox_send(struct cdn_dp_device *dp, u8 module_id,
return 0;
}
-static int cdn_dp_reg_write(struct cdn_dp_device *dp, u16 addr, u32 val)
+static int cdns_mhdp_reg_write(struct cdns_mhdp_device *mhdp, u16 addr, u32 val)
{
u8 msg[6];
@@ -199,12 +199,12 @@ static int cdn_dp_reg_write(struct cdn_dp_device *dp, u16 addr, u32 val)
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,
- sizeof(msg), msg);
+ return cdns_mhdp_mailbox_send(mhdp, MB_MODULE_ID_DP_TX,
+ DPTX_WRITE_REGISTER, sizeof(msg), msg);
}
-static int cdn_dp_reg_write_bit(struct cdn_dp_device *dp, u16 addr,
- u8 start_bit, u8 bits_no, u32 val)
+static int cdns_mhdp_reg_write_bit(struct cdns_mhdp_device *mhdp, u16 addr,
+ u8 start_bit, u8 bits_no, u32 val)
{
u8 field[8];
@@ -217,11 +217,12 @@ static int cdn_dp_reg_write_bit(struct cdn_dp_device *dp, u16 addr,
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);
+ return cdns_mhdp_mailbox_send(mhdp, MB_MODULE_ID_DP_TX,
+ DPTX_WRITE_FIELD, sizeof(field), field);
}
-int cdn_dp_dpcd_read(struct cdn_dp_device *dp, u32 addr, u8 *data, u16 len)
+int cdns_mhdp_dpcd_read(struct cdns_mhdp_device *mhdp,
+ u32 addr, u8 *data, u16 len)
{
u8 msg[5], reg[5];
int ret;
@@ -231,28 +232,28 @@ int cdn_dp_dpcd_read(struct cdn_dp_device *dp, u32 addr, u8 *data, u16 len)
msg[2] = (addr >> 16) & 0xff;
msg[3] = (addr >> 8) & 0xff;
msg[4] = addr & 0xff;
- ret = cdn_dp_mailbox_send(dp, MB_MODULE_ID_DP_TX, DPTX_READ_DPCD,
- sizeof(msg), msg);
+ ret = cdns_mhdp_mailbox_send(mhdp, MB_MODULE_ID_DP_TX,
+ DPTX_READ_DPCD, sizeof(msg), msg);
if (ret)
goto err_dpcd_read;
- ret = cdn_dp_mailbox_validate_receive(dp, MB_MODULE_ID_DP_TX,
- DPTX_READ_DPCD,
- sizeof(reg) + len);
+ ret = cdns_mhdp_mailbox_validate_receive(mhdp, MB_MODULE_ID_DP_TX,
+ DPTX_READ_DPCD,
+ sizeof(reg) + len);
if (ret)
goto err_dpcd_read;
- ret = cdn_dp_mailbox_read_receive(dp, reg, sizeof(reg));
+ ret = cdns_mhdp_mailbox_read_receive(mhdp, reg, sizeof(reg));
if (ret)
goto err_dpcd_read;
- ret = cdn_dp_mailbox_read_receive(dp, data, len);
+ ret = cdns_mhdp_mailbox_read_receive(mhdp, data, len);
err_dpcd_read:
return ret;
}
-int cdn_dp_dpcd_write(struct cdn_dp_device *dp, u32 addr, u8 value)
+int cdns_mhdp_dpcd_write(struct cdns_mhdp_device *mhdp, u32 addr, u8 value)
{
u8 msg[6], reg[5];
int ret;
@@ -263,17 +264,17 @@ int cdn_dp_dpcd_write(struct cdn_dp_device *dp, u32 addr, u8 value)
msg[3] = (addr >> 8) & 0xff;
msg[4] = addr & 0xff;
msg[5] = value;
- ret = cdn_dp_mailbox_send(dp, MB_MODULE_ID_DP_TX, DPTX_WRITE_DPCD,
- sizeof(msg), msg);
+ ret = cdns_mhdp_mailbox_send(mhdp, MB_MODULE_ID_DP_TX,
+ DPTX_WRITE_DPCD, sizeof(msg), msg);
if (ret)
goto err_dpcd_write;
- ret = cdn_dp_mailbox_validate_receive(dp, MB_MODULE_ID_DP_TX,
- DPTX_WRITE_DPCD, sizeof(reg));
+ ret = cdns_mhdp_mailbox_validate_receive(mhdp, MB_MODULE_ID_DP_TX,
+ DPTX_WRITE_DPCD, sizeof(reg));
if (ret)
goto err_dpcd_write;
- ret = cdn_dp_mailbox_read_receive(dp, reg, sizeof(reg));
+ ret = cdns_mhdp_mailbox_read_receive(mhdp, reg, sizeof(reg));
if (ret)
goto err_dpcd_write;
@@ -282,53 +283,53 @@ int cdn_dp_dpcd_write(struct cdn_dp_device *dp, u32 addr, u8 value)
err_dpcd_write:
if (ret)
- DRM_DEV_ERROR(dp->dev, "dpcd write failed: %d\n", ret);
+ DRM_DEV_ERROR(mhdp->dev, "dpcd write failed: %d\n", ret);
return ret;
}
-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 cdns_mhdp_load_firmware(struct cdns_mhdp_device *mhdp, const u32 *i_mem,
+ u32 i_size, const u32 *d_mem, u32 d_size)
{
u32 reg;
int i, ret;
/* reset ucpu before load firmware*/
writel(APB_IRAM_PATH | APB_DRAM_PATH | APB_XT_RESET,
- dp->regs + APB_CTRL);
+ mhdp->regs + APB_CTRL);
for (i = 0; i < i_size; i += 4)
- writel(*i_mem++, dp->regs + ADDR_IMEM + i);
+ writel(*i_mem++, mhdp->regs + ADDR_IMEM + i);
for (i = 0; i < d_size; i += 4)
- writel(*d_mem++, dp->regs + ADDR_DMEM + i);
+ writel(*d_mem++, mhdp->regs + ADDR_DMEM + i);
/* un-reset ucpu */
- writel(0, dp->regs + APB_CTRL);
+ writel(0, mhdp->regs + APB_CTRL);
/* check the keep alive register to make sure fw working */
- ret = readx_poll_timeout(readl, dp->regs + KEEP_ALIVE,
+ ret = readx_poll_timeout(readl, mhdp->regs + KEEP_ALIVE,
reg, reg, 2000, FW_ALIVE_TIMEOUT_US);
if (ret < 0) {
- DRM_DEV_ERROR(dp->dev, "failed to loaded the FW reg = %x\n",
+ DRM_DEV_ERROR(mhdp->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;
+ reg = readl(mhdp->regs + VER_L) & 0xff;
+ mhdp->fw_version = reg;
+ reg = readl(mhdp->regs + VER_H) & 0xff;
+ mhdp->fw_version |= reg << 8;
+ reg = readl(mhdp->regs + VER_LIB_L_ADDR) & 0xff;
+ mhdp->fw_version |= reg << 16;
+ reg = readl(mhdp->regs + VER_LIB_H_ADDR) & 0xff;
+ mhdp->fw_version |= reg << 24;
- DRM_DEV_DEBUG(dp->dev, "firmware version: %x\n", dp->fw_version);
+ DRM_DEV_DEBUG(mhdp->dev, "firmware version: %x\n", mhdp->fw_version);
return 0;
}
-int cdn_dp_set_firmware_active(struct cdn_dp_device *dp, bool enable)
+int cdns_mhdp_set_firmware_active(struct cdns_mhdp_device *mhdp, bool enable)
{
u8 msg[5];
int ret, i;
@@ -340,14 +341,14 @@ int cdn_dp_set_firmware_active(struct cdn_dp_device *dp, bool enable)
msg[4] = enable ? FW_ACTIVE : FW_STANDBY;
for (i = 0; i < sizeof(msg); i++) {
- ret = cdp_dp_mailbox_write(dp, msg[i]);
+ ret = cdp_dp_mailbox_write(mhdp, msg[i]);
if (ret)
goto err_set_firmware_active;
}
/* read the firmware state */
for (i = 0; i < sizeof(msg); i++) {
- ret = cdn_dp_mailbox_read(dp);
+ ret = cdns_mhdp_mailbox_read(mhdp);
if (ret < 0)
goto err_set_firmware_active;
@@ -358,16 +359,16 @@ int cdn_dp_set_firmware_active(struct cdn_dp_device *dp, bool enable)
err_set_firmware_active:
if (ret < 0)
- DRM_DEV_ERROR(dp->dev, "set firmware active failed\n");
+ DRM_DEV_ERROR(mhdp->dev, "set firmware active failed\n");
return ret;
}
-int cdn_dp_set_host_cap(struct cdn_dp_device *dp, u8 lanes, bool flip)
+int cdns_mhdp_set_host_cap(struct cdns_mhdp_device *mhdp, u8 lanes, bool flip)
{
u8 msg[8];
int ret;
- msg[0] = CDN_DP_MAX_LINK_RATE;
+ msg[0] = CDNS_DP_MAX_LINK_RATE;
msg[1] = lanes | SCRAMBLER_EN;
msg[2] = VOLTAGE_LEVEL_2;
msg[3] = PRE_EMPHASIS_LEVEL_3;
@@ -376,22 +377,22 @@ int cdn_dp_set_host_cap(struct cdn_dp_device *dp, u8 lanes, bool flip)
msg[6] = flip ? LANE_MAPPING_FLIPPED : LANE_MAPPING_NORMAL;
msg[7] = ENHANCED;
- ret = cdn_dp_mailbox_send(dp, MB_MODULE_ID_DP_TX,
- DPTX_SET_HOST_CAPABILITIES,
- sizeof(msg), msg);
+ ret = cdns_mhdp_mailbox_send(mhdp, MB_MODULE_ID_DP_TX,
+ DPTX_SET_HOST_CAPABILITIES,
+ sizeof(msg), msg);
if (ret)
goto err_set_host_cap;
- ret = cdn_dp_reg_write(dp, DP_AUX_SWAP_INVERSION_CONTROL,
- AUX_HOST_INVERT);
+ ret = cdns_mhdp_reg_write(mhdp, DP_AUX_SWAP_INVERSION_CONTROL,
+ AUX_HOST_INVERT);
err_set_host_cap:
if (ret)
- DRM_DEV_ERROR(dp->dev, "set host cap failed: %d\n", ret);
+ DRM_DEV_ERROR(mhdp->dev, "set host cap failed: %d\n", ret);
return ret;
}
-int cdn_dp_event_config(struct cdn_dp_device *dp)
+int cdns_mhdp_event_config(struct cdns_mhdp_device *mhdp)
{
u8 msg[5];
int ret;
@@ -400,49 +401,50 @@ int cdn_dp_event_config(struct cdn_dp_device *dp)
msg[0] = DPTX_EVENT_ENABLE_HPD | DPTX_EVENT_ENABLE_TRAINING;
- ret = cdn_dp_mailbox_send(dp, MB_MODULE_ID_DP_TX, DPTX_ENABLE_EVENT,
- sizeof(msg), msg);
+ ret = cdns_mhdp_mailbox_send(mhdp, MB_MODULE_ID_DP_TX,
+ DPTX_ENABLE_EVENT, sizeof(msg), msg);
if (ret)
- DRM_DEV_ERROR(dp->dev, "set event config failed: %d\n", ret);
+ DRM_DEV_ERROR(mhdp->dev, "set event config failed: %d\n", ret);
return ret;
}
-u32 cdn_dp_get_event(struct cdn_dp_device *dp)
+u32 cdns_mhdp_get_event(struct cdns_mhdp_device *mhdp)
{
- return readl(dp->regs + SW_EVENTS0);
+ return readl(mhdp->regs + SW_EVENTS0);
}
-int cdn_dp_get_hpd_status(struct cdn_dp_device *dp)
+int cdns_mhdp_get_hpd_status(struct cdns_mhdp_device *mhdp)
{
u8 status;
int ret;
- ret = cdn_dp_mailbox_send(dp, MB_MODULE_ID_DP_TX, DPTX_HPD_STATE,
- 0, NULL);
+ ret = cdns_mhdp_mailbox_send(mhdp, MB_MODULE_ID_DP_TX,
+ DPTX_HPD_STATE, 0, NULL);
if (ret)
goto err_get_hpd;
- ret = cdn_dp_mailbox_validate_receive(dp, MB_MODULE_ID_DP_TX,
- DPTX_HPD_STATE, sizeof(status));
+ ret = cdns_mhdp_mailbox_validate_receive(mhdp, MB_MODULE_ID_DP_TX,
+ DPTX_HPD_STATE,
+ sizeof(status));
if (ret)
goto err_get_hpd;
- ret = cdn_dp_mailbox_read_receive(dp, &status, sizeof(status));
+ ret = cdns_mhdp_mailbox_read_receive(mhdp, &status, sizeof(status));
if (ret)
goto err_get_hpd;
return status;
err_get_hpd:
- DRM_DEV_ERROR(dp->dev, "get hpd status failed: %d\n", ret);
+ DRM_DEV_ERROR(mhdp->dev, "get hpd status failed: %d\n", ret);
return ret;
}
-int cdn_dp_get_edid_block(void *data, u8 *edid,
+int cdns_mhdp_get_edid_block(void *data, u8 *edid,
unsigned int block, size_t length)
{
- struct cdn_dp_device *dp = data;
+ struct cdns_mhdp_device *mhdp = data;
u8 msg[2], reg[2], i;
int ret;
@@ -450,22 +452,23 @@ int cdn_dp_get_edid_block(void *data, u8 *edid,
msg[0] = block / 2;
msg[1] = block % 2;
- ret = cdn_dp_mailbox_send(dp, MB_MODULE_ID_DP_TX, DPTX_GET_EDID,
- sizeof(msg), msg);
+ ret = cdns_mhdp_mailbox_send(mhdp, MB_MODULE_ID_DP_TX,
+ DPTX_GET_EDID, sizeof(msg), msg);
if (ret)
continue;
- ret = cdn_dp_mailbox_validate_receive(dp, MB_MODULE_ID_DP_TX,
- DPTX_GET_EDID,
- sizeof(reg) + length);
+ ret = cdns_mhdp_mailbox_validate_receive(mhdp,
+ MB_MODULE_ID_DP_TX,
+ DPTX_GET_EDID,
+ sizeof(reg) + length);
if (ret)
continue;
- ret = cdn_dp_mailbox_read_receive(dp, reg, sizeof(reg));
+ ret = cdns_mhdp_mailbox_read_receive(mhdp, reg, sizeof(reg));
if (ret)
continue;
- ret = cdn_dp_mailbox_read_receive(dp, edid, length);
+ ret = cdns_mhdp_mailbox_read_receive(mhdp, edid, length);
if (ret)
continue;
@@ -474,13 +477,13 @@ int cdn_dp_get_edid_block(void *data, u8 *edid,
}
if (ret)
- DRM_DEV_ERROR(dp->dev, "get block[%d] edid failed: %d\n", block,
- ret);
+ DRM_DEV_ERROR(mhdp->dev, "get block[%d] edid failed: %d\n",
+ block, ret);
return ret;
}
-static int cdn_dp_training_start(struct cdn_dp_device *dp)
+static int cdns_mhdp_training_start(struct cdns_mhdp_device *mhdp)
{
unsigned long timeout;
u8 msg, event[2];
@@ -489,26 +492,28 @@ static int cdn_dp_training_start(struct cdn_dp_device *dp)
msg = LINK_TRAINING_RUN;
/* start training */
- ret = cdn_dp_mailbox_send(dp, MB_MODULE_ID_DP_TX, DPTX_TRAINING_CONTROL,
- sizeof(msg), &msg);
+ ret = cdns_mhdp_mailbox_send(mhdp, MB_MODULE_ID_DP_TX,
+ DPTX_TRAINING_CONTROL, sizeof(msg), &msg);
if (ret)
goto err_training_start;
timeout = jiffies + msecs_to_jiffies(LINK_TRAINING_TIMEOUT_MS);
while (time_before(jiffies, timeout)) {
msleep(LINK_TRAINING_RETRY_MS);
- ret = cdn_dp_mailbox_send(dp, MB_MODULE_ID_DP_TX,
- DPTX_READ_EVENT, 0, NULL);
+ ret = cdns_mhdp_mailbox_send(mhdp, MB_MODULE_ID_DP_TX,
+ DPTX_READ_EVENT, 0, NULL);
if (ret)
goto err_training_start;
- ret = cdn_dp_mailbox_validate_receive(dp, MB_MODULE_ID_DP_TX,
- DPTX_READ_EVENT,
- sizeof(event));
+ ret = cdns_mhdp_mailbox_validate_receive(mhdp,
+ MB_MODULE_ID_DP_TX,
+ DPTX_READ_EVENT,
+ sizeof(event));
if (ret)
goto err_training_start;
- ret = cdn_dp_mailbox_read_receive(dp, event, sizeof(event));
+ ret = cdns_mhdp_mailbox_read_receive(mhdp, event,
+ sizeof(event));
if (ret)
goto err_training_start;
@@ -519,77 +524,80 @@ static int cdn_dp_training_start(struct cdn_dp_device *dp)
ret = -ETIMEDOUT;
err_training_start:
- DRM_DEV_ERROR(dp->dev, "training failed: %d\n", ret);
+ DRM_DEV_ERROR(mhdp->dev, "training failed: %d\n", ret);
return ret;
}
-static int cdn_dp_get_training_status(struct cdn_dp_device *dp)
+static int cdns_mhdp_get_training_status(struct cdns_mhdp_device *mhdp)
{
u8 status[10];
int ret;
- ret = cdn_dp_mailbox_send(dp, MB_MODULE_ID_DP_TX, DPTX_READ_LINK_STAT,
- 0, NULL);
+ ret = cdns_mhdp_mailbox_send(mhdp, MB_MODULE_ID_DP_TX,
+ DPTX_READ_LINK_STAT, 0, NULL);
if (ret)
goto err_get_training_status;
- ret = cdn_dp_mailbox_validate_receive(dp, MB_MODULE_ID_DP_TX,
- DPTX_READ_LINK_STAT,
- sizeof(status));
+ ret = cdns_mhdp_mailbox_validate_receive(mhdp, MB_MODULE_ID_DP_TX,
+ DPTX_READ_LINK_STAT,
+ sizeof(status));
if (ret)
goto err_get_training_status;
- ret = cdn_dp_mailbox_read_receive(dp, status, sizeof(status));
+ ret = cdns_mhdp_mailbox_read_receive(mhdp, status, sizeof(status));
if (ret)
goto err_get_training_status;
- dp->link.rate = status[0];
- dp->link.num_lanes = status[1];
+ mhdp->link.rate = status[0];
+ mhdp->link.num_lanes = status[1];
err_get_training_status:
if (ret)
- DRM_DEV_ERROR(dp->dev, "get training status failed: %d\n", ret);
+ DRM_DEV_ERROR(mhdp->dev, "get training status failed: %d\n",
+ ret);
return ret;
}
-int cdn_dp_train_link(struct cdn_dp_device *dp)
+int cdns_mhdp_train_link(struct cdns_mhdp_device *mhdp)
{
int ret;
- ret = cdn_dp_training_start(dp);
+ ret = cdns_mhdp_training_start(mhdp);
if (ret) {
- DRM_DEV_ERROR(dp->dev, "Failed to start training %d\n", ret);
+ DRM_DEV_ERROR(mhdp->dev, "Failed to start training %d\n",
+ ret);
return ret;
}
- ret = cdn_dp_get_training_status(dp);
+ ret = cdns_mhdp_get_training_status(mhdp);
if (ret) {
- DRM_DEV_ERROR(dp->dev, "Failed to get training stat %d\n", ret);
+ DRM_DEV_ERROR(mhdp->dev, "Failed to get training stat %d\n",
+ ret);
return ret;
}
- DRM_DEV_DEBUG_KMS(dp->dev, "rate:0x%x, lanes:%d\n", dp->link.rate,
- dp->link.num_lanes);
+ DRM_DEV_DEBUG_KMS(mhdp->dev, "rate:0x%x, lanes:%d\n", mhdp->link.rate,
+ mhdp->link.num_lanes);
return ret;
}
-int cdn_dp_set_video_status(struct cdn_dp_device *dp, int active)
+int cdns_mhdp_set_video_status(struct cdns_mhdp_device *mhdp, int active)
{
u8 msg;
int ret;
msg = !!active;
- ret = cdn_dp_mailbox_send(dp, MB_MODULE_ID_DP_TX, DPTX_SET_VIDEO,
- sizeof(msg), &msg);
+ ret = cdns_mhdp_mailbox_send(mhdp, MB_MODULE_ID_DP_TX,
+ DPTX_SET_VIDEO, sizeof(msg), &msg);
if (ret)
- DRM_DEV_ERROR(dp->dev, "set video status failed: %d\n", ret);
+ DRM_DEV_ERROR(mhdp->dev, "set video status failed: %d\n", ret);
return ret;
}
-static int cdn_dp_get_msa_misc(struct video_info *video,
- struct drm_display_mode *mode)
+static int cdns_mhdp_get_msa_misc(struct video_info *video,
+ struct drm_display_mode *mode)
{
u32 msa_misc;
u8 val[2] = {0};
@@ -635,10 +643,10 @@ static int cdn_dp_get_msa_misc(struct video_info *video,
return msa_misc;
}
-int cdn_dp_config_video(struct cdn_dp_device *dp)
+int cdns_mhdp_config_video(struct cdns_mhdp_device *mhdp)
{
- struct video_info *video = &dp->video_info;
- struct drm_display_mode *mode = &dp->mode;
+ struct video_info *video = &mhdp->video_info;
+ struct drm_display_mode *mode = &mhdp->mode;
u64 symbol;
u32 val, link_rate, rem;
u8 bit_per_pix, tu_size_reg = TU_SIZE;
@@ -647,13 +655,13 @@ int cdn_dp_config_video(struct cdn_dp_device *dp)
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) / 1000;
+ link_rate = drm_dp_bw_code_to_link_rate(mhdp->link.rate) / 1000;
- ret = cdn_dp_reg_write(dp, BND_HSYNC2VSYNC, VIF_BYPASS_INTERLACE);
+ ret = cdns_mhdp_reg_write(mhdp, BND_HSYNC2VSYNC, VIF_BYPASS_INTERLACE);
if (ret)
goto err_config_video;
- ret = cdn_dp_reg_write(dp, HSYNC2VSYNC_POL_CTRL, 0);
+ ret = cdns_mhdp_reg_write(mhdp, HSYNC2VSYNC_POL_CTRL, 0);
if (ret)
goto err_config_video;
@@ -667,13 +675,13 @@ int cdn_dp_config_video(struct cdn_dp_device *dp)
do {
tu_size_reg += 2;
symbol = tu_size_reg * mode->clock * bit_per_pix;
- do_div(symbol, dp->link.num_lanes * link_rate * 8);
+ do_div(symbol, mhdp->link.num_lanes * link_rate * 8);
rem = do_div(symbol, 1000);
if (tu_size_reg > 64) {
ret = -EINVAL;
- DRM_DEV_ERROR(dp->dev,
+ DRM_DEV_ERROR(mhdp->dev,
"tu error, clk:%d, lanes:%d, rate:%d\n",
- mode->clock, dp->link.num_lanes,
+ mode->clock, mhdp->link.num_lanes,
link_rate);
goto err_config_video;
}
@@ -682,16 +690,16 @@ int cdn_dp_config_video(struct cdn_dp_device *dp)
val = symbol + (tu_size_reg << 8);
val |= TU_CNT_RST_EN;
- ret = cdn_dp_reg_write(dp, DP_FRAMER_TU, val);
+ ret = cdns_mhdp_reg_write(mhdp, DP_FRAMER_TU, val);
if (ret)
goto err_config_video;
/* set the FIFO Buffer size */
val = div_u64(mode->clock * (symbol + 1), 1000) + link_rate;
- val /= (dp->link.num_lanes * link_rate);
+ val /= (mhdp->link.num_lanes * link_rate);
val = div_u64(8 * (symbol + 1), bit_per_pix) - val;
val += 2;
- ret = cdn_dp_reg_write(dp, DP_VC_TABLE(15), val);
+ ret = cdns_mhdp_reg_write(mhdp, DP_VC_TABLE(15), val);
switch (video->color_depth) {
case 6:
@@ -712,136 +720,137 @@ int cdn_dp_config_video(struct cdn_dp_device *dp)
};
val += video->color_fmt << 8;
- ret = cdn_dp_reg_write(dp, DP_FRAMER_PXL_REPR, val);
+ ret = cdns_mhdp_reg_write(mhdp, DP_FRAMER_PXL_REPR, val);
if (ret)
goto err_config_video;
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);
+ ret = cdns_mhdp_reg_write(mhdp, DP_FRAMER_SP, val);
if (ret)
goto err_config_video;
val = (mode->hsync_start - mode->hdisplay) << 16;
val |= mode->htotal - mode->hsync_end;
- ret = cdn_dp_reg_write(dp, DP_FRONT_BACK_PORCH, val);
+ ret = cdns_mhdp_reg_write(mhdp, DP_FRONT_BACK_PORCH, val);
if (ret)
goto err_config_video;
val = mode->hdisplay * bit_per_pix / 8;
- ret = cdn_dp_reg_write(dp, DP_BYTE_COUNT, val);
+ ret = cdns_mhdp_reg_write(mhdp, DP_BYTE_COUNT, val);
if (ret)
goto err_config_video;
val = mode->htotal | ((mode->htotal - mode->hsync_start) << 16);
- ret = cdn_dp_reg_write(dp, MSA_HORIZONTAL_0, val);
+ ret = cdns_mhdp_reg_write(mhdp, MSA_HORIZONTAL_0, val);
if (ret)
goto err_config_video;
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);
+ ret = cdns_mhdp_reg_write(mhdp, MSA_HORIZONTAL_1, val);
if (ret)
goto err_config_video;
val = mode->vtotal;
val |= (mode->vtotal - mode->vsync_start) << 16;
- ret = cdn_dp_reg_write(dp, MSA_VERTICAL_0, val);
+ ret = cdns_mhdp_reg_write(mhdp, MSA_VERTICAL_0, val);
if (ret)
goto err_config_video;
val = mode->vsync_end - mode->vsync_start;
val |= (mode->vdisplay << 16) | (video->v_sync_polarity << 15);
- ret = cdn_dp_reg_write(dp, MSA_VERTICAL_1, val);
+ ret = cdns_mhdp_reg_write(mhdp, MSA_VERTICAL_1, val);
if (ret)
goto err_config_video;
- val = cdn_dp_get_msa_misc(video, mode);
- ret = cdn_dp_reg_write(dp, MSA_MISC, val);
+ val = cdns_mhdp_get_msa_misc(video, mode);
+ ret = cdns_mhdp_reg_write(mhdp, MSA_MISC, val);
if (ret)
goto err_config_video;
- ret = cdn_dp_reg_write(dp, STREAM_CONFIG, 1);
+ ret = cdns_mhdp_reg_write(mhdp, STREAM_CONFIG, 1);
if (ret)
goto err_config_video;
val = mode->hsync_end - mode->hsync_start;
val |= mode->hdisplay << 16;
- ret = cdn_dp_reg_write(dp, DP_HORIZONTAL, val);
+ ret = cdns_mhdp_reg_write(mhdp, DP_HORIZONTAL, val);
if (ret)
goto err_config_video;
val = mode->vdisplay;
val |= (mode->vtotal - mode->vsync_start) << 16;
- ret = cdn_dp_reg_write(dp, DP_VERTICAL_0, val);
+ ret = cdns_mhdp_reg_write(mhdp, DP_VERTICAL_0, val);
if (ret)
goto err_config_video;
val = mode->vtotal;
- ret = cdn_dp_reg_write(dp, DP_VERTICAL_1, val);
+ ret = cdns_mhdp_reg_write(mhdp, DP_VERTICAL_1, val);
if (ret)
goto err_config_video;
- ret = cdn_dp_reg_write_bit(dp, DP_VB_ID, 2, 1, 0);
+ ret = cdns_mhdp_reg_write_bit(mhdp, DP_VB_ID, 2, 1, 0);
err_config_video:
if (ret)
- DRM_DEV_ERROR(dp->dev, "config video failed: %d\n", ret);
+ DRM_DEV_ERROR(mhdp->dev, "config video failed: %d\n", ret);
return ret;
}
-int cdn_dp_audio_stop(struct cdn_dp_device *dp, struct audio_info *audio)
+int cdns_mhdp_audio_stop(struct cdns_mhdp_device *mhdp,
+ struct audio_info *audio)
{
int ret;
- ret = cdn_dp_reg_write(dp, AUDIO_PACK_CONTROL, 0);
+ ret = cdns_mhdp_reg_write(mhdp, AUDIO_PACK_CONTROL, 0);
if (ret) {
- DRM_DEV_ERROR(dp->dev, "audio stop failed: %d\n", ret);
+ DRM_DEV_ERROR(mhdp->dev, "audio stop failed: %d\n", ret);
return ret;
}
- writel(0, dp->regs + SPDIF_CTRL_ADDR);
+ writel(0, mhdp->regs + SPDIF_CTRL_ADDR);
/* clearn the audio config and reset */
- writel(0, dp->regs + AUDIO_SRC_CNTL);
- writel(0, dp->regs + AUDIO_SRC_CNFG);
- writel(AUDIO_SW_RST, dp->regs + AUDIO_SRC_CNTL);
- writel(0, dp->regs + AUDIO_SRC_CNTL);
+ writel(0, mhdp->regs + AUDIO_SRC_CNTL);
+ writel(0, mhdp->regs + AUDIO_SRC_CNFG);
+ writel(AUDIO_SW_RST, mhdp->regs + AUDIO_SRC_CNTL);
+ writel(0, mhdp->regs + AUDIO_SRC_CNTL);
/* reset smpl2pckt component */
- writel(0, dp->regs + SMPL2PKT_CNTL);
- writel(AUDIO_SW_RST, dp->regs + SMPL2PKT_CNTL);
- writel(0, dp->regs + SMPL2PKT_CNTL);
+ writel(0, mhdp->regs + SMPL2PKT_CNTL);
+ writel(AUDIO_SW_RST, mhdp->regs + SMPL2PKT_CNTL);
+ writel(0, mhdp->regs + SMPL2PKT_CNTL);
/* reset FIFO */
- writel(AUDIO_SW_RST, dp->regs + FIFO_CNTL);
- writel(0, dp->regs + FIFO_CNTL);
+ writel(AUDIO_SW_RST, mhdp->regs + FIFO_CNTL);
+ writel(0, mhdp->regs + FIFO_CNTL);
if (audio->format == AFMT_SPDIF)
- clk_disable_unprepare(dp->spdif_clk);
+ clk_disable_unprepare(mhdp->spdif_clk);
return 0;
}
-int cdn_dp_audio_mute(struct cdn_dp_device *dp, bool enable)
+int cdns_mhdp_audio_mute(struct cdns_mhdp_device *mhdp, bool enable)
{
int ret;
- ret = cdn_dp_reg_write_bit(dp, DP_VB_ID, 4, 1, enable);
+ ret = cdns_mhdp_reg_write_bit(mhdp, DP_VB_ID, 4, 1, enable);
if (ret)
- DRM_DEV_ERROR(dp->dev, "audio mute failed: %d\n", ret);
+ DRM_DEV_ERROR(mhdp->dev, "audio mute failed: %d\n", ret);
return ret;
}
-static void cdn_dp_audio_config_i2s(struct cdn_dp_device *dp,
- struct audio_info *audio)
+static void cdns_mhdp_audio_config_i2s(struct cdns_mhdp_device *mhdp,
+ struct audio_info *audio)
{
int sub_pckt_num = 1, i2s_port_en_val = 0xf, i;
u32 val;
if (audio->channels == 2) {
- if (dp->link.num_lanes == 1)
+ if (mhdp->link.num_lanes == 1)
sub_pckt_num = 2;
else
sub_pckt_num = 4;
@@ -851,15 +860,15 @@ static void cdn_dp_audio_config_i2s(struct cdn_dp_device *dp,
i2s_port_en_val = 3;
}
- writel(0x0, dp->regs + SPDIF_CTRL_ADDR);
+ writel(0x0, mhdp->regs + SPDIF_CTRL_ADDR);
- writel(SYNC_WR_TO_CH_ZERO, dp->regs + FIFO_CNTL);
+ writel(SYNC_WR_TO_CH_ZERO, mhdp->regs + FIFO_CNTL);
val = MAX_NUM_CH(audio->channels);
val |= NUM_OF_I2S_PORTS(audio->channels);
val |= AUDIO_TYPE_LPCM;
val |= CFG_SUB_PCKT_NUM(sub_pckt_num);
- writel(val, dp->regs + SMPL2PKT_CNFG);
+ writel(val, mhdp->regs + SMPL2PKT_CNFG);
if (audio->sample_width == 16)
val = 0;
@@ -871,7 +880,7 @@ static void cdn_dp_audio_config_i2s(struct cdn_dp_device *dp,
val |= AUDIO_CH_NUM(audio->channels);
val |= I2S_DEC_PORT_EN(i2s_port_en_val);
val |= TRANS_SMPL_WIDTH_32;
- writel(val, dp->regs + AUDIO_SRC_CNFG);
+ writel(val, mhdp->regs + AUDIO_SRC_CNFG);
for (i = 0; i < (audio->channels + 1) / 2; i++) {
if (audio->sample_width == 16)
@@ -880,7 +889,7 @@ static void cdn_dp_audio_config_i2s(struct cdn_dp_device *dp,
val = (0x0b << 8) | (0x0b << 20);
val |= ((2 * i) << 4) | ((2 * i + 1) << 16);
- writel(val, dp->regs + STTS_BIT_CH(i));
+ writel(val, mhdp->regs + STTS_BIT_CH(i));
}
switch (audio->sample_rate) {
@@ -914,56 +923,57 @@ static void cdn_dp_audio_config_i2s(struct cdn_dp_device *dp,
break;
}
val |= 4;
- writel(val, dp->regs + COM_CH_STTS_BITS);
+ writel(val, mhdp->regs + COM_CH_STTS_BITS);
- writel(SMPL2PKT_EN, dp->regs + SMPL2PKT_CNTL);
- writel(I2S_DEC_START, dp->regs + AUDIO_SRC_CNTL);
+ writel(SMPL2PKT_EN, mhdp->regs + SMPL2PKT_CNTL);
+ writel(I2S_DEC_START, mhdp->regs + AUDIO_SRC_CNTL);
}
-static void cdn_dp_audio_config_spdif(struct cdn_dp_device *dp)
+static void cdns_mhdp_audio_config_spdif(struct cdns_mhdp_device *mhdp)
{
u32 val;
- writel(SYNC_WR_TO_CH_ZERO, dp->regs + FIFO_CNTL);
+ writel(SYNC_WR_TO_CH_ZERO, mhdp->regs + FIFO_CNTL);
val = MAX_NUM_CH(2) | AUDIO_TYPE_LPCM | CFG_SUB_PCKT_NUM(4);
- writel(val, dp->regs + SMPL2PKT_CNFG);
- writel(SMPL2PKT_EN, dp->regs + SMPL2PKT_CNTL);
+ writel(val, mhdp->regs + SMPL2PKT_CNFG);
+ writel(SMPL2PKT_EN, mhdp->regs + SMPL2PKT_CNTL);
val = SPDIF_ENABLE | SPDIF_AVG_SEL | SPDIF_JITTER_BYPASS;
- writel(val, dp->regs + SPDIF_CTRL_ADDR);
+ writel(val, mhdp->regs + SPDIF_CTRL_ADDR);
- clk_prepare_enable(dp->spdif_clk);
- clk_set_rate(dp->spdif_clk, CDN_DP_SPDIF_CLK);
+ clk_prepare_enable(mhdp->spdif_clk);
+ clk_set_rate(mhdp->spdif_clk, CDNS_DP_SPDIF_CLK);
}
-int cdn_dp_audio_config(struct cdn_dp_device *dp, struct audio_info *audio)
+int cdns_mhdp_audio_config(struct cdns_mhdp_device *mhdp,
+ struct audio_info *audio)
{
int ret;
/* reset the spdif clk before config */
if (audio->format == AFMT_SPDIF) {
- reset_control_assert(dp->spdif_rst);
- reset_control_deassert(dp->spdif_rst);
+ reset_control_assert(mhdp->spdif_rst);
+ reset_control_deassert(mhdp->spdif_rst);
}
- ret = cdn_dp_reg_write(dp, CM_LANE_CTRL, LANE_REF_CYC);
+ ret = cdns_mhdp_reg_write(mhdp, CM_LANE_CTRL, LANE_REF_CYC);
if (ret)
goto err_audio_config;
- ret = cdn_dp_reg_write(dp, CM_CTRL, 0);
+ ret = cdns_mhdp_reg_write(mhdp, CM_CTRL, 0);
if (ret)
goto err_audio_config;
if (audio->format == AFMT_I2S)
- cdn_dp_audio_config_i2s(dp, audio);
+ cdns_mhdp_audio_config_i2s(mhdp, audio);
else if (audio->format == AFMT_SPDIF)
- cdn_dp_audio_config_spdif(dp);
+ cdns_mhdp_audio_config_spdif(mhdp);
- ret = cdn_dp_reg_write(dp, AUDIO_PACK_CONTROL, AUDIO_PACK_EN);
+ ret = cdns_mhdp_reg_write(mhdp, AUDIO_PACK_CONTROL, AUDIO_PACK_EN);
err_audio_config:
if (ret)
- DRM_DEV_ERROR(dp->dev, "audio config failed: %d\n", ret);
+ DRM_DEV_ERROR(mhdp->dev, "audio config failed: %d\n", ret);
return ret;
}
diff --git a/drivers/gpu/drm/rockchip/cdn-dp-reg.h b/drivers/gpu/drm/rockchip/cdn-dp-reg.h
index c4bbb4a83319..3cb40d719515 100644
--- a/drivers/gpu/drm/rockchip/cdn-dp-reg.h
+++ b/drivers/gpu/drm/rockchip/cdn-dp-reg.h
@@ -395,7 +395,7 @@
#define HDCP_TX_IS_RECEIVER_ID_VALID_EVENT BIT(7)
#define TU_SIZE 30
-#define CDN_DP_MAX_LINK_RATE DP_LINK_BW_5_4
+#define CDNS_DP_MAX_LINK_RATE DP_LINK_BW_5_4
/* audio */
#define AUDIO_PACK_EN BIT(8)
@@ -459,24 +459,96 @@ enum vic_bt_type {
BT_709 = 0x1,
};
-void cdn_dp_clock_reset(struct cdn_dp_device *dp);
-
-void cdn_dp_set_fw_clk(struct cdn_dp_device *dp, unsigned long 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_set_firmware_active(struct cdn_dp_device *dp, bool enable);
-int cdn_dp_set_host_cap(struct cdn_dp_device *dp, u8 lanes, bool flip);
-int cdn_dp_event_config(struct cdn_dp_device *dp);
-u32 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, u8 *data, u16 len);
-int cdn_dp_get_edid_block(void *dp, u8 *edid,
- unsigned int block, size_t length);
-int cdn_dp_train_link(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(struct cdn_dp_device *dp, struct audio_info *audio);
+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;
+};
+
+enum vic_pxl_encoding_format {
+ PXL_RGB = 0x1,
+ YCBCR_4_4_4 = 0x2,
+ YCBCR_4_2_2 = 0x4,
+ YCBCR_4_2_0 = 0x8,
+ Y_ONLY = 0x10,
+};
+
+struct video_info {
+ bool h_sync_polarity;
+ bool v_sync_polarity;
+ bool interlaced;
+ int color_depth;
+ enum vic_pxl_encoding_format color_fmt;
+};
+
+struct cdns_mhdp_host {
+ unsigned int link_rate;
+ u8 lanes_cnt;
+ u8 volt_swing;
+ u8 pre_emphasis;
+ u8 pattern_supp;
+ u8 fast_link;
+ u8 lane_mapping;
+ u8 enhanced;
+};
+
+struct cdns_mhdp_sink {
+ unsigned int link_rate;
+ u8 lanes_cnt;
+ u8 pattern_supp;
+ u8 fast_link;
+ u8 enhanced;
+};
+
+struct cdns_mhdp_device {
+ void __iomem *regs;
+
+ struct device *dev;
+
+ struct drm_dp_link link;
+ struct drm_connector connector;
+ struct clk *spdif_clk;
+ struct reset_control *spdif_rst;
+
+ struct drm_dp_aux aux;
+ struct cdns_mhdp_host host;
+ struct cdns_mhdp_sink sink;
+ struct drm_bridge bridge;
+ struct phy *phy;
+ void __iomem *dbg_regs;
+
+ struct video_info video_info;
+ struct drm_display_mode mode;
+ unsigned int fw_version;
+};
+
+void cdns_mhdp_clock_reset(struct cdns_mhdp_device *mhdp);
+void cdns_mhdp_set_fw_clk(struct cdns_mhdp_device *mhdp, unsigned long clk);
+int cdns_mhdp_load_firmware(struct cdns_mhdp_device *mhdp, const u32 *i_mem,
+ u32 i_size, const u32 *d_mem, u32 d_size);
+int cdns_mhdp_set_firmware_active(struct cdns_mhdp_device *mhdp, bool enable);
+int cdns_mhdp_set_host_cap(struct cdns_mhdp_device *mhdp, u8 lanes, bool flip);
+int cdns_mhdp_event_config(struct cdns_mhdp_device *mhdp);
+u32 cdns_mhdp_get_event(struct cdns_mhdp_device *mhdp);
+int cdns_mhdp_get_hpd_status(struct cdns_mhdp_device *mhdp);
+int cdns_mhdp_dpcd_write(struct cdns_mhdp_device *mhdp, u32 addr, u8 value);
+int cdns_mhdp_dpcd_read(struct cdns_mhdp_device *mhdp,
+ u32 addr, u8 *data, u16 len);
+int cdns_mhdp_get_edid_block(void *mhdp, u8 *edid,
+ unsigned int block, size_t length);
+int cdns_mhdp_train_link(struct cdns_mhdp_device *mhdp);
+int cdns_mhdp_set_video_status(struct cdns_mhdp_device *mhdp, int active);
+int cdns_mhdp_config_video(struct cdns_mhdp_device *mhdp);
+int cdns_mhdp_audio_stop(struct cdns_mhdp_device *mhdp,
+ struct audio_info *audio);
+int cdns_mhdp_audio_mute(struct cdns_mhdp_device *mhdp, bool enable);
+int cdns_mhdp_audio_config(struct cdns_mhdp_device *mhdp,
+ struct audio_info *audio);
#endif /* _CDN_DP_REG_H */
--
2.17.1
^ permalink raw reply related [flat|nested] 45+ messages in thread
* [PATCH v6 1/6] drm/rockchip: prepare common code for cdns and rk dpi/dp driver
@ 2018-10-08 21:42 ` Damian Kos
0 siblings, 0 replies; 45+ messages in thread
From: Damian Kos @ 2018-10-08 21:42 UTC (permalink / raw)
To: David Airlie, Rob Herring, Mark Rutland, Archit Taneja,
Andrzej Hajda, Laurent Pinchart, Gustavo Padovan,
Maarten Lankhorst, Sean Paul, Sandy Huang, Heiko Stübner,
Quentin Schulz, Damian Kos, Piotr Sroka, dri-devel, devicetree,
linux-kernel, linux-arm-kernel, linux-rockchip
Cc: rafalc, quentin.schulz, jbergsagel
- Extracted common fields from cdn_dp_device to a new cdns_mhdp_device
structure which will be used by two separate drivers later on.
- Moved some datatypes (audio_format, audio_info, vic_pxl_encoding_format,
video_info) from cdn-dp-core.c to cdn-dp-reg.h.
- Changed prefixes from cdn_dp to cdns_mhdp
cdn -> cdns to match the other Cadence's drivers
dp -> mhdp to distinguish it from a "just a DP" as the IP underneath
this registers map can be a HDMI (which is internally different,
but the interface for commands, events is pretty much the same).
- Modified cdn-dp-core.c to use the new driver structure and new function
names.
Signed-off-by: Damian Kos <dkos@cadence.com>
Reviewed-by: Andrzej Hajda <a.hajda@samsung.com>
---
drivers/gpu/drm/rockchip/cdn-dp-core.c | 220 +++++++------
drivers/gpu/drm/rockchip/cdn-dp-core.h | 40 +--
drivers/gpu/drm/rockchip/cdn-dp-reg.c | 428 +++++++++++++------------
drivers/gpu/drm/rockchip/cdn-dp-reg.h | 114 +++++--
4 files changed, 431 insertions(+), 371 deletions(-)
diff --git a/drivers/gpu/drm/rockchip/cdn-dp-core.c b/drivers/gpu/drm/rockchip/cdn-dp-core.c
index 8ad0d773dc33..bf7e206326f0 100644
--- a/drivers/gpu/drm/rockchip/cdn-dp-core.c
+++ b/drivers/gpu/drm/rockchip/cdn-dp-core.c
@@ -31,11 +31,10 @@
#include <sound/hdmi-codec.h>
#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)
+ container_of(c, struct cdn_dp_device, mhdp.connector)
#define encoder_to_dp(c) \
container_of(c, struct cdn_dp_device, encoder)
@@ -70,17 +69,18 @@ MODULE_DEVICE_TABLE(of, cdn_dp_dt_ids);
static int cdn_dp_grf_write(struct cdn_dp_device *dp,
unsigned int reg, unsigned int val)
{
+ struct device *dev = dp->mhdp.dev;
int ret;
ret = clk_prepare_enable(dp->grf_clk);
if (ret) {
- DRM_DEV_ERROR(dp->dev, "Failed to prepare_enable grf clock\n");
+ DRM_DEV_ERROR(dev, "Failed to prepare_enable grf clock\n");
return ret;
}
ret = regmap_write(dp->grf, reg, val);
if (ret) {
- DRM_DEV_ERROR(dp->dev, "Could not write to GRF: %d\n", ret);
+ DRM_DEV_ERROR(dev, "Could not write to GRF: %d\n", ret);
return ret;
}
@@ -91,24 +91,25 @@ static int cdn_dp_grf_write(struct cdn_dp_device *dp,
static int cdn_dp_clk_enable(struct cdn_dp_device *dp)
{
+ struct device *dev = dp->mhdp.dev;
int ret;
unsigned long rate;
ret = clk_prepare_enable(dp->pclk);
if (ret < 0) {
- DRM_DEV_ERROR(dp->dev, "cannot enable dp pclk %d\n", ret);
+ DRM_DEV_ERROR(dev, "cannot enable dp pclk %d\n", ret);
goto err_pclk;
}
ret = clk_prepare_enable(dp->core_clk);
if (ret < 0) {
- DRM_DEV_ERROR(dp->dev, "cannot enable core_clk %d\n", ret);
+ DRM_DEV_ERROR(dev, "cannot enable core_clk %d\n", ret);
goto err_core_clk;
}
- ret = pm_runtime_get_sync(dp->dev);
+ ret = pm_runtime_get_sync(dev);
if (ret < 0) {
- DRM_DEV_ERROR(dp->dev, "cannot get pm runtime %d\n", ret);
+ DRM_DEV_ERROR(dev, "cannot get pm runtime %d\n", ret);
goto err_pm_runtime_get;
}
@@ -121,18 +122,18 @@ static int cdn_dp_clk_enable(struct cdn_dp_device *dp)
rate = clk_get_rate(dp->core_clk);
if (!rate) {
- DRM_DEV_ERROR(dp->dev, "get clk rate failed\n");
+ DRM_DEV_ERROR(dev, "get clk rate failed\n");
ret = -EINVAL;
goto err_set_rate;
}
- cdn_dp_set_fw_clk(dp, rate);
- cdn_dp_clock_reset(dp);
+ cdns_mhdp_set_fw_clk(&dp->mhdp, rate);
+ cdns_mhdp_clock_reset(&dp->mhdp);
return 0;
err_set_rate:
- pm_runtime_put(dp->dev);
+ pm_runtime_put(dev);
err_pm_runtime_get:
clk_disable_unprepare(dp->core_clk);
err_core_clk:
@@ -143,7 +144,7 @@ static int cdn_dp_clk_enable(struct cdn_dp_device *dp)
static void cdn_dp_clk_disable(struct cdn_dp_device *dp)
{
- pm_runtime_put_sync(dp->dev);
+ pm_runtime_put_sync(dp->mhdp.dev);
clk_disable_unprepare(dp->pclk);
clk_disable_unprepare(dp->core_clk);
}
@@ -176,7 +177,7 @@ static int cdn_dp_get_sink_count(struct cdn_dp_device *dp, u8 *sink_count)
u8 value;
*sink_count = 0;
- ret = cdn_dp_dpcd_read(dp, DP_SINK_COUNT, &value, 1);
+ ret = cdns_mhdp_dpcd_read(&dp->mhdp, DP_SINK_COUNT, &value, 1);
if (ret)
return ret;
@@ -200,12 +201,13 @@ static struct cdn_dp_port *cdn_dp_connected_port(struct cdn_dp_device *dp)
static bool cdn_dp_check_sink_connection(struct cdn_dp_device *dp)
{
+ struct device *dev = dp->mhdp.dev;
unsigned long timeout = jiffies + msecs_to_jiffies(CDN_DPCD_TIMEOUT_MS);
struct cdn_dp_port *port;
u8 sink_count = 0;
if (dp->active_port < 0 || dp->active_port >= dp->ports) {
- DRM_DEV_ERROR(dp->dev, "active_port is wrong!\n");
+ DRM_DEV_ERROR(dev, "active_port is wrong!\n");
return false;
}
@@ -227,7 +229,7 @@ static bool cdn_dp_check_sink_connection(struct cdn_dp_device *dp)
usleep_range(5000, 10000);
}
- DRM_DEV_ERROR(dp->dev, "Get sink capability timed out\n");
+ DRM_DEV_ERROR(dev, "Get sink capability timed out\n");
return false;
}
@@ -269,7 +271,8 @@ static int cdn_dp_connector_get_modes(struct drm_connector *connector)
mutex_lock(&dp->lock);
edid = dp->edid;
if (edid) {
- DRM_DEV_DEBUG_KMS(dp->dev, "got edid: width[%d] x height[%d]\n",
+ DRM_DEV_DEBUG_KMS(dp->mhdp.dev,
+ "got edid: width[%d] x height[%d]\n",
edid->width_cm, edid->height_cm);
dp->sink_has_audio = drm_detect_monitor_audio(edid);
@@ -287,7 +290,8 @@ 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;
+ struct drm_display_info *display_info =
+ &dp->mhdp.connector.display_info;
u32 requested, actual, rate, sink_max, source_max = 0;
u8 lanes, bpc;
@@ -313,7 +317,7 @@ static int cdn_dp_connector_mode_valid(struct drm_connector *connector,
sink_max = drm_dp_max_lane_count(dp->dpcd);
lanes = min(source_max, sink_max);
- source_max = drm_dp_bw_code_to_link_rate(CDN_DP_MAX_LINK_RATE);
+ source_max = drm_dp_bw_code_to_link_rate(CDNS_DP_MAX_LINK_RATE);
sink_max = drm_dp_max_link_rate(dp->dpcd);
rate = min(source_max, sink_max);
@@ -323,7 +327,7 @@ static int cdn_dp_connector_mode_valid(struct drm_connector *connector,
actual = actual * 8 / 10;
if (requested > actual) {
- DRM_DEV_DEBUG_KMS(dp->dev,
+ DRM_DEV_DEBUG_KMS(dp->mhdp.dev,
"requested=%d, actual=%d, clock=%d\n",
requested, actual, mode->clock);
return MODE_CLOCK_HIGH;
@@ -343,28 +347,29 @@ static int cdn_dp_firmware_init(struct cdn_dp_device *dp)
const u32 *iram_data, *dram_data;
const struct firmware *fw = dp->fw;
const struct cdn_firmware_header *hdr;
+ struct device *dev = dp->mhdp.dev;
hdr = (struct cdn_firmware_header *)fw->data;
if (fw->size != le32_to_cpu(hdr->size_bytes)) {
- DRM_DEV_ERROR(dp->dev, "firmware is invalid\n");
+ DRM_DEV_ERROR(dev, "firmware is invalid\n");
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);
+ ret = cdns_mhdp_load_firmware(&dp->mhdp, iram_data, hdr->iram_size,
+ dram_data, hdr->dram_size);
if (ret)
return ret;
- ret = cdn_dp_set_firmware_active(dp, true);
+ ret = cdns_mhdp_set_firmware_active(&dp->mhdp, true);
if (ret) {
- DRM_DEV_ERROR(dp->dev, "active ucpu failed: %d\n", ret);
+ DRM_DEV_ERROR(dev, "active ucpu failed: %d\n", ret);
return ret;
}
- return cdn_dp_event_config(dp);
+ return cdns_mhdp_event_config(&dp->mhdp);
}
static int cdn_dp_get_sink_capability(struct cdn_dp_device *dp)
@@ -374,28 +379,29 @@ static int cdn_dp_get_sink_capability(struct cdn_dp_device *dp)
if (!cdn_dp_check_sink_connection(dp))
return -ENODEV;
- ret = cdn_dp_dpcd_read(dp, DP_DPCD_REV, dp->dpcd,
- DP_RECEIVER_CAP_SIZE);
+ ret = cdns_mhdp_dpcd_read(&dp->mhdp, DP_DPCD_REV, dp->dpcd,
+ DP_RECEIVER_CAP_SIZE);
if (ret) {
- DRM_DEV_ERROR(dp->dev, "Failed to get caps %d\n", ret);
+ DRM_DEV_ERROR(dp->mhdp.dev, "Failed to get caps %d\n", ret);
return ret;
}
kfree(dp->edid);
- dp->edid = drm_do_get_edid(&dp->connector,
- cdn_dp_get_edid_block, dp);
+ dp->edid = drm_do_get_edid(&dp->mhdp.connector,
+ cdns_mhdp_get_edid_block, &dp->mhdp);
return 0;
}
static int cdn_dp_enable_phy(struct cdn_dp_device *dp, struct cdn_dp_port *port)
{
+ struct device *dev = dp->mhdp.dev;
union extcon_property_value property;
int ret;
if (!port->phy_enabled) {
ret = phy_power_on(port->phy);
if (ret) {
- DRM_DEV_ERROR(dp->dev, "phy power on failed: %d\n",
+ DRM_DEV_ERROR(dev, "phy power on failed: %d\n",
ret);
goto err_phy;
}
@@ -405,28 +411,28 @@ static int cdn_dp_enable_phy(struct cdn_dp_device *dp, struct cdn_dp_port *port)
ret = cdn_dp_grf_write(dp, GRF_SOC_CON26,
DPTX_HPD_SEL_MASK | DPTX_HPD_SEL);
if (ret) {
- DRM_DEV_ERROR(dp->dev, "Failed to write HPD_SEL %d\n", ret);
+ DRM_DEV_ERROR(dev, "Failed to write HPD_SEL %d\n", ret);
goto err_power_on;
}
- ret = cdn_dp_get_hpd_status(dp);
+ ret = cdns_mhdp_get_hpd_status(&dp->mhdp);
if (ret <= 0) {
if (!ret)
- DRM_DEV_ERROR(dp->dev, "hpd does not exist\n");
+ DRM_DEV_ERROR(dev, "hpd does not exist\n");
goto err_power_on;
}
ret = extcon_get_property(port->extcon, EXTCON_DISP_DP,
EXTCON_PROP_USB_TYPEC_POLARITY, &property);
if (ret) {
- DRM_DEV_ERROR(dp->dev, "get property failed\n");
+ DRM_DEV_ERROR(dev, "get property failed\n");
goto err_power_on;
}
port->lanes = cdn_dp_get_port_lanes(port);
- ret = cdn_dp_set_host_cap(dp, port->lanes, property.intval);
+ ret = cdns_mhdp_set_host_cap(&dp->mhdp, port->lanes, property.intval);
if (ret) {
- DRM_DEV_ERROR(dp->dev, "set host capabilities failed: %d\n",
+ DRM_DEV_ERROR(dev, "set host capabilities failed: %d\n",
ret);
goto err_power_on;
}
@@ -436,7 +442,7 @@ static int cdn_dp_enable_phy(struct cdn_dp_device *dp, struct cdn_dp_port *port)
err_power_on:
if (phy_power_off(port->phy))
- DRM_DEV_ERROR(dp->dev, "phy power off failed: %d", ret);
+ DRM_DEV_ERROR(dev, "phy power off failed: %d", ret);
else
port->phy_enabled = false;
@@ -454,7 +460,8 @@ static int cdn_dp_disable_phy(struct cdn_dp_device *dp,
if (port->phy_enabled) {
ret = phy_power_off(port->phy);
if (ret) {
- DRM_DEV_ERROR(dp->dev, "phy power off failed: %d", ret);
+ DRM_DEV_ERROR(dp->mhdp.dev,
+ "phy power off failed: %d", ret);
return ret;
}
}
@@ -478,16 +485,16 @@ static int cdn_dp_disable(struct cdn_dp_device *dp)
ret = cdn_dp_grf_write(dp, GRF_SOC_CON26,
DPTX_HPD_SEL_MASK | DPTX_HPD_DEL);
if (ret) {
- DRM_DEV_ERROR(dp->dev, "Failed to clear hpd sel %d\n",
+ DRM_DEV_ERROR(dp->mhdp.dev, "Failed to clear hpd sel %d\n",
ret);
return ret;
}
- cdn_dp_set_firmware_active(dp, false);
+ cdns_mhdp_set_firmware_active(&dp->mhdp, false);
cdn_dp_clk_disable(dp);
dp->active = false;
- dp->link.rate = 0;
- dp->link.num_lanes = 0;
+ dp->mhdp.link.rate = 0;
+ dp->mhdp.link.num_lanes = 0;
if (!dp->connected) {
kfree(dp->edid);
dp->edid = NULL;
@@ -500,11 +507,11 @@ static int cdn_dp_enable(struct cdn_dp_device *dp)
{
int ret, i, lanes;
struct cdn_dp_port *port;
+ struct device *dev = dp->mhdp.dev;
port = cdn_dp_connected_port(dp);
if (!port) {
- DRM_DEV_ERROR(dp->dev,
- "Can't enable without connection\n");
+ DRM_DEV_ERROR(dev, "Can't enable without connection\n");
return -ENODEV;
}
@@ -517,7 +524,7 @@ static int cdn_dp_enable(struct cdn_dp_device *dp)
ret = cdn_dp_firmware_init(dp);
if (ret) {
- DRM_DEV_ERROR(dp->dev, "firmware init failed: %d", ret);
+ DRM_DEV_ERROR(dp->mhdp.dev, "firmware init failed: %d", ret);
goto err_clk_disable;
}
@@ -551,8 +558,9 @@ static void cdn_dp_encoder_mode_set(struct drm_encoder *encoder,
struct drm_display_mode *adjusted)
{
struct cdn_dp_device *dp = encoder_to_dp(encoder);
- struct drm_display_info *display_info = &dp->connector.display_info;
- struct video_info *video = &dp->video_info;
+ struct drm_display_info *display_info =
+ &dp->mhdp.connector.display_info;
+ struct video_info *video = &dp->mhdp.video_info;
switch (display_info->bpc) {
case 10:
@@ -570,7 +578,7 @@ static void cdn_dp_encoder_mode_set(struct drm_encoder *encoder,
video->v_sync_polarity = !!(mode->flags & DRM_MODE_FLAG_NVSYNC);
video->h_sync_polarity = !!(mode->flags & DRM_MODE_FLAG_NHSYNC);
- memcpy(&dp->mode, adjusted, sizeof(*mode));
+ memcpy(&dp->mhdp.mode, adjusted, sizeof(*mode));
}
static bool cdn_dp_check_link_status(struct cdn_dp_device *dp)
@@ -579,11 +587,11 @@ static bool cdn_dp_check_link_status(struct cdn_dp_device *dp)
struct cdn_dp_port *port = cdn_dp_connected_port(dp);
u8 sink_lanes = drm_dp_max_lane_count(dp->dpcd);
- if (!port || !dp->link.rate || !dp->link.num_lanes)
+ if (!port || !dp->mhdp.link.rate || !dp->mhdp.link.num_lanes)
return false;
- if (cdn_dp_dpcd_read(dp, DP_LANE0_1_STATUS, link_status,
- DP_LINK_STATUS_SIZE)) {
+ if (cdns_mhdp_dpcd_read(&dp->mhdp, DP_LANE0_1_STATUS, link_status,
+ DP_LINK_STATUS_SIZE)) {
DRM_ERROR("Failed to get link status\n");
return false;
}
@@ -595,15 +603,16 @@ static bool cdn_dp_check_link_status(struct cdn_dp_device *dp)
static void cdn_dp_encoder_enable(struct drm_encoder *encoder)
{
struct cdn_dp_device *dp = encoder_to_dp(encoder);
+ struct device *dev = dp->mhdp.dev;
int ret, val;
- ret = drm_of_encoder_active_endpoint_id(dp->dev->of_node, encoder);
+ ret = drm_of_encoder_active_endpoint_id(dev->of_node, encoder);
if (ret < 0) {
- DRM_DEV_ERROR(dp->dev, "Could not get vop id, %d", ret);
+ DRM_DEV_ERROR(dev, "Could not get vop id, %d", ret);
return;
}
- DRM_DEV_DEBUG_KMS(dp->dev, "vop %s output to cdn-dp\n",
+ DRM_DEV_DEBUG_KMS(dev, "vop %s output to cdn-dp\n",
(ret) ? "LIT" : "BIG");
if (ret)
val = DP_SEL_VOP_LIT | (DP_SEL_VOP_LIT << 16);
@@ -618,33 +627,33 @@ static void cdn_dp_encoder_enable(struct drm_encoder *encoder)
ret = cdn_dp_enable(dp);
if (ret) {
- DRM_DEV_ERROR(dp->dev, "Failed to enable encoder %d\n",
+ DRM_DEV_ERROR(dev, "Failed to enable encoder %d\n",
ret);
goto out;
}
if (!cdn_dp_check_link_status(dp)) {
- ret = cdn_dp_train_link(dp);
+ ret = cdns_mhdp_train_link(&dp->mhdp);
if (ret) {
- DRM_DEV_ERROR(dp->dev, "Failed link train %d\n", ret);
+ DRM_DEV_ERROR(dev, "Failed link train %d\n", ret);
goto out;
}
}
- ret = cdn_dp_set_video_status(dp, CONTROL_VIDEO_IDLE);
+ ret = cdns_mhdp_set_video_status(&dp->mhdp, CONTROL_VIDEO_IDLE);
if (ret) {
- DRM_DEV_ERROR(dp->dev, "Failed to idle video %d\n", ret);
+ DRM_DEV_ERROR(dev, "Failed to idle video %d\n", ret);
goto out;
}
- ret = cdn_dp_config_video(dp);
+ ret = cdns_mhdp_config_video(&dp->mhdp);
if (ret) {
- DRM_DEV_ERROR(dp->dev, "Failed to config video %d\n", ret);
+ DRM_DEV_ERROR(dev, "Failed to config video %d\n", ret);
goto out;
}
- ret = cdn_dp_set_video_status(dp, CONTROL_VIDEO_VALID);
+ ret = cdns_mhdp_set_video_status(&dp->mhdp, CONTROL_VIDEO_VALID);
if (ret) {
- DRM_DEV_ERROR(dp->dev, "Failed to valid video %d\n", ret);
+ DRM_DEV_ERROR(dev, "Failed to valid video %d\n", ret);
goto out;
}
out:
@@ -660,7 +669,8 @@ static void cdn_dp_encoder_disable(struct drm_encoder *encoder)
if (dp->active) {
ret = cdn_dp_disable(dp);
if (ret) {
- DRM_DEV_ERROR(dp->dev, "Failed to disable encoder %d\n",
+ DRM_DEV_ERROR(dp->mhdp.dev,
+ "Failed to disable encoder %d\n",
ret);
}
}
@@ -704,7 +714,7 @@ static const struct drm_encoder_funcs cdn_dp_encoder_funcs = {
static int cdn_dp_parse_dt(struct cdn_dp_device *dp)
{
- struct device *dev = dp->dev;
+ struct device *dev = dp->mhdp.dev;
struct device_node *np = dev->of_node;
struct platform_device *pdev = to_platform_device(dev);
struct resource *res;
@@ -716,10 +726,10 @@ static int cdn_dp_parse_dt(struct cdn_dp_device *dp)
}
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
- dp->regs = devm_ioremap_resource(dev, res);
- if (IS_ERR(dp->regs)) {
+ dp->mhdp.regs = devm_ioremap_resource(dev, res);
+ if (IS_ERR(dp->mhdp.regs)) {
DRM_DEV_ERROR(dev, "ioremap reg failed\n");
- return PTR_ERR(dp->regs);
+ return PTR_ERR(dp->mhdp.regs);
}
dp->core_clk = devm_clk_get(dev, "core-clk");
@@ -734,10 +744,10 @@ static int cdn_dp_parse_dt(struct cdn_dp_device *dp)
return PTR_ERR(dp->pclk);
}
- dp->spdif_clk = devm_clk_get(dev, "spdif");
- if (IS_ERR(dp->spdif_clk)) {
+ dp->mhdp.spdif_clk = devm_clk_get(dev, "spdif");
+ if (IS_ERR(dp->mhdp.spdif_clk)) {
DRM_DEV_ERROR(dev, "cannot get spdif_clk\n");
- return PTR_ERR(dp->spdif_clk);
+ return PTR_ERR(dp->mhdp.spdif_clk);
}
dp->grf_clk = devm_clk_get(dev, "grf");
@@ -746,10 +756,10 @@ static int cdn_dp_parse_dt(struct cdn_dp_device *dp)
return PTR_ERR(dp->grf_clk);
}
- dp->spdif_rst = devm_reset_control_get(dev, "spdif");
- if (IS_ERR(dp->spdif_rst)) {
+ dp->mhdp.spdif_rst = devm_reset_control_get(dev, "spdif");
+ if (IS_ERR(dp->mhdp.spdif_rst)) {
DRM_DEV_ERROR(dev, "no spdif reset control found\n");
- return PTR_ERR(dp->spdif_rst);
+ return PTR_ERR(dp->mhdp.spdif_rst);
}
dp->dptx_rst = devm_reset_control_get(dev, "dptx");
@@ -804,7 +814,7 @@ static int cdn_dp_audio_hw_params(struct device *dev, void *data,
goto out;
}
- ret = cdn_dp_audio_config(dp, &audio);
+ ret = cdns_mhdp_audio_config(&dp->mhdp, &audio);
if (!ret)
dp->audio_info = audio;
@@ -822,7 +832,7 @@ static void cdn_dp_audio_shutdown(struct device *dev, void *data)
if (!dp->active)
goto out;
- ret = cdn_dp_audio_stop(dp, &dp->audio_info);
+ ret = cdns_mhdp_audio_stop(&dp->mhdp, &dp->audio_info);
if (!ret)
dp->audio_info.format = AFMT_UNUSED;
out:
@@ -841,7 +851,7 @@ static int cdn_dp_audio_digital_mute(struct device *dev, void *data,
goto out;
}
- ret = cdn_dp_audio_mute(dp, enable);
+ ret = cdns_mhdp_audio_mute(&dp->mhdp, enable);
out:
mutex_unlock(&dp->lock);
@@ -853,7 +863,8 @@ static int cdn_dp_audio_get_eld(struct device *dev, void *data,
{
struct cdn_dp_device *dp = dev_get_drvdata(dev);
- memcpy(buf, dp->connector.eld, min(sizeof(dp->connector.eld), len));
+ memcpy(buf, dp->mhdp.connector.eld,
+ min(sizeof(dp->mhdp.connector.eld), len));
return 0;
}
@@ -887,6 +898,7 @@ static int cdn_dp_request_firmware(struct cdn_dp_device *dp)
int ret;
unsigned long timeout = jiffies + msecs_to_jiffies(CDN_FW_TIMEOUT_MS);
unsigned long sleep = 1000;
+ struct device *dev = dp->mhdp.dev;
WARN_ON(!mutex_is_locked(&dp->lock));
@@ -897,13 +909,13 @@ static int cdn_dp_request_firmware(struct cdn_dp_device *dp)
mutex_unlock(&dp->lock);
while (time_before(jiffies, timeout)) {
- ret = request_firmware(&dp->fw, CDN_DP_FIRMWARE, dp->dev);
+ ret = request_firmware(&dp->fw, CDN_DP_FIRMWARE, dev);
if (ret == -ENOENT) {
msleep(sleep);
sleep *= 2;
continue;
} else if (ret) {
- DRM_DEV_ERROR(dp->dev,
+ DRM_DEV_ERROR(dev,
"failed to request firmware: %d\n", ret);
goto out;
}
@@ -913,7 +925,7 @@ static int cdn_dp_request_firmware(struct cdn_dp_device *dp)
goto out;
}
- DRM_DEV_ERROR(dp->dev, "Timed out trying to load firmware\n");
+ DRM_DEV_ERROR(dev, "Timed out trying to load firmware\n");
ret = -ETIMEDOUT;
out:
mutex_lock(&dp->lock);
@@ -924,8 +936,9 @@ static void cdn_dp_pd_event_work(struct work_struct *work)
{
struct cdn_dp_device *dp = container_of(work, struct cdn_dp_device,
event_work);
- struct drm_connector *connector = &dp->connector;
+ struct drm_connector *connector = &dp->mhdp.connector;
enum drm_connector_status old_status;
+ struct device *dev = dp->mhdp.dev;
int ret;
@@ -942,44 +955,45 @@ static void cdn_dp_pd_event_work(struct work_struct *work)
/* Not connected, notify userspace to disable the block */
if (!cdn_dp_connected_port(dp)) {
- DRM_DEV_INFO(dp->dev, "Not connected. Disabling cdn\n");
+ DRM_DEV_INFO(dev, "Not connected. Disabling cdn\n");
dp->connected = false;
/* Connected but not enabled, enable the block */
} else if (!dp->active) {
- DRM_DEV_INFO(dp->dev, "Connected, not enabled. Enabling cdn\n");
+ DRM_DEV_INFO(dev, "Connected, not enabled. Enabling cdn\n");
ret = cdn_dp_enable(dp);
if (ret) {
- DRM_DEV_ERROR(dp->dev, "Enable dp failed %d\n", ret);
+ DRM_DEV_ERROR(dev, "Enable dp failed %d\n", ret);
dp->connected = false;
}
/* Enabled and connected to a dongle without a sink, notify userspace */
} else if (!cdn_dp_check_sink_connection(dp)) {
- DRM_DEV_INFO(dp->dev, "Connected without sink. Assert hpd\n");
+ DRM_DEV_INFO(dev, "Connected without sink. Assert hpd\n");
dp->connected = false;
/* Enabled and connected with a sink, re-train if requested */
} else if (!cdn_dp_check_link_status(dp)) {
- unsigned int rate = dp->link.rate;
- unsigned int lanes = dp->link.num_lanes;
- struct drm_display_mode *mode = &dp->mode;
+ unsigned int rate = dp->mhdp.link.rate;
+ unsigned int lanes = dp->mhdp.link.num_lanes;
+ struct drm_display_mode *mode = &dp->mhdp.mode;
- DRM_DEV_INFO(dp->dev, "Connected with sink. Re-train link\n");
- ret = cdn_dp_train_link(dp);
+ DRM_DEV_INFO(dev, "Connected with sink. Re-train link\n");
+ ret = cdns_mhdp_train_link(&dp->mhdp);
if (ret) {
dp->connected = false;
- DRM_DEV_ERROR(dp->dev, "Train link failed %d\n", ret);
+ DRM_DEV_ERROR(dev, "Train link failed %d\n", ret);
goto out;
}
/* If training result is changed, update the video config */
if (mode->clock &&
- (rate != dp->link.rate || lanes != dp->link.num_lanes)) {
- ret = cdn_dp_config_video(dp);
+ (rate != dp->mhdp.link.rate ||
+ lanes != dp->mhdp.link.num_lanes)) {
+ ret = cdns_mhdp_config_video(&dp->mhdp);
if (ret) {
dp->connected = false;
- DRM_DEV_ERROR(dp->dev,
+ DRM_DEV_ERROR(dev,
"Failed to config video %d\n",
ret);
}
@@ -1048,7 +1062,7 @@ static int cdn_dp_bind(struct device *dev, struct device *master, void *data)
drm_encoder_helper_add(encoder, &cdn_dp_encoder_helper_funcs);
- connector = &dp->connector;
+ connector = &dp->mhdp.connector;
connector->polled = DRM_CONNECTOR_POLL_HPD;
connector->dpms = DRM_MODE_DPMS_OFF;
@@ -1072,7 +1086,7 @@ static int cdn_dp_bind(struct device *dev, struct device *master, void *data)
port = dp->port[i];
port->event_nb.notifier_call = cdn_dp_pd_event;
- ret = devm_extcon_register_notifier(dp->dev, port->extcon,
+ ret = devm_extcon_register_notifier(dp->mhdp.dev, port->extcon,
EXTCON_DISP_DP,
&port->event_nb);
if (ret) {
@@ -1099,7 +1113,7 @@ 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;
- struct drm_connector *connector = &dp->connector;
+ struct drm_connector *connector = &dp->mhdp.connector;
cancel_work_sync(&dp->event_work);
cdn_dp_encoder_disable(encoder);
@@ -1159,7 +1173,7 @@ static int cdn_dp_probe(struct platform_device *pdev)
dp = devm_kzalloc(dev, sizeof(*dp), GFP_KERNEL);
if (!dp)
return -ENOMEM;
- dp->dev = dev;
+ dp->mhdp.dev = dev;
match = of_match_node(cdn_dp_dt_ids, pdev->dev.of_node);
dp_data = (struct cdn_dp_data *)match->data;
@@ -1204,7 +1218,7 @@ static int cdn_dp_remove(struct platform_device *pdev)
struct cdn_dp_device *dp = platform_get_drvdata(pdev);
platform_device_unregister(dp->audio_pdev);
- cdn_dp_suspend(dp->dev);
+ cdn_dp_suspend(dp->mhdp.dev);
component_del(&pdev->dev, &cdn_dp_component_ops);
return 0;
@@ -1214,7 +1228,7 @@ static void cdn_dp_shutdown(struct platform_device *pdev)
{
struct cdn_dp_device *dp = platform_get_drvdata(pdev);
- cdn_dp_suspend(dp->dev);
+ cdn_dp_suspend(dp->mhdp.dev);
}
static const struct dev_pm_ops cdn_dp_pm_ops = {
diff --git a/drivers/gpu/drm/rockchip/cdn-dp-core.h b/drivers/gpu/drm/rockchip/cdn-dp-core.h
index f57e296401b8..bad65c2fe610 100644
--- a/drivers/gpu/drm/rockchip/cdn-dp-core.h
+++ b/drivers/gpu/drm/rockchip/cdn-dp-core.h
@@ -20,38 +20,10 @@
#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
-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;
-};
-
-enum vic_pxl_encoding_format {
- PXL_RGB = 0x1,
- YCBCR_4_4_4 = 0x2,
- YCBCR_4_2_2 = 0x4,
- YCBCR_4_2_0 = 0x8,
- Y_ONLY = 0x10,
-};
-
-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 */
@@ -70,11 +42,9 @@ struct cdn_dp_port {
};
struct cdn_dp_device {
- struct device *dev;
+ struct cdns_mhdp_device mhdp;
struct drm_device *drm_dev;
- struct drm_connector connector;
struct drm_encoder encoder;
- struct drm_display_mode mode;
struct platform_device *audio_pdev;
struct work_struct event_work;
struct edid *edid;
@@ -85,22 +55,16 @@ struct cdn_dp_device {
bool suspended;
const struct firmware *fw; /* cdn dp firmware */
- unsigned int fw_version; /* cdn fw version */
bool fw_loaded;
- void __iomem *regs;
struct regmap *grf;
struct clk *core_clk;
struct clk *pclk;
- struct clk *spdif_clk;
struct clk *grf_clk;
- struct reset_control *spdif_rst;
struct reset_control *dptx_rst;
struct reset_control *apb_rst;
struct reset_control *core_rst;
struct audio_info audio_info;
- struct video_info video_info;
- struct drm_dp_link link;
struct cdn_dp_port *port[MAX_PHY];
u8 ports;
u8 lanes;
diff --git a/drivers/gpu/drm/rockchip/cdn-dp-reg.c b/drivers/gpu/drm/rockchip/cdn-dp-reg.c
index 3105965fc260..c1a76e6fff88 100644
--- a/drivers/gpu/drm/rockchip/cdn-dp-reg.c
+++ b/drivers/gpu/drm/rockchip/cdn-dp-reg.c
@@ -22,19 +22,19 @@
#include "cdn-dp-core.h"
#include "cdn-dp-reg.h"
-#define CDN_DP_SPDIF_CLK 200000000
+#define CDNS_DP_SPDIF_CLK 200000000
#define FW_ALIVE_TIMEOUT_US 1000000
#define MAILBOX_RETRY_US 1000
#define MAILBOX_TIMEOUT_US 5000000
#define LINK_TRAINING_RETRY_MS 20
#define LINK_TRAINING_TIMEOUT_MS 500
-void cdn_dp_set_fw_clk(struct cdn_dp_device *dp, unsigned long clk)
+void cdns_mhdp_set_fw_clk(struct cdns_mhdp_device *mhdp, unsigned long clk)
{
- writel(clk / 1000000, dp->regs + SW_CLK_H);
+ writel(clk / 1000000, mhdp->regs + SW_CLK_H);
}
-void cdn_dp_clock_reset(struct cdn_dp_device *dp)
+void cdns_mhdp_clock_reset(struct cdns_mhdp_device *mhdp)
{
u32 val;
@@ -50,16 +50,16 @@ void cdn_dp_clock_reset(struct cdn_dp_device *dp)
DPTX_SYS_CLK_EN |
CFG_DPTX_VIF_CLK_RSTN_EN |
CFG_DPTX_VIF_CLK_EN;
- writel(val, dp->regs + SOURCE_DPTX_CAR);
+ writel(val, mhdp->regs + SOURCE_DPTX_CAR);
val = SOURCE_PHY_RSTN_EN | SOURCE_PHY_CLK_EN;
- writel(val, dp->regs + SOURCE_PHY_CAR);
+ writel(val, mhdp->regs + SOURCE_PHY_CAR);
val = SOURCE_PKT_SYS_RSTN_EN |
SOURCE_PKT_SYS_CLK_EN |
SOURCE_PKT_DATA_RSTN_EN |
SOURCE_PKT_DATA_CLK_EN;
- writel(val, dp->regs + SOURCE_PKT_CAR);
+ writel(val, mhdp->regs + SOURCE_PKT_CAR);
val = SPDIF_CDR_CLK_RSTN_EN |
SPDIF_CDR_CLK_EN |
@@ -67,53 +67,53 @@ void cdn_dp_clock_reset(struct cdn_dp_device *dp)
SOURCE_AIF_SYS_CLK_EN |
SOURCE_AIF_CLK_RSTN_EN |
SOURCE_AIF_CLK_EN;
- writel(val, dp->regs + SOURCE_AIF_CAR);
+ writel(val, mhdp->regs + SOURCE_AIF_CAR);
val = SOURCE_CIPHER_SYSTEM_CLK_RSTN_EN |
SOURCE_CIPHER_SYS_CLK_EN |
SOURCE_CIPHER_CHAR_CLK_RSTN_EN |
SOURCE_CIPHER_CHAR_CLK_EN;
- writel(val, dp->regs + SOURCE_CIPHER_CAR);
+ writel(val, mhdp->regs + SOURCE_CIPHER_CAR);
val = SOURCE_CRYPTO_SYS_CLK_RSTN_EN |
SOURCE_CRYPTO_SYS_CLK_EN;
- writel(val, dp->regs + SOURCE_CRYPTO_CAR);
+ writel(val, mhdp->regs + SOURCE_CRYPTO_CAR);
/* enable Mailbox and PIF interrupt */
- writel(0, dp->regs + APB_INT_MASK);
+ writel(0, mhdp->regs + APB_INT_MASK);
}
-static int cdn_dp_mailbox_read(struct cdn_dp_device *dp)
+static int cdns_mhdp_mailbox_read(struct cdns_mhdp_device *mhdp)
{
int val, ret;
- ret = readx_poll_timeout(readl, dp->regs + MAILBOX_EMPTY_ADDR,
+ ret = readx_poll_timeout(readl, mhdp->regs + MAILBOX_EMPTY_ADDR,
val, !val, MAILBOX_RETRY_US,
MAILBOX_TIMEOUT_US);
if (ret < 0)
return ret;
- return readl(dp->regs + MAILBOX0_RD_DATA) & 0xff;
+ return readl(mhdp->regs + MAILBOX0_RD_DATA) & 0xff;
}
-static int cdp_dp_mailbox_write(struct cdn_dp_device *dp, u8 val)
+static int cdp_dp_mailbox_write(struct cdns_mhdp_device *mhdp, u8 val)
{
int ret, full;
- ret = readx_poll_timeout(readl, dp->regs + MAILBOX_FULL_ADDR,
+ ret = readx_poll_timeout(readl, mhdp->regs + MAILBOX_FULL_ADDR,
full, !full, MAILBOX_RETRY_US,
MAILBOX_TIMEOUT_US);
if (ret < 0)
return ret;
- writel(val, dp->regs + MAILBOX0_WR_DATA);
+ writel(val, mhdp->regs + MAILBOX0_WR_DATA);
return 0;
}
-static int cdn_dp_mailbox_validate_receive(struct cdn_dp_device *dp,
- u8 module_id, u8 opcode,
- u8 req_size)
+static int cdns_mhdp_mailbox_validate_receive(struct cdns_mhdp_device *mhdp,
+ u8 module_id, u8 opcode,
+ u8 req_size)
{
u32 mbox_size, i;
u8 header[4];
@@ -121,7 +121,7 @@ static int cdn_dp_mailbox_validate_receive(struct cdn_dp_device *dp,
/* read the header of the message */
for (i = 0; i < 4; i++) {
- ret = cdn_dp_mailbox_read(dp);
+ ret = cdns_mhdp_mailbox_read(mhdp);
if (ret < 0)
return ret;
@@ -137,7 +137,7 @@ static int cdn_dp_mailbox_validate_receive(struct cdn_dp_device *dp,
* clear the mailbox by reading its contents.
*/
for (i = 0; i < mbox_size; i++)
- if (cdn_dp_mailbox_read(dp) < 0)
+ if (cdns_mhdp_mailbox_read(mhdp) < 0)
break;
return -EINVAL;
@@ -146,14 +146,14 @@ static int cdn_dp_mailbox_validate_receive(struct cdn_dp_device *dp,
return 0;
}
-static int cdn_dp_mailbox_read_receive(struct cdn_dp_device *dp,
- u8 *buff, u8 buff_size)
+static int cdns_mhdp_mailbox_read_receive(struct cdns_mhdp_device *mhdp,
+ u8 *buff, u8 buff_size)
{
u32 i;
int ret;
for (i = 0; i < buff_size; i++) {
- ret = cdn_dp_mailbox_read(dp);
+ ret = cdns_mhdp_mailbox_read(mhdp);
if (ret < 0)
return ret;
@@ -163,8 +163,8 @@ static int cdn_dp_mailbox_read_receive(struct cdn_dp_device *dp,
return 0;
}
-static int cdn_dp_mailbox_send(struct cdn_dp_device *dp, u8 module_id,
- u8 opcode, u16 size, u8 *message)
+static int cdns_mhdp_mailbox_send(struct cdns_mhdp_device *mhdp, u8 module_id,
+ u8 opcode, u16 size, u8 *message)
{
u8 header[4];
int ret, i;
@@ -175,13 +175,13 @@ static int cdn_dp_mailbox_send(struct cdn_dp_device *dp, u8 module_id,
header[3] = size & 0xff;
for (i = 0; i < 4; i++) {
- ret = cdp_dp_mailbox_write(dp, header[i]);
+ ret = cdp_dp_mailbox_write(mhdp, header[i]);
if (ret)
return ret;
}
for (i = 0; i < size; i++) {
- ret = cdp_dp_mailbox_write(dp, message[i]);
+ ret = cdp_dp_mailbox_write(mhdp, message[i]);
if (ret)
return ret;
}
@@ -189,7 +189,7 @@ static int cdn_dp_mailbox_send(struct cdn_dp_device *dp, u8 module_id,
return 0;
}
-static int cdn_dp_reg_write(struct cdn_dp_device *dp, u16 addr, u32 val)
+static int cdns_mhdp_reg_write(struct cdns_mhdp_device *mhdp, u16 addr, u32 val)
{
u8 msg[6];
@@ -199,12 +199,12 @@ static int cdn_dp_reg_write(struct cdn_dp_device *dp, u16 addr, u32 val)
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,
- sizeof(msg), msg);
+ return cdns_mhdp_mailbox_send(mhdp, MB_MODULE_ID_DP_TX,
+ DPTX_WRITE_REGISTER, sizeof(msg), msg);
}
-static int cdn_dp_reg_write_bit(struct cdn_dp_device *dp, u16 addr,
- u8 start_bit, u8 bits_no, u32 val)
+static int cdns_mhdp_reg_write_bit(struct cdns_mhdp_device *mhdp, u16 addr,
+ u8 start_bit, u8 bits_no, u32 val)
{
u8 field[8];
@@ -217,11 +217,12 @@ static int cdn_dp_reg_write_bit(struct cdn_dp_device *dp, u16 addr,
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);
+ return cdns_mhdp_mailbox_send(mhdp, MB_MODULE_ID_DP_TX,
+ DPTX_WRITE_FIELD, sizeof(field), field);
}
-int cdn_dp_dpcd_read(struct cdn_dp_device *dp, u32 addr, u8 *data, u16 len)
+int cdns_mhdp_dpcd_read(struct cdns_mhdp_device *mhdp,
+ u32 addr, u8 *data, u16 len)
{
u8 msg[5], reg[5];
int ret;
@@ -231,28 +232,28 @@ int cdn_dp_dpcd_read(struct cdn_dp_device *dp, u32 addr, u8 *data, u16 len)
msg[2] = (addr >> 16) & 0xff;
msg[3] = (addr >> 8) & 0xff;
msg[4] = addr & 0xff;
- ret = cdn_dp_mailbox_send(dp, MB_MODULE_ID_DP_TX, DPTX_READ_DPCD,
- sizeof(msg), msg);
+ ret = cdns_mhdp_mailbox_send(mhdp, MB_MODULE_ID_DP_TX,
+ DPTX_READ_DPCD, sizeof(msg), msg);
if (ret)
goto err_dpcd_read;
- ret = cdn_dp_mailbox_validate_receive(dp, MB_MODULE_ID_DP_TX,
- DPTX_READ_DPCD,
- sizeof(reg) + len);
+ ret = cdns_mhdp_mailbox_validate_receive(mhdp, MB_MODULE_ID_DP_TX,
+ DPTX_READ_DPCD,
+ sizeof(reg) + len);
if (ret)
goto err_dpcd_read;
- ret = cdn_dp_mailbox_read_receive(dp, reg, sizeof(reg));
+ ret = cdns_mhdp_mailbox_read_receive(mhdp, reg, sizeof(reg));
if (ret)
goto err_dpcd_read;
- ret = cdn_dp_mailbox_read_receive(dp, data, len);
+ ret = cdns_mhdp_mailbox_read_receive(mhdp, data, len);
err_dpcd_read:
return ret;
}
-int cdn_dp_dpcd_write(struct cdn_dp_device *dp, u32 addr, u8 value)
+int cdns_mhdp_dpcd_write(struct cdns_mhdp_device *mhdp, u32 addr, u8 value)
{
u8 msg[6], reg[5];
int ret;
@@ -263,17 +264,17 @@ int cdn_dp_dpcd_write(struct cdn_dp_device *dp, u32 addr, u8 value)
msg[3] = (addr >> 8) & 0xff;
msg[4] = addr & 0xff;
msg[5] = value;
- ret = cdn_dp_mailbox_send(dp, MB_MODULE_ID_DP_TX, DPTX_WRITE_DPCD,
- sizeof(msg), msg);
+ ret = cdns_mhdp_mailbox_send(mhdp, MB_MODULE_ID_DP_TX,
+ DPTX_WRITE_DPCD, sizeof(msg), msg);
if (ret)
goto err_dpcd_write;
- ret = cdn_dp_mailbox_validate_receive(dp, MB_MODULE_ID_DP_TX,
- DPTX_WRITE_DPCD, sizeof(reg));
+ ret = cdns_mhdp_mailbox_validate_receive(mhdp, MB_MODULE_ID_DP_TX,
+ DPTX_WRITE_DPCD, sizeof(reg));
if (ret)
goto err_dpcd_write;
- ret = cdn_dp_mailbox_read_receive(dp, reg, sizeof(reg));
+ ret = cdns_mhdp_mailbox_read_receive(mhdp, reg, sizeof(reg));
if (ret)
goto err_dpcd_write;
@@ -282,53 +283,53 @@ int cdn_dp_dpcd_write(struct cdn_dp_device *dp, u32 addr, u8 value)
err_dpcd_write:
if (ret)
- DRM_DEV_ERROR(dp->dev, "dpcd write failed: %d\n", ret);
+ DRM_DEV_ERROR(mhdp->dev, "dpcd write failed: %d\n", ret);
return ret;
}
-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 cdns_mhdp_load_firmware(struct cdns_mhdp_device *mhdp, const u32 *i_mem,
+ u32 i_size, const u32 *d_mem, u32 d_size)
{
u32 reg;
int i, ret;
/* reset ucpu before load firmware*/
writel(APB_IRAM_PATH | APB_DRAM_PATH | APB_XT_RESET,
- dp->regs + APB_CTRL);
+ mhdp->regs + APB_CTRL);
for (i = 0; i < i_size; i += 4)
- writel(*i_mem++, dp->regs + ADDR_IMEM + i);
+ writel(*i_mem++, mhdp->regs + ADDR_IMEM + i);
for (i = 0; i < d_size; i += 4)
- writel(*d_mem++, dp->regs + ADDR_DMEM + i);
+ writel(*d_mem++, mhdp->regs + ADDR_DMEM + i);
/* un-reset ucpu */
- writel(0, dp->regs + APB_CTRL);
+ writel(0, mhdp->regs + APB_CTRL);
/* check the keep alive register to make sure fw working */
- ret = readx_poll_timeout(readl, dp->regs + KEEP_ALIVE,
+ ret = readx_poll_timeout(readl, mhdp->regs + KEEP_ALIVE,
reg, reg, 2000, FW_ALIVE_TIMEOUT_US);
if (ret < 0) {
- DRM_DEV_ERROR(dp->dev, "failed to loaded the FW reg = %x\n",
+ DRM_DEV_ERROR(mhdp->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;
+ reg = readl(mhdp->regs + VER_L) & 0xff;
+ mhdp->fw_version = reg;
+ reg = readl(mhdp->regs + VER_H) & 0xff;
+ mhdp->fw_version |= reg << 8;
+ reg = readl(mhdp->regs + VER_LIB_L_ADDR) & 0xff;
+ mhdp->fw_version |= reg << 16;
+ reg = readl(mhdp->regs + VER_LIB_H_ADDR) & 0xff;
+ mhdp->fw_version |= reg << 24;
- DRM_DEV_DEBUG(dp->dev, "firmware version: %x\n", dp->fw_version);
+ DRM_DEV_DEBUG(mhdp->dev, "firmware version: %x\n", mhdp->fw_version);
return 0;
}
-int cdn_dp_set_firmware_active(struct cdn_dp_device *dp, bool enable)
+int cdns_mhdp_set_firmware_active(struct cdns_mhdp_device *mhdp, bool enable)
{
u8 msg[5];
int ret, i;
@@ -340,14 +341,14 @@ int cdn_dp_set_firmware_active(struct cdn_dp_device *dp, bool enable)
msg[4] = enable ? FW_ACTIVE : FW_STANDBY;
for (i = 0; i < sizeof(msg); i++) {
- ret = cdp_dp_mailbox_write(dp, msg[i]);
+ ret = cdp_dp_mailbox_write(mhdp, msg[i]);
if (ret)
goto err_set_firmware_active;
}
/* read the firmware state */
for (i = 0; i < sizeof(msg); i++) {
- ret = cdn_dp_mailbox_read(dp);
+ ret = cdns_mhdp_mailbox_read(mhdp);
if (ret < 0)
goto err_set_firmware_active;
@@ -358,16 +359,16 @@ int cdn_dp_set_firmware_active(struct cdn_dp_device *dp, bool enable)
err_set_firmware_active:
if (ret < 0)
- DRM_DEV_ERROR(dp->dev, "set firmware active failed\n");
+ DRM_DEV_ERROR(mhdp->dev, "set firmware active failed\n");
return ret;
}
-int cdn_dp_set_host_cap(struct cdn_dp_device *dp, u8 lanes, bool flip)
+int cdns_mhdp_set_host_cap(struct cdns_mhdp_device *mhdp, u8 lanes, bool flip)
{
u8 msg[8];
int ret;
- msg[0] = CDN_DP_MAX_LINK_RATE;
+ msg[0] = CDNS_DP_MAX_LINK_RATE;
msg[1] = lanes | SCRAMBLER_EN;
msg[2] = VOLTAGE_LEVEL_2;
msg[3] = PRE_EMPHASIS_LEVEL_3;
@@ -376,22 +377,22 @@ int cdn_dp_set_host_cap(struct cdn_dp_device *dp, u8 lanes, bool flip)
msg[6] = flip ? LANE_MAPPING_FLIPPED : LANE_MAPPING_NORMAL;
msg[7] = ENHANCED;
- ret = cdn_dp_mailbox_send(dp, MB_MODULE_ID_DP_TX,
- DPTX_SET_HOST_CAPABILITIES,
- sizeof(msg), msg);
+ ret = cdns_mhdp_mailbox_send(mhdp, MB_MODULE_ID_DP_TX,
+ DPTX_SET_HOST_CAPABILITIES,
+ sizeof(msg), msg);
if (ret)
goto err_set_host_cap;
- ret = cdn_dp_reg_write(dp, DP_AUX_SWAP_INVERSION_CONTROL,
- AUX_HOST_INVERT);
+ ret = cdns_mhdp_reg_write(mhdp, DP_AUX_SWAP_INVERSION_CONTROL,
+ AUX_HOST_INVERT);
err_set_host_cap:
if (ret)
- DRM_DEV_ERROR(dp->dev, "set host cap failed: %d\n", ret);
+ DRM_DEV_ERROR(mhdp->dev, "set host cap failed: %d\n", ret);
return ret;
}
-int cdn_dp_event_config(struct cdn_dp_device *dp)
+int cdns_mhdp_event_config(struct cdns_mhdp_device *mhdp)
{
u8 msg[5];
int ret;
@@ -400,49 +401,50 @@ int cdn_dp_event_config(struct cdn_dp_device *dp)
msg[0] = DPTX_EVENT_ENABLE_HPD | DPTX_EVENT_ENABLE_TRAINING;
- ret = cdn_dp_mailbox_send(dp, MB_MODULE_ID_DP_TX, DPTX_ENABLE_EVENT,
- sizeof(msg), msg);
+ ret = cdns_mhdp_mailbox_send(mhdp, MB_MODULE_ID_DP_TX,
+ DPTX_ENABLE_EVENT, sizeof(msg), msg);
if (ret)
- DRM_DEV_ERROR(dp->dev, "set event config failed: %d\n", ret);
+ DRM_DEV_ERROR(mhdp->dev, "set event config failed: %d\n", ret);
return ret;
}
-u32 cdn_dp_get_event(struct cdn_dp_device *dp)
+u32 cdns_mhdp_get_event(struct cdns_mhdp_device *mhdp)
{
- return readl(dp->regs + SW_EVENTS0);
+ return readl(mhdp->regs + SW_EVENTS0);
}
-int cdn_dp_get_hpd_status(struct cdn_dp_device *dp)
+int cdns_mhdp_get_hpd_status(struct cdns_mhdp_device *mhdp)
{
u8 status;
int ret;
- ret = cdn_dp_mailbox_send(dp, MB_MODULE_ID_DP_TX, DPTX_HPD_STATE,
- 0, NULL);
+ ret = cdns_mhdp_mailbox_send(mhdp, MB_MODULE_ID_DP_TX,
+ DPTX_HPD_STATE, 0, NULL);
if (ret)
goto err_get_hpd;
- ret = cdn_dp_mailbox_validate_receive(dp, MB_MODULE_ID_DP_TX,
- DPTX_HPD_STATE, sizeof(status));
+ ret = cdns_mhdp_mailbox_validate_receive(mhdp, MB_MODULE_ID_DP_TX,
+ DPTX_HPD_STATE,
+ sizeof(status));
if (ret)
goto err_get_hpd;
- ret = cdn_dp_mailbox_read_receive(dp, &status, sizeof(status));
+ ret = cdns_mhdp_mailbox_read_receive(mhdp, &status, sizeof(status));
if (ret)
goto err_get_hpd;
return status;
err_get_hpd:
- DRM_DEV_ERROR(dp->dev, "get hpd status failed: %d\n", ret);
+ DRM_DEV_ERROR(mhdp->dev, "get hpd status failed: %d\n", ret);
return ret;
}
-int cdn_dp_get_edid_block(void *data, u8 *edid,
+int cdns_mhdp_get_edid_block(void *data, u8 *edid,
unsigned int block, size_t length)
{
- struct cdn_dp_device *dp = data;
+ struct cdns_mhdp_device *mhdp = data;
u8 msg[2], reg[2], i;
int ret;
@@ -450,22 +452,23 @@ int cdn_dp_get_edid_block(void *data, u8 *edid,
msg[0] = block / 2;
msg[1] = block % 2;
- ret = cdn_dp_mailbox_send(dp, MB_MODULE_ID_DP_TX, DPTX_GET_EDID,
- sizeof(msg), msg);
+ ret = cdns_mhdp_mailbox_send(mhdp, MB_MODULE_ID_DP_TX,
+ DPTX_GET_EDID, sizeof(msg), msg);
if (ret)
continue;
- ret = cdn_dp_mailbox_validate_receive(dp, MB_MODULE_ID_DP_TX,
- DPTX_GET_EDID,
- sizeof(reg) + length);
+ ret = cdns_mhdp_mailbox_validate_receive(mhdp,
+ MB_MODULE_ID_DP_TX,
+ DPTX_GET_EDID,
+ sizeof(reg) + length);
if (ret)
continue;
- ret = cdn_dp_mailbox_read_receive(dp, reg, sizeof(reg));
+ ret = cdns_mhdp_mailbox_read_receive(mhdp, reg, sizeof(reg));
if (ret)
continue;
- ret = cdn_dp_mailbox_read_receive(dp, edid, length);
+ ret = cdns_mhdp_mailbox_read_receive(mhdp, edid, length);
if (ret)
continue;
@@ -474,13 +477,13 @@ int cdn_dp_get_edid_block(void *data, u8 *edid,
}
if (ret)
- DRM_DEV_ERROR(dp->dev, "get block[%d] edid failed: %d\n", block,
- ret);
+ DRM_DEV_ERROR(mhdp->dev, "get block[%d] edid failed: %d\n",
+ block, ret);
return ret;
}
-static int cdn_dp_training_start(struct cdn_dp_device *dp)
+static int cdns_mhdp_training_start(struct cdns_mhdp_device *mhdp)
{
unsigned long timeout;
u8 msg, event[2];
@@ -489,26 +492,28 @@ static int cdn_dp_training_start(struct cdn_dp_device *dp)
msg = LINK_TRAINING_RUN;
/* start training */
- ret = cdn_dp_mailbox_send(dp, MB_MODULE_ID_DP_TX, DPTX_TRAINING_CONTROL,
- sizeof(msg), &msg);
+ ret = cdns_mhdp_mailbox_send(mhdp, MB_MODULE_ID_DP_TX,
+ DPTX_TRAINING_CONTROL, sizeof(msg), &msg);
if (ret)
goto err_training_start;
timeout = jiffies + msecs_to_jiffies(LINK_TRAINING_TIMEOUT_MS);
while (time_before(jiffies, timeout)) {
msleep(LINK_TRAINING_RETRY_MS);
- ret = cdn_dp_mailbox_send(dp, MB_MODULE_ID_DP_TX,
- DPTX_READ_EVENT, 0, NULL);
+ ret = cdns_mhdp_mailbox_send(mhdp, MB_MODULE_ID_DP_TX,
+ DPTX_READ_EVENT, 0, NULL);
if (ret)
goto err_training_start;
- ret = cdn_dp_mailbox_validate_receive(dp, MB_MODULE_ID_DP_TX,
- DPTX_READ_EVENT,
- sizeof(event));
+ ret = cdns_mhdp_mailbox_validate_receive(mhdp,
+ MB_MODULE_ID_DP_TX,
+ DPTX_READ_EVENT,
+ sizeof(event));
if (ret)
goto err_training_start;
- ret = cdn_dp_mailbox_read_receive(dp, event, sizeof(event));
+ ret = cdns_mhdp_mailbox_read_receive(mhdp, event,
+ sizeof(event));
if (ret)
goto err_training_start;
@@ -519,77 +524,80 @@ static int cdn_dp_training_start(struct cdn_dp_device *dp)
ret = -ETIMEDOUT;
err_training_start:
- DRM_DEV_ERROR(dp->dev, "training failed: %d\n", ret);
+ DRM_DEV_ERROR(mhdp->dev, "training failed: %d\n", ret);
return ret;
}
-static int cdn_dp_get_training_status(struct cdn_dp_device *dp)
+static int cdns_mhdp_get_training_status(struct cdns_mhdp_device *mhdp)
{
u8 status[10];
int ret;
- ret = cdn_dp_mailbox_send(dp, MB_MODULE_ID_DP_TX, DPTX_READ_LINK_STAT,
- 0, NULL);
+ ret = cdns_mhdp_mailbox_send(mhdp, MB_MODULE_ID_DP_TX,
+ DPTX_READ_LINK_STAT, 0, NULL);
if (ret)
goto err_get_training_status;
- ret = cdn_dp_mailbox_validate_receive(dp, MB_MODULE_ID_DP_TX,
- DPTX_READ_LINK_STAT,
- sizeof(status));
+ ret = cdns_mhdp_mailbox_validate_receive(mhdp, MB_MODULE_ID_DP_TX,
+ DPTX_READ_LINK_STAT,
+ sizeof(status));
if (ret)
goto err_get_training_status;
- ret = cdn_dp_mailbox_read_receive(dp, status, sizeof(status));
+ ret = cdns_mhdp_mailbox_read_receive(mhdp, status, sizeof(status));
if (ret)
goto err_get_training_status;
- dp->link.rate = status[0];
- dp->link.num_lanes = status[1];
+ mhdp->link.rate = status[0];
+ mhdp->link.num_lanes = status[1];
err_get_training_status:
if (ret)
- DRM_DEV_ERROR(dp->dev, "get training status failed: %d\n", ret);
+ DRM_DEV_ERROR(mhdp->dev, "get training status failed: %d\n",
+ ret);
return ret;
}
-int cdn_dp_train_link(struct cdn_dp_device *dp)
+int cdns_mhdp_train_link(struct cdns_mhdp_device *mhdp)
{
int ret;
- ret = cdn_dp_training_start(dp);
+ ret = cdns_mhdp_training_start(mhdp);
if (ret) {
- DRM_DEV_ERROR(dp->dev, "Failed to start training %d\n", ret);
+ DRM_DEV_ERROR(mhdp->dev, "Failed to start training %d\n",
+ ret);
return ret;
}
- ret = cdn_dp_get_training_status(dp);
+ ret = cdns_mhdp_get_training_status(mhdp);
if (ret) {
- DRM_DEV_ERROR(dp->dev, "Failed to get training stat %d\n", ret);
+ DRM_DEV_ERROR(mhdp->dev, "Failed to get training stat %d\n",
+ ret);
return ret;
}
- DRM_DEV_DEBUG_KMS(dp->dev, "rate:0x%x, lanes:%d\n", dp->link.rate,
- dp->link.num_lanes);
+ DRM_DEV_DEBUG_KMS(mhdp->dev, "rate:0x%x, lanes:%d\n", mhdp->link.rate,
+ mhdp->link.num_lanes);
return ret;
}
-int cdn_dp_set_video_status(struct cdn_dp_device *dp, int active)
+int cdns_mhdp_set_video_status(struct cdns_mhdp_device *mhdp, int active)
{
u8 msg;
int ret;
msg = !!active;
- ret = cdn_dp_mailbox_send(dp, MB_MODULE_ID_DP_TX, DPTX_SET_VIDEO,
- sizeof(msg), &msg);
+ ret = cdns_mhdp_mailbox_send(mhdp, MB_MODULE_ID_DP_TX,
+ DPTX_SET_VIDEO, sizeof(msg), &msg);
if (ret)
- DRM_DEV_ERROR(dp->dev, "set video status failed: %d\n", ret);
+ DRM_DEV_ERROR(mhdp->dev, "set video status failed: %d\n", ret);
return ret;
}
-static int cdn_dp_get_msa_misc(struct video_info *video,
- struct drm_display_mode *mode)
+static int cdns_mhdp_get_msa_misc(struct video_info *video,
+ struct drm_display_mode *mode)
{
u32 msa_misc;
u8 val[2] = {0};
@@ -635,10 +643,10 @@ static int cdn_dp_get_msa_misc(struct video_info *video,
return msa_misc;
}
-int cdn_dp_config_video(struct cdn_dp_device *dp)
+int cdns_mhdp_config_video(struct cdns_mhdp_device *mhdp)
{
- struct video_info *video = &dp->video_info;
- struct drm_display_mode *mode = &dp->mode;
+ struct video_info *video = &mhdp->video_info;
+ struct drm_display_mode *mode = &mhdp->mode;
u64 symbol;
u32 val, link_rate, rem;
u8 bit_per_pix, tu_size_reg = TU_SIZE;
@@ -647,13 +655,13 @@ int cdn_dp_config_video(struct cdn_dp_device *dp)
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) / 1000;
+ link_rate = drm_dp_bw_code_to_link_rate(mhdp->link.rate) / 1000;
- ret = cdn_dp_reg_write(dp, BND_HSYNC2VSYNC, VIF_BYPASS_INTERLACE);
+ ret = cdns_mhdp_reg_write(mhdp, BND_HSYNC2VSYNC, VIF_BYPASS_INTERLACE);
if (ret)
goto err_config_video;
- ret = cdn_dp_reg_write(dp, HSYNC2VSYNC_POL_CTRL, 0);
+ ret = cdns_mhdp_reg_write(mhdp, HSYNC2VSYNC_POL_CTRL, 0);
if (ret)
goto err_config_video;
@@ -667,13 +675,13 @@ int cdn_dp_config_video(struct cdn_dp_device *dp)
do {
tu_size_reg += 2;
symbol = tu_size_reg * mode->clock * bit_per_pix;
- do_div(symbol, dp->link.num_lanes * link_rate * 8);
+ do_div(symbol, mhdp->link.num_lanes * link_rate * 8);
rem = do_div(symbol, 1000);
if (tu_size_reg > 64) {
ret = -EINVAL;
- DRM_DEV_ERROR(dp->dev,
+ DRM_DEV_ERROR(mhdp->dev,
"tu error, clk:%d, lanes:%d, rate:%d\n",
- mode->clock, dp->link.num_lanes,
+ mode->clock, mhdp->link.num_lanes,
link_rate);
goto err_config_video;
}
@@ -682,16 +690,16 @@ int cdn_dp_config_video(struct cdn_dp_device *dp)
val = symbol + (tu_size_reg << 8);
val |= TU_CNT_RST_EN;
- ret = cdn_dp_reg_write(dp, DP_FRAMER_TU, val);
+ ret = cdns_mhdp_reg_write(mhdp, DP_FRAMER_TU, val);
if (ret)
goto err_config_video;
/* set the FIFO Buffer size */
val = div_u64(mode->clock * (symbol + 1), 1000) + link_rate;
- val /= (dp->link.num_lanes * link_rate);
+ val /= (mhdp->link.num_lanes * link_rate);
val = div_u64(8 * (symbol + 1), bit_per_pix) - val;
val += 2;
- ret = cdn_dp_reg_write(dp, DP_VC_TABLE(15), val);
+ ret = cdns_mhdp_reg_write(mhdp, DP_VC_TABLE(15), val);
switch (video->color_depth) {
case 6:
@@ -712,136 +720,137 @@ int cdn_dp_config_video(struct cdn_dp_device *dp)
};
val += video->color_fmt << 8;
- ret = cdn_dp_reg_write(dp, DP_FRAMER_PXL_REPR, val);
+ ret = cdns_mhdp_reg_write(mhdp, DP_FRAMER_PXL_REPR, val);
if (ret)
goto err_config_video;
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);
+ ret = cdns_mhdp_reg_write(mhdp, DP_FRAMER_SP, val);
if (ret)
goto err_config_video;
val = (mode->hsync_start - mode->hdisplay) << 16;
val |= mode->htotal - mode->hsync_end;
- ret = cdn_dp_reg_write(dp, DP_FRONT_BACK_PORCH, val);
+ ret = cdns_mhdp_reg_write(mhdp, DP_FRONT_BACK_PORCH, val);
if (ret)
goto err_config_video;
val = mode->hdisplay * bit_per_pix / 8;
- ret = cdn_dp_reg_write(dp, DP_BYTE_COUNT, val);
+ ret = cdns_mhdp_reg_write(mhdp, DP_BYTE_COUNT, val);
if (ret)
goto err_config_video;
val = mode->htotal | ((mode->htotal - mode->hsync_start) << 16);
- ret = cdn_dp_reg_write(dp, MSA_HORIZONTAL_0, val);
+ ret = cdns_mhdp_reg_write(mhdp, MSA_HORIZONTAL_0, val);
if (ret)
goto err_config_video;
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);
+ ret = cdns_mhdp_reg_write(mhdp, MSA_HORIZONTAL_1, val);
if (ret)
goto err_config_video;
val = mode->vtotal;
val |= (mode->vtotal - mode->vsync_start) << 16;
- ret = cdn_dp_reg_write(dp, MSA_VERTICAL_0, val);
+ ret = cdns_mhdp_reg_write(mhdp, MSA_VERTICAL_0, val);
if (ret)
goto err_config_video;
val = mode->vsync_end - mode->vsync_start;
val |= (mode->vdisplay << 16) | (video->v_sync_polarity << 15);
- ret = cdn_dp_reg_write(dp, MSA_VERTICAL_1, val);
+ ret = cdns_mhdp_reg_write(mhdp, MSA_VERTICAL_1, val);
if (ret)
goto err_config_video;
- val = cdn_dp_get_msa_misc(video, mode);
- ret = cdn_dp_reg_write(dp, MSA_MISC, val);
+ val = cdns_mhdp_get_msa_misc(video, mode);
+ ret = cdns_mhdp_reg_write(mhdp, MSA_MISC, val);
if (ret)
goto err_config_video;
- ret = cdn_dp_reg_write(dp, STREAM_CONFIG, 1);
+ ret = cdns_mhdp_reg_write(mhdp, STREAM_CONFIG, 1);
if (ret)
goto err_config_video;
val = mode->hsync_end - mode->hsync_start;
val |= mode->hdisplay << 16;
- ret = cdn_dp_reg_write(dp, DP_HORIZONTAL, val);
+ ret = cdns_mhdp_reg_write(mhdp, DP_HORIZONTAL, val);
if (ret)
goto err_config_video;
val = mode->vdisplay;
val |= (mode->vtotal - mode->vsync_start) << 16;
- ret = cdn_dp_reg_write(dp, DP_VERTICAL_0, val);
+ ret = cdns_mhdp_reg_write(mhdp, DP_VERTICAL_0, val);
if (ret)
goto err_config_video;
val = mode->vtotal;
- ret = cdn_dp_reg_write(dp, DP_VERTICAL_1, val);
+ ret = cdns_mhdp_reg_write(mhdp, DP_VERTICAL_1, val);
if (ret)
goto err_config_video;
- ret = cdn_dp_reg_write_bit(dp, DP_VB_ID, 2, 1, 0);
+ ret = cdns_mhdp_reg_write_bit(mhdp, DP_VB_ID, 2, 1, 0);
err_config_video:
if (ret)
- DRM_DEV_ERROR(dp->dev, "config video failed: %d\n", ret);
+ DRM_DEV_ERROR(mhdp->dev, "config video failed: %d\n", ret);
return ret;
}
-int cdn_dp_audio_stop(struct cdn_dp_device *dp, struct audio_info *audio)
+int cdns_mhdp_audio_stop(struct cdns_mhdp_device *mhdp,
+ struct audio_info *audio)
{
int ret;
- ret = cdn_dp_reg_write(dp, AUDIO_PACK_CONTROL, 0);
+ ret = cdns_mhdp_reg_write(mhdp, AUDIO_PACK_CONTROL, 0);
if (ret) {
- DRM_DEV_ERROR(dp->dev, "audio stop failed: %d\n", ret);
+ DRM_DEV_ERROR(mhdp->dev, "audio stop failed: %d\n", ret);
return ret;
}
- writel(0, dp->regs + SPDIF_CTRL_ADDR);
+ writel(0, mhdp->regs + SPDIF_CTRL_ADDR);
/* clearn the audio config and reset */
- writel(0, dp->regs + AUDIO_SRC_CNTL);
- writel(0, dp->regs + AUDIO_SRC_CNFG);
- writel(AUDIO_SW_RST, dp->regs + AUDIO_SRC_CNTL);
- writel(0, dp->regs + AUDIO_SRC_CNTL);
+ writel(0, mhdp->regs + AUDIO_SRC_CNTL);
+ writel(0, mhdp->regs + AUDIO_SRC_CNFG);
+ writel(AUDIO_SW_RST, mhdp->regs + AUDIO_SRC_CNTL);
+ writel(0, mhdp->regs + AUDIO_SRC_CNTL);
/* reset smpl2pckt component */
- writel(0, dp->regs + SMPL2PKT_CNTL);
- writel(AUDIO_SW_RST, dp->regs + SMPL2PKT_CNTL);
- writel(0, dp->regs + SMPL2PKT_CNTL);
+ writel(0, mhdp->regs + SMPL2PKT_CNTL);
+ writel(AUDIO_SW_RST, mhdp->regs + SMPL2PKT_CNTL);
+ writel(0, mhdp->regs + SMPL2PKT_CNTL);
/* reset FIFO */
- writel(AUDIO_SW_RST, dp->regs + FIFO_CNTL);
- writel(0, dp->regs + FIFO_CNTL);
+ writel(AUDIO_SW_RST, mhdp->regs + FIFO_CNTL);
+ writel(0, mhdp->regs + FIFO_CNTL);
if (audio->format == AFMT_SPDIF)
- clk_disable_unprepare(dp->spdif_clk);
+ clk_disable_unprepare(mhdp->spdif_clk);
return 0;
}
-int cdn_dp_audio_mute(struct cdn_dp_device *dp, bool enable)
+int cdns_mhdp_audio_mute(struct cdns_mhdp_device *mhdp, bool enable)
{
int ret;
- ret = cdn_dp_reg_write_bit(dp, DP_VB_ID, 4, 1, enable);
+ ret = cdns_mhdp_reg_write_bit(mhdp, DP_VB_ID, 4, 1, enable);
if (ret)
- DRM_DEV_ERROR(dp->dev, "audio mute failed: %d\n", ret);
+ DRM_DEV_ERROR(mhdp->dev, "audio mute failed: %d\n", ret);
return ret;
}
-static void cdn_dp_audio_config_i2s(struct cdn_dp_device *dp,
- struct audio_info *audio)
+static void cdns_mhdp_audio_config_i2s(struct cdns_mhdp_device *mhdp,
+ struct audio_info *audio)
{
int sub_pckt_num = 1, i2s_port_en_val = 0xf, i;
u32 val;
if (audio->channels == 2) {
- if (dp->link.num_lanes == 1)
+ if (mhdp->link.num_lanes == 1)
sub_pckt_num = 2;
else
sub_pckt_num = 4;
@@ -851,15 +860,15 @@ static void cdn_dp_audio_config_i2s(struct cdn_dp_device *dp,
i2s_port_en_val = 3;
}
- writel(0x0, dp->regs + SPDIF_CTRL_ADDR);
+ writel(0x0, mhdp->regs + SPDIF_CTRL_ADDR);
- writel(SYNC_WR_TO_CH_ZERO, dp->regs + FIFO_CNTL);
+ writel(SYNC_WR_TO_CH_ZERO, mhdp->regs + FIFO_CNTL);
val = MAX_NUM_CH(audio->channels);
val |= NUM_OF_I2S_PORTS(audio->channels);
val |= AUDIO_TYPE_LPCM;
val |= CFG_SUB_PCKT_NUM(sub_pckt_num);
- writel(val, dp->regs + SMPL2PKT_CNFG);
+ writel(val, mhdp->regs + SMPL2PKT_CNFG);
if (audio->sample_width == 16)
val = 0;
@@ -871,7 +880,7 @@ static void cdn_dp_audio_config_i2s(struct cdn_dp_device *dp,
val |= AUDIO_CH_NUM(audio->channels);
val |= I2S_DEC_PORT_EN(i2s_port_en_val);
val |= TRANS_SMPL_WIDTH_32;
- writel(val, dp->regs + AUDIO_SRC_CNFG);
+ writel(val, mhdp->regs + AUDIO_SRC_CNFG);
for (i = 0; i < (audio->channels + 1) / 2; i++) {
if (audio->sample_width == 16)
@@ -880,7 +889,7 @@ static void cdn_dp_audio_config_i2s(struct cdn_dp_device *dp,
val = (0x0b << 8) | (0x0b << 20);
val |= ((2 * i) << 4) | ((2 * i + 1) << 16);
- writel(val, dp->regs + STTS_BIT_CH(i));
+ writel(val, mhdp->regs + STTS_BIT_CH(i));
}
switch (audio->sample_rate) {
@@ -914,56 +923,57 @@ static void cdn_dp_audio_config_i2s(struct cdn_dp_device *dp,
break;
}
val |= 4;
- writel(val, dp->regs + COM_CH_STTS_BITS);
+ writel(val, mhdp->regs + COM_CH_STTS_BITS);
- writel(SMPL2PKT_EN, dp->regs + SMPL2PKT_CNTL);
- writel(I2S_DEC_START, dp->regs + AUDIO_SRC_CNTL);
+ writel(SMPL2PKT_EN, mhdp->regs + SMPL2PKT_CNTL);
+ writel(I2S_DEC_START, mhdp->regs + AUDIO_SRC_CNTL);
}
-static void cdn_dp_audio_config_spdif(struct cdn_dp_device *dp)
+static void cdns_mhdp_audio_config_spdif(struct cdns_mhdp_device *mhdp)
{
u32 val;
- writel(SYNC_WR_TO_CH_ZERO, dp->regs + FIFO_CNTL);
+ writel(SYNC_WR_TO_CH_ZERO, mhdp->regs + FIFO_CNTL);
val = MAX_NUM_CH(2) | AUDIO_TYPE_LPCM | CFG_SUB_PCKT_NUM(4);
- writel(val, dp->regs + SMPL2PKT_CNFG);
- writel(SMPL2PKT_EN, dp->regs + SMPL2PKT_CNTL);
+ writel(val, mhdp->regs + SMPL2PKT_CNFG);
+ writel(SMPL2PKT_EN, mhdp->regs + SMPL2PKT_CNTL);
val = SPDIF_ENABLE | SPDIF_AVG_SEL | SPDIF_JITTER_BYPASS;
- writel(val, dp->regs + SPDIF_CTRL_ADDR);
+ writel(val, mhdp->regs + SPDIF_CTRL_ADDR);
- clk_prepare_enable(dp->spdif_clk);
- clk_set_rate(dp->spdif_clk, CDN_DP_SPDIF_CLK);
+ clk_prepare_enable(mhdp->spdif_clk);
+ clk_set_rate(mhdp->spdif_clk, CDNS_DP_SPDIF_CLK);
}
-int cdn_dp_audio_config(struct cdn_dp_device *dp, struct audio_info *audio)
+int cdns_mhdp_audio_config(struct cdns_mhdp_device *mhdp,
+ struct audio_info *audio)
{
int ret;
/* reset the spdif clk before config */
if (audio->format == AFMT_SPDIF) {
- reset_control_assert(dp->spdif_rst);
- reset_control_deassert(dp->spdif_rst);
+ reset_control_assert(mhdp->spdif_rst);
+ reset_control_deassert(mhdp->spdif_rst);
}
- ret = cdn_dp_reg_write(dp, CM_LANE_CTRL, LANE_REF_CYC);
+ ret = cdns_mhdp_reg_write(mhdp, CM_LANE_CTRL, LANE_REF_CYC);
if (ret)
goto err_audio_config;
- ret = cdn_dp_reg_write(dp, CM_CTRL, 0);
+ ret = cdns_mhdp_reg_write(mhdp, CM_CTRL, 0);
if (ret)
goto err_audio_config;
if (audio->format == AFMT_I2S)
- cdn_dp_audio_config_i2s(dp, audio);
+ cdns_mhdp_audio_config_i2s(mhdp, audio);
else if (audio->format == AFMT_SPDIF)
- cdn_dp_audio_config_spdif(dp);
+ cdns_mhdp_audio_config_spdif(mhdp);
- ret = cdn_dp_reg_write(dp, AUDIO_PACK_CONTROL, AUDIO_PACK_EN);
+ ret = cdns_mhdp_reg_write(mhdp, AUDIO_PACK_CONTROL, AUDIO_PACK_EN);
err_audio_config:
if (ret)
- DRM_DEV_ERROR(dp->dev, "audio config failed: %d\n", ret);
+ DRM_DEV_ERROR(mhdp->dev, "audio config failed: %d\n", ret);
return ret;
}
diff --git a/drivers/gpu/drm/rockchip/cdn-dp-reg.h b/drivers/gpu/drm/rockchip/cdn-dp-reg.h
index c4bbb4a83319..3cb40d719515 100644
--- a/drivers/gpu/drm/rockchip/cdn-dp-reg.h
+++ b/drivers/gpu/drm/rockchip/cdn-dp-reg.h
@@ -395,7 +395,7 @@
#define HDCP_TX_IS_RECEIVER_ID_VALID_EVENT BIT(7)
#define TU_SIZE 30
-#define CDN_DP_MAX_LINK_RATE DP_LINK_BW_5_4
+#define CDNS_DP_MAX_LINK_RATE DP_LINK_BW_5_4
/* audio */
#define AUDIO_PACK_EN BIT(8)
@@ -459,24 +459,96 @@ enum vic_bt_type {
BT_709 = 0x1,
};
-void cdn_dp_clock_reset(struct cdn_dp_device *dp);
-
-void cdn_dp_set_fw_clk(struct cdn_dp_device *dp, unsigned long 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_set_firmware_active(struct cdn_dp_device *dp, bool enable);
-int cdn_dp_set_host_cap(struct cdn_dp_device *dp, u8 lanes, bool flip);
-int cdn_dp_event_config(struct cdn_dp_device *dp);
-u32 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, u8 *data, u16 len);
-int cdn_dp_get_edid_block(void *dp, u8 *edid,
- unsigned int block, size_t length);
-int cdn_dp_train_link(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(struct cdn_dp_device *dp, struct audio_info *audio);
+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;
+};
+
+enum vic_pxl_encoding_format {
+ PXL_RGB = 0x1,
+ YCBCR_4_4_4 = 0x2,
+ YCBCR_4_2_2 = 0x4,
+ YCBCR_4_2_0 = 0x8,
+ Y_ONLY = 0x10,
+};
+
+struct video_info {
+ bool h_sync_polarity;
+ bool v_sync_polarity;
+ bool interlaced;
+ int color_depth;
+ enum vic_pxl_encoding_format color_fmt;
+};
+
+struct cdns_mhdp_host {
+ unsigned int link_rate;
+ u8 lanes_cnt;
+ u8 volt_swing;
+ u8 pre_emphasis;
+ u8 pattern_supp;
+ u8 fast_link;
+ u8 lane_mapping;
+ u8 enhanced;
+};
+
+struct cdns_mhdp_sink {
+ unsigned int link_rate;
+ u8 lanes_cnt;
+ u8 pattern_supp;
+ u8 fast_link;
+ u8 enhanced;
+};
+
+struct cdns_mhdp_device {
+ void __iomem *regs;
+
+ struct device *dev;
+
+ struct drm_dp_link link;
+ struct drm_connector connector;
+ struct clk *spdif_clk;
+ struct reset_control *spdif_rst;
+
+ struct drm_dp_aux aux;
+ struct cdns_mhdp_host host;
+ struct cdns_mhdp_sink sink;
+ struct drm_bridge bridge;
+ struct phy *phy;
+ void __iomem *dbg_regs;
+
+ struct video_info video_info;
+ struct drm_display_mode mode;
+ unsigned int fw_version;
+};
+
+void cdns_mhdp_clock_reset(struct cdns_mhdp_device *mhdp);
+void cdns_mhdp_set_fw_clk(struct cdns_mhdp_device *mhdp, unsigned long clk);
+int cdns_mhdp_load_firmware(struct cdns_mhdp_device *mhdp, const u32 *i_mem,
+ u32 i_size, const u32 *d_mem, u32 d_size);
+int cdns_mhdp_set_firmware_active(struct cdns_mhdp_device *mhdp, bool enable);
+int cdns_mhdp_set_host_cap(struct cdns_mhdp_device *mhdp, u8 lanes, bool flip);
+int cdns_mhdp_event_config(struct cdns_mhdp_device *mhdp);
+u32 cdns_mhdp_get_event(struct cdns_mhdp_device *mhdp);
+int cdns_mhdp_get_hpd_status(struct cdns_mhdp_device *mhdp);
+int cdns_mhdp_dpcd_write(struct cdns_mhdp_device *mhdp, u32 addr, u8 value);
+int cdns_mhdp_dpcd_read(struct cdns_mhdp_device *mhdp,
+ u32 addr, u8 *data, u16 len);
+int cdns_mhdp_get_edid_block(void *mhdp, u8 *edid,
+ unsigned int block, size_t length);
+int cdns_mhdp_train_link(struct cdns_mhdp_device *mhdp);
+int cdns_mhdp_set_video_status(struct cdns_mhdp_device *mhdp, int active);
+int cdns_mhdp_config_video(struct cdns_mhdp_device *mhdp);
+int cdns_mhdp_audio_stop(struct cdns_mhdp_device *mhdp,
+ struct audio_info *audio);
+int cdns_mhdp_audio_mute(struct cdns_mhdp_device *mhdp, bool enable);
+int cdns_mhdp_audio_config(struct cdns_mhdp_device *mhdp,
+ struct audio_info *audio);
#endif /* _CDN_DP_REG_H */
--
2.17.1
^ permalink raw reply related [flat|nested] 45+ messages in thread
* [PATCH v6 1/6] drm/rockchip: prepare common code for cdns and rk dpi/dp driver
@ 2018-10-08 21:42 ` Damian Kos
0 siblings, 0 replies; 45+ messages in thread
From: Damian Kos @ 2018-10-08 21:42 UTC (permalink / raw)
To: linux-arm-kernel
- Extracted common fields from cdn_dp_device to a new cdns_mhdp_device
structure which will be used by two separate drivers later on.
- Moved some datatypes (audio_format, audio_info, vic_pxl_encoding_format,
video_info) from cdn-dp-core.c to cdn-dp-reg.h.
- Changed prefixes from cdn_dp to cdns_mhdp
cdn -> cdns to match the other Cadence's drivers
dp -> mhdp to distinguish it from a "just a DP" as the IP underneath
this registers map can be a HDMI (which is internally different,
but the interface for commands, events is pretty much the same).
- Modified cdn-dp-core.c to use the new driver structure and new function
names.
Signed-off-by: Damian Kos <dkos@cadence.com>
Reviewed-by: Andrzej Hajda <a.hajda@samsung.com>
---
drivers/gpu/drm/rockchip/cdn-dp-core.c | 220 +++++++------
drivers/gpu/drm/rockchip/cdn-dp-core.h | 40 +--
drivers/gpu/drm/rockchip/cdn-dp-reg.c | 428 +++++++++++++------------
drivers/gpu/drm/rockchip/cdn-dp-reg.h | 114 +++++--
4 files changed, 431 insertions(+), 371 deletions(-)
diff --git a/drivers/gpu/drm/rockchip/cdn-dp-core.c b/drivers/gpu/drm/rockchip/cdn-dp-core.c
index 8ad0d773dc33..bf7e206326f0 100644
--- a/drivers/gpu/drm/rockchip/cdn-dp-core.c
+++ b/drivers/gpu/drm/rockchip/cdn-dp-core.c
@@ -31,11 +31,10 @@
#include <sound/hdmi-codec.h>
#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)
+ container_of(c, struct cdn_dp_device, mhdp.connector)
#define encoder_to_dp(c) \
container_of(c, struct cdn_dp_device, encoder)
@@ -70,17 +69,18 @@ MODULE_DEVICE_TABLE(of, cdn_dp_dt_ids);
static int cdn_dp_grf_write(struct cdn_dp_device *dp,
unsigned int reg, unsigned int val)
{
+ struct device *dev = dp->mhdp.dev;
int ret;
ret = clk_prepare_enable(dp->grf_clk);
if (ret) {
- DRM_DEV_ERROR(dp->dev, "Failed to prepare_enable grf clock\n");
+ DRM_DEV_ERROR(dev, "Failed to prepare_enable grf clock\n");
return ret;
}
ret = regmap_write(dp->grf, reg, val);
if (ret) {
- DRM_DEV_ERROR(dp->dev, "Could not write to GRF: %d\n", ret);
+ DRM_DEV_ERROR(dev, "Could not write to GRF: %d\n", ret);
return ret;
}
@@ -91,24 +91,25 @@ static int cdn_dp_grf_write(struct cdn_dp_device *dp,
static int cdn_dp_clk_enable(struct cdn_dp_device *dp)
{
+ struct device *dev = dp->mhdp.dev;
int ret;
unsigned long rate;
ret = clk_prepare_enable(dp->pclk);
if (ret < 0) {
- DRM_DEV_ERROR(dp->dev, "cannot enable dp pclk %d\n", ret);
+ DRM_DEV_ERROR(dev, "cannot enable dp pclk %d\n", ret);
goto err_pclk;
}
ret = clk_prepare_enable(dp->core_clk);
if (ret < 0) {
- DRM_DEV_ERROR(dp->dev, "cannot enable core_clk %d\n", ret);
+ DRM_DEV_ERROR(dev, "cannot enable core_clk %d\n", ret);
goto err_core_clk;
}
- ret = pm_runtime_get_sync(dp->dev);
+ ret = pm_runtime_get_sync(dev);
if (ret < 0) {
- DRM_DEV_ERROR(dp->dev, "cannot get pm runtime %d\n", ret);
+ DRM_DEV_ERROR(dev, "cannot get pm runtime %d\n", ret);
goto err_pm_runtime_get;
}
@@ -121,18 +122,18 @@ static int cdn_dp_clk_enable(struct cdn_dp_device *dp)
rate = clk_get_rate(dp->core_clk);
if (!rate) {
- DRM_DEV_ERROR(dp->dev, "get clk rate failed\n");
+ DRM_DEV_ERROR(dev, "get clk rate failed\n");
ret = -EINVAL;
goto err_set_rate;
}
- cdn_dp_set_fw_clk(dp, rate);
- cdn_dp_clock_reset(dp);
+ cdns_mhdp_set_fw_clk(&dp->mhdp, rate);
+ cdns_mhdp_clock_reset(&dp->mhdp);
return 0;
err_set_rate:
- pm_runtime_put(dp->dev);
+ pm_runtime_put(dev);
err_pm_runtime_get:
clk_disable_unprepare(dp->core_clk);
err_core_clk:
@@ -143,7 +144,7 @@ static int cdn_dp_clk_enable(struct cdn_dp_device *dp)
static void cdn_dp_clk_disable(struct cdn_dp_device *dp)
{
- pm_runtime_put_sync(dp->dev);
+ pm_runtime_put_sync(dp->mhdp.dev);
clk_disable_unprepare(dp->pclk);
clk_disable_unprepare(dp->core_clk);
}
@@ -176,7 +177,7 @@ static int cdn_dp_get_sink_count(struct cdn_dp_device *dp, u8 *sink_count)
u8 value;
*sink_count = 0;
- ret = cdn_dp_dpcd_read(dp, DP_SINK_COUNT, &value, 1);
+ ret = cdns_mhdp_dpcd_read(&dp->mhdp, DP_SINK_COUNT, &value, 1);
if (ret)
return ret;
@@ -200,12 +201,13 @@ static struct cdn_dp_port *cdn_dp_connected_port(struct cdn_dp_device *dp)
static bool cdn_dp_check_sink_connection(struct cdn_dp_device *dp)
{
+ struct device *dev = dp->mhdp.dev;
unsigned long timeout = jiffies + msecs_to_jiffies(CDN_DPCD_TIMEOUT_MS);
struct cdn_dp_port *port;
u8 sink_count = 0;
if (dp->active_port < 0 || dp->active_port >= dp->ports) {
- DRM_DEV_ERROR(dp->dev, "active_port is wrong!\n");
+ DRM_DEV_ERROR(dev, "active_port is wrong!\n");
return false;
}
@@ -227,7 +229,7 @@ static bool cdn_dp_check_sink_connection(struct cdn_dp_device *dp)
usleep_range(5000, 10000);
}
- DRM_DEV_ERROR(dp->dev, "Get sink capability timed out\n");
+ DRM_DEV_ERROR(dev, "Get sink capability timed out\n");
return false;
}
@@ -269,7 +271,8 @@ static int cdn_dp_connector_get_modes(struct drm_connector *connector)
mutex_lock(&dp->lock);
edid = dp->edid;
if (edid) {
- DRM_DEV_DEBUG_KMS(dp->dev, "got edid: width[%d] x height[%d]\n",
+ DRM_DEV_DEBUG_KMS(dp->mhdp.dev,
+ "got edid: width[%d] x height[%d]\n",
edid->width_cm, edid->height_cm);
dp->sink_has_audio = drm_detect_monitor_audio(edid);
@@ -287,7 +290,8 @@ 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;
+ struct drm_display_info *display_info =
+ &dp->mhdp.connector.display_info;
u32 requested, actual, rate, sink_max, source_max = 0;
u8 lanes, bpc;
@@ -313,7 +317,7 @@ static int cdn_dp_connector_mode_valid(struct drm_connector *connector,
sink_max = drm_dp_max_lane_count(dp->dpcd);
lanes = min(source_max, sink_max);
- source_max = drm_dp_bw_code_to_link_rate(CDN_DP_MAX_LINK_RATE);
+ source_max = drm_dp_bw_code_to_link_rate(CDNS_DP_MAX_LINK_RATE);
sink_max = drm_dp_max_link_rate(dp->dpcd);
rate = min(source_max, sink_max);
@@ -323,7 +327,7 @@ static int cdn_dp_connector_mode_valid(struct drm_connector *connector,
actual = actual * 8 / 10;
if (requested > actual) {
- DRM_DEV_DEBUG_KMS(dp->dev,
+ DRM_DEV_DEBUG_KMS(dp->mhdp.dev,
"requested=%d, actual=%d, clock=%d\n",
requested, actual, mode->clock);
return MODE_CLOCK_HIGH;
@@ -343,28 +347,29 @@ static int cdn_dp_firmware_init(struct cdn_dp_device *dp)
const u32 *iram_data, *dram_data;
const struct firmware *fw = dp->fw;
const struct cdn_firmware_header *hdr;
+ struct device *dev = dp->mhdp.dev;
hdr = (struct cdn_firmware_header *)fw->data;
if (fw->size != le32_to_cpu(hdr->size_bytes)) {
- DRM_DEV_ERROR(dp->dev, "firmware is invalid\n");
+ DRM_DEV_ERROR(dev, "firmware is invalid\n");
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);
+ ret = cdns_mhdp_load_firmware(&dp->mhdp, iram_data, hdr->iram_size,
+ dram_data, hdr->dram_size);
if (ret)
return ret;
- ret = cdn_dp_set_firmware_active(dp, true);
+ ret = cdns_mhdp_set_firmware_active(&dp->mhdp, true);
if (ret) {
- DRM_DEV_ERROR(dp->dev, "active ucpu failed: %d\n", ret);
+ DRM_DEV_ERROR(dev, "active ucpu failed: %d\n", ret);
return ret;
}
- return cdn_dp_event_config(dp);
+ return cdns_mhdp_event_config(&dp->mhdp);
}
static int cdn_dp_get_sink_capability(struct cdn_dp_device *dp)
@@ -374,28 +379,29 @@ static int cdn_dp_get_sink_capability(struct cdn_dp_device *dp)
if (!cdn_dp_check_sink_connection(dp))
return -ENODEV;
- ret = cdn_dp_dpcd_read(dp, DP_DPCD_REV, dp->dpcd,
- DP_RECEIVER_CAP_SIZE);
+ ret = cdns_mhdp_dpcd_read(&dp->mhdp, DP_DPCD_REV, dp->dpcd,
+ DP_RECEIVER_CAP_SIZE);
if (ret) {
- DRM_DEV_ERROR(dp->dev, "Failed to get caps %d\n", ret);
+ DRM_DEV_ERROR(dp->mhdp.dev, "Failed to get caps %d\n", ret);
return ret;
}
kfree(dp->edid);
- dp->edid = drm_do_get_edid(&dp->connector,
- cdn_dp_get_edid_block, dp);
+ dp->edid = drm_do_get_edid(&dp->mhdp.connector,
+ cdns_mhdp_get_edid_block, &dp->mhdp);
return 0;
}
static int cdn_dp_enable_phy(struct cdn_dp_device *dp, struct cdn_dp_port *port)
{
+ struct device *dev = dp->mhdp.dev;
union extcon_property_value property;
int ret;
if (!port->phy_enabled) {
ret = phy_power_on(port->phy);
if (ret) {
- DRM_DEV_ERROR(dp->dev, "phy power on failed: %d\n",
+ DRM_DEV_ERROR(dev, "phy power on failed: %d\n",
ret);
goto err_phy;
}
@@ -405,28 +411,28 @@ static int cdn_dp_enable_phy(struct cdn_dp_device *dp, struct cdn_dp_port *port)
ret = cdn_dp_grf_write(dp, GRF_SOC_CON26,
DPTX_HPD_SEL_MASK | DPTX_HPD_SEL);
if (ret) {
- DRM_DEV_ERROR(dp->dev, "Failed to write HPD_SEL %d\n", ret);
+ DRM_DEV_ERROR(dev, "Failed to write HPD_SEL %d\n", ret);
goto err_power_on;
}
- ret = cdn_dp_get_hpd_status(dp);
+ ret = cdns_mhdp_get_hpd_status(&dp->mhdp);
if (ret <= 0) {
if (!ret)
- DRM_DEV_ERROR(dp->dev, "hpd does not exist\n");
+ DRM_DEV_ERROR(dev, "hpd does not exist\n");
goto err_power_on;
}
ret = extcon_get_property(port->extcon, EXTCON_DISP_DP,
EXTCON_PROP_USB_TYPEC_POLARITY, &property);
if (ret) {
- DRM_DEV_ERROR(dp->dev, "get property failed\n");
+ DRM_DEV_ERROR(dev, "get property failed\n");
goto err_power_on;
}
port->lanes = cdn_dp_get_port_lanes(port);
- ret = cdn_dp_set_host_cap(dp, port->lanes, property.intval);
+ ret = cdns_mhdp_set_host_cap(&dp->mhdp, port->lanes, property.intval);
if (ret) {
- DRM_DEV_ERROR(dp->dev, "set host capabilities failed: %d\n",
+ DRM_DEV_ERROR(dev, "set host capabilities failed: %d\n",
ret);
goto err_power_on;
}
@@ -436,7 +442,7 @@ static int cdn_dp_enable_phy(struct cdn_dp_device *dp, struct cdn_dp_port *port)
err_power_on:
if (phy_power_off(port->phy))
- DRM_DEV_ERROR(dp->dev, "phy power off failed: %d", ret);
+ DRM_DEV_ERROR(dev, "phy power off failed: %d", ret);
else
port->phy_enabled = false;
@@ -454,7 +460,8 @@ static int cdn_dp_disable_phy(struct cdn_dp_device *dp,
if (port->phy_enabled) {
ret = phy_power_off(port->phy);
if (ret) {
- DRM_DEV_ERROR(dp->dev, "phy power off failed: %d", ret);
+ DRM_DEV_ERROR(dp->mhdp.dev,
+ "phy power off failed: %d", ret);
return ret;
}
}
@@ -478,16 +485,16 @@ static int cdn_dp_disable(struct cdn_dp_device *dp)
ret = cdn_dp_grf_write(dp, GRF_SOC_CON26,
DPTX_HPD_SEL_MASK | DPTX_HPD_DEL);
if (ret) {
- DRM_DEV_ERROR(dp->dev, "Failed to clear hpd sel %d\n",
+ DRM_DEV_ERROR(dp->mhdp.dev, "Failed to clear hpd sel %d\n",
ret);
return ret;
}
- cdn_dp_set_firmware_active(dp, false);
+ cdns_mhdp_set_firmware_active(&dp->mhdp, false);
cdn_dp_clk_disable(dp);
dp->active = false;
- dp->link.rate = 0;
- dp->link.num_lanes = 0;
+ dp->mhdp.link.rate = 0;
+ dp->mhdp.link.num_lanes = 0;
if (!dp->connected) {
kfree(dp->edid);
dp->edid = NULL;
@@ -500,11 +507,11 @@ static int cdn_dp_enable(struct cdn_dp_device *dp)
{
int ret, i, lanes;
struct cdn_dp_port *port;
+ struct device *dev = dp->mhdp.dev;
port = cdn_dp_connected_port(dp);
if (!port) {
- DRM_DEV_ERROR(dp->dev,
- "Can't enable without connection\n");
+ DRM_DEV_ERROR(dev, "Can't enable without connection\n");
return -ENODEV;
}
@@ -517,7 +524,7 @@ static int cdn_dp_enable(struct cdn_dp_device *dp)
ret = cdn_dp_firmware_init(dp);
if (ret) {
- DRM_DEV_ERROR(dp->dev, "firmware init failed: %d", ret);
+ DRM_DEV_ERROR(dp->mhdp.dev, "firmware init failed: %d", ret);
goto err_clk_disable;
}
@@ -551,8 +558,9 @@ static void cdn_dp_encoder_mode_set(struct drm_encoder *encoder,
struct drm_display_mode *adjusted)
{
struct cdn_dp_device *dp = encoder_to_dp(encoder);
- struct drm_display_info *display_info = &dp->connector.display_info;
- struct video_info *video = &dp->video_info;
+ struct drm_display_info *display_info =
+ &dp->mhdp.connector.display_info;
+ struct video_info *video = &dp->mhdp.video_info;
switch (display_info->bpc) {
case 10:
@@ -570,7 +578,7 @@ static void cdn_dp_encoder_mode_set(struct drm_encoder *encoder,
video->v_sync_polarity = !!(mode->flags & DRM_MODE_FLAG_NVSYNC);
video->h_sync_polarity = !!(mode->flags & DRM_MODE_FLAG_NHSYNC);
- memcpy(&dp->mode, adjusted, sizeof(*mode));
+ memcpy(&dp->mhdp.mode, adjusted, sizeof(*mode));
}
static bool cdn_dp_check_link_status(struct cdn_dp_device *dp)
@@ -579,11 +587,11 @@ static bool cdn_dp_check_link_status(struct cdn_dp_device *dp)
struct cdn_dp_port *port = cdn_dp_connected_port(dp);
u8 sink_lanes = drm_dp_max_lane_count(dp->dpcd);
- if (!port || !dp->link.rate || !dp->link.num_lanes)
+ if (!port || !dp->mhdp.link.rate || !dp->mhdp.link.num_lanes)
return false;
- if (cdn_dp_dpcd_read(dp, DP_LANE0_1_STATUS, link_status,
- DP_LINK_STATUS_SIZE)) {
+ if (cdns_mhdp_dpcd_read(&dp->mhdp, DP_LANE0_1_STATUS, link_status,
+ DP_LINK_STATUS_SIZE)) {
DRM_ERROR("Failed to get link status\n");
return false;
}
@@ -595,15 +603,16 @@ static bool cdn_dp_check_link_status(struct cdn_dp_device *dp)
static void cdn_dp_encoder_enable(struct drm_encoder *encoder)
{
struct cdn_dp_device *dp = encoder_to_dp(encoder);
+ struct device *dev = dp->mhdp.dev;
int ret, val;
- ret = drm_of_encoder_active_endpoint_id(dp->dev->of_node, encoder);
+ ret = drm_of_encoder_active_endpoint_id(dev->of_node, encoder);
if (ret < 0) {
- DRM_DEV_ERROR(dp->dev, "Could not get vop id, %d", ret);
+ DRM_DEV_ERROR(dev, "Could not get vop id, %d", ret);
return;
}
- DRM_DEV_DEBUG_KMS(dp->dev, "vop %s output to cdn-dp\n",
+ DRM_DEV_DEBUG_KMS(dev, "vop %s output to cdn-dp\n",
(ret) ? "LIT" : "BIG");
if (ret)
val = DP_SEL_VOP_LIT | (DP_SEL_VOP_LIT << 16);
@@ -618,33 +627,33 @@ static void cdn_dp_encoder_enable(struct drm_encoder *encoder)
ret = cdn_dp_enable(dp);
if (ret) {
- DRM_DEV_ERROR(dp->dev, "Failed to enable encoder %d\n",
+ DRM_DEV_ERROR(dev, "Failed to enable encoder %d\n",
ret);
goto out;
}
if (!cdn_dp_check_link_status(dp)) {
- ret = cdn_dp_train_link(dp);
+ ret = cdns_mhdp_train_link(&dp->mhdp);
if (ret) {
- DRM_DEV_ERROR(dp->dev, "Failed link train %d\n", ret);
+ DRM_DEV_ERROR(dev, "Failed link train %d\n", ret);
goto out;
}
}
- ret = cdn_dp_set_video_status(dp, CONTROL_VIDEO_IDLE);
+ ret = cdns_mhdp_set_video_status(&dp->mhdp, CONTROL_VIDEO_IDLE);
if (ret) {
- DRM_DEV_ERROR(dp->dev, "Failed to idle video %d\n", ret);
+ DRM_DEV_ERROR(dev, "Failed to idle video %d\n", ret);
goto out;
}
- ret = cdn_dp_config_video(dp);
+ ret = cdns_mhdp_config_video(&dp->mhdp);
if (ret) {
- DRM_DEV_ERROR(dp->dev, "Failed to config video %d\n", ret);
+ DRM_DEV_ERROR(dev, "Failed to config video %d\n", ret);
goto out;
}
- ret = cdn_dp_set_video_status(dp, CONTROL_VIDEO_VALID);
+ ret = cdns_mhdp_set_video_status(&dp->mhdp, CONTROL_VIDEO_VALID);
if (ret) {
- DRM_DEV_ERROR(dp->dev, "Failed to valid video %d\n", ret);
+ DRM_DEV_ERROR(dev, "Failed to valid video %d\n", ret);
goto out;
}
out:
@@ -660,7 +669,8 @@ static void cdn_dp_encoder_disable(struct drm_encoder *encoder)
if (dp->active) {
ret = cdn_dp_disable(dp);
if (ret) {
- DRM_DEV_ERROR(dp->dev, "Failed to disable encoder %d\n",
+ DRM_DEV_ERROR(dp->mhdp.dev,
+ "Failed to disable encoder %d\n",
ret);
}
}
@@ -704,7 +714,7 @@ static const struct drm_encoder_funcs cdn_dp_encoder_funcs = {
static int cdn_dp_parse_dt(struct cdn_dp_device *dp)
{
- struct device *dev = dp->dev;
+ struct device *dev = dp->mhdp.dev;
struct device_node *np = dev->of_node;
struct platform_device *pdev = to_platform_device(dev);
struct resource *res;
@@ -716,10 +726,10 @@ static int cdn_dp_parse_dt(struct cdn_dp_device *dp)
}
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
- dp->regs = devm_ioremap_resource(dev, res);
- if (IS_ERR(dp->regs)) {
+ dp->mhdp.regs = devm_ioremap_resource(dev, res);
+ if (IS_ERR(dp->mhdp.regs)) {
DRM_DEV_ERROR(dev, "ioremap reg failed\n");
- return PTR_ERR(dp->regs);
+ return PTR_ERR(dp->mhdp.regs);
}
dp->core_clk = devm_clk_get(dev, "core-clk");
@@ -734,10 +744,10 @@ static int cdn_dp_parse_dt(struct cdn_dp_device *dp)
return PTR_ERR(dp->pclk);
}
- dp->spdif_clk = devm_clk_get(dev, "spdif");
- if (IS_ERR(dp->spdif_clk)) {
+ dp->mhdp.spdif_clk = devm_clk_get(dev, "spdif");
+ if (IS_ERR(dp->mhdp.spdif_clk)) {
DRM_DEV_ERROR(dev, "cannot get spdif_clk\n");
- return PTR_ERR(dp->spdif_clk);
+ return PTR_ERR(dp->mhdp.spdif_clk);
}
dp->grf_clk = devm_clk_get(dev, "grf");
@@ -746,10 +756,10 @@ static int cdn_dp_parse_dt(struct cdn_dp_device *dp)
return PTR_ERR(dp->grf_clk);
}
- dp->spdif_rst = devm_reset_control_get(dev, "spdif");
- if (IS_ERR(dp->spdif_rst)) {
+ dp->mhdp.spdif_rst = devm_reset_control_get(dev, "spdif");
+ if (IS_ERR(dp->mhdp.spdif_rst)) {
DRM_DEV_ERROR(dev, "no spdif reset control found\n");
- return PTR_ERR(dp->spdif_rst);
+ return PTR_ERR(dp->mhdp.spdif_rst);
}
dp->dptx_rst = devm_reset_control_get(dev, "dptx");
@@ -804,7 +814,7 @@ static int cdn_dp_audio_hw_params(struct device *dev, void *data,
goto out;
}
- ret = cdn_dp_audio_config(dp, &audio);
+ ret = cdns_mhdp_audio_config(&dp->mhdp, &audio);
if (!ret)
dp->audio_info = audio;
@@ -822,7 +832,7 @@ static void cdn_dp_audio_shutdown(struct device *dev, void *data)
if (!dp->active)
goto out;
- ret = cdn_dp_audio_stop(dp, &dp->audio_info);
+ ret = cdns_mhdp_audio_stop(&dp->mhdp, &dp->audio_info);
if (!ret)
dp->audio_info.format = AFMT_UNUSED;
out:
@@ -841,7 +851,7 @@ static int cdn_dp_audio_digital_mute(struct device *dev, void *data,
goto out;
}
- ret = cdn_dp_audio_mute(dp, enable);
+ ret = cdns_mhdp_audio_mute(&dp->mhdp, enable);
out:
mutex_unlock(&dp->lock);
@@ -853,7 +863,8 @@ static int cdn_dp_audio_get_eld(struct device *dev, void *data,
{
struct cdn_dp_device *dp = dev_get_drvdata(dev);
- memcpy(buf, dp->connector.eld, min(sizeof(dp->connector.eld), len));
+ memcpy(buf, dp->mhdp.connector.eld,
+ min(sizeof(dp->mhdp.connector.eld), len));
return 0;
}
@@ -887,6 +898,7 @@ static int cdn_dp_request_firmware(struct cdn_dp_device *dp)
int ret;
unsigned long timeout = jiffies + msecs_to_jiffies(CDN_FW_TIMEOUT_MS);
unsigned long sleep = 1000;
+ struct device *dev = dp->mhdp.dev;
WARN_ON(!mutex_is_locked(&dp->lock));
@@ -897,13 +909,13 @@ static int cdn_dp_request_firmware(struct cdn_dp_device *dp)
mutex_unlock(&dp->lock);
while (time_before(jiffies, timeout)) {
- ret = request_firmware(&dp->fw, CDN_DP_FIRMWARE, dp->dev);
+ ret = request_firmware(&dp->fw, CDN_DP_FIRMWARE, dev);
if (ret == -ENOENT) {
msleep(sleep);
sleep *= 2;
continue;
} else if (ret) {
- DRM_DEV_ERROR(dp->dev,
+ DRM_DEV_ERROR(dev,
"failed to request firmware: %d\n", ret);
goto out;
}
@@ -913,7 +925,7 @@ static int cdn_dp_request_firmware(struct cdn_dp_device *dp)
goto out;
}
- DRM_DEV_ERROR(dp->dev, "Timed out trying to load firmware\n");
+ DRM_DEV_ERROR(dev, "Timed out trying to load firmware\n");
ret = -ETIMEDOUT;
out:
mutex_lock(&dp->lock);
@@ -924,8 +936,9 @@ static void cdn_dp_pd_event_work(struct work_struct *work)
{
struct cdn_dp_device *dp = container_of(work, struct cdn_dp_device,
event_work);
- struct drm_connector *connector = &dp->connector;
+ struct drm_connector *connector = &dp->mhdp.connector;
enum drm_connector_status old_status;
+ struct device *dev = dp->mhdp.dev;
int ret;
@@ -942,44 +955,45 @@ static void cdn_dp_pd_event_work(struct work_struct *work)
/* Not connected, notify userspace to disable the block */
if (!cdn_dp_connected_port(dp)) {
- DRM_DEV_INFO(dp->dev, "Not connected. Disabling cdn\n");
+ DRM_DEV_INFO(dev, "Not connected. Disabling cdn\n");
dp->connected = false;
/* Connected but not enabled, enable the block */
} else if (!dp->active) {
- DRM_DEV_INFO(dp->dev, "Connected, not enabled. Enabling cdn\n");
+ DRM_DEV_INFO(dev, "Connected, not enabled. Enabling cdn\n");
ret = cdn_dp_enable(dp);
if (ret) {
- DRM_DEV_ERROR(dp->dev, "Enable dp failed %d\n", ret);
+ DRM_DEV_ERROR(dev, "Enable dp failed %d\n", ret);
dp->connected = false;
}
/* Enabled and connected to a dongle without a sink, notify userspace */
} else if (!cdn_dp_check_sink_connection(dp)) {
- DRM_DEV_INFO(dp->dev, "Connected without sink. Assert hpd\n");
+ DRM_DEV_INFO(dev, "Connected without sink. Assert hpd\n");
dp->connected = false;
/* Enabled and connected with a sink, re-train if requested */
} else if (!cdn_dp_check_link_status(dp)) {
- unsigned int rate = dp->link.rate;
- unsigned int lanes = dp->link.num_lanes;
- struct drm_display_mode *mode = &dp->mode;
+ unsigned int rate = dp->mhdp.link.rate;
+ unsigned int lanes = dp->mhdp.link.num_lanes;
+ struct drm_display_mode *mode = &dp->mhdp.mode;
- DRM_DEV_INFO(dp->dev, "Connected with sink. Re-train link\n");
- ret = cdn_dp_train_link(dp);
+ DRM_DEV_INFO(dev, "Connected with sink. Re-train link\n");
+ ret = cdns_mhdp_train_link(&dp->mhdp);
if (ret) {
dp->connected = false;
- DRM_DEV_ERROR(dp->dev, "Train link failed %d\n", ret);
+ DRM_DEV_ERROR(dev, "Train link failed %d\n", ret);
goto out;
}
/* If training result is changed, update the video config */
if (mode->clock &&
- (rate != dp->link.rate || lanes != dp->link.num_lanes)) {
- ret = cdn_dp_config_video(dp);
+ (rate != dp->mhdp.link.rate ||
+ lanes != dp->mhdp.link.num_lanes)) {
+ ret = cdns_mhdp_config_video(&dp->mhdp);
if (ret) {
dp->connected = false;
- DRM_DEV_ERROR(dp->dev,
+ DRM_DEV_ERROR(dev,
"Failed to config video %d\n",
ret);
}
@@ -1048,7 +1062,7 @@ static int cdn_dp_bind(struct device *dev, struct device *master, void *data)
drm_encoder_helper_add(encoder, &cdn_dp_encoder_helper_funcs);
- connector = &dp->connector;
+ connector = &dp->mhdp.connector;
connector->polled = DRM_CONNECTOR_POLL_HPD;
connector->dpms = DRM_MODE_DPMS_OFF;
@@ -1072,7 +1086,7 @@ static int cdn_dp_bind(struct device *dev, struct device *master, void *data)
port = dp->port[i];
port->event_nb.notifier_call = cdn_dp_pd_event;
- ret = devm_extcon_register_notifier(dp->dev, port->extcon,
+ ret = devm_extcon_register_notifier(dp->mhdp.dev, port->extcon,
EXTCON_DISP_DP,
&port->event_nb);
if (ret) {
@@ -1099,7 +1113,7 @@ 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;
- struct drm_connector *connector = &dp->connector;
+ struct drm_connector *connector = &dp->mhdp.connector;
cancel_work_sync(&dp->event_work);
cdn_dp_encoder_disable(encoder);
@@ -1159,7 +1173,7 @@ static int cdn_dp_probe(struct platform_device *pdev)
dp = devm_kzalloc(dev, sizeof(*dp), GFP_KERNEL);
if (!dp)
return -ENOMEM;
- dp->dev = dev;
+ dp->mhdp.dev = dev;
match = of_match_node(cdn_dp_dt_ids, pdev->dev.of_node);
dp_data = (struct cdn_dp_data *)match->data;
@@ -1204,7 +1218,7 @@ static int cdn_dp_remove(struct platform_device *pdev)
struct cdn_dp_device *dp = platform_get_drvdata(pdev);
platform_device_unregister(dp->audio_pdev);
- cdn_dp_suspend(dp->dev);
+ cdn_dp_suspend(dp->mhdp.dev);
component_del(&pdev->dev, &cdn_dp_component_ops);
return 0;
@@ -1214,7 +1228,7 @@ static void cdn_dp_shutdown(struct platform_device *pdev)
{
struct cdn_dp_device *dp = platform_get_drvdata(pdev);
- cdn_dp_suspend(dp->dev);
+ cdn_dp_suspend(dp->mhdp.dev);
}
static const struct dev_pm_ops cdn_dp_pm_ops = {
diff --git a/drivers/gpu/drm/rockchip/cdn-dp-core.h b/drivers/gpu/drm/rockchip/cdn-dp-core.h
index f57e296401b8..bad65c2fe610 100644
--- a/drivers/gpu/drm/rockchip/cdn-dp-core.h
+++ b/drivers/gpu/drm/rockchip/cdn-dp-core.h
@@ -20,38 +20,10 @@
#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
-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;
-};
-
-enum vic_pxl_encoding_format {
- PXL_RGB = 0x1,
- YCBCR_4_4_4 = 0x2,
- YCBCR_4_2_2 = 0x4,
- YCBCR_4_2_0 = 0x8,
- Y_ONLY = 0x10,
-};
-
-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 */
@@ -70,11 +42,9 @@ struct cdn_dp_port {
};
struct cdn_dp_device {
- struct device *dev;
+ struct cdns_mhdp_device mhdp;
struct drm_device *drm_dev;
- struct drm_connector connector;
struct drm_encoder encoder;
- struct drm_display_mode mode;
struct platform_device *audio_pdev;
struct work_struct event_work;
struct edid *edid;
@@ -85,22 +55,16 @@ struct cdn_dp_device {
bool suspended;
const struct firmware *fw; /* cdn dp firmware */
- unsigned int fw_version; /* cdn fw version */
bool fw_loaded;
- void __iomem *regs;
struct regmap *grf;
struct clk *core_clk;
struct clk *pclk;
- struct clk *spdif_clk;
struct clk *grf_clk;
- struct reset_control *spdif_rst;
struct reset_control *dptx_rst;
struct reset_control *apb_rst;
struct reset_control *core_rst;
struct audio_info audio_info;
- struct video_info video_info;
- struct drm_dp_link link;
struct cdn_dp_port *port[MAX_PHY];
u8 ports;
u8 lanes;
diff --git a/drivers/gpu/drm/rockchip/cdn-dp-reg.c b/drivers/gpu/drm/rockchip/cdn-dp-reg.c
index 3105965fc260..c1a76e6fff88 100644
--- a/drivers/gpu/drm/rockchip/cdn-dp-reg.c
+++ b/drivers/gpu/drm/rockchip/cdn-dp-reg.c
@@ -22,19 +22,19 @@
#include "cdn-dp-core.h"
#include "cdn-dp-reg.h"
-#define CDN_DP_SPDIF_CLK 200000000
+#define CDNS_DP_SPDIF_CLK 200000000
#define FW_ALIVE_TIMEOUT_US 1000000
#define MAILBOX_RETRY_US 1000
#define MAILBOX_TIMEOUT_US 5000000
#define LINK_TRAINING_RETRY_MS 20
#define LINK_TRAINING_TIMEOUT_MS 500
-void cdn_dp_set_fw_clk(struct cdn_dp_device *dp, unsigned long clk)
+void cdns_mhdp_set_fw_clk(struct cdns_mhdp_device *mhdp, unsigned long clk)
{
- writel(clk / 1000000, dp->regs + SW_CLK_H);
+ writel(clk / 1000000, mhdp->regs + SW_CLK_H);
}
-void cdn_dp_clock_reset(struct cdn_dp_device *dp)
+void cdns_mhdp_clock_reset(struct cdns_mhdp_device *mhdp)
{
u32 val;
@@ -50,16 +50,16 @@ void cdn_dp_clock_reset(struct cdn_dp_device *dp)
DPTX_SYS_CLK_EN |
CFG_DPTX_VIF_CLK_RSTN_EN |
CFG_DPTX_VIF_CLK_EN;
- writel(val, dp->regs + SOURCE_DPTX_CAR);
+ writel(val, mhdp->regs + SOURCE_DPTX_CAR);
val = SOURCE_PHY_RSTN_EN | SOURCE_PHY_CLK_EN;
- writel(val, dp->regs + SOURCE_PHY_CAR);
+ writel(val, mhdp->regs + SOURCE_PHY_CAR);
val = SOURCE_PKT_SYS_RSTN_EN |
SOURCE_PKT_SYS_CLK_EN |
SOURCE_PKT_DATA_RSTN_EN |
SOURCE_PKT_DATA_CLK_EN;
- writel(val, dp->regs + SOURCE_PKT_CAR);
+ writel(val, mhdp->regs + SOURCE_PKT_CAR);
val = SPDIF_CDR_CLK_RSTN_EN |
SPDIF_CDR_CLK_EN |
@@ -67,53 +67,53 @@ void cdn_dp_clock_reset(struct cdn_dp_device *dp)
SOURCE_AIF_SYS_CLK_EN |
SOURCE_AIF_CLK_RSTN_EN |
SOURCE_AIF_CLK_EN;
- writel(val, dp->regs + SOURCE_AIF_CAR);
+ writel(val, mhdp->regs + SOURCE_AIF_CAR);
val = SOURCE_CIPHER_SYSTEM_CLK_RSTN_EN |
SOURCE_CIPHER_SYS_CLK_EN |
SOURCE_CIPHER_CHAR_CLK_RSTN_EN |
SOURCE_CIPHER_CHAR_CLK_EN;
- writel(val, dp->regs + SOURCE_CIPHER_CAR);
+ writel(val, mhdp->regs + SOURCE_CIPHER_CAR);
val = SOURCE_CRYPTO_SYS_CLK_RSTN_EN |
SOURCE_CRYPTO_SYS_CLK_EN;
- writel(val, dp->regs + SOURCE_CRYPTO_CAR);
+ writel(val, mhdp->regs + SOURCE_CRYPTO_CAR);
/* enable Mailbox and PIF interrupt */
- writel(0, dp->regs + APB_INT_MASK);
+ writel(0, mhdp->regs + APB_INT_MASK);
}
-static int cdn_dp_mailbox_read(struct cdn_dp_device *dp)
+static int cdns_mhdp_mailbox_read(struct cdns_mhdp_device *mhdp)
{
int val, ret;
- ret = readx_poll_timeout(readl, dp->regs + MAILBOX_EMPTY_ADDR,
+ ret = readx_poll_timeout(readl, mhdp->regs + MAILBOX_EMPTY_ADDR,
val, !val, MAILBOX_RETRY_US,
MAILBOX_TIMEOUT_US);
if (ret < 0)
return ret;
- return readl(dp->regs + MAILBOX0_RD_DATA) & 0xff;
+ return readl(mhdp->regs + MAILBOX0_RD_DATA) & 0xff;
}
-static int cdp_dp_mailbox_write(struct cdn_dp_device *dp, u8 val)
+static int cdp_dp_mailbox_write(struct cdns_mhdp_device *mhdp, u8 val)
{
int ret, full;
- ret = readx_poll_timeout(readl, dp->regs + MAILBOX_FULL_ADDR,
+ ret = readx_poll_timeout(readl, mhdp->regs + MAILBOX_FULL_ADDR,
full, !full, MAILBOX_RETRY_US,
MAILBOX_TIMEOUT_US);
if (ret < 0)
return ret;
- writel(val, dp->regs + MAILBOX0_WR_DATA);
+ writel(val, mhdp->regs + MAILBOX0_WR_DATA);
return 0;
}
-static int cdn_dp_mailbox_validate_receive(struct cdn_dp_device *dp,
- u8 module_id, u8 opcode,
- u8 req_size)
+static int cdns_mhdp_mailbox_validate_receive(struct cdns_mhdp_device *mhdp,
+ u8 module_id, u8 opcode,
+ u8 req_size)
{
u32 mbox_size, i;
u8 header[4];
@@ -121,7 +121,7 @@ static int cdn_dp_mailbox_validate_receive(struct cdn_dp_device *dp,
/* read the header of the message */
for (i = 0; i < 4; i++) {
- ret = cdn_dp_mailbox_read(dp);
+ ret = cdns_mhdp_mailbox_read(mhdp);
if (ret < 0)
return ret;
@@ -137,7 +137,7 @@ static int cdn_dp_mailbox_validate_receive(struct cdn_dp_device *dp,
* clear the mailbox by reading its contents.
*/
for (i = 0; i < mbox_size; i++)
- if (cdn_dp_mailbox_read(dp) < 0)
+ if (cdns_mhdp_mailbox_read(mhdp) < 0)
break;
return -EINVAL;
@@ -146,14 +146,14 @@ static int cdn_dp_mailbox_validate_receive(struct cdn_dp_device *dp,
return 0;
}
-static int cdn_dp_mailbox_read_receive(struct cdn_dp_device *dp,
- u8 *buff, u8 buff_size)
+static int cdns_mhdp_mailbox_read_receive(struct cdns_mhdp_device *mhdp,
+ u8 *buff, u8 buff_size)
{
u32 i;
int ret;
for (i = 0; i < buff_size; i++) {
- ret = cdn_dp_mailbox_read(dp);
+ ret = cdns_mhdp_mailbox_read(mhdp);
if (ret < 0)
return ret;
@@ -163,8 +163,8 @@ static int cdn_dp_mailbox_read_receive(struct cdn_dp_device *dp,
return 0;
}
-static int cdn_dp_mailbox_send(struct cdn_dp_device *dp, u8 module_id,
- u8 opcode, u16 size, u8 *message)
+static int cdns_mhdp_mailbox_send(struct cdns_mhdp_device *mhdp, u8 module_id,
+ u8 opcode, u16 size, u8 *message)
{
u8 header[4];
int ret, i;
@@ -175,13 +175,13 @@ static int cdn_dp_mailbox_send(struct cdn_dp_device *dp, u8 module_id,
header[3] = size & 0xff;
for (i = 0; i < 4; i++) {
- ret = cdp_dp_mailbox_write(dp, header[i]);
+ ret = cdp_dp_mailbox_write(mhdp, header[i]);
if (ret)
return ret;
}
for (i = 0; i < size; i++) {
- ret = cdp_dp_mailbox_write(dp, message[i]);
+ ret = cdp_dp_mailbox_write(mhdp, message[i]);
if (ret)
return ret;
}
@@ -189,7 +189,7 @@ static int cdn_dp_mailbox_send(struct cdn_dp_device *dp, u8 module_id,
return 0;
}
-static int cdn_dp_reg_write(struct cdn_dp_device *dp, u16 addr, u32 val)
+static int cdns_mhdp_reg_write(struct cdns_mhdp_device *mhdp, u16 addr, u32 val)
{
u8 msg[6];
@@ -199,12 +199,12 @@ static int cdn_dp_reg_write(struct cdn_dp_device *dp, u16 addr, u32 val)
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,
- sizeof(msg), msg);
+ return cdns_mhdp_mailbox_send(mhdp, MB_MODULE_ID_DP_TX,
+ DPTX_WRITE_REGISTER, sizeof(msg), msg);
}
-static int cdn_dp_reg_write_bit(struct cdn_dp_device *dp, u16 addr,
- u8 start_bit, u8 bits_no, u32 val)
+static int cdns_mhdp_reg_write_bit(struct cdns_mhdp_device *mhdp, u16 addr,
+ u8 start_bit, u8 bits_no, u32 val)
{
u8 field[8];
@@ -217,11 +217,12 @@ static int cdn_dp_reg_write_bit(struct cdn_dp_device *dp, u16 addr,
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);
+ return cdns_mhdp_mailbox_send(mhdp, MB_MODULE_ID_DP_TX,
+ DPTX_WRITE_FIELD, sizeof(field), field);
}
-int cdn_dp_dpcd_read(struct cdn_dp_device *dp, u32 addr, u8 *data, u16 len)
+int cdns_mhdp_dpcd_read(struct cdns_mhdp_device *mhdp,
+ u32 addr, u8 *data, u16 len)
{
u8 msg[5], reg[5];
int ret;
@@ -231,28 +232,28 @@ int cdn_dp_dpcd_read(struct cdn_dp_device *dp, u32 addr, u8 *data, u16 len)
msg[2] = (addr >> 16) & 0xff;
msg[3] = (addr >> 8) & 0xff;
msg[4] = addr & 0xff;
- ret = cdn_dp_mailbox_send(dp, MB_MODULE_ID_DP_TX, DPTX_READ_DPCD,
- sizeof(msg), msg);
+ ret = cdns_mhdp_mailbox_send(mhdp, MB_MODULE_ID_DP_TX,
+ DPTX_READ_DPCD, sizeof(msg), msg);
if (ret)
goto err_dpcd_read;
- ret = cdn_dp_mailbox_validate_receive(dp, MB_MODULE_ID_DP_TX,
- DPTX_READ_DPCD,
- sizeof(reg) + len);
+ ret = cdns_mhdp_mailbox_validate_receive(mhdp, MB_MODULE_ID_DP_TX,
+ DPTX_READ_DPCD,
+ sizeof(reg) + len);
if (ret)
goto err_dpcd_read;
- ret = cdn_dp_mailbox_read_receive(dp, reg, sizeof(reg));
+ ret = cdns_mhdp_mailbox_read_receive(mhdp, reg, sizeof(reg));
if (ret)
goto err_dpcd_read;
- ret = cdn_dp_mailbox_read_receive(dp, data, len);
+ ret = cdns_mhdp_mailbox_read_receive(mhdp, data, len);
err_dpcd_read:
return ret;
}
-int cdn_dp_dpcd_write(struct cdn_dp_device *dp, u32 addr, u8 value)
+int cdns_mhdp_dpcd_write(struct cdns_mhdp_device *mhdp, u32 addr, u8 value)
{
u8 msg[6], reg[5];
int ret;
@@ -263,17 +264,17 @@ int cdn_dp_dpcd_write(struct cdn_dp_device *dp, u32 addr, u8 value)
msg[3] = (addr >> 8) & 0xff;
msg[4] = addr & 0xff;
msg[5] = value;
- ret = cdn_dp_mailbox_send(dp, MB_MODULE_ID_DP_TX, DPTX_WRITE_DPCD,
- sizeof(msg), msg);
+ ret = cdns_mhdp_mailbox_send(mhdp, MB_MODULE_ID_DP_TX,
+ DPTX_WRITE_DPCD, sizeof(msg), msg);
if (ret)
goto err_dpcd_write;
- ret = cdn_dp_mailbox_validate_receive(dp, MB_MODULE_ID_DP_TX,
- DPTX_WRITE_DPCD, sizeof(reg));
+ ret = cdns_mhdp_mailbox_validate_receive(mhdp, MB_MODULE_ID_DP_TX,
+ DPTX_WRITE_DPCD, sizeof(reg));
if (ret)
goto err_dpcd_write;
- ret = cdn_dp_mailbox_read_receive(dp, reg, sizeof(reg));
+ ret = cdns_mhdp_mailbox_read_receive(mhdp, reg, sizeof(reg));
if (ret)
goto err_dpcd_write;
@@ -282,53 +283,53 @@ int cdn_dp_dpcd_write(struct cdn_dp_device *dp, u32 addr, u8 value)
err_dpcd_write:
if (ret)
- DRM_DEV_ERROR(dp->dev, "dpcd write failed: %d\n", ret);
+ DRM_DEV_ERROR(mhdp->dev, "dpcd write failed: %d\n", ret);
return ret;
}
-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 cdns_mhdp_load_firmware(struct cdns_mhdp_device *mhdp, const u32 *i_mem,
+ u32 i_size, const u32 *d_mem, u32 d_size)
{
u32 reg;
int i, ret;
/* reset ucpu before load firmware*/
writel(APB_IRAM_PATH | APB_DRAM_PATH | APB_XT_RESET,
- dp->regs + APB_CTRL);
+ mhdp->regs + APB_CTRL);
for (i = 0; i < i_size; i += 4)
- writel(*i_mem++, dp->regs + ADDR_IMEM + i);
+ writel(*i_mem++, mhdp->regs + ADDR_IMEM + i);
for (i = 0; i < d_size; i += 4)
- writel(*d_mem++, dp->regs + ADDR_DMEM + i);
+ writel(*d_mem++, mhdp->regs + ADDR_DMEM + i);
/* un-reset ucpu */
- writel(0, dp->regs + APB_CTRL);
+ writel(0, mhdp->regs + APB_CTRL);
/* check the keep alive register to make sure fw working */
- ret = readx_poll_timeout(readl, dp->regs + KEEP_ALIVE,
+ ret = readx_poll_timeout(readl, mhdp->regs + KEEP_ALIVE,
reg, reg, 2000, FW_ALIVE_TIMEOUT_US);
if (ret < 0) {
- DRM_DEV_ERROR(dp->dev, "failed to loaded the FW reg = %x\n",
+ DRM_DEV_ERROR(mhdp->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;
+ reg = readl(mhdp->regs + VER_L) & 0xff;
+ mhdp->fw_version = reg;
+ reg = readl(mhdp->regs + VER_H) & 0xff;
+ mhdp->fw_version |= reg << 8;
+ reg = readl(mhdp->regs + VER_LIB_L_ADDR) & 0xff;
+ mhdp->fw_version |= reg << 16;
+ reg = readl(mhdp->regs + VER_LIB_H_ADDR) & 0xff;
+ mhdp->fw_version |= reg << 24;
- DRM_DEV_DEBUG(dp->dev, "firmware version: %x\n", dp->fw_version);
+ DRM_DEV_DEBUG(mhdp->dev, "firmware version: %x\n", mhdp->fw_version);
return 0;
}
-int cdn_dp_set_firmware_active(struct cdn_dp_device *dp, bool enable)
+int cdns_mhdp_set_firmware_active(struct cdns_mhdp_device *mhdp, bool enable)
{
u8 msg[5];
int ret, i;
@@ -340,14 +341,14 @@ int cdn_dp_set_firmware_active(struct cdn_dp_device *dp, bool enable)
msg[4] = enable ? FW_ACTIVE : FW_STANDBY;
for (i = 0; i < sizeof(msg); i++) {
- ret = cdp_dp_mailbox_write(dp, msg[i]);
+ ret = cdp_dp_mailbox_write(mhdp, msg[i]);
if (ret)
goto err_set_firmware_active;
}
/* read the firmware state */
for (i = 0; i < sizeof(msg); i++) {
- ret = cdn_dp_mailbox_read(dp);
+ ret = cdns_mhdp_mailbox_read(mhdp);
if (ret < 0)
goto err_set_firmware_active;
@@ -358,16 +359,16 @@ int cdn_dp_set_firmware_active(struct cdn_dp_device *dp, bool enable)
err_set_firmware_active:
if (ret < 0)
- DRM_DEV_ERROR(dp->dev, "set firmware active failed\n");
+ DRM_DEV_ERROR(mhdp->dev, "set firmware active failed\n");
return ret;
}
-int cdn_dp_set_host_cap(struct cdn_dp_device *dp, u8 lanes, bool flip)
+int cdns_mhdp_set_host_cap(struct cdns_mhdp_device *mhdp, u8 lanes, bool flip)
{
u8 msg[8];
int ret;
- msg[0] = CDN_DP_MAX_LINK_RATE;
+ msg[0] = CDNS_DP_MAX_LINK_RATE;
msg[1] = lanes | SCRAMBLER_EN;
msg[2] = VOLTAGE_LEVEL_2;
msg[3] = PRE_EMPHASIS_LEVEL_3;
@@ -376,22 +377,22 @@ int cdn_dp_set_host_cap(struct cdn_dp_device *dp, u8 lanes, bool flip)
msg[6] = flip ? LANE_MAPPING_FLIPPED : LANE_MAPPING_NORMAL;
msg[7] = ENHANCED;
- ret = cdn_dp_mailbox_send(dp, MB_MODULE_ID_DP_TX,
- DPTX_SET_HOST_CAPABILITIES,
- sizeof(msg), msg);
+ ret = cdns_mhdp_mailbox_send(mhdp, MB_MODULE_ID_DP_TX,
+ DPTX_SET_HOST_CAPABILITIES,
+ sizeof(msg), msg);
if (ret)
goto err_set_host_cap;
- ret = cdn_dp_reg_write(dp, DP_AUX_SWAP_INVERSION_CONTROL,
- AUX_HOST_INVERT);
+ ret = cdns_mhdp_reg_write(mhdp, DP_AUX_SWAP_INVERSION_CONTROL,
+ AUX_HOST_INVERT);
err_set_host_cap:
if (ret)
- DRM_DEV_ERROR(dp->dev, "set host cap failed: %d\n", ret);
+ DRM_DEV_ERROR(mhdp->dev, "set host cap failed: %d\n", ret);
return ret;
}
-int cdn_dp_event_config(struct cdn_dp_device *dp)
+int cdns_mhdp_event_config(struct cdns_mhdp_device *mhdp)
{
u8 msg[5];
int ret;
@@ -400,49 +401,50 @@ int cdn_dp_event_config(struct cdn_dp_device *dp)
msg[0] = DPTX_EVENT_ENABLE_HPD | DPTX_EVENT_ENABLE_TRAINING;
- ret = cdn_dp_mailbox_send(dp, MB_MODULE_ID_DP_TX, DPTX_ENABLE_EVENT,
- sizeof(msg), msg);
+ ret = cdns_mhdp_mailbox_send(mhdp, MB_MODULE_ID_DP_TX,
+ DPTX_ENABLE_EVENT, sizeof(msg), msg);
if (ret)
- DRM_DEV_ERROR(dp->dev, "set event config failed: %d\n", ret);
+ DRM_DEV_ERROR(mhdp->dev, "set event config failed: %d\n", ret);
return ret;
}
-u32 cdn_dp_get_event(struct cdn_dp_device *dp)
+u32 cdns_mhdp_get_event(struct cdns_mhdp_device *mhdp)
{
- return readl(dp->regs + SW_EVENTS0);
+ return readl(mhdp->regs + SW_EVENTS0);
}
-int cdn_dp_get_hpd_status(struct cdn_dp_device *dp)
+int cdns_mhdp_get_hpd_status(struct cdns_mhdp_device *mhdp)
{
u8 status;
int ret;
- ret = cdn_dp_mailbox_send(dp, MB_MODULE_ID_DP_TX, DPTX_HPD_STATE,
- 0, NULL);
+ ret = cdns_mhdp_mailbox_send(mhdp, MB_MODULE_ID_DP_TX,
+ DPTX_HPD_STATE, 0, NULL);
if (ret)
goto err_get_hpd;
- ret = cdn_dp_mailbox_validate_receive(dp, MB_MODULE_ID_DP_TX,
- DPTX_HPD_STATE, sizeof(status));
+ ret = cdns_mhdp_mailbox_validate_receive(mhdp, MB_MODULE_ID_DP_TX,
+ DPTX_HPD_STATE,
+ sizeof(status));
if (ret)
goto err_get_hpd;
- ret = cdn_dp_mailbox_read_receive(dp, &status, sizeof(status));
+ ret = cdns_mhdp_mailbox_read_receive(mhdp, &status, sizeof(status));
if (ret)
goto err_get_hpd;
return status;
err_get_hpd:
- DRM_DEV_ERROR(dp->dev, "get hpd status failed: %d\n", ret);
+ DRM_DEV_ERROR(mhdp->dev, "get hpd status failed: %d\n", ret);
return ret;
}
-int cdn_dp_get_edid_block(void *data, u8 *edid,
+int cdns_mhdp_get_edid_block(void *data, u8 *edid,
unsigned int block, size_t length)
{
- struct cdn_dp_device *dp = data;
+ struct cdns_mhdp_device *mhdp = data;
u8 msg[2], reg[2], i;
int ret;
@@ -450,22 +452,23 @@ int cdn_dp_get_edid_block(void *data, u8 *edid,
msg[0] = block / 2;
msg[1] = block % 2;
- ret = cdn_dp_mailbox_send(dp, MB_MODULE_ID_DP_TX, DPTX_GET_EDID,
- sizeof(msg), msg);
+ ret = cdns_mhdp_mailbox_send(mhdp, MB_MODULE_ID_DP_TX,
+ DPTX_GET_EDID, sizeof(msg), msg);
if (ret)
continue;
- ret = cdn_dp_mailbox_validate_receive(dp, MB_MODULE_ID_DP_TX,
- DPTX_GET_EDID,
- sizeof(reg) + length);
+ ret = cdns_mhdp_mailbox_validate_receive(mhdp,
+ MB_MODULE_ID_DP_TX,
+ DPTX_GET_EDID,
+ sizeof(reg) + length);
if (ret)
continue;
- ret = cdn_dp_mailbox_read_receive(dp, reg, sizeof(reg));
+ ret = cdns_mhdp_mailbox_read_receive(mhdp, reg, sizeof(reg));
if (ret)
continue;
- ret = cdn_dp_mailbox_read_receive(dp, edid, length);
+ ret = cdns_mhdp_mailbox_read_receive(mhdp, edid, length);
if (ret)
continue;
@@ -474,13 +477,13 @@ int cdn_dp_get_edid_block(void *data, u8 *edid,
}
if (ret)
- DRM_DEV_ERROR(dp->dev, "get block[%d] edid failed: %d\n", block,
- ret);
+ DRM_DEV_ERROR(mhdp->dev, "get block[%d] edid failed: %d\n",
+ block, ret);
return ret;
}
-static int cdn_dp_training_start(struct cdn_dp_device *dp)
+static int cdns_mhdp_training_start(struct cdns_mhdp_device *mhdp)
{
unsigned long timeout;
u8 msg, event[2];
@@ -489,26 +492,28 @@ static int cdn_dp_training_start(struct cdn_dp_device *dp)
msg = LINK_TRAINING_RUN;
/* start training */
- ret = cdn_dp_mailbox_send(dp, MB_MODULE_ID_DP_TX, DPTX_TRAINING_CONTROL,
- sizeof(msg), &msg);
+ ret = cdns_mhdp_mailbox_send(mhdp, MB_MODULE_ID_DP_TX,
+ DPTX_TRAINING_CONTROL, sizeof(msg), &msg);
if (ret)
goto err_training_start;
timeout = jiffies + msecs_to_jiffies(LINK_TRAINING_TIMEOUT_MS);
while (time_before(jiffies, timeout)) {
msleep(LINK_TRAINING_RETRY_MS);
- ret = cdn_dp_mailbox_send(dp, MB_MODULE_ID_DP_TX,
- DPTX_READ_EVENT, 0, NULL);
+ ret = cdns_mhdp_mailbox_send(mhdp, MB_MODULE_ID_DP_TX,
+ DPTX_READ_EVENT, 0, NULL);
if (ret)
goto err_training_start;
- ret = cdn_dp_mailbox_validate_receive(dp, MB_MODULE_ID_DP_TX,
- DPTX_READ_EVENT,
- sizeof(event));
+ ret = cdns_mhdp_mailbox_validate_receive(mhdp,
+ MB_MODULE_ID_DP_TX,
+ DPTX_READ_EVENT,
+ sizeof(event));
if (ret)
goto err_training_start;
- ret = cdn_dp_mailbox_read_receive(dp, event, sizeof(event));
+ ret = cdns_mhdp_mailbox_read_receive(mhdp, event,
+ sizeof(event));
if (ret)
goto err_training_start;
@@ -519,77 +524,80 @@ static int cdn_dp_training_start(struct cdn_dp_device *dp)
ret = -ETIMEDOUT;
err_training_start:
- DRM_DEV_ERROR(dp->dev, "training failed: %d\n", ret);
+ DRM_DEV_ERROR(mhdp->dev, "training failed: %d\n", ret);
return ret;
}
-static int cdn_dp_get_training_status(struct cdn_dp_device *dp)
+static int cdns_mhdp_get_training_status(struct cdns_mhdp_device *mhdp)
{
u8 status[10];
int ret;
- ret = cdn_dp_mailbox_send(dp, MB_MODULE_ID_DP_TX, DPTX_READ_LINK_STAT,
- 0, NULL);
+ ret = cdns_mhdp_mailbox_send(mhdp, MB_MODULE_ID_DP_TX,
+ DPTX_READ_LINK_STAT, 0, NULL);
if (ret)
goto err_get_training_status;
- ret = cdn_dp_mailbox_validate_receive(dp, MB_MODULE_ID_DP_TX,
- DPTX_READ_LINK_STAT,
- sizeof(status));
+ ret = cdns_mhdp_mailbox_validate_receive(mhdp, MB_MODULE_ID_DP_TX,
+ DPTX_READ_LINK_STAT,
+ sizeof(status));
if (ret)
goto err_get_training_status;
- ret = cdn_dp_mailbox_read_receive(dp, status, sizeof(status));
+ ret = cdns_mhdp_mailbox_read_receive(mhdp, status, sizeof(status));
if (ret)
goto err_get_training_status;
- dp->link.rate = status[0];
- dp->link.num_lanes = status[1];
+ mhdp->link.rate = status[0];
+ mhdp->link.num_lanes = status[1];
err_get_training_status:
if (ret)
- DRM_DEV_ERROR(dp->dev, "get training status failed: %d\n", ret);
+ DRM_DEV_ERROR(mhdp->dev, "get training status failed: %d\n",
+ ret);
return ret;
}
-int cdn_dp_train_link(struct cdn_dp_device *dp)
+int cdns_mhdp_train_link(struct cdns_mhdp_device *mhdp)
{
int ret;
- ret = cdn_dp_training_start(dp);
+ ret = cdns_mhdp_training_start(mhdp);
if (ret) {
- DRM_DEV_ERROR(dp->dev, "Failed to start training %d\n", ret);
+ DRM_DEV_ERROR(mhdp->dev, "Failed to start training %d\n",
+ ret);
return ret;
}
- ret = cdn_dp_get_training_status(dp);
+ ret = cdns_mhdp_get_training_status(mhdp);
if (ret) {
- DRM_DEV_ERROR(dp->dev, "Failed to get training stat %d\n", ret);
+ DRM_DEV_ERROR(mhdp->dev, "Failed to get training stat %d\n",
+ ret);
return ret;
}
- DRM_DEV_DEBUG_KMS(dp->dev, "rate:0x%x, lanes:%d\n", dp->link.rate,
- dp->link.num_lanes);
+ DRM_DEV_DEBUG_KMS(mhdp->dev, "rate:0x%x, lanes:%d\n", mhdp->link.rate,
+ mhdp->link.num_lanes);
return ret;
}
-int cdn_dp_set_video_status(struct cdn_dp_device *dp, int active)
+int cdns_mhdp_set_video_status(struct cdns_mhdp_device *mhdp, int active)
{
u8 msg;
int ret;
msg = !!active;
- ret = cdn_dp_mailbox_send(dp, MB_MODULE_ID_DP_TX, DPTX_SET_VIDEO,
- sizeof(msg), &msg);
+ ret = cdns_mhdp_mailbox_send(mhdp, MB_MODULE_ID_DP_TX,
+ DPTX_SET_VIDEO, sizeof(msg), &msg);
if (ret)
- DRM_DEV_ERROR(dp->dev, "set video status failed: %d\n", ret);
+ DRM_DEV_ERROR(mhdp->dev, "set video status failed: %d\n", ret);
return ret;
}
-static int cdn_dp_get_msa_misc(struct video_info *video,
- struct drm_display_mode *mode)
+static int cdns_mhdp_get_msa_misc(struct video_info *video,
+ struct drm_display_mode *mode)
{
u32 msa_misc;
u8 val[2] = {0};
@@ -635,10 +643,10 @@ static int cdn_dp_get_msa_misc(struct video_info *video,
return msa_misc;
}
-int cdn_dp_config_video(struct cdn_dp_device *dp)
+int cdns_mhdp_config_video(struct cdns_mhdp_device *mhdp)
{
- struct video_info *video = &dp->video_info;
- struct drm_display_mode *mode = &dp->mode;
+ struct video_info *video = &mhdp->video_info;
+ struct drm_display_mode *mode = &mhdp->mode;
u64 symbol;
u32 val, link_rate, rem;
u8 bit_per_pix, tu_size_reg = TU_SIZE;
@@ -647,13 +655,13 @@ int cdn_dp_config_video(struct cdn_dp_device *dp)
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) / 1000;
+ link_rate = drm_dp_bw_code_to_link_rate(mhdp->link.rate) / 1000;
- ret = cdn_dp_reg_write(dp, BND_HSYNC2VSYNC, VIF_BYPASS_INTERLACE);
+ ret = cdns_mhdp_reg_write(mhdp, BND_HSYNC2VSYNC, VIF_BYPASS_INTERLACE);
if (ret)
goto err_config_video;
- ret = cdn_dp_reg_write(dp, HSYNC2VSYNC_POL_CTRL, 0);
+ ret = cdns_mhdp_reg_write(mhdp, HSYNC2VSYNC_POL_CTRL, 0);
if (ret)
goto err_config_video;
@@ -667,13 +675,13 @@ int cdn_dp_config_video(struct cdn_dp_device *dp)
do {
tu_size_reg += 2;
symbol = tu_size_reg * mode->clock * bit_per_pix;
- do_div(symbol, dp->link.num_lanes * link_rate * 8);
+ do_div(symbol, mhdp->link.num_lanes * link_rate * 8);
rem = do_div(symbol, 1000);
if (tu_size_reg > 64) {
ret = -EINVAL;
- DRM_DEV_ERROR(dp->dev,
+ DRM_DEV_ERROR(mhdp->dev,
"tu error, clk:%d, lanes:%d, rate:%d\n",
- mode->clock, dp->link.num_lanes,
+ mode->clock, mhdp->link.num_lanes,
link_rate);
goto err_config_video;
}
@@ -682,16 +690,16 @@ int cdn_dp_config_video(struct cdn_dp_device *dp)
val = symbol + (tu_size_reg << 8);
val |= TU_CNT_RST_EN;
- ret = cdn_dp_reg_write(dp, DP_FRAMER_TU, val);
+ ret = cdns_mhdp_reg_write(mhdp, DP_FRAMER_TU, val);
if (ret)
goto err_config_video;
/* set the FIFO Buffer size */
val = div_u64(mode->clock * (symbol + 1), 1000) + link_rate;
- val /= (dp->link.num_lanes * link_rate);
+ val /= (mhdp->link.num_lanes * link_rate);
val = div_u64(8 * (symbol + 1), bit_per_pix) - val;
val += 2;
- ret = cdn_dp_reg_write(dp, DP_VC_TABLE(15), val);
+ ret = cdns_mhdp_reg_write(mhdp, DP_VC_TABLE(15), val);
switch (video->color_depth) {
case 6:
@@ -712,136 +720,137 @@ int cdn_dp_config_video(struct cdn_dp_device *dp)
};
val += video->color_fmt << 8;
- ret = cdn_dp_reg_write(dp, DP_FRAMER_PXL_REPR, val);
+ ret = cdns_mhdp_reg_write(mhdp, DP_FRAMER_PXL_REPR, val);
if (ret)
goto err_config_video;
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);
+ ret = cdns_mhdp_reg_write(mhdp, DP_FRAMER_SP, val);
if (ret)
goto err_config_video;
val = (mode->hsync_start - mode->hdisplay) << 16;
val |= mode->htotal - mode->hsync_end;
- ret = cdn_dp_reg_write(dp, DP_FRONT_BACK_PORCH, val);
+ ret = cdns_mhdp_reg_write(mhdp, DP_FRONT_BACK_PORCH, val);
if (ret)
goto err_config_video;
val = mode->hdisplay * bit_per_pix / 8;
- ret = cdn_dp_reg_write(dp, DP_BYTE_COUNT, val);
+ ret = cdns_mhdp_reg_write(mhdp, DP_BYTE_COUNT, val);
if (ret)
goto err_config_video;
val = mode->htotal | ((mode->htotal - mode->hsync_start) << 16);
- ret = cdn_dp_reg_write(dp, MSA_HORIZONTAL_0, val);
+ ret = cdns_mhdp_reg_write(mhdp, MSA_HORIZONTAL_0, val);
if (ret)
goto err_config_video;
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);
+ ret = cdns_mhdp_reg_write(mhdp, MSA_HORIZONTAL_1, val);
if (ret)
goto err_config_video;
val = mode->vtotal;
val |= (mode->vtotal - mode->vsync_start) << 16;
- ret = cdn_dp_reg_write(dp, MSA_VERTICAL_0, val);
+ ret = cdns_mhdp_reg_write(mhdp, MSA_VERTICAL_0, val);
if (ret)
goto err_config_video;
val = mode->vsync_end - mode->vsync_start;
val |= (mode->vdisplay << 16) | (video->v_sync_polarity << 15);
- ret = cdn_dp_reg_write(dp, MSA_VERTICAL_1, val);
+ ret = cdns_mhdp_reg_write(mhdp, MSA_VERTICAL_1, val);
if (ret)
goto err_config_video;
- val = cdn_dp_get_msa_misc(video, mode);
- ret = cdn_dp_reg_write(dp, MSA_MISC, val);
+ val = cdns_mhdp_get_msa_misc(video, mode);
+ ret = cdns_mhdp_reg_write(mhdp, MSA_MISC, val);
if (ret)
goto err_config_video;
- ret = cdn_dp_reg_write(dp, STREAM_CONFIG, 1);
+ ret = cdns_mhdp_reg_write(mhdp, STREAM_CONFIG, 1);
if (ret)
goto err_config_video;
val = mode->hsync_end - mode->hsync_start;
val |= mode->hdisplay << 16;
- ret = cdn_dp_reg_write(dp, DP_HORIZONTAL, val);
+ ret = cdns_mhdp_reg_write(mhdp, DP_HORIZONTAL, val);
if (ret)
goto err_config_video;
val = mode->vdisplay;
val |= (mode->vtotal - mode->vsync_start) << 16;
- ret = cdn_dp_reg_write(dp, DP_VERTICAL_0, val);
+ ret = cdns_mhdp_reg_write(mhdp, DP_VERTICAL_0, val);
if (ret)
goto err_config_video;
val = mode->vtotal;
- ret = cdn_dp_reg_write(dp, DP_VERTICAL_1, val);
+ ret = cdns_mhdp_reg_write(mhdp, DP_VERTICAL_1, val);
if (ret)
goto err_config_video;
- ret = cdn_dp_reg_write_bit(dp, DP_VB_ID, 2, 1, 0);
+ ret = cdns_mhdp_reg_write_bit(mhdp, DP_VB_ID, 2, 1, 0);
err_config_video:
if (ret)
- DRM_DEV_ERROR(dp->dev, "config video failed: %d\n", ret);
+ DRM_DEV_ERROR(mhdp->dev, "config video failed: %d\n", ret);
return ret;
}
-int cdn_dp_audio_stop(struct cdn_dp_device *dp, struct audio_info *audio)
+int cdns_mhdp_audio_stop(struct cdns_mhdp_device *mhdp,
+ struct audio_info *audio)
{
int ret;
- ret = cdn_dp_reg_write(dp, AUDIO_PACK_CONTROL, 0);
+ ret = cdns_mhdp_reg_write(mhdp, AUDIO_PACK_CONTROL, 0);
if (ret) {
- DRM_DEV_ERROR(dp->dev, "audio stop failed: %d\n", ret);
+ DRM_DEV_ERROR(mhdp->dev, "audio stop failed: %d\n", ret);
return ret;
}
- writel(0, dp->regs + SPDIF_CTRL_ADDR);
+ writel(0, mhdp->regs + SPDIF_CTRL_ADDR);
/* clearn the audio config and reset */
- writel(0, dp->regs + AUDIO_SRC_CNTL);
- writel(0, dp->regs + AUDIO_SRC_CNFG);
- writel(AUDIO_SW_RST, dp->regs + AUDIO_SRC_CNTL);
- writel(0, dp->regs + AUDIO_SRC_CNTL);
+ writel(0, mhdp->regs + AUDIO_SRC_CNTL);
+ writel(0, mhdp->regs + AUDIO_SRC_CNFG);
+ writel(AUDIO_SW_RST, mhdp->regs + AUDIO_SRC_CNTL);
+ writel(0, mhdp->regs + AUDIO_SRC_CNTL);
/* reset smpl2pckt component */
- writel(0, dp->regs + SMPL2PKT_CNTL);
- writel(AUDIO_SW_RST, dp->regs + SMPL2PKT_CNTL);
- writel(0, dp->regs + SMPL2PKT_CNTL);
+ writel(0, mhdp->regs + SMPL2PKT_CNTL);
+ writel(AUDIO_SW_RST, mhdp->regs + SMPL2PKT_CNTL);
+ writel(0, mhdp->regs + SMPL2PKT_CNTL);
/* reset FIFO */
- writel(AUDIO_SW_RST, dp->regs + FIFO_CNTL);
- writel(0, dp->regs + FIFO_CNTL);
+ writel(AUDIO_SW_RST, mhdp->regs + FIFO_CNTL);
+ writel(0, mhdp->regs + FIFO_CNTL);
if (audio->format == AFMT_SPDIF)
- clk_disable_unprepare(dp->spdif_clk);
+ clk_disable_unprepare(mhdp->spdif_clk);
return 0;
}
-int cdn_dp_audio_mute(struct cdn_dp_device *dp, bool enable)
+int cdns_mhdp_audio_mute(struct cdns_mhdp_device *mhdp, bool enable)
{
int ret;
- ret = cdn_dp_reg_write_bit(dp, DP_VB_ID, 4, 1, enable);
+ ret = cdns_mhdp_reg_write_bit(mhdp, DP_VB_ID, 4, 1, enable);
if (ret)
- DRM_DEV_ERROR(dp->dev, "audio mute failed: %d\n", ret);
+ DRM_DEV_ERROR(mhdp->dev, "audio mute failed: %d\n", ret);
return ret;
}
-static void cdn_dp_audio_config_i2s(struct cdn_dp_device *dp,
- struct audio_info *audio)
+static void cdns_mhdp_audio_config_i2s(struct cdns_mhdp_device *mhdp,
+ struct audio_info *audio)
{
int sub_pckt_num = 1, i2s_port_en_val = 0xf, i;
u32 val;
if (audio->channels == 2) {
- if (dp->link.num_lanes == 1)
+ if (mhdp->link.num_lanes == 1)
sub_pckt_num = 2;
else
sub_pckt_num = 4;
@@ -851,15 +860,15 @@ static void cdn_dp_audio_config_i2s(struct cdn_dp_device *dp,
i2s_port_en_val = 3;
}
- writel(0x0, dp->regs + SPDIF_CTRL_ADDR);
+ writel(0x0, mhdp->regs + SPDIF_CTRL_ADDR);
- writel(SYNC_WR_TO_CH_ZERO, dp->regs + FIFO_CNTL);
+ writel(SYNC_WR_TO_CH_ZERO, mhdp->regs + FIFO_CNTL);
val = MAX_NUM_CH(audio->channels);
val |= NUM_OF_I2S_PORTS(audio->channels);
val |= AUDIO_TYPE_LPCM;
val |= CFG_SUB_PCKT_NUM(sub_pckt_num);
- writel(val, dp->regs + SMPL2PKT_CNFG);
+ writel(val, mhdp->regs + SMPL2PKT_CNFG);
if (audio->sample_width == 16)
val = 0;
@@ -871,7 +880,7 @@ static void cdn_dp_audio_config_i2s(struct cdn_dp_device *dp,
val |= AUDIO_CH_NUM(audio->channels);
val |= I2S_DEC_PORT_EN(i2s_port_en_val);
val |= TRANS_SMPL_WIDTH_32;
- writel(val, dp->regs + AUDIO_SRC_CNFG);
+ writel(val, mhdp->regs + AUDIO_SRC_CNFG);
for (i = 0; i < (audio->channels + 1) / 2; i++) {
if (audio->sample_width == 16)
@@ -880,7 +889,7 @@ static void cdn_dp_audio_config_i2s(struct cdn_dp_device *dp,
val = (0x0b << 8) | (0x0b << 20);
val |= ((2 * i) << 4) | ((2 * i + 1) << 16);
- writel(val, dp->regs + STTS_BIT_CH(i));
+ writel(val, mhdp->regs + STTS_BIT_CH(i));
}
switch (audio->sample_rate) {
@@ -914,56 +923,57 @@ static void cdn_dp_audio_config_i2s(struct cdn_dp_device *dp,
break;
}
val |= 4;
- writel(val, dp->regs + COM_CH_STTS_BITS);
+ writel(val, mhdp->regs + COM_CH_STTS_BITS);
- writel(SMPL2PKT_EN, dp->regs + SMPL2PKT_CNTL);
- writel(I2S_DEC_START, dp->regs + AUDIO_SRC_CNTL);
+ writel(SMPL2PKT_EN, mhdp->regs + SMPL2PKT_CNTL);
+ writel(I2S_DEC_START, mhdp->regs + AUDIO_SRC_CNTL);
}
-static void cdn_dp_audio_config_spdif(struct cdn_dp_device *dp)
+static void cdns_mhdp_audio_config_spdif(struct cdns_mhdp_device *mhdp)
{
u32 val;
- writel(SYNC_WR_TO_CH_ZERO, dp->regs + FIFO_CNTL);
+ writel(SYNC_WR_TO_CH_ZERO, mhdp->regs + FIFO_CNTL);
val = MAX_NUM_CH(2) | AUDIO_TYPE_LPCM | CFG_SUB_PCKT_NUM(4);
- writel(val, dp->regs + SMPL2PKT_CNFG);
- writel(SMPL2PKT_EN, dp->regs + SMPL2PKT_CNTL);
+ writel(val, mhdp->regs + SMPL2PKT_CNFG);
+ writel(SMPL2PKT_EN, mhdp->regs + SMPL2PKT_CNTL);
val = SPDIF_ENABLE | SPDIF_AVG_SEL | SPDIF_JITTER_BYPASS;
- writel(val, dp->regs + SPDIF_CTRL_ADDR);
+ writel(val, mhdp->regs + SPDIF_CTRL_ADDR);
- clk_prepare_enable(dp->spdif_clk);
- clk_set_rate(dp->spdif_clk, CDN_DP_SPDIF_CLK);
+ clk_prepare_enable(mhdp->spdif_clk);
+ clk_set_rate(mhdp->spdif_clk, CDNS_DP_SPDIF_CLK);
}
-int cdn_dp_audio_config(struct cdn_dp_device *dp, struct audio_info *audio)
+int cdns_mhdp_audio_config(struct cdns_mhdp_device *mhdp,
+ struct audio_info *audio)
{
int ret;
/* reset the spdif clk before config */
if (audio->format == AFMT_SPDIF) {
- reset_control_assert(dp->spdif_rst);
- reset_control_deassert(dp->spdif_rst);
+ reset_control_assert(mhdp->spdif_rst);
+ reset_control_deassert(mhdp->spdif_rst);
}
- ret = cdn_dp_reg_write(dp, CM_LANE_CTRL, LANE_REF_CYC);
+ ret = cdns_mhdp_reg_write(mhdp, CM_LANE_CTRL, LANE_REF_CYC);
if (ret)
goto err_audio_config;
- ret = cdn_dp_reg_write(dp, CM_CTRL, 0);
+ ret = cdns_mhdp_reg_write(mhdp, CM_CTRL, 0);
if (ret)
goto err_audio_config;
if (audio->format == AFMT_I2S)
- cdn_dp_audio_config_i2s(dp, audio);
+ cdns_mhdp_audio_config_i2s(mhdp, audio);
else if (audio->format == AFMT_SPDIF)
- cdn_dp_audio_config_spdif(dp);
+ cdns_mhdp_audio_config_spdif(mhdp);
- ret = cdn_dp_reg_write(dp, AUDIO_PACK_CONTROL, AUDIO_PACK_EN);
+ ret = cdns_mhdp_reg_write(mhdp, AUDIO_PACK_CONTROL, AUDIO_PACK_EN);
err_audio_config:
if (ret)
- DRM_DEV_ERROR(dp->dev, "audio config failed: %d\n", ret);
+ DRM_DEV_ERROR(mhdp->dev, "audio config failed: %d\n", ret);
return ret;
}
diff --git a/drivers/gpu/drm/rockchip/cdn-dp-reg.h b/drivers/gpu/drm/rockchip/cdn-dp-reg.h
index c4bbb4a83319..3cb40d719515 100644
--- a/drivers/gpu/drm/rockchip/cdn-dp-reg.h
+++ b/drivers/gpu/drm/rockchip/cdn-dp-reg.h
@@ -395,7 +395,7 @@
#define HDCP_TX_IS_RECEIVER_ID_VALID_EVENT BIT(7)
#define TU_SIZE 30
-#define CDN_DP_MAX_LINK_RATE DP_LINK_BW_5_4
+#define CDNS_DP_MAX_LINK_RATE DP_LINK_BW_5_4
/* audio */
#define AUDIO_PACK_EN BIT(8)
@@ -459,24 +459,96 @@ enum vic_bt_type {
BT_709 = 0x1,
};
-void cdn_dp_clock_reset(struct cdn_dp_device *dp);
-
-void cdn_dp_set_fw_clk(struct cdn_dp_device *dp, unsigned long 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_set_firmware_active(struct cdn_dp_device *dp, bool enable);
-int cdn_dp_set_host_cap(struct cdn_dp_device *dp, u8 lanes, bool flip);
-int cdn_dp_event_config(struct cdn_dp_device *dp);
-u32 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, u8 *data, u16 len);
-int cdn_dp_get_edid_block(void *dp, u8 *edid,
- unsigned int block, size_t length);
-int cdn_dp_train_link(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(struct cdn_dp_device *dp, struct audio_info *audio);
+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;
+};
+
+enum vic_pxl_encoding_format {
+ PXL_RGB = 0x1,
+ YCBCR_4_4_4 = 0x2,
+ YCBCR_4_2_2 = 0x4,
+ YCBCR_4_2_0 = 0x8,
+ Y_ONLY = 0x10,
+};
+
+struct video_info {
+ bool h_sync_polarity;
+ bool v_sync_polarity;
+ bool interlaced;
+ int color_depth;
+ enum vic_pxl_encoding_format color_fmt;
+};
+
+struct cdns_mhdp_host {
+ unsigned int link_rate;
+ u8 lanes_cnt;
+ u8 volt_swing;
+ u8 pre_emphasis;
+ u8 pattern_supp;
+ u8 fast_link;
+ u8 lane_mapping;
+ u8 enhanced;
+};
+
+struct cdns_mhdp_sink {
+ unsigned int link_rate;
+ u8 lanes_cnt;
+ u8 pattern_supp;
+ u8 fast_link;
+ u8 enhanced;
+};
+
+struct cdns_mhdp_device {
+ void __iomem *regs;
+
+ struct device *dev;
+
+ struct drm_dp_link link;
+ struct drm_connector connector;
+ struct clk *spdif_clk;
+ struct reset_control *spdif_rst;
+
+ struct drm_dp_aux aux;
+ struct cdns_mhdp_host host;
+ struct cdns_mhdp_sink sink;
+ struct drm_bridge bridge;
+ struct phy *phy;
+ void __iomem *dbg_regs;
+
+ struct video_info video_info;
+ struct drm_display_mode mode;
+ unsigned int fw_version;
+};
+
+void cdns_mhdp_clock_reset(struct cdns_mhdp_device *mhdp);
+void cdns_mhdp_set_fw_clk(struct cdns_mhdp_device *mhdp, unsigned long clk);
+int cdns_mhdp_load_firmware(struct cdns_mhdp_device *mhdp, const u32 *i_mem,
+ u32 i_size, const u32 *d_mem, u32 d_size);
+int cdns_mhdp_set_firmware_active(struct cdns_mhdp_device *mhdp, bool enable);
+int cdns_mhdp_set_host_cap(struct cdns_mhdp_device *mhdp, u8 lanes, bool flip);
+int cdns_mhdp_event_config(struct cdns_mhdp_device *mhdp);
+u32 cdns_mhdp_get_event(struct cdns_mhdp_device *mhdp);
+int cdns_mhdp_get_hpd_status(struct cdns_mhdp_device *mhdp);
+int cdns_mhdp_dpcd_write(struct cdns_mhdp_device *mhdp, u32 addr, u8 value);
+int cdns_mhdp_dpcd_read(struct cdns_mhdp_device *mhdp,
+ u32 addr, u8 *data, u16 len);
+int cdns_mhdp_get_edid_block(void *mhdp, u8 *edid,
+ unsigned int block, size_t length);
+int cdns_mhdp_train_link(struct cdns_mhdp_device *mhdp);
+int cdns_mhdp_set_video_status(struct cdns_mhdp_device *mhdp, int active);
+int cdns_mhdp_config_video(struct cdns_mhdp_device *mhdp);
+int cdns_mhdp_audio_stop(struct cdns_mhdp_device *mhdp,
+ struct audio_info *audio);
+int cdns_mhdp_audio_mute(struct cdns_mhdp_device *mhdp, bool enable);
+int cdns_mhdp_audio_config(struct cdns_mhdp_device *mhdp,
+ struct audio_info *audio);
#endif /* _CDN_DP_REG_H */
--
2.17.1
^ permalink raw reply related [flat|nested] 45+ messages in thread
* [PATCH v6 2/6] drm/dp: fix link probing for devices supporting DP 1.4+
@ 2018-10-08 21:42 ` Damian Kos
0 siblings, 0 replies; 45+ messages in thread
From: Damian Kos @ 2018-10-08 21:42 UTC (permalink / raw)
To: David Airlie, Rob Herring, Mark Rutland, Archit Taneja,
Andrzej Hajda, Laurent Pinchart, Gustavo Padovan,
Maarten Lankhorst, Sean Paul, Sandy Huang, Heiko Stübner,
Quentin Schulz, Damian Kos, Piotr Sroka, dri-devel, devicetree,
linux-kernel, linux-arm-kernel, linux-rockchip
Cc: rafalc, quentin.schulz, jbergsagel
From: Quentin Schulz <quentin.schulz@free-electrons.com>
DP 1.4 introduced a DP_EXTENDED_RECEIVER_CAP_FIELD_PRESENT bit in
DP_TRAINING_AUX_RD_INTERVAL register. If set, DPCD registers from
DP_DPCD_REV to DP_ADAPTER_CAP should be retrieved starting from
DP_DPCD_REV_EXTENDED. All registers are copied except DP_DPCD_REV,
DP_MAX_LINK_RATE and DP_DOWNSTREAMPORT_PRESENT which represent the
"true capabilities" of DPRX device.
Original DP_DPCD_REV, DP_MAX_LINK_RATE and DP_DOWNSTREAMPORT_PRESENT
might falsely return lower capabilities to "avoid interoperability
issues with some of the existing DP Source devices that malfunction
when they discover the higher capabilities within those three
registers.".
Before DP 1.4, DP_EXTENDED_RECEIVER_CAP_FIELD_PRESENT bit was reserved
and read 0 so it's safe to check against it even if DP revision is
<1.4
Signed-off-by: Quentin Schulz <quentin.schulz@free-electrons.com>
Signed-off-by: Damian Kos <dkos@cadence.com>
Reviewed-by: Andrzej Hajda <a.hajda@samsung.com>
Reviewed-by: Manasi Navare <manasi.d.navare@intel.com>
---
drivers/gpu/drm/drm_dp_helper.c | 30 +++++++++++++++++++++++++++++-
1 file changed, 29 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/drm_dp_helper.c b/drivers/gpu/drm/drm_dp_helper.c
index 37c01b6076ec..d96ec74a87f5 100644
--- a/drivers/gpu/drm/drm_dp_helper.c
+++ b/drivers/gpu/drm/drm_dp_helper.c
@@ -370,10 +370,38 @@ int drm_dp_link_probe(struct drm_dp_aux *aux, struct drm_dp_link *link)
{
u8 values[3];
int err;
+ unsigned int addr;
memset(link, 0, sizeof(*link));
- err = drm_dp_dpcd_read(aux, DP_DPCD_REV, values, sizeof(values));
+ /*
+ * DP 1.4 introduced a DP_EXTENDED_RECEIVER_CAP_FIELD_PRESENT bit in
+ * DP_TRAINING_AUX_RD_INTERVAL register. If set, DPCD registers from
+ * DP_DPCD_REV to DP_ADAPTER_CAP should be retrieved starting from
+ * DP_DPCD_REV_EXTENDED. All registers are copied except DP_DPCD_REV,
+ * DP_MAX_LINK_RATE and DP_DOWNSTREAMPORT_PRESENT which represent the
+ * "true capabilities" of DPRX device.
+ *
+ * Original DP_DPCD_REV, DP_MAX_LINK_RATE and DP_DOWNSTREAMPORT_PRESENT
+ * might falsely return lower capabilities to "avoid interoperability
+ * issues with some of the existing DP Source devices that malfunction
+ * when they discover the higher capabilities within those three
+ * registers.".
+ *
+ * Before DP 1.4, DP_EXTENDED_RECEIVER_CAP_FIELD_PRESENT bit was reserved
+ * and read 0 so it's safe to check against it even if DP revision is
+ * <1.4
+ */
+ err = drm_dp_dpcd_readb(aux, DP_TRAINING_AUX_RD_INTERVAL, values);
+ if (err < 0)
+ return err;
+
+ if (values[0] & DP_EXTENDED_RECEIVER_CAP_FIELD_PRESENT)
+ addr = DP_DP13_DPCD_REV;
+ else
+ addr = DP_DPCD_REV;
+
+ err = drm_dp_dpcd_read(aux, addr, values, sizeof(values));
if (err < 0)
return err;
--
2.17.1
^ permalink raw reply related [flat|nested] 45+ messages in thread
* [PATCH v6 2/6] drm/dp: fix link probing for devices supporting DP 1.4+
@ 2018-10-08 21:42 ` Damian Kos
0 siblings, 0 replies; 45+ messages in thread
From: Damian Kos @ 2018-10-08 21:42 UTC (permalink / raw)
To: David Airlie, Rob Herring, Mark Rutland, Archit Taneja,
Andrzej Hajda, Laurent Pinchart, Gustavo Padovan,
Maarten Lankhorst, Sean Paul, Sandy Huang, Heiko Stübner,
Quentin Schulz, Damian Kos, Piotr Sroka,
dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW,
devicetree-u79uwXL29TY76Z2rM5mHXA,
linux-kernel-u79uwXL29TY76Z2rM5mHXA,
linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
linux-rockchip-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r
Cc: jbergsagel-l0cyMroinI0, rafalc-vna1KIf7WgpBDgjK7y7TUQ,
quentin.schulz-LDxbnhwyfcJBDgjK7y7TUQ
From: Quentin Schulz <quentin.schulz-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org>
DP 1.4 introduced a DP_EXTENDED_RECEIVER_CAP_FIELD_PRESENT bit in
DP_TRAINING_AUX_RD_INTERVAL register. If set, DPCD registers from
DP_DPCD_REV to DP_ADAPTER_CAP should be retrieved starting from
DP_DPCD_REV_EXTENDED. All registers are copied except DP_DPCD_REV,
DP_MAX_LINK_RATE and DP_DOWNSTREAMPORT_PRESENT which represent the
"true capabilities" of DPRX device.
Original DP_DPCD_REV, DP_MAX_LINK_RATE and DP_DOWNSTREAMPORT_PRESENT
might falsely return lower capabilities to "avoid interoperability
issues with some of the existing DP Source devices that malfunction
when they discover the higher capabilities within those three
registers.".
Before DP 1.4, DP_EXTENDED_RECEIVER_CAP_FIELD_PRESENT bit was reserved
and read 0 so it's safe to check against it even if DP revision is
<1.4
Signed-off-by: Quentin Schulz <quentin.schulz-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org>
Signed-off-by: Damian Kos <dkos-vna1KIf7WgpBDgjK7y7TUQ@public.gmane.org>
Reviewed-by: Andrzej Hajda <a.hajda-Sze3O3UU22JBDgjK7y7TUQ@public.gmane.org>
Reviewed-by: Manasi Navare <manasi.d.navare-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
---
drivers/gpu/drm/drm_dp_helper.c | 30 +++++++++++++++++++++++++++++-
1 file changed, 29 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/drm_dp_helper.c b/drivers/gpu/drm/drm_dp_helper.c
index 37c01b6076ec..d96ec74a87f5 100644
--- a/drivers/gpu/drm/drm_dp_helper.c
+++ b/drivers/gpu/drm/drm_dp_helper.c
@@ -370,10 +370,38 @@ int drm_dp_link_probe(struct drm_dp_aux *aux, struct drm_dp_link *link)
{
u8 values[3];
int err;
+ unsigned int addr;
memset(link, 0, sizeof(*link));
- err = drm_dp_dpcd_read(aux, DP_DPCD_REV, values, sizeof(values));
+ /*
+ * DP 1.4 introduced a DP_EXTENDED_RECEIVER_CAP_FIELD_PRESENT bit in
+ * DP_TRAINING_AUX_RD_INTERVAL register. If set, DPCD registers from
+ * DP_DPCD_REV to DP_ADAPTER_CAP should be retrieved starting from
+ * DP_DPCD_REV_EXTENDED. All registers are copied except DP_DPCD_REV,
+ * DP_MAX_LINK_RATE and DP_DOWNSTREAMPORT_PRESENT which represent the
+ * "true capabilities" of DPRX device.
+ *
+ * Original DP_DPCD_REV, DP_MAX_LINK_RATE and DP_DOWNSTREAMPORT_PRESENT
+ * might falsely return lower capabilities to "avoid interoperability
+ * issues with some of the existing DP Source devices that malfunction
+ * when they discover the higher capabilities within those three
+ * registers.".
+ *
+ * Before DP 1.4, DP_EXTENDED_RECEIVER_CAP_FIELD_PRESENT bit was reserved
+ * and read 0 so it's safe to check against it even if DP revision is
+ * <1.4
+ */
+ err = drm_dp_dpcd_readb(aux, DP_TRAINING_AUX_RD_INTERVAL, values);
+ if (err < 0)
+ return err;
+
+ if (values[0] & DP_EXTENDED_RECEIVER_CAP_FIELD_PRESENT)
+ addr = DP_DP13_DPCD_REV;
+ else
+ addr = DP_DPCD_REV;
+
+ err = drm_dp_dpcd_read(aux, addr, values, sizeof(values));
if (err < 0)
return err;
--
2.17.1
^ permalink raw reply related [flat|nested] 45+ messages in thread
* [PATCH v6 2/6] drm/dp: fix link probing for devices supporting DP 1.4+
@ 2018-10-08 21:42 ` Damian Kos
0 siblings, 0 replies; 45+ messages in thread
From: Damian Kos @ 2018-10-08 21:42 UTC (permalink / raw)
To: linux-arm-kernel
From: Quentin Schulz <quentin.schulz@free-electrons.com>
DP 1.4 introduced a DP_EXTENDED_RECEIVER_CAP_FIELD_PRESENT bit in
DP_TRAINING_AUX_RD_INTERVAL register. If set, DPCD registers from
DP_DPCD_REV to DP_ADAPTER_CAP should be retrieved starting from
DP_DPCD_REV_EXTENDED. All registers are copied except DP_DPCD_REV,
DP_MAX_LINK_RATE and DP_DOWNSTREAMPORT_PRESENT which represent the
"true capabilities" of DPRX device.
Original DP_DPCD_REV, DP_MAX_LINK_RATE and DP_DOWNSTREAMPORT_PRESENT
might falsely return lower capabilities to "avoid interoperability
issues with some of the existing DP Source devices that malfunction
when they discover the higher capabilities within those three
registers.".
Before DP 1.4, DP_EXTENDED_RECEIVER_CAP_FIELD_PRESENT bit was reserved
and read 0 so it's safe to check against it even if DP revision is
<1.4
Signed-off-by: Quentin Schulz <quentin.schulz@free-electrons.com>
Signed-off-by: Damian Kos <dkos@cadence.com>
Reviewed-by: Andrzej Hajda <a.hajda@samsung.com>
Reviewed-by: Manasi Navare <manasi.d.navare@intel.com>
---
drivers/gpu/drm/drm_dp_helper.c | 30 +++++++++++++++++++++++++++++-
1 file changed, 29 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/drm_dp_helper.c b/drivers/gpu/drm/drm_dp_helper.c
index 37c01b6076ec..d96ec74a87f5 100644
--- a/drivers/gpu/drm/drm_dp_helper.c
+++ b/drivers/gpu/drm/drm_dp_helper.c
@@ -370,10 +370,38 @@ int drm_dp_link_probe(struct drm_dp_aux *aux, struct drm_dp_link *link)
{
u8 values[3];
int err;
+ unsigned int addr;
memset(link, 0, sizeof(*link));
- err = drm_dp_dpcd_read(aux, DP_DPCD_REV, values, sizeof(values));
+ /*
+ * DP 1.4 introduced a DP_EXTENDED_RECEIVER_CAP_FIELD_PRESENT bit in
+ * DP_TRAINING_AUX_RD_INTERVAL register. If set, DPCD registers from
+ * DP_DPCD_REV to DP_ADAPTER_CAP should be retrieved starting from
+ * DP_DPCD_REV_EXTENDED. All registers are copied except DP_DPCD_REV,
+ * DP_MAX_LINK_RATE and DP_DOWNSTREAMPORT_PRESENT which represent the
+ * "true capabilities" of DPRX device.
+ *
+ * Original DP_DPCD_REV, DP_MAX_LINK_RATE and DP_DOWNSTREAMPORT_PRESENT
+ * might falsely return lower capabilities to "avoid interoperability
+ * issues with some of the existing DP Source devices that malfunction
+ * when they discover the higher capabilities within those three
+ * registers.".
+ *
+ * Before DP 1.4, DP_EXTENDED_RECEIVER_CAP_FIELD_PRESENT bit was reserved
+ * and read 0 so it's safe to check against it even if DP revision is
+ * <1.4
+ */
+ err = drm_dp_dpcd_readb(aux, DP_TRAINING_AUX_RD_INTERVAL, values);
+ if (err < 0)
+ return err;
+
+ if (values[0] & DP_EXTENDED_RECEIVER_CAP_FIELD_PRESENT)
+ addr = DP_DP13_DPCD_REV;
+ else
+ addr = DP_DPCD_REV;
+
+ err = drm_dp_dpcd_read(aux, addr, values, sizeof(values));
if (err < 0)
return err;
--
2.17.1
^ permalink raw reply related [flat|nested] 45+ messages in thread
* [PATCH v6 3/6] dt-bindings: drm/bridge: Document Cadence MHDP bridge bindings
2018-10-08 21:42 ` Damian Kos
(?)
@ 2018-10-08 21:42 ` Damian Kos
-1 siblings, 0 replies; 45+ messages in thread
From: Damian Kos @ 2018-10-08 21:42 UTC (permalink / raw)
To: David Airlie, Rob Herring, Mark Rutland, Archit Taneja,
Andrzej Hajda, Laurent Pinchart, Gustavo Padovan,
Maarten Lankhorst, Sean Paul, Sandy Huang, Heiko Stübner,
Quentin Schulz, Damian Kos, Piotr Sroka, dri-devel, devicetree,
linux-kernel, linux-arm-kernel, linux-rockchip
Cc: rafalc, quentin.schulz, jbergsagel
From: Quentin Schulz <quentin.schulz@free-electrons.com>
Document the bindings used for the Cadence MHDP DPI/DP bridge.
Signed-off-by: Quentin Schulz <quentin.schulz@free-electrons.com>
Signed-off-by: Damian Kos <dkos@cadence.com>
Reviewed-by: Rob Herring <robh@kernel.org>
---
.../bindings/display/bridge/cdns,mhdp.txt | 43 +++++++++++++++++++
1 file changed, 43 insertions(+)
create mode 100644 Documentation/devicetree/bindings/display/bridge/cdns,mhdp.txt
diff --git a/Documentation/devicetree/bindings/display/bridge/cdns,mhdp.txt b/Documentation/devicetree/bindings/display/bridge/cdns,mhdp.txt
new file mode 100644
index 000000000000..f8334c520b98
--- /dev/null
+++ b/Documentation/devicetree/bindings/display/bridge/cdns,mhdp.txt
@@ -0,0 +1,43 @@
+Cadence MHDP bridge
+==========================
+
+The Cadence MHDP bridge is a DPI to DP bridge.
+
+Required properties:
+- compatible: should be "cdns,mhdp8546",
+- reg: physical base address and length of the controller's registers,
+- clocks: DP bridge clock, it's used by the IP to know how to translate
+ a number of clock cycles into a time (which is used to comply
+ with DP standard timings and delays),
+
+Required subnodes:
+- ports: Ports as described in Documentation/devictree/bindings/graph.txt
+ Port 0 - input port representing the DP bridge input
+ Port 1 - output port representing the DP bridge output
+
+Example:
+
+ mhdp: dp-bridge@f0fb000000 {
+ compatible = "cdns,mhdp8546";
+ reg = <0xf0 0xfb000000 0x0 0x1000000>;
+ clocks = <&mhdp_clock>;
+
+ ports {
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ port@0 {
+ reg = <0>;
+ dp_bridge_input: endpoint {
+ remote-endpoint = <&xxx_dpi_output>;
+ };
+ };
+
+ port@1 {
+ reg = <1>;
+ dp_bridge_output: endpoint {
+ remote-endpoint = <&xxx_dp_connector_input>;
+ };
+ };
+ };
+ };
--
2.17.1
^ permalink raw reply related [flat|nested] 45+ messages in thread
* [PATCH v6 3/6] dt-bindings: drm/bridge: Document Cadence MHDP bridge bindings
@ 2018-10-08 21:42 ` Damian Kos
0 siblings, 0 replies; 45+ messages in thread
From: Damian Kos @ 2018-10-08 21:42 UTC (permalink / raw)
To: David Airlie, Rob Herring, Mark Rutland, Archit Taneja,
Andrzej Hajda, Laurent Pinchart, Gustavo Padovan,
Maarten Lankhorst, Sean Paul, Sandy Huang, Heiko Stübner,
Quentin Schulz, Damian Kos, Piotr Sroka, dri-devel, devicetree,
linux-kernel, linux-arm-kernel, linux-rockchip
Cc: rafalc, quentin.schulz, jbergsagel
From: Quentin Schulz <quentin.schulz@free-electrons.com>
Document the bindings used for the Cadence MHDP DPI/DP bridge.
Signed-off-by: Quentin Schulz <quentin.schulz@free-electrons.com>
Signed-off-by: Damian Kos <dkos@cadence.com>
Reviewed-by: Rob Herring <robh@kernel.org>
---
.../bindings/display/bridge/cdns,mhdp.txt | 43 +++++++++++++++++++
1 file changed, 43 insertions(+)
create mode 100644 Documentation/devicetree/bindings/display/bridge/cdns,mhdp.txt
diff --git a/Documentation/devicetree/bindings/display/bridge/cdns,mhdp.txt b/Documentation/devicetree/bindings/display/bridge/cdns,mhdp.txt
new file mode 100644
index 000000000000..f8334c520b98
--- /dev/null
+++ b/Documentation/devicetree/bindings/display/bridge/cdns,mhdp.txt
@@ -0,0 +1,43 @@
+Cadence MHDP bridge
+==========================
+
+The Cadence MHDP bridge is a DPI to DP bridge.
+
+Required properties:
+- compatible: should be "cdns,mhdp8546",
+- reg: physical base address and length of the controller's registers,
+- clocks: DP bridge clock, it's used by the IP to know how to translate
+ a number of clock cycles into a time (which is used to comply
+ with DP standard timings and delays),
+
+Required subnodes:
+- ports: Ports as described in Documentation/devictree/bindings/graph.txt
+ Port 0 - input port representing the DP bridge input
+ Port 1 - output port representing the DP bridge output
+
+Example:
+
+ mhdp: dp-bridge@f0fb000000 {
+ compatible = "cdns,mhdp8546";
+ reg = <0xf0 0xfb000000 0x0 0x1000000>;
+ clocks = <&mhdp_clock>;
+
+ ports {
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ port@0 {
+ reg = <0>;
+ dp_bridge_input: endpoint {
+ remote-endpoint = <&xxx_dpi_output>;
+ };
+ };
+
+ port@1 {
+ reg = <1>;
+ dp_bridge_output: endpoint {
+ remote-endpoint = <&xxx_dp_connector_input>;
+ };
+ };
+ };
+ };
--
2.17.1
^ permalink raw reply related [flat|nested] 45+ messages in thread
* [PATCH v6 3/6] dt-bindings: drm/bridge: Document Cadence MHDP bridge bindings
@ 2018-10-08 21:42 ` Damian Kos
0 siblings, 0 replies; 45+ messages in thread
From: Damian Kos @ 2018-10-08 21:42 UTC (permalink / raw)
To: linux-arm-kernel
From: Quentin Schulz <quentin.schulz@free-electrons.com>
Document the bindings used for the Cadence MHDP DPI/DP bridge.
Signed-off-by: Quentin Schulz <quentin.schulz@free-electrons.com>
Signed-off-by: Damian Kos <dkos@cadence.com>
Reviewed-by: Rob Herring <robh@kernel.org>
---
.../bindings/display/bridge/cdns,mhdp.txt | 43 +++++++++++++++++++
1 file changed, 43 insertions(+)
create mode 100644 Documentation/devicetree/bindings/display/bridge/cdns,mhdp.txt
diff --git a/Documentation/devicetree/bindings/display/bridge/cdns,mhdp.txt b/Documentation/devicetree/bindings/display/bridge/cdns,mhdp.txt
new file mode 100644
index 000000000000..f8334c520b98
--- /dev/null
+++ b/Documentation/devicetree/bindings/display/bridge/cdns,mhdp.txt
@@ -0,0 +1,43 @@
+Cadence MHDP bridge
+==========================
+
+The Cadence MHDP bridge is a DPI to DP bridge.
+
+Required properties:
+- compatible: should be "cdns,mhdp8546",
+- reg: physical base address and length of the controller's registers,
+- clocks: DP bridge clock, it's used by the IP to know how to translate
+ a number of clock cycles into a time (which is used to comply
+ with DP standard timings and delays),
+
+Required subnodes:
+- ports: Ports as described in Documentation/devictree/bindings/graph.txt
+ Port 0 - input port representing the DP bridge input
+ Port 1 - output port representing the DP bridge output
+
+Example:
+
+ mhdp: dp-bridge at f0fb000000 {
+ compatible = "cdns,mhdp8546";
+ reg = <0xf0 0xfb000000 0x0 0x1000000>;
+ clocks = <&mhdp_clock>;
+
+ ports {
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ port at 0 {
+ reg = <0>;
+ dp_bridge_input: endpoint {
+ remote-endpoint = <&xxx_dpi_output>;
+ };
+ };
+
+ port at 1 {
+ reg = <1>;
+ dp_bridge_output: endpoint {
+ remote-endpoint = <&xxx_dp_connector_input>;
+ };
+ };
+ };
+ };
--
2.17.1
^ permalink raw reply related [flat|nested] 45+ messages in thread
* [PATCH v6 4/6] drm: bridge: add support for Cadence MHDP DPI/DP bridge
2018-10-08 21:42 ` Damian Kos
(?)
@ 2018-10-08 21:42 ` Damian Kos
-1 siblings, 0 replies; 45+ messages in thread
From: Damian Kos @ 2018-10-08 21:42 UTC (permalink / raw)
To: David Airlie, Rob Herring, Mark Rutland, Archit Taneja,
Andrzej Hajda, Laurent Pinchart, Gustavo Padovan,
Maarten Lankhorst, Sean Paul, Sandy Huang, Heiko Stübner,
Quentin Schulz, Damian Kos, Piotr Sroka, dri-devel, devicetree,
linux-kernel, linux-arm-kernel, linux-rockchip
Cc: rafalc, quentin.schulz, jbergsagel
From: Quentin Schulz <quentin.schulz@free-electrons.com>
This adds basic support for Cadence MHDP DPI to DP bridge.
Basically, it takes a DPI stream as input and output it encoded in DP
format. It's missing proper HPD, HDCP and currently supports only
SST mode.
Changes made in the low level driver (cdn-dp-reg.*):
- moved it to from drivers/gpu/drm/rockchip to
drivers/gpu/drm/bridge/cdns-mhdp-common.c and
include/drm/bridge/cdns-mhdp-common.h
- functions for sending/receiving commands are now public
- added functions for reading registers and link training
adjustment
Changes made in RK's driver (cdn-dp-core.*):
- Moved audio_info and audio_pdev fields from cdn_dp_device to
cdns_mhdp_device structure.
Signed-off-by: Quentin Schulz <quentin.schulz@free-electrons.com>
Signed-off-by: Damian Kos <dkos@cadence.com>
---
drivers/gpu/drm/bridge/Kconfig | 9 +
drivers/gpu/drm/bridge/Makefile | 3 +
.../cdns-mhdp-common.c} | 136 +-
drivers/gpu/drm/bridge/cdns-mhdp.c | 1304 +++++++++++++++++
drivers/gpu/drm/rockchip/Kconfig | 4 +-
drivers/gpu/drm/rockchip/Makefile | 2 +-
drivers/gpu/drm/rockchip/cdn-dp-core.c | 16 +-
drivers/gpu/drm/rockchip/cdn-dp-core.h | 5 +-
.../drm/bridge/cdns-mhdp-common.h | 21 +-
9 files changed, 1480 insertions(+), 20 deletions(-)
rename drivers/gpu/drm/{rockchip/cdn-dp-reg.c => bridge/cdns-mhdp-common.c} (87%)
create mode 100644 drivers/gpu/drm/bridge/cdns-mhdp.c
rename drivers/gpu/drm/rockchip/cdn-dp-reg.h => include/drm/bridge/cdns-mhdp-common.h (95%)
diff --git a/drivers/gpu/drm/bridge/Kconfig b/drivers/gpu/drm/bridge/Kconfig
index 9eeb8ef0b174..90a4810a8c96 100644
--- a/drivers/gpu/drm/bridge/Kconfig
+++ b/drivers/gpu/drm/bridge/Kconfig
@@ -35,6 +35,15 @@ config DRM_CDNS_DSI
Support Cadence DPI to DSI bridge. This is an internal
bridge and is meant to be directly embedded in a SoC.
+config DRM_CDNS_MHDP
+ tristate "Cadence DPI/DP bridge"
+ select DRM_KMS_HELPER
+ select DRM_PANEL_BRIDGE
+ depends on OF
+ help
+ Support Cadence DPI to DP bridge. This is an internal
+ bridge and is meant to be directly embedded in a SoC.
+
config DRM_DUMB_VGA_DAC
tristate "Dumb VGA DAC Bridge support"
depends on OF
diff --git a/drivers/gpu/drm/bridge/Makefile b/drivers/gpu/drm/bridge/Makefile
index 4934fcf5a6f8..e802fdb85750 100644
--- a/drivers/gpu/drm/bridge/Makefile
+++ b/drivers/gpu/drm/bridge/Makefile
@@ -16,4 +16,7 @@ obj-$(CONFIG_DRM_ANALOGIX_DP) += analogix/
obj-$(CONFIG_DRM_I2C_ADV7511) += adv7511/
obj-$(CONFIG_DRM_TI_SN65DSI86) += ti-sn65dsi86.o
obj-$(CONFIG_DRM_TI_TFP410) += ti-tfp410.o
+obj-$(CONFIG_DRM_CDNS_MHDP) += mhdp8546.o
obj-y += synopsys/
+
+mhdp8546-objs := cdns-mhdp-common.o cdns-mhdp.o
diff --git a/drivers/gpu/drm/rockchip/cdn-dp-reg.c b/drivers/gpu/drm/bridge/cdns-mhdp-common.c
similarity index 87%
rename from drivers/gpu/drm/rockchip/cdn-dp-reg.c
rename to drivers/gpu/drm/bridge/cdns-mhdp-common.c
index c1a76e6fff88..fda1bee7adb5 100644
--- a/drivers/gpu/drm/rockchip/cdn-dp-reg.c
+++ b/drivers/gpu/drm/bridge/cdns-mhdp-common.c
@@ -19,8 +19,9 @@
#include <linux/iopoll.h>
#include <linux/reset.h>
-#include "cdn-dp-core.h"
-#include "cdn-dp-reg.h"
+#include <drm/drm_print.h>
+#include <drm/drm_modes.h>
+#include <drm/bridge/cdns-mhdp-common.h>
#define CDNS_DP_SPDIF_CLK 200000000
#define FW_ALIVE_TIMEOUT_US 1000000
@@ -33,6 +34,7 @@ void cdns_mhdp_set_fw_clk(struct cdns_mhdp_device *mhdp, unsigned long clk)
{
writel(clk / 1000000, mhdp->regs + SW_CLK_H);
}
+EXPORT_SYMBOL(cdns_mhdp_set_fw_clk);
void cdns_mhdp_clock_reset(struct cdns_mhdp_device *mhdp)
{
@@ -82,6 +84,7 @@ void cdns_mhdp_clock_reset(struct cdns_mhdp_device *mhdp)
/* enable Mailbox and PIF interrupt */
writel(0, mhdp->regs + APB_INT_MASK);
}
+EXPORT_SYMBOL(cdns_mhdp_clock_reset);
static int cdns_mhdp_mailbox_read(struct cdns_mhdp_device *mhdp)
{
@@ -189,7 +192,56 @@ static int cdns_mhdp_mailbox_send(struct cdns_mhdp_device *mhdp, u8 module_id,
return 0;
}
-static int cdns_mhdp_reg_write(struct cdns_mhdp_device *mhdp, u16 addr, u32 val)
+int cdns_mhdp_reg_read(struct cdns_mhdp_device *mhdp, u32 addr, u32 *value)
+{
+ u8 msg[4], resp[8];
+ int ret;
+
+ if (addr == 0) {
+ ret = -EINVAL;
+ goto err_reg_read;
+ }
+
+ msg[0] = (u8)(addr >> 24);
+ msg[1] = (u8)(addr >> 16);
+ msg[2] = (u8)(addr >> 8);
+ msg[3] = (u8)addr;
+
+ ret = cdns_mhdp_mailbox_send(mhdp, MB_MODULE_ID_GENERAL,
+ GENERAL_REGISTER_READ,
+ sizeof(msg), msg);
+ if (ret)
+ goto err_reg_read;
+
+ ret = cdns_mhdp_mailbox_validate_receive(mhdp, MB_MODULE_ID_GENERAL,
+ GENERAL_REGISTER_READ,
+ sizeof(resp));
+ if (ret)
+ goto err_reg_read;
+
+ ret = cdns_mhdp_mailbox_read_receive(mhdp, resp, sizeof(resp));
+ if (ret)
+ goto err_reg_read;
+
+ /* Returned address value should be the same as requested */
+ if (memcmp(msg, resp, sizeof(msg))) {
+ ret = -EINVAL;
+ goto err_reg_read;
+ }
+
+ *value = (resp[4] << 24) | (resp[5] << 16) | (resp[6] << 8) | resp[7];
+
+err_reg_read:
+ if (ret) {
+ DRM_DEV_ERROR(mhdp->dev, "Failed to read register.\n");
+ *value = 0;
+ }
+
+ return ret;
+}
+EXPORT_SYMBOL(cdns_mhdp_reg_read);
+
+int cdns_mhdp_reg_write(struct cdns_mhdp_device *mhdp, u16 addr, u32 val)
{
u8 msg[6];
@@ -202,8 +254,9 @@ static int cdns_mhdp_reg_write(struct cdns_mhdp_device *mhdp, u16 addr, u32 val)
return cdns_mhdp_mailbox_send(mhdp, MB_MODULE_ID_DP_TX,
DPTX_WRITE_REGISTER, sizeof(msg), msg);
}
+EXPORT_SYMBOL(cdns_mhdp_reg_write);
-static int cdns_mhdp_reg_write_bit(struct cdns_mhdp_device *mhdp, u16 addr,
+int cdns_mhdp_reg_write_bit(struct cdns_mhdp_device *mhdp, u16 addr,
u8 start_bit, u8 bits_no, u32 val)
{
u8 field[8];
@@ -220,6 +273,7 @@ static int cdns_mhdp_reg_write_bit(struct cdns_mhdp_device *mhdp, u16 addr,
return cdns_mhdp_mailbox_send(mhdp, MB_MODULE_ID_DP_TX,
DPTX_WRITE_FIELD, sizeof(field), field);
}
+EXPORT_SYMBOL(cdns_mhdp_reg_write_bit);
int cdns_mhdp_dpcd_read(struct cdns_mhdp_device *mhdp,
u32 addr, u8 *data, u16 len)
@@ -252,6 +306,7 @@ int cdns_mhdp_dpcd_read(struct cdns_mhdp_device *mhdp,
err_dpcd_read:
return ret;
}
+EXPORT_SYMBOL(cdns_mhdp_dpcd_read);
int cdns_mhdp_dpcd_write(struct cdns_mhdp_device *mhdp, u32 addr, u8 value)
{
@@ -286,6 +341,7 @@ int cdns_mhdp_dpcd_write(struct cdns_mhdp_device *mhdp, u32 addr, u8 value)
DRM_DEV_ERROR(mhdp->dev, "dpcd write failed: %d\n", ret);
return ret;
}
+EXPORT_SYMBOL(cdns_mhdp_dpcd_write);
int cdns_mhdp_load_firmware(struct cdns_mhdp_device *mhdp, const u32 *i_mem,
u32 i_size, const u32 *d_mem, u32 d_size)
@@ -328,6 +384,7 @@ int cdns_mhdp_load_firmware(struct cdns_mhdp_device *mhdp, const u32 *i_mem,
return 0;
}
+EXPORT_SYMBOL(cdns_mhdp_load_firmware);
int cdns_mhdp_set_firmware_active(struct cdns_mhdp_device *mhdp, bool enable)
{
@@ -362,6 +419,7 @@ int cdns_mhdp_set_firmware_active(struct cdns_mhdp_device *mhdp, bool enable)
DRM_DEV_ERROR(mhdp->dev, "set firmware active failed\n");
return ret;
}
+EXPORT_SYMBOL(cdns_mhdp_set_firmware_active);
int cdns_mhdp_set_host_cap(struct cdns_mhdp_device *mhdp, u8 lanes, bool flip)
{
@@ -391,6 +449,7 @@ int cdns_mhdp_set_host_cap(struct cdns_mhdp_device *mhdp, u8 lanes, bool flip)
DRM_DEV_ERROR(mhdp->dev, "set host cap failed: %d\n", ret);
return ret;
}
+EXPORT_SYMBOL(cdns_mhdp_set_host_cap);
int cdns_mhdp_event_config(struct cdns_mhdp_device *mhdp)
{
@@ -408,11 +467,13 @@ int cdns_mhdp_event_config(struct cdns_mhdp_device *mhdp)
return ret;
}
+EXPORT_SYMBOL(cdns_mhdp_event_config);
u32 cdns_mhdp_get_event(struct cdns_mhdp_device *mhdp)
{
return readl(mhdp->regs + SW_EVENTS0);
}
+EXPORT_SYMBOL(cdns_mhdp_get_event);
int cdns_mhdp_get_hpd_status(struct cdns_mhdp_device *mhdp)
{
@@ -440,6 +501,7 @@ int cdns_mhdp_get_hpd_status(struct cdns_mhdp_device *mhdp)
DRM_DEV_ERROR(mhdp->dev, "get hpd status failed: %d\n", ret);
return ret;
}
+EXPORT_SYMBOL(cdns_mhdp_get_hpd_status);
int cdns_mhdp_get_edid_block(void *data, u8 *edid,
unsigned int block, size_t length)
@@ -482,6 +544,7 @@ int cdns_mhdp_get_edid_block(void *data, u8 *edid,
return ret;
}
+EXPORT_SYMBOL(cdns_mhdp_get_edid_block);
static int cdns_mhdp_training_start(struct cdns_mhdp_device *mhdp)
{
@@ -580,6 +643,7 @@ int cdns_mhdp_train_link(struct cdns_mhdp_device *mhdp)
mhdp->link.num_lanes);
return ret;
}
+EXPORT_SYMBOL(cdns_mhdp_train_link);
int cdns_mhdp_set_video_status(struct cdns_mhdp_device *mhdp, int active)
{
@@ -595,6 +659,7 @@ int cdns_mhdp_set_video_status(struct cdns_mhdp_device *mhdp, int active)
return ret;
}
+EXPORT_SYMBOL(cdns_mhdp_set_video_status);
static int cdns_mhdp_get_msa_misc(struct video_info *video,
struct drm_display_mode *mode)
@@ -797,6 +862,7 @@ int cdns_mhdp_config_video(struct cdns_mhdp_device *mhdp)
DRM_DEV_ERROR(mhdp->dev, "config video failed: %d\n", ret);
return ret;
}
+EXPORT_SYMBOL(cdns_mhdp_config_video);
int cdns_mhdp_audio_stop(struct cdns_mhdp_device *mhdp,
struct audio_info *audio)
@@ -831,6 +897,7 @@ int cdns_mhdp_audio_stop(struct cdns_mhdp_device *mhdp,
return 0;
}
+EXPORT_SYMBOL(cdns_mhdp_audio_stop);
int cdns_mhdp_audio_mute(struct cdns_mhdp_device *mhdp, bool enable)
{
@@ -842,6 +909,7 @@ int cdns_mhdp_audio_mute(struct cdns_mhdp_device *mhdp, bool enable)
return ret;
}
+EXPORT_SYMBOL(cdns_mhdp_audio_mute);
static void cdns_mhdp_audio_config_i2s(struct cdns_mhdp_device *mhdp,
struct audio_info *audio)
@@ -977,3 +1045,63 @@ int cdns_mhdp_audio_config(struct cdns_mhdp_device *mhdp,
DRM_DEV_ERROR(mhdp->dev, "audio config failed: %d\n", ret);
return ret;
}
+EXPORT_SYMBOL(cdns_mhdp_audio_config);
+
+int cdns_mhdp_adjust_lt(struct cdns_mhdp_device *mhdp,
+ u8 nlanes, u16 udelay, u8 *lanes_data, u8 *dpcd)
+{
+ u8 payload[7];
+ u8 hdr[5]; /* For DPCD read response header */
+ u32 addr;
+ u8 const nregs = 6; /* Registers 0x202-0x207 */
+ int ret;
+
+ if (nlanes != 4 && nlanes != 2 && nlanes != 1) {
+ DRM_DEV_ERROR(mhdp->dev, "invalid number of lanes: %d\n",
+ nlanes);
+ ret = -EINVAL;
+ goto err_adjust_lt;
+ }
+
+ payload[0] = nlanes;
+ payload[1] = (u8)(udelay >> 8);
+ payload[2] = (u8)udelay;
+
+ payload[3] = lanes_data[0];
+ if (nlanes > 1)
+ payload[4] = lanes_data[1];
+ if (nlanes > 2) {
+ payload[5] = lanes_data[2];
+ payload[6] = lanes_data[3];
+ }
+
+ ret = cdns_mhdp_mailbox_send(mhdp, MB_MODULE_ID_DP_TX,
+ DPTX_ADJUST_LT,
+ sizeof(payload), payload);
+ if (ret)
+ goto err_adjust_lt;
+
+ /* Yes, read the DPCD read command response */
+ ret = cdns_mhdp_mailbox_validate_receive(mhdp, MB_MODULE_ID_DP_TX,
+ DPTX_READ_DPCD,
+ sizeof(hdr) + nregs);
+ if (ret)
+ goto err_adjust_lt;
+
+ ret = cdns_mhdp_mailbox_read_receive(mhdp, hdr, sizeof(hdr));
+ if (ret)
+ goto err_adjust_lt;
+
+ addr = (hdr[2] << 24) | (hdr[3] << 8) | hdr[4];
+ if (addr != DP_LANE0_1_STATUS)
+ goto err_adjust_lt;
+
+ ret = cdns_mhdp_mailbox_read_receive(mhdp, dpcd, nregs);
+
+err_adjust_lt:
+ if (ret)
+ DRM_DEV_ERROR(mhdp->dev, "Failed to adjust Link Training.\n");
+
+ return ret;
+}
+EXPORT_SYMBOL(cdns_mhdp_adjust_lt);
diff --git a/drivers/gpu/drm/bridge/cdns-mhdp.c b/drivers/gpu/drm/bridge/cdns-mhdp.c
new file mode 100644
index 000000000000..a3bbc0e809a5
--- /dev/null
+++ b/drivers/gpu/drm/bridge/cdns-mhdp.c
@@ -0,0 +1,1304 @@
+// SPDX-License-Identifier: GPL v2
+/*
+ * Cadence MHDP DP bridge driver.
+ *
+ * Copyright: 2018 Cadence Design Systems, Inc.
+ *
+ * Author: Quentin Schulz <quentin.schulz@free-electrons.com>
+ */
+
+#include <linux/clk.h>
+#include <linux/delay.h>
+#include <linux/err.h>
+#include <linux/firmware.h>
+#include <linux/io.h>
+#include <linux/iopoll.h>
+#include <linux/module.h>
+#include <linux/of.h>
+#include <linux/platform_device.h>
+#include <linux/slab.h>
+
+#include <drm/drm_atomic_helper.h>
+#include <drm/drm_bridge.h>
+#include <drm/drm_connector.h>
+#include <drm/drm_crtc_helper.h>
+#include <drm/drm_dp_helper.h>
+#include <drm/drm_modeset_helper_vtables.h>
+#include <drm/bridge/cdns-mhdp-common.h>
+
+#include <sound/hdmi-codec.h>
+
+
+#define DEBUG_MSG
+
+#define FW_NAME "cadence/mhdp8546.bin"
+
+#define CDNS_APB_CFG 0x00000
+#define CDNS_APB_CTRL (CDNS_APB_CFG + 0x00)
+#define CDNS_MAILBOX_FULL (CDNS_APB_CFG + 0x08)
+#define CDNS_MAILBOX_EMPTY (CDNS_APB_CFG + 0x0c)
+#define CDNS_MAILBOX_TX_DATA (CDNS_APB_CFG + 0x10)
+#define CDNS_MAILBOX_RX_DATA (CDNS_APB_CFG + 0x14)
+#define CDNS_KEEP_ALIVE (CDNS_APB_CFG + 0x18)
+#define CDNS_KEEP_ALIVE_MASK GENMASK(7, 0)
+
+#define CDNS_SW_CLK_L (CDNS_APB_CFG + 0x3c)
+#define CDNS_SW_CLK_H (CDNS_APB_CFG + 0x40)
+#define CDNS_SW_EVENT0 (CDNS_APB_CFG + 0x44)
+#define CDNS_DPTX_HPD BIT(0)
+
+#define CDNS_SW_EVENT1 (CDNS_APB_CFG + 0x48)
+#define CDNS_SW_EVENT2 (CDNS_APB_CFG + 0x4c)
+#define CDNS_SW_EVENT3 (CDNS_APB_CFG + 0x50)
+
+#define CDNS_DPTX_CAR (CDNS_APB_CFG + 0x904)
+#define CDNS_VIF_CLK_EN BIT(0)
+#define CDNS_VIF_CLK_RSTN BIT(1)
+
+#define CDNS_SOURCE_VIDEO_INTERFACE 0x00b00
+#define CDNS_BND_HSYNC2VSYNC (CDNS_SOURCE_VIDEO_INTERFACE + \
+ 0x00)
+#define CDNS_IP_DTCT_WIN GENMASK(11, 0)
+#define CDNS_IP_DET_INTERLACE_FORMAT BIT(12)
+#define CDNS_IP_BYPASS_V_INTERFACE BIT(13)
+
+#define CDNS_HSYNC2VSYNC_POL_CTRL (CDNS_SOURCE_VIDEO_INTERFACE + \
+ 0x10)
+#define CDNS_H2V_HSYNC_POL_ACTIVE_LOW BIT(1)
+#define CDNS_H2V_VSYNC_POL_ACTIVE_LOW BIT(2)
+
+#define CDNS_DPTX_PHY_CONFIG 0x02000
+#define CDNS_PHY_TRAINING_EN BIT(0)
+#define CDNS_PHY_TRAINING_TYPE(x) (((x) & GENMASK(3, 0)) << 1)
+#define CDNS_PHY_SCRAMBLER_BYPASS BIT(5)
+#define CDNS_PHY_ENCODER_BYPASS BIT(6)
+#define CDNS_PHY_SKEW_BYPASS BIT(7)
+#define CDNS_PHY_TRAINING_AUTO BIT(8)
+#define CDNS_PHY_LANE0_SKEW(x) (((x) & GENMASK(2, 0)) << 9)
+#define CDNS_PHY_LANE1_SKEW(x) (((x) & GENMASK(2, 0)) << 12)
+#define CDNS_PHY_LANE2_SKEW(x) (((x) & GENMASK(2, 0)) << 15)
+#define CDNS_PHY_LANE3_SKEW(x) (((x) & GENMASK(2, 0)) << 18)
+#define CDNS_PHY_COMMON_CONFIG (CDNS_PHY_LANE1_SKEW(1) | \
+ CDNS_PHY_LANE2_SKEW(2) | \
+ CDNS_PHY_LANE3_SKEW(3))
+#define CDNS_PHY_10BIT_EN BIT(21)
+
+#define CDNS_DPTX_FRAMER 0x02200
+#define CDNS_DP_FRAMER_GLOBAL_CONFIG (CDNS_DPTX_FRAMER + 0x00)
+#define CDNS_DP_NUM_LANES(x) (x - 1)
+#define CDNS_DP_FRAMER_EN BIT(3)
+#define CDNS_DP_RATE_GOVERNOR_EN BIT(4)
+#define CDNS_DP_NO_VIDEO_MODE BIT(5)
+#define CDNS_DP_DISABLE_PHY_RST BIT(6)
+#define CDNS_DP_WR_FAILING_EDGE_VSYNC BIT(7)
+
+#define CDNS_DP_SW_RESET (CDNS_DPTX_FRAMER + 0x04)
+#define CDNS_DP_FRAMER_TU (CDNS_DPTX_FRAMER + 0x08)
+#define CDNS_DP_FRAMER_TU_SIZE(x) (((x) & GENMASK(6, 0)) << 8)
+#define CDNS_DP_FRAMER_TU_VS(x) ((x) & GENMASK(5, 0))
+#define CDNS_DP_FRAMER_TU_CNT_RST_EN BIT(15)
+
+#define CDNS_DPTX_STREAM 0x03000
+#define CDNS_DP_MSA_HORIZONTAL_0 (CDNS_DPTX_STREAM + 0x00)
+#define CDNS_DP_MSAH0_H_TOTAL(x) (x)
+#define CDNS_DP_MSAH0_HSYNC_START(x) ((x) << 16)
+
+#define CDNS_DP_MSA_HORIZONTAL_1 (CDNS_DPTX_STREAM + 0x04)
+#define CDNS_DP_MSAH1_HSYNC_WIDTH(x) (x)
+#define CDNS_DP_MSAH1_HSYNC_POL_LOW BIT(15)
+#define CDNS_DP_MSAH1_HDISP_WIDTH(x) ((x) << 16)
+
+#define CDNS_DP_MSA_VERTICAL_0 (CDNS_DPTX_STREAM + 0x08)
+#define CDNS_DP_MSAV0_V_TOTAL(x) (x)
+#define CDNS_DP_MSAV0_VSYNC_START(x) ((x) << 16)
+
+#define CDNS_DP_MSA_VERTICAL_1 (CDNS_DPTX_STREAM + 0x0c)
+#define CDNS_DP_MSAV1_VSYNC_WIDTH(x) (x)
+#define CDNS_DP_MSAV1_VSYNC_POL_LOW BIT(15)
+#define CDNS_DP_MSAV1_VDISP_WIDTH(x) ((x) << 16)
+
+#define CDNS_DP_MSA_MISC (CDNS_DPTX_STREAM + 0x10)
+#define CDNS_DP_STREAM_CONFIG (CDNS_DPTX_STREAM + 0x14)
+#define CDNS_DP_RATE_GOVERNOR_STATUS (CDNS_DPTX_STREAM + 0x2c)
+#define CDNS_DP_RG_TU_VS_DIFF(x) ((x) << 8)
+
+#define CDNS_DP_HORIZONTAL (CDNS_DPTX_STREAM + 0x30)
+#define CDNS_DP_H_HSYNC_WIDTH(x) (x)
+#define CDNS_DP_H_H_TOTAL(x) ((x) << 16)
+
+#define CDNS_DP_VERTICAL_0 (CDNS_DPTX_STREAM + 0x34)
+#define CDNS_DP_V0_VHEIGHT(x) (x)
+#define CDNS_DP_V0_VSTART(x) ((x) << 16)
+
+#define CDNS_DP_VERTICAL_1 (CDNS_DPTX_STREAM + 0x38)
+#define CDNS_DP_V1_VTOTAL(x) (x)
+#define CDNS_DP_V1_VTOTAL_EVEN BIT(16)
+
+#define CDNS_DP_FRAMER_PXL_REPR (CDNS_DPTX_STREAM + 0x4c)
+#define CDNS_DP_FRAMER_6_BPC BIT(0)
+#define CDNS_DP_FRAMER_8_BPC BIT(1)
+#define CDNS_DP_FRAMER_10_BPC BIT(2)
+#define CDNS_DP_FRAMER_12_BPC BIT(3)
+#define CDNS_DP_FRAMER_16_BPC BIT(4)
+#define CDNS_DP_FRAMER_PXL_FORMAT 0x8
+#define CDNS_DP_FRAMER_RGB BIT(0)
+#define CDNS_DP_FRAMER_YCBCR444 BIT(1)
+#define CDNS_DP_FRAMER_YCBCR422 BIT(2)
+#define CDNS_DP_FRAMER_YCBCR420 BIT(3)
+#define CDNS_DP_FRAMER_Y_ONLY BIT(4)
+
+#define CDNS_DP_FRAMER_SP (CDNS_DPTX_STREAM + 0x10)
+#define CDNS_DP_FRAMER_VSYNC_POL_LOW BIT(0)
+#define CDNS_DP_FRAMER_HSYNC_POL_LOW BIT(1)
+#define CDNS_DP_FRAMER_INTERLACE BIT(2)
+
+#define CDNS_DP_LINE_THRESH (CDNS_DPTX_STREAM + 0x64)
+#define CDNS_DP_VB_ID (CDNS_DPTX_STREAM + 0x68)
+#define CDNS_DP_VB_ID_INTERLACED BIT(2)
+
+#define CDNS_DP_FRONT_BACK_PORCH (CDNS_DPTX_STREAM + 0x78)
+#define CDNS_DP_BACK_PORCH(x) (x)
+#define CDNS_DP_FRONT_PORCH(x) ((x) << 16)
+
+#define CDNS_DP_BYTE_COUNT (CDNS_DPTX_STREAM + 0x7c)
+
+#define CDNS_DPTX_GLOBAL 0x02300
+#define CDNS_DP_LANE_EN (CDNS_DPTX_GLOBAL + 0x00)
+#define CDNS_DP_LANE_EN_LANES(x) GENMASK(x - 1, 0)
+#define CDNS_DP_ENHNCD (CDNS_DPTX_GLOBAL + 0x04)
+
+#define CDNS_MHDP_IMEM 0x10000
+#define CDNS_MHDP_DMEM 0x20000
+
+#define CDNS_DP_TRAINING_PATTERN_4 0x7
+
+/* 3min delay because of EDID mb being VERY slow */
+/* FIXME: should be >615000 when upstreaming */
+#define CDNS_TIMEOUT_MAILBOX (1000 * 1000 * 60 * 3)
+
+/* FIXME: Should be 2000 */
+#define CDNS_KEEP_ALIVE_TIMEOUT 40000
+#define CDNS_SW_EVENT0_TIMEOUT 40000
+
+static const struct of_device_id mhdp_ids[] = {
+ { .compatible = "cdns,mhdp8546", },
+ { /* sentinel */ }
+};
+MODULE_DEVICE_TABLE(of, mhdp_ids);
+
+#define CDNS_LANE_1 BIT(0)
+#define CDNS_LANE_2 BIT(1)
+#define CDNS_LANE_4 BIT(2)
+#define CDNS_SSC BIT(3)
+#define CDNS_SCRAMBLER BIT(4)
+
+#define CDNS_VOLT_SWING(x) ((x) & GENMASK(1, 0))
+#define CDNS_FORCE_VOLT_SWING BIT(2)
+
+#define CDNS_PRE_EMPHASIS(x) ((x) & GENMASK(1, 0))
+#define CDNS_FORCE_PRE_EMPHASIS BIT(2)
+
+#define CDNS_SUPPORT_TPS(x) BIT((x) - 1)
+
+#define CDNS_FAST_LINK_TRAINING BIT(0)
+
+#define CDNS_LANE_MAPPING_TYPE_C_LANE_0(x) ((x) & GENMASK(1, 0))
+#define CDNS_LANE_MAPPING_TYPE_C_LANE_1(x) ((x) & GENMASK(3, 2))
+#define CDNS_LANE_MAPPING_TYPE_C_LANE_2(x) ((x) & GENMASK(5, 4))
+#define CDNS_LANE_MAPPING_TYPE_C_LANE_3(x) ((x) & GENMASK(7, 6))
+#define CDNS_LANE_MAPPING_NORMAL 0xe4
+#define CDNS_LANE_MAPPING_FLIPPED 0x1b
+
+#define CDNS_DP_MAX_NUM_LANES 4
+#define CDNS_DP_TEST_VSC_SDP (1 << 6) /* 1.3+ */
+#define CDNS_DP_TEST_COLOR_FORMAT_RAW_Y_ONLY (1 << 7)
+
+static inline struct cdns_mhdp_device *connector_to_mhdp(
+ struct drm_connector *conn)
+{
+ return container_of(conn, struct cdns_mhdp_device, connector);
+}
+
+static inline struct cdns_mhdp_device *bridge_to_mhdp(
+ struct drm_bridge *bridge)
+{
+ return container_of(bridge, struct cdns_mhdp_device, bridge);
+}
+
+static unsigned int max_link_rate(struct cdns_mhdp_host host,
+ struct cdns_mhdp_sink sink)
+{
+ return min(host.link_rate, sink.link_rate);
+}
+
+static u8 eq_training_pattern_supported(struct cdns_mhdp_host host,
+ struct cdns_mhdp_sink sink)
+{
+ return fls(host.pattern_supp & sink.pattern_supp);
+}
+
+static ssize_t mhdp_transfer(struct drm_dp_aux *aux,
+ struct drm_dp_aux_msg *msg)
+{
+ struct cdns_mhdp_device *mhdp = dev_get_drvdata(aux->dev);
+ int ret;
+
+ if (msg->request != DP_AUX_NATIVE_WRITE &&
+ msg->request != DP_AUX_NATIVE_READ)
+ return -ENOTSUPP;
+
+ if (msg->request == DP_AUX_NATIVE_WRITE) {
+ int i;
+
+ for (i = 0; i < msg->size; ++i) {
+ ret = cdns_mhdp_dpcd_write(mhdp,
+ msg->address + i,
+ *((u8 *)msg->buffer + i));
+ if (!ret)
+ continue;
+
+ DRM_DEV_ERROR(mhdp->dev, "Failed to write DPCD\n");
+
+ return i;
+ }
+ } else {
+ ret = cdns_mhdp_dpcd_read(mhdp, msg->address,
+ msg->buffer, msg->size);
+ if (ret) {
+ DRM_DEV_ERROR(mhdp->dev, "Failed to read DPCD\n");
+ return 0;
+ }
+ }
+
+ return msg->size;
+}
+
+static int cdns_mhdp_get_modes(struct drm_connector *connector)
+{
+ struct cdns_mhdp_device *mhdp = connector_to_mhdp(connector);
+ struct edid *edid;
+ int num_modes;
+
+ edid = drm_do_get_edid(connector, cdns_mhdp_get_edid_block, mhdp);
+
+ drm_connector_update_edid_property(connector, edid);
+
+ num_modes = drm_add_edid_modes(connector, edid);
+
+ return num_modes;
+}
+
+static const struct drm_connector_helper_funcs cdns_mhdp_conn_helper_funcs = {
+ .get_modes = cdns_mhdp_get_modes,
+};
+
+static enum drm_connector_status cdns_mhdp_detect(struct drm_connector *conn,
+ bool force)
+{
+ struct cdns_mhdp_device *mhdp = connector_to_mhdp(conn);
+ enum drm_connector_status status = connector_status_disconnected;
+ int ret;
+
+ ret = cdns_mhdp_get_hpd_status(mhdp);
+ if (ret > 0)
+ status = connector_status_connected;
+ else if (ret < 0)
+ dev_err(mhdp->dev, "Failed to obtain HPD state\n");
+
+ return status;
+}
+
+static const struct drm_connector_funcs cdns_mhdp_conn_funcs = {
+ .fill_modes = drm_helper_probe_single_connector_modes,
+ .atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state,
+ .atomic_destroy_state = drm_atomic_helper_connector_destroy_state,
+ .reset = drm_atomic_helper_connector_reset,
+ .destroy = drm_connector_cleanup,
+ .dpms = drm_helper_connector_dpms,
+ .detect = cdns_mhdp_detect,
+};
+
+static int cdns_mhdp_attach(struct drm_bridge *bridge)
+{
+ struct cdns_mhdp_device *mhdp = bridge_to_mhdp(bridge);
+ struct drm_connector *conn = &mhdp->connector;
+ int ret;
+
+ conn->polled = DRM_CONNECTOR_POLL_CONNECT |
+ DRM_CONNECTOR_POLL_DISCONNECT;
+
+ ret = drm_connector_init(bridge->dev, conn, &cdns_mhdp_conn_funcs,
+ DRM_MODE_CONNECTOR_DisplayPort);
+ if (ret) {
+ dev_err(mhdp->dev, "failed to init connector\n");
+ return ret;
+ }
+
+ drm_connector_helper_add(conn, &cdns_mhdp_conn_helper_funcs);
+
+ ret = drm_connector_attach_encoder(conn, bridge->encoder);
+ if (ret) {
+ dev_err(mhdp->dev, "failed to attach connector to encoder\n");
+ return ret;
+ }
+
+ return 0;
+}
+
+enum pixel_format {
+ PIXEL_FORMAT_RGB = 1,
+ PIXEL_FORMAT_YCBCR_444 = 2,
+ PIXEL_FORMAT_YCBCR_422 = 4,
+ PIXEL_FORMAT_YCBCR_420 = 8,
+ PIXEL_FORMAT_Y_ONLY = 16,
+};
+
+static void mhdp_link_training_init(struct cdns_mhdp_device *mhdp)
+{
+ u32 reg32;
+
+ drm_dp_dpcd_writeb(&mhdp->aux, DP_TRAINING_PATTERN_SET,
+ DP_TRAINING_PATTERN_DISABLE);
+
+ /* Reset PHY configuration */
+ reg32 = CDNS_PHY_COMMON_CONFIG | CDNS_PHY_TRAINING_TYPE(1);
+ if (!(mhdp->host.lanes_cnt & CDNS_SCRAMBLER))
+ reg32 |= CDNS_PHY_SCRAMBLER_BYPASS;
+
+ cdns_mhdp_reg_write(mhdp, CDNS_DPTX_PHY_CONFIG, reg32);
+
+ cdns_mhdp_reg_write(mhdp, CDNS_DP_ENHNCD,
+ mhdp->sink.enhanced & mhdp->host.enhanced);
+
+ cdns_mhdp_reg_write(mhdp, CDNS_DP_LANE_EN,
+ CDNS_DP_LANE_EN_LANES(mhdp->link.num_lanes));
+
+ drm_dp_link_configure(&mhdp->aux, &mhdp->link);
+
+ cdns_mhdp_reg_write(mhdp, CDNS_DPTX_PHY_CONFIG,
+ CDNS_PHY_COMMON_CONFIG |
+ CDNS_PHY_TRAINING_EN |
+ CDNS_PHY_TRAINING_TYPE(1) |
+ CDNS_PHY_SCRAMBLER_BYPASS);
+
+ drm_dp_dpcd_writeb(&mhdp->aux, DP_TRAINING_PATTERN_SET,
+ DP_TRAINING_PATTERN_1 | DP_LINK_SCRAMBLING_DISABLE);
+}
+
+static void mhdp_get_adjust_train(struct cdns_mhdp_device *mhdp,
+ u8 link_status[DP_LINK_STATUS_SIZE],
+ u8 lanes_data[CDNS_DP_MAX_NUM_LANES])
+{
+ unsigned int i;
+ u8 adjust, max_pre_emphasis, max_volt_swing;
+
+ max_pre_emphasis = CDNS_PRE_EMPHASIS(mhdp->host.pre_emphasis)
+ << DP_TRAIN_PRE_EMPHASIS_SHIFT;
+ max_volt_swing = CDNS_VOLT_SWING(mhdp->host.volt_swing);
+
+ for (i = 0; i < mhdp->link.num_lanes; i++) {
+ adjust = drm_dp_get_adjust_request_voltage(link_status, i);
+ lanes_data[i] = min_t(u8, adjust, max_volt_swing);
+ if (lanes_data[i] != adjust)
+ lanes_data[i] |= DP_TRAIN_MAX_SWING_REACHED;
+
+ adjust = drm_dp_get_adjust_request_pre_emphasis(link_status, i);
+ lanes_data[i] |= min_t(u8, adjust, max_pre_emphasis);
+ if ((lanes_data[i] >> DP_TRAIN_PRE_EMPHASIS_SHIFT) != adjust)
+ lanes_data[i] |= DP_TRAIN_MAX_PRE_EMPHASIS_REACHED;
+ }
+}
+
+static void mhdp_set_adjust_request_voltage(
+ u8 link_status[DP_LINK_STATUS_SIZE], int lane, u8 volt)
+{
+ int i = DP_ADJUST_REQUEST_LANE0_1 + (lane >> 1);
+ int s = ((lane & 1) ?
+ DP_ADJUST_VOLTAGE_SWING_LANE1_SHIFT :
+ DP_ADJUST_VOLTAGE_SWING_LANE0_SHIFT);
+ int idx = i - DP_LANE0_1_STATUS;
+
+ link_status[idx] &= ~(DP_ADJUST_VOLTAGE_SWING_LANE0_MASK << s);
+ link_status[idx] |= volt << s;
+}
+
+static void mhdp_set_adjust_request_pre_emphasis(
+ u8 link_status[DP_LINK_STATUS_SIZE], int lane, u8 pre_emphasis)
+{
+ int i = DP_ADJUST_REQUEST_LANE0_1 + (lane >> 1);
+ int s = ((lane & 1) ?
+ DP_ADJUST_PRE_EMPHASIS_LANE1_SHIFT :
+ DP_ADJUST_PRE_EMPHASIS_LANE0_SHIFT);
+ int idx = i - DP_LANE0_1_STATUS;
+
+ link_status[idx] &= ~(DP_ADJUST_PRE_EMPHASIS_LANE0_MASK << s);
+ link_status[idx] |= pre_emphasis << s;
+}
+
+static void mhdp_adjust_requested_eq(struct cdns_mhdp_device *mhdp,
+ u8 link_status[DP_LINK_STATUS_SIZE])
+{
+ unsigned int i;
+ u8 pre, volt, max_pre = CDNS_VOLT_SWING(mhdp->host.volt_swing),
+ max_volt = CDNS_PRE_EMPHASIS(mhdp->host.pre_emphasis);
+
+ for (i = 0; i < mhdp->link.num_lanes; i++) {
+ volt = drm_dp_get_adjust_request_voltage(link_status, i);
+ pre = drm_dp_get_adjust_request_pre_emphasis(link_status, i);
+ if (volt + pre > 3)
+ mhdp_set_adjust_request_voltage(link_status, i,
+ 3 - pre);
+ if (mhdp->host.volt_swing & CDNS_FORCE_VOLT_SWING)
+ mhdp_set_adjust_request_voltage(link_status, i,
+ max_volt);
+ if (mhdp->host.pre_emphasis & CDNS_FORCE_PRE_EMPHASIS)
+ mhdp_set_adjust_request_pre_emphasis(link_status, i,
+ max_pre);
+ }
+}
+
+static bool mhdp_link_training_channel_eq(struct cdns_mhdp_device *mhdp,
+ u8 eq_tps,
+ unsigned int training_interval)
+{
+ u8 lanes_data[CDNS_DP_MAX_NUM_LANES], fail_counter_short = 0;
+ u8 dpcd[DP_LINK_STATUS_SIZE];
+ u32 reg32;
+
+ dev_dbg(mhdp->dev, "Link training - Starting EQ phase\n");
+
+ /* Enable link training TPS[eq_tps] in PHY */
+ reg32 = CDNS_PHY_COMMON_CONFIG | CDNS_PHY_TRAINING_EN |
+ CDNS_PHY_TRAINING_TYPE(eq_tps);
+ if (eq_tps != 4)
+ reg32 |= CDNS_PHY_SCRAMBLER_BYPASS;
+ cdns_mhdp_reg_write(mhdp, CDNS_DPTX_PHY_CONFIG, reg32);
+
+ drm_dp_dpcd_writeb(&mhdp->aux, DP_TRAINING_PATTERN_SET,
+ (eq_tps != 4) ? eq_tps | DP_LINK_SCRAMBLING_DISABLE :
+ CDNS_DP_TRAINING_PATTERN_4);
+
+ drm_dp_dpcd_read_link_status(&mhdp->aux, dpcd);
+
+ do {
+ mhdp_get_adjust_train(mhdp, dpcd, lanes_data);
+
+ cdns_mhdp_adjust_lt(mhdp, mhdp->link.num_lanes,
+ training_interval, lanes_data, dpcd);
+
+ if (!drm_dp_clock_recovery_ok(dpcd, mhdp->link.num_lanes))
+ goto err;
+
+ if (drm_dp_channel_eq_ok(dpcd, mhdp->link.num_lanes)) {
+ dev_dbg(mhdp->dev,
+ "Link training: EQ phase succeeded\n");
+ return true;
+ }
+
+ fail_counter_short++;
+
+ mhdp_adjust_requested_eq(mhdp, dpcd);
+ } while (fail_counter_short < 5);
+
+err:
+ dev_dbg(mhdp->dev,
+ "Link training - EQ phase failed for %d lanes and %d rate\n",
+ mhdp->link.num_lanes, mhdp->link.rate);
+
+ return false;
+}
+
+static void mhdp_adjust_requested_cr(struct cdns_mhdp_device *mhdp,
+ u8 link_status[DP_LINK_STATUS_SIZE],
+ u8 *req_volt, u8 *req_pre)
+{
+ unsigned int i, max_volt = CDNS_VOLT_SWING(mhdp->host.volt_swing),
+ max_pre = CDNS_PRE_EMPHASIS(mhdp->host.pre_emphasis);
+
+ for (i = 0; i < mhdp->link.num_lanes; i++) {
+ if (mhdp->host.volt_swing & CDNS_FORCE_VOLT_SWING)
+ mhdp_set_adjust_request_voltage(link_status, i,
+ max_volt);
+ else
+ mhdp_set_adjust_request_voltage(link_status, i,
+ req_volt[i]);
+
+ if (mhdp->host.pre_emphasis & CDNS_FORCE_PRE_EMPHASIS)
+ mhdp_set_adjust_request_pre_emphasis(link_status, i,
+ max_pre);
+ else
+ mhdp_set_adjust_request_pre_emphasis(link_status, i,
+ req_pre[i]);
+ }
+}
+
+static void mhdp_validate_cr(struct cdns_mhdp_device *mhdp, bool *cr_done,
+ bool *same_before_adjust, bool *max_swing_reached,
+ u8 before_cr[DP_LINK_STATUS_SIZE],
+ u8 after_cr[DP_LINK_STATUS_SIZE], u8 *req_volt,
+ u8 *req_pre)
+{
+ unsigned int i;
+ u8 tmp, max_volt = CDNS_VOLT_SWING(mhdp->host.volt_swing),
+ max_pre = CDNS_PRE_EMPHASIS(mhdp->host.pre_emphasis);
+ bool same_pre, same_volt;
+
+ *same_before_adjust = false;
+ *max_swing_reached = false;
+ *cr_done = drm_dp_clock_recovery_ok(after_cr, mhdp->link.num_lanes);
+
+ for (i = 0; i < mhdp->link.num_lanes; i++) {
+ tmp = drm_dp_get_adjust_request_voltage(after_cr, i);
+ req_volt[i] = min_t(u8, tmp, max_volt);
+
+ tmp = drm_dp_get_adjust_request_pre_emphasis(after_cr, i) >>
+ DP_TRAIN_PRE_EMPHASIS_SHIFT;
+ req_pre[i] = min_t(u8, tmp, max_pre);
+
+ same_pre = (before_cr[i] & DP_TRAIN_PRE_EMPHASIS_MASK) ==
+ (req_pre[i] << DP_TRAIN_PRE_EMPHASIS_SHIFT);
+ same_volt = (before_cr[i] & DP_TRAIN_VOLTAGE_SWING_MASK) ==
+ req_volt[i];
+ if (same_pre && same_volt)
+ *same_before_adjust = true;
+
+ /* 3.1.5.2 in DP Standard v1.4. Table 3-1 */
+ if (!*cr_done && req_volt[i] + req_pre[i] >= 3) {
+ *max_swing_reached = true;
+ return;
+ }
+ }
+}
+
+static bool mhdp_link_training_clock_recovery(struct cdns_mhdp_device *mhdp)
+{
+ u8 lanes_data[CDNS_DP_MAX_NUM_LANES], fail_counter_short = 0,
+ fail_counter_cr_long = 0;
+ u8 dpcd[DP_LINK_STATUS_SIZE];
+ bool cr_done;
+
+ dev_dbg(mhdp->dev, "Link training starting CR phase\n");
+
+ mhdp_link_training_init(mhdp);
+
+ drm_dp_dpcd_read_link_status(&mhdp->aux, dpcd);
+
+ do {
+ u8 requested_adjust_volt_swing[CDNS_DP_MAX_NUM_LANES] = {},
+ requested_adjust_pre_emphasis[CDNS_DP_MAX_NUM_LANES] = {};
+ bool same_before_adjust, max_swing_reached;
+
+ mhdp_get_adjust_train(mhdp, dpcd, lanes_data);
+
+ cdns_mhdp_adjust_lt(mhdp, mhdp->link.num_lanes, 100,
+ lanes_data, dpcd);
+
+ mhdp_validate_cr(mhdp, &cr_done, &same_before_adjust,
+ &max_swing_reached, lanes_data, dpcd,
+ requested_adjust_volt_swing,
+ requested_adjust_pre_emphasis);
+
+ if (max_swing_reached)
+ goto err;
+
+ if (cr_done) {
+ dev_dbg(mhdp->dev,
+ "Link training: CR phase succeeded\n");
+ return true;
+ }
+
+ /* Not all CR_DONE bits set */
+ fail_counter_cr_long++;
+
+ if (same_before_adjust) {
+ fail_counter_short++;
+ continue;
+ }
+
+ fail_counter_short = 0;
+ /*
+ * Voltage swing/pre-emphasis adjust requested
+ * during CR phase
+ */
+ mhdp_adjust_requested_cr(mhdp, dpcd,
+ requested_adjust_volt_swing,
+ requested_adjust_pre_emphasis);
+ } while (fail_counter_short < 5 && fail_counter_cr_long < 10);
+
+err:
+ dev_dbg(mhdp->dev,
+ "Link training: CR phase failed for %d lanes and %d rate\n",
+ mhdp->link.num_lanes, mhdp->link.rate);
+
+ return false;
+}
+
+static void lower_link_rate(struct drm_dp_link *link)
+{
+ switch (drm_dp_link_rate_to_bw_code(link->rate)) {
+ case DP_LINK_BW_2_7:
+ link->rate = drm_dp_bw_code_to_link_rate(DP_LINK_BW_1_62);
+ break;
+ case DP_LINK_BW_5_4:
+ link->rate = drm_dp_bw_code_to_link_rate(DP_LINK_BW_2_7);
+ break;
+ case DP_LINK_BW_8_1:
+ link->rate = drm_dp_bw_code_to_link_rate(DP_LINK_BW_5_4);
+ break;
+ }
+}
+
+static int mhdp_link_training(struct cdns_mhdp_device *mhdp,
+ unsigned int video_mode,
+ unsigned int training_interval)
+{
+ u32 reg32;
+ u8 eq_tps = eq_training_pattern_supported(mhdp->host, mhdp->sink);
+
+ while (1) {
+ if (!mhdp_link_training_clock_recovery(mhdp)) {
+ if (drm_dp_link_rate_to_bw_code(mhdp->link.rate) !=
+ DP_LINK_BW_1_62) {
+ dev_dbg(mhdp->dev,
+ "Reducing link rate during CR phase\n");
+ lower_link_rate(&mhdp->link);
+ drm_dp_link_configure(&mhdp->aux, &mhdp->link);
+
+ continue;
+ } else if (mhdp->link.num_lanes > 1) {
+ dev_dbg(mhdp->dev,
+ "Reducing lanes number during CR phase\n");
+ mhdp->link.num_lanes >>= 1;
+ mhdp->link.rate = max_link_rate(mhdp->host,
+ mhdp->sink);
+ drm_dp_link_configure(&mhdp->aux, &mhdp->link);
+
+ continue;
+ }
+
+ dev_dbg(mhdp->dev,
+ "Link training failed during CR phase\n");
+ goto err;
+ }
+
+ if (mhdp_link_training_channel_eq(mhdp, eq_tps,
+ training_interval))
+ break;
+
+ if (mhdp->link.num_lanes > 1) {
+ dev_dbg(mhdp->dev,
+ "Reducing lanes number during EQ phase\n");
+ mhdp->link.num_lanes >>= 1;
+ drm_dp_link_configure(&mhdp->aux, &mhdp->link);
+
+ continue;
+ } else if (drm_dp_link_rate_to_bw_code(mhdp->link.rate) !=
+ DP_LINK_BW_1_62) {
+ dev_dbg(mhdp->dev,
+ "Reducing link rate during EQ phase\n");
+ lower_link_rate(&mhdp->link);
+ drm_dp_link_configure(&mhdp->aux, &mhdp->link);
+
+ continue;
+ }
+
+ dev_dbg(mhdp->dev, "Link training failed during EQ phase\n");
+ goto err;
+ }
+
+ dev_dbg(mhdp->dev, "Link training successful\n");
+
+ drm_dp_dpcd_writeb(&mhdp->aux, DP_TRAINING_PATTERN_SET,
+ (mhdp->host.lanes_cnt & CDNS_SCRAMBLER) ? 0 :
+ DP_LINK_SCRAMBLING_DISABLE);
+
+ /* SW reset DPTX framer */
+ cdns_mhdp_reg_write(mhdp, CDNS_DP_SW_RESET, 1);
+ cdns_mhdp_reg_write(mhdp, CDNS_DP_SW_RESET, 0);
+
+ /* Enable framer */
+ /* FIXME: update when MST supported, BIT(2) */
+ cdns_mhdp_reg_write(mhdp, CDNS_DP_FRAMER_GLOBAL_CONFIG,
+ CDNS_DP_FRAMER_EN |
+ CDNS_DP_NUM_LANES(mhdp->link.num_lanes) |
+ CDNS_DP_DISABLE_PHY_RST |
+ CDNS_DP_WR_FAILING_EDGE_VSYNC |
+ (!video_mode ? CDNS_DP_NO_VIDEO_MODE : 0));
+
+ /* Reset PHY config */
+ reg32 = CDNS_PHY_COMMON_CONFIG | CDNS_PHY_TRAINING_TYPE(1);
+ if (!(mhdp->host.lanes_cnt & CDNS_SCRAMBLER))
+ reg32 |= CDNS_PHY_SCRAMBLER_BYPASS;
+ cdns_mhdp_reg_write(mhdp, CDNS_DPTX_PHY_CONFIG, reg32);
+
+ return 0;
+err:
+ /* Reset PHY config */
+ reg32 = CDNS_PHY_COMMON_CONFIG | CDNS_PHY_TRAINING_TYPE(1);
+ if (!(mhdp->host.lanes_cnt & CDNS_SCRAMBLER))
+ reg32 |= CDNS_PHY_SCRAMBLER_BYPASS;
+ cdns_mhdp_reg_write(mhdp, CDNS_DPTX_PHY_CONFIG, reg32);
+
+ drm_dp_dpcd_writeb(&mhdp->aux, DP_TRAINING_PATTERN_SET,
+ DP_TRAINING_PATTERN_DISABLE);
+
+ return -EIO;
+}
+
+static void cdns_mhdp_disable(struct drm_bridge *bridge)
+{
+ struct cdns_mhdp_device *mhdp = bridge_to_mhdp(bridge);
+
+ cdns_mhdp_set_video_status(mhdp, 0);
+
+ drm_dp_link_power_down(&mhdp->aux, &mhdp->link);
+}
+
+static void cdns_mhdp_enable(struct drm_bridge *bridge)
+{
+ struct cdns_mhdp_device *mhdp = bridge_to_mhdp(bridge);
+ struct drm_display_mode *mode;
+ struct drm_display_info *disp_info = &mhdp->connector.display_info;
+ enum pixel_format pxlfmt;
+ int pxlclock;
+ unsigned int rate, tu_size = 30, vs, vs_f, bpp, required_bandwidth,
+ available_bandwidth, dp_framer_sp = 0, msa_horizontal_1,
+ msa_vertical_1, bnd_hsync2vsync, hsync2vsync_pol_ctrl,
+ misc0 = 0, misc1 = 0, line_thresh = 0, pxl_repr,
+ front_porch, back_porch, msa_h0, msa_v0, hsync, vsync,
+ dp_vertical_1, line_thresh1, line_thresh2;
+ u32 resp;
+
+ unsigned int size = DP_RECEIVER_CAP_SIZE, dp_framer_global_config,
+ video_mode, training_interval_us;
+ u8 reg0[size], reg8, amp[2];
+
+ mode = &bridge->encoder->crtc->state->adjusted_mode;
+ pxlclock = mode->crtc_clock;
+
+ /*
+ * Upon power-on reset/device disconnection: [2:0] bits should be 0b001
+ * and [7:5] bits 0b000.
+ */
+ drm_dp_dpcd_writeb(&mhdp->aux, DP_SET_POWER, 1);
+
+ drm_dp_link_probe(&mhdp->aux, &mhdp->link);
+
+ dev_dbg(mhdp->dev, "Set sink device power state via DPCD\n");
+ drm_dp_link_power_up(&mhdp->aux, &mhdp->link);
+ /* FIXME (CDNS): do we have to wait for 100ms before going on? */
+ mdelay(100);
+
+ mhdp->sink.link_rate = mhdp->link.rate;
+ mhdp->sink.lanes_cnt = mhdp->link.num_lanes;
+ mhdp->sink.enhanced = !!(mhdp->link.capabilities &
+ DP_LINK_CAP_ENHANCED_FRAMING);
+
+ drm_dp_dpcd_read(&mhdp->aux, DP_DPCD_REV, reg0, size);
+
+ mhdp->sink.pattern_supp = CDNS_SUPPORT_TPS(1) | CDNS_SUPPORT_TPS(2);
+ if (drm_dp_tps3_supported(reg0))
+ mhdp->sink.pattern_supp |= CDNS_SUPPORT_TPS(3);
+ if (drm_dp_tps4_supported(reg0))
+ mhdp->sink.pattern_supp |= CDNS_SUPPORT_TPS(4);
+
+ mhdp->sink.fast_link = !!(reg0[DP_MAX_DOWNSPREAD] &
+ DP_NO_AUX_HANDSHAKE_LINK_TRAINING);
+
+ mhdp->link.rate = max_link_rate(mhdp->host, mhdp->sink);
+ mhdp->link.num_lanes = min_t(u8, mhdp->sink.lanes_cnt,
+ mhdp->host.lanes_cnt & GENMASK(2, 0));
+
+ reg8 = reg0[DP_TRAINING_AUX_RD_INTERVAL] &
+ DP_TRAINING_AUX_RD_MASK;
+ switch (reg8) {
+ case 0:
+ training_interval_us = 400;
+ break;
+ case 1:
+ case 2:
+ case 3:
+ case 4:
+ training_interval_us = 4000 << (reg8 - 1);
+ break;
+ default:
+ dev_err(mhdp->dev,
+ "wrong training interval returned by DPCD: %d\n", reg8);
+ return;
+ }
+
+ cdns_mhdp_reg_read(mhdp, CDNS_DP_FRAMER_GLOBAL_CONFIG, &resp);
+
+ dp_framer_global_config = be32_to_cpu(resp);
+
+ video_mode = !(dp_framer_global_config & CDNS_DP_NO_VIDEO_MODE);
+
+ if (dp_framer_global_config & CDNS_DP_FRAMER_EN)
+ cdns_mhdp_reg_write(mhdp, CDNS_DP_FRAMER_GLOBAL_CONFIG,
+ dp_framer_global_config &
+ ~CDNS_DP_FRAMER_EN);
+
+ /* Spread AMP if required, enable 8b/10b coding */
+ amp[0] = (mhdp->host.lanes_cnt & CDNS_SSC) ? DP_SPREAD_AMP_0_5 : 0;
+ amp[1] = DP_SET_ANSI_8B10B;
+ drm_dp_dpcd_write(&mhdp->aux, DP_DOWNSPREAD_CTRL, amp, 2);
+
+ if (mhdp->host.fast_link & mhdp->sink.fast_link) {
+ /* FIXME: implement fastlink */
+ dev_dbg(mhdp->dev, "fastlink\n");
+ } else {
+ if (mhdp_link_training(mhdp, video_mode,
+ training_interval_us)) {
+ dev_err(mhdp->dev, "Link training failed. Exiting.\n");
+ return;
+ }
+ }
+
+ rate = mhdp->link.rate / 1000;
+
+ /* FIXME: what about Y_ONLY? how is it handled in the kernel? */
+ if (disp_info->color_formats & DRM_COLOR_FORMAT_YCRCB444)
+ pxlfmt = PIXEL_FORMAT_YCBCR_444;
+ else if (disp_info->color_formats & DRM_COLOR_FORMAT_YCRCB422)
+ pxlfmt = PIXEL_FORMAT_YCBCR_422;
+ else if (disp_info->color_formats & DRM_COLOR_FORMAT_YCRCB420)
+ pxlfmt = PIXEL_FORMAT_YCBCR_420;
+ else
+ pxlfmt = PIXEL_FORMAT_RGB;
+
+ /* if YCBCR supported and stream not SD, use ITU709 */
+ /* FIXME: handle ITU version with YCBCR420 when supported */
+ if ((pxlfmt == PIXEL_FORMAT_YCBCR_444 ||
+ pxlfmt == PIXEL_FORMAT_YCBCR_422) && mode->crtc_vdisplay >= 720)
+ misc0 = DP_YCBCR_COEFFICIENTS_ITU709;
+
+ switch (pxlfmt) {
+ case PIXEL_FORMAT_RGB:
+ bpp = disp_info->bpc * 3;
+ pxl_repr = CDNS_DP_FRAMER_RGB << CDNS_DP_FRAMER_PXL_FORMAT;
+ misc0 |= DP_COLOR_FORMAT_RGB;
+ break;
+ case PIXEL_FORMAT_YCBCR_444:
+ bpp = disp_info->bpc * 3;
+ pxl_repr = CDNS_DP_FRAMER_YCBCR444 << CDNS_DP_FRAMER_PXL_FORMAT;
+ misc0 |= DP_COLOR_FORMAT_YCbCr444 | DP_TEST_DYNAMIC_RANGE_CEA;
+ break;
+ case PIXEL_FORMAT_YCBCR_422:
+ bpp = disp_info->bpc * 2;
+ pxl_repr = CDNS_DP_FRAMER_YCBCR422 << CDNS_DP_FRAMER_PXL_FORMAT;
+ misc0 |= DP_COLOR_FORMAT_YCbCr422 | DP_TEST_DYNAMIC_RANGE_CEA;
+ break;
+ case PIXEL_FORMAT_YCBCR_420:
+ bpp = disp_info->bpc * 3 / 2;
+ pxl_repr = CDNS_DP_FRAMER_YCBCR420 << CDNS_DP_FRAMER_PXL_FORMAT;
+ break;
+ default:
+ bpp = disp_info->bpc;
+ pxl_repr = CDNS_DP_FRAMER_Y_ONLY << CDNS_DP_FRAMER_PXL_FORMAT;
+ }
+
+ switch (disp_info->bpc) {
+ case 6:
+ misc0 |= DP_TEST_BIT_DEPTH_6;
+ pxl_repr |= CDNS_DP_FRAMER_6_BPC;
+ break;
+ case 8:
+ misc0 |= DP_TEST_BIT_DEPTH_8;
+ pxl_repr |= CDNS_DP_FRAMER_8_BPC;
+ break;
+ case 10:
+ misc0 |= DP_TEST_BIT_DEPTH_10;
+ pxl_repr |= CDNS_DP_FRAMER_10_BPC;
+ break;
+ case 12:
+ misc0 |= DP_TEST_BIT_DEPTH_12;
+ pxl_repr |= CDNS_DP_FRAMER_12_BPC;
+ break;
+ case 16:
+ misc0 |= DP_TEST_BIT_DEPTH_16;
+ pxl_repr |= CDNS_DP_FRAMER_16_BPC;
+ break;
+ }
+
+ /* find optimal tu_size */
+ required_bandwidth = pxlclock * bpp / 8;
+ available_bandwidth = mhdp->link.num_lanes * rate;
+ do {
+ tu_size += 2;
+
+ vs_f = tu_size * required_bandwidth / available_bandwidth;
+ vs = vs_f / 1000;
+ vs_f = vs_f % 1000;
+ /*
+ * FIXME (CDNS): downspreading?
+ * It's unused is what I've been told.
+ */
+ } while ((vs == 1 || ((vs_f > 850 || vs_f < 100) && vs_f != 0) ||
+ tu_size - vs < 2) && tu_size < 64);
+
+ if (vs > 64)
+ return;
+
+ bnd_hsync2vsync = CDNS_IP_BYPASS_V_INTERFACE;
+ if (mode->flags & DRM_MODE_FLAG_INTERLACE)
+ bnd_hsync2vsync |= CDNS_IP_DET_INTERLACE_FORMAT;
+
+ cdns_mhdp_reg_write(mhdp, CDNS_BND_HSYNC2VSYNC, bnd_hsync2vsync);
+
+ if (mode->flags & DRM_MODE_FLAG_INTERLACE &&
+ mode->flags & DRM_MODE_FLAG_PHSYNC)
+ hsync2vsync_pol_ctrl = CDNS_H2V_HSYNC_POL_ACTIVE_LOW |
+ CDNS_H2V_VSYNC_POL_ACTIVE_LOW;
+ else
+ hsync2vsync_pol_ctrl = 0;
+
+ cdns_mhdp_reg_write(mhdp, CDNS_HSYNC2VSYNC_POL_CTRL,
+ hsync2vsync_pol_ctrl);
+
+ cdns_mhdp_reg_write(mhdp, CDNS_DP_FRAMER_TU,
+ CDNS_DP_FRAMER_TU_VS(vs) |
+ CDNS_DP_FRAMER_TU_SIZE(tu_size) |
+ CDNS_DP_FRAMER_TU_CNT_RST_EN);
+
+ cdns_mhdp_reg_write(mhdp, CDNS_DP_FRAMER_PXL_REPR, pxl_repr);
+
+ if (mode->flags & DRM_MODE_FLAG_INTERLACE)
+ dp_framer_sp |= CDNS_DP_FRAMER_INTERLACE;
+ if (mode->flags & DRM_MODE_FLAG_NHSYNC)
+ dp_framer_sp |= CDNS_DP_FRAMER_HSYNC_POL_LOW;
+ if (mode->flags & DRM_MODE_FLAG_NVSYNC)
+ dp_framer_sp |= CDNS_DP_FRAMER_VSYNC_POL_LOW;
+ cdns_mhdp_reg_write(mhdp, CDNS_DP_FRAMER_SP, dp_framer_sp);
+
+ front_porch = mode->crtc_hsync_start - mode->crtc_hdisplay;
+ back_porch = mode->crtc_htotal - mode->crtc_hsync_end;
+ cdns_mhdp_reg_write(mhdp, CDNS_DP_FRONT_BACK_PORCH,
+ CDNS_DP_FRONT_PORCH(front_porch) |
+ CDNS_DP_BACK_PORCH(back_porch));
+
+ cdns_mhdp_reg_write(mhdp, CDNS_DP_BYTE_COUNT,
+ mode->crtc_hdisplay * bpp / 8);
+
+ msa_h0 = mode->crtc_htotal - mode->crtc_hsync_start;
+ cdns_mhdp_reg_write(mhdp, CDNS_DP_MSA_HORIZONTAL_0,
+ CDNS_DP_MSAH0_H_TOTAL(mode->crtc_htotal) |
+ CDNS_DP_MSAH0_HSYNC_START(msa_h0));
+
+ hsync = mode->crtc_hsync_end - mode->crtc_hsync_start;
+ msa_horizontal_1 = CDNS_DP_MSAH1_HSYNC_WIDTH(hsync) |
+ CDNS_DP_MSAH1_HDISP_WIDTH(mode->crtc_hdisplay);
+ if (mode->flags & DRM_MODE_FLAG_NHSYNC)
+ msa_horizontal_1 |= CDNS_DP_MSAH1_HSYNC_POL_LOW;
+ cdns_mhdp_reg_write(mhdp, CDNS_DP_MSA_HORIZONTAL_1,
+ msa_horizontal_1);
+
+ msa_v0 = mode->crtc_vtotal - mode->crtc_vsync_start;
+ cdns_mhdp_reg_write(mhdp, CDNS_DP_MSA_VERTICAL_0,
+ CDNS_DP_MSAV0_V_TOTAL(mode->crtc_vtotal) |
+ CDNS_DP_MSAV0_VSYNC_START(msa_v0));
+
+ vsync = mode->crtc_vsync_end - mode->crtc_vsync_start;
+ msa_vertical_1 = CDNS_DP_MSAV1_VSYNC_WIDTH(vsync) |
+ CDNS_DP_MSAV1_VDISP_WIDTH(mode->crtc_vdisplay);
+ if (mode->flags & DRM_MODE_FLAG_NVSYNC)
+ msa_vertical_1 |= CDNS_DP_MSAV1_VSYNC_POL_LOW;
+ cdns_mhdp_reg_write(mhdp, CDNS_DP_MSA_VERTICAL_1, msa_vertical_1);
+
+ if ((mode->flags & DRM_MODE_FLAG_INTERLACE) &&
+ mode->crtc_vtotal % 2 == 0)
+ misc1 = DP_TEST_INTERLACED;
+ if (pxlfmt == PIXEL_FORMAT_Y_ONLY)
+ misc1 |= CDNS_DP_TEST_COLOR_FORMAT_RAW_Y_ONLY;
+ /* FIXME: use VSC SDP for Y420 */
+ /* FIXME: (CDNS) no code for Y420 in bare metal test */
+ if (pxlfmt == PIXEL_FORMAT_YCBCR_420)
+ misc1 = CDNS_DP_TEST_VSC_SDP;
+
+ cdns_mhdp_reg_write(mhdp, CDNS_DP_MSA_MISC, misc0 | (misc1 << 8));
+
+ /* FIXME: to be changed if MST mode */
+ cdns_mhdp_reg_write(mhdp, CDNS_DP_STREAM_CONFIG, 1);
+
+ cdns_mhdp_reg_write(mhdp, CDNS_DP_HORIZONTAL,
+ CDNS_DP_H_HSYNC_WIDTH(hsync) |
+ CDNS_DP_H_H_TOTAL(mode->crtc_hdisplay));
+
+ cdns_mhdp_reg_write(mhdp, CDNS_DP_VERTICAL_0,
+ CDNS_DP_V0_VHEIGHT(mode->crtc_vdisplay) |
+ CDNS_DP_V0_VSTART(msa_v0));
+
+ dp_vertical_1 = CDNS_DP_V1_VTOTAL(mode->crtc_vtotal);
+ if ((mode->flags & DRM_MODE_FLAG_INTERLACE) &&
+ mode->crtc_vtotal % 2 == 0)
+ dp_vertical_1 |= CDNS_DP_V1_VTOTAL_EVEN;
+
+ cdns_mhdp_reg_write(mhdp, CDNS_DP_VERTICAL_1, dp_vertical_1);
+
+ cdns_mhdp_reg_write_bit(mhdp, CDNS_DP_VB_ID, 2, 1,
+ (mode->flags & DRM_MODE_FLAG_INTERLACE) ?
+ CDNS_DP_VB_ID_INTERLACED : 0);
+
+ line_thresh1 = ((vs + 1) << 5) * 8 / bpp;
+ line_thresh2 = (pxlclock << 5) / 1000 / rate * (vs + 1) - (1 << 5);
+ line_thresh = line_thresh1 - line_thresh2 / mhdp->link.num_lanes;
+ line_thresh = (line_thresh >> 5) + 2;
+ cdns_mhdp_reg_write(mhdp, CDNS_DP_LINE_THRESH,
+ line_thresh & GENMASK(5, 0));
+
+ cdns_mhdp_reg_write(mhdp, CDNS_DP_RATE_GOVERNOR_STATUS,
+ CDNS_DP_RG_TU_VS_DIFF((tu_size - vs > 3) ?
+ 0 : tu_size - vs));
+
+ cdns_mhdp_set_video_status(mhdp, 1);
+}
+
+static const struct drm_bridge_funcs cdns_mhdp_bridge_funcs = {
+ .enable = cdns_mhdp_enable,
+ .disable = cdns_mhdp_disable,
+ .attach = cdns_mhdp_attach,
+};
+
+static int load_firmware(struct cdns_mhdp_device *mhdp, const char *name,
+ unsigned int addr)
+{
+ const struct firmware *fw;
+ int ret;
+
+ ret = request_firmware(&fw, name, mhdp->dev);
+ if (ret) {
+ dev_err(mhdp->dev, "failed to load firmware (%s), ret: %d\n",
+ name, ret);
+ return ret;
+ }
+
+ memcpy_toio(mhdp->regs + addr, fw->data, fw->size);
+
+ release_firmware(fw);
+
+ return 0;
+}
+
+static int cdns_mhdp_audio_hw_params(struct device *dev, void *data,
+ struct hdmi_codec_daifmt *daifmt,
+ struct hdmi_codec_params *params)
+{
+ struct cdns_mhdp_device *mhdp = dev_get_drvdata(dev);
+ struct audio_info audio = {
+ .sample_width = params->sample_width,
+ .sample_rate = params->sample_rate,
+ .channels = params->channels,
+ };
+ int ret;
+
+ if (daifmt->fmt != HDMI_I2S) {
+ DRM_DEV_ERROR(dev, "Invalid format %d\n", daifmt->fmt);
+ return -EINVAL;
+ }
+
+ audio.format = AFMT_I2S;
+
+ ret = cdns_mhdp_audio_config(mhdp, &audio);
+ if (!ret)
+ mhdp->audio_info = audio;
+
+ return 0;
+}
+
+static void cdns_mhdp_audio_shutdown(struct device *dev, void *data)
+{
+ struct cdns_mhdp_device *mhdp = dev_get_drvdata(dev);
+ int ret;
+
+ ret = cdns_mhdp_audio_stop(mhdp, &mhdp->audio_info);
+ if (!ret)
+ mhdp->audio_info.format = AFMT_UNUSED;
+}
+
+static int cdns_mhdp_audio_digital_mute(struct device *dev, void *data,
+ bool enable)
+{
+ struct cdns_mhdp_device *mhdp = dev_get_drvdata(dev);
+
+ return cdns_mhdp_audio_mute(mhdp, enable);
+}
+
+static int cdns_mhdp_audio_get_eld(struct device *dev, void *data,
+ u8 *buf, size_t len)
+{
+ struct cdns_mhdp_device *mhdp = dev_get_drvdata(dev);
+
+ memcpy(buf, mhdp->connector.eld,
+ min(sizeof(mhdp->connector.eld), len));
+
+ return 0;
+}
+
+static const struct hdmi_codec_ops audio_codec_ops = {
+ .hw_params = cdns_mhdp_audio_hw_params,
+ .audio_shutdown = cdns_mhdp_audio_shutdown,
+ .digital_mute = cdns_mhdp_audio_digital_mute,
+ .get_eld = cdns_mhdp_audio_get_eld,
+};
+
+static int mhdp_probe(struct platform_device *pdev)
+{
+ struct resource *regs;
+ struct cdns_mhdp_device *mhdp;
+ struct clk *clk;
+ int ret;
+ unsigned int reg;
+ unsigned long rate;
+ u32 resp;
+
+ struct hdmi_codec_pdata codec_data = {
+ .i2s = 1,
+ .max_i2s_channels = 8,
+ .ops = &audio_codec_ops,
+ };
+
+ mhdp = devm_kzalloc(&pdev->dev, sizeof(struct cdns_mhdp_device),
+ GFP_KERNEL);
+ if (!mhdp)
+ return -ENOMEM;
+
+ clk = devm_clk_get(&pdev->dev, NULL);
+ if (IS_ERR(clk)) {
+ dev_err(&pdev->dev, "couldn't get clk: %ld\n", PTR_ERR(clk));
+ return PTR_ERR(clk);
+ }
+
+ mhdp->dev = &pdev->dev;
+ dev_set_drvdata(&pdev->dev, mhdp);
+
+ drm_dp_aux_init(&mhdp->aux);
+ mhdp->aux.dev = &pdev->dev;
+ mhdp->aux.transfer = mhdp_transfer;
+
+ regs = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+ mhdp->regs = devm_ioremap_resource(&pdev->dev, regs);
+ if (IS_ERR(mhdp->regs))
+ return PTR_ERR(mhdp->regs);
+
+ platform_set_drvdata(pdev, mhdp);
+
+ ret = load_firmware(mhdp, FW_NAME, CDNS_MHDP_IMEM);
+ if (ret)
+ return ret;
+
+ rate = clk_get_rate(clk);
+ writel(rate % 1000000, mhdp->regs + CDNS_SW_CLK_L);
+ writel(rate / 1000000, mhdp->regs + CDNS_SW_CLK_H);
+
+ /* Leave debug mode */
+ writel(0, mhdp->regs + CDNS_APB_CTRL);
+
+ /*
+ * Wait for the KEEP_ALIVE "message" on the first 8 bits.
+ * Updated each sched "tick" (~2ms)
+ */
+ ret = readl_poll_timeout(mhdp->regs + CDNS_KEEP_ALIVE, reg,
+ reg & CDNS_KEEP_ALIVE_MASK, 500,
+ CDNS_KEEP_ALIVE_TIMEOUT);
+ if (ret) {
+ dev_err(&pdev->dev,
+ "device didn't give any life sign: reg %d\n", reg);
+ return -EIO;
+ }
+
+ /*
+ * FIXME (CDNS): how are the characteristics/features of the host
+ * defined? Will they be always hardcoded?
+ */
+ /* FIXME: link rate 2.7; num_lanes = 2, */
+ /* FIXME: read capabilities from PHY */
+ mhdp->host.link_rate = drm_dp_bw_code_to_link_rate(DP_LINK_BW_5_4);
+ mhdp->host.lanes_cnt = CDNS_LANE_4 | CDNS_SCRAMBLER;
+ mhdp->host.volt_swing = CDNS_VOLT_SWING(3);
+ mhdp->host.pre_emphasis = CDNS_PRE_EMPHASIS(2);
+ mhdp->host.pattern_supp = CDNS_SUPPORT_TPS(1) |
+ CDNS_SUPPORT_TPS(2) | CDNS_SUPPORT_TPS(3) |
+ CDNS_SUPPORT_TPS(4);
+ mhdp->host.fast_link = 0;
+ mhdp->host.lane_mapping = CDNS_LANE_MAPPING_FLIPPED;
+ mhdp->host.enhanced = true;
+
+ mhdp->bridge.of_node = pdev->dev.of_node;
+ mhdp->bridge.funcs = &cdns_mhdp_bridge_funcs;
+
+ /* Init events to 0 as it's not cleared by FW at boot but on read */
+ readl(mhdp->regs + CDNS_SW_EVENT0);
+ readl(mhdp->regs + CDNS_SW_EVENT1);
+ readl(mhdp->regs + CDNS_SW_EVENT2);
+ readl(mhdp->regs + CDNS_SW_EVENT3);
+
+ /* Activate uCPU */
+ ret = cdns_mhdp_set_firmware_active(mhdp, true);
+ if (ret) {
+ dev_err(mhdp->dev, "Failed to activate DP\n");
+ return ret;
+ }
+
+ mhdp->audio_pdev = platform_device_register_data(
+ mhdp->dev, HDMI_CODEC_DRV_NAME, PLATFORM_DEVID_AUTO,
+ &codec_data, sizeof(codec_data));
+
+ /* Enable VIF clock for stream 0 */
+ cdns_mhdp_reg_read(mhdp, CDNS_DPTX_CAR, &resp);
+ cdns_mhdp_reg_write(mhdp, CDNS_DPTX_CAR,
+ resp | CDNS_VIF_CLK_EN | CDNS_VIF_CLK_RSTN);
+
+ /* Loop over HDP change */
+ /*
+ * FIXME: does not work when put in mhdp_bridge_enable.
+ * Where should we put it?
+ */
+ /* Is it still needed with use of mb message HPD STATUS? */
+ ret = readl_poll_timeout(mhdp->regs + CDNS_SW_EVENT0, reg,
+ reg & CDNS_DPTX_HPD, 500,
+ CDNS_SW_EVENT0_TIMEOUT);
+ if (ret) {
+ dev_err(mhdp->dev, "no HPD received %d\n", reg);
+ return -ENODEV;
+ }
+
+ drm_bridge_add(&mhdp->bridge);
+
+ return 0;
+}
+
+MODULE_FIRMWARE(FW_NAME);
+
+static int mhdp_remove(struct platform_device *pdev)
+{
+ struct cdns_mhdp_device *mhdp = dev_get_drvdata(&pdev->dev);
+ int ret;
+
+ platform_device_unregister(mhdp->audio_pdev);
+
+ drm_bridge_remove(&mhdp->bridge);
+
+ ret = cdns_mhdp_set_firmware_active(mhdp, false);
+ if (ret) {
+ dev_err(mhdp->dev, "Failed to de-activate DP\n");
+ return ret;
+ }
+
+ /* FIXME: check for missing functions */
+
+ return 0;
+}
+
+static struct platform_driver mhdp_driver = {
+ .driver = {
+ .name = "cdns-mhdp",
+ .of_match_table = of_match_ptr(mhdp_ids),
+ },
+ .probe = mhdp_probe,
+ .remove = mhdp_remove,
+};
+module_platform_driver(mhdp_driver);
+
+MODULE_AUTHOR("Quentin Schulz <quentin.schulz@free-electrons.com>");
+MODULE_DESCRIPTION("Cadence MHDP DP bridge driver");
+MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:cdns-mhdp");
diff --git a/drivers/gpu/drm/rockchip/Kconfig b/drivers/gpu/drm/rockchip/Kconfig
index 26438d45732b..bd6454b590a2 100644
--- a/drivers/gpu/drm/rockchip/Kconfig
+++ b/drivers/gpu/drm/rockchip/Kconfig
@@ -28,7 +28,9 @@ config ROCKCHIP_ANALOGIX_DP
config ROCKCHIP_CDN_DP
bool "Rockchip cdn DP"
- depends on EXTCON=y || (EXTCON=m && DRM_ROCKCHIP=m)
+ depends on DRM_ROCKCHIP
+ select EXTCON
+ select DRM_CDNS_MHDP
help
This selects support for Rockchip SoC specific extensions
for the cdn DP driver. If you want to enable Dp on
diff --git a/drivers/gpu/drm/rockchip/Makefile b/drivers/gpu/drm/rockchip/Makefile
index 868263ff0302..c908a4fb8a47 100644
--- a/drivers/gpu/drm/rockchip/Makefile
+++ b/drivers/gpu/drm/rockchip/Makefile
@@ -9,7 +9,7 @@ rockchipdrm-y := rockchip_drm_drv.o rockchip_drm_fb.o \
rockchipdrm-$(CONFIG_DRM_FBDEV_EMULATION) += rockchip_drm_fbdev.o
rockchipdrm-$(CONFIG_ROCKCHIP_ANALOGIX_DP) += analogix_dp-rockchip.o
-rockchipdrm-$(CONFIG_ROCKCHIP_CDN_DP) += cdn-dp-core.o cdn-dp-reg.o
+rockchipdrm-$(CONFIG_ROCKCHIP_CDN_DP) += cdn-dp-core.o
rockchipdrm-$(CONFIG_ROCKCHIP_DW_HDMI) += dw_hdmi-rockchip.o
rockchipdrm-$(CONFIG_ROCKCHIP_DW_MIPI_DSI) += dw-mipi-dsi.o
rockchipdrm-$(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
index bf7e206326f0..343f381e3440 100644
--- a/drivers/gpu/drm/rockchip/cdn-dp-core.c
+++ b/drivers/gpu/drm/rockchip/cdn-dp-core.c
@@ -816,7 +816,7 @@ static int cdn_dp_audio_hw_params(struct device *dev, void *data,
ret = cdns_mhdp_audio_config(&dp->mhdp, &audio);
if (!ret)
- dp->audio_info = audio;
+ dp->mhdp.audio_info = audio;
out:
mutex_unlock(&dp->lock);
@@ -832,9 +832,9 @@ static void cdn_dp_audio_shutdown(struct device *dev, void *data)
if (!dp->active)
goto out;
- ret = cdns_mhdp_audio_stop(&dp->mhdp, &dp->audio_info);
+ ret = cdns_mhdp_audio_stop(&dp->mhdp, &dp->mhdp.audio_info);
if (!ret)
- dp->audio_info.format = AFMT_UNUSED;
+ dp->mhdp.audio_info.format = AFMT_UNUSED;
out:
mutex_unlock(&dp->lock);
}
@@ -886,11 +886,11 @@ static int cdn_dp_audio_codec_init(struct cdn_dp_device *dp,
.max_i2s_channels = 8,
};
- dp->audio_pdev = platform_device_register_data(
- dev, HDMI_CODEC_DRV_NAME, PLATFORM_DEVID_AUTO,
- &codec_data, sizeof(codec_data));
+ dp->mhdp.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);
+ return PTR_ERR_OR_ZERO(dp->mhdp.audio_pdev);
}
static int cdn_dp_request_firmware(struct cdn_dp_device *dp)
@@ -1217,7 +1217,7 @@ static int cdn_dp_remove(struct platform_device *pdev)
{
struct cdn_dp_device *dp = platform_get_drvdata(pdev);
- platform_device_unregister(dp->audio_pdev);
+ platform_device_unregister(dp->mhdp.audio_pdev);
cdn_dp_suspend(dp->mhdp.dev);
component_del(&pdev->dev, &cdn_dp_component_ops);
diff --git a/drivers/gpu/drm/rockchip/cdn-dp-core.h b/drivers/gpu/drm/rockchip/cdn-dp-core.h
index bad65c2fe610..a086dad31287 100644
--- a/drivers/gpu/drm/rockchip/cdn-dp-core.h
+++ b/drivers/gpu/drm/rockchip/cdn-dp-core.h
@@ -19,8 +19,9 @@
#include <drm/drm_crtc_helper.h>
#include <drm/drm_dp_helper.h>
#include <drm/drm_panel.h>
+#include <drm/bridge/cdns-mhdp-common.h>
+
#include "rockchip_drm_drv.h"
-#include "cdn-dp-reg.h"
#define MAX_PHY 2
@@ -45,7 +46,6 @@ struct cdn_dp_device {
struct cdns_mhdp_device mhdp;
struct drm_device *drm_dev;
struct drm_encoder encoder;
- struct platform_device *audio_pdev;
struct work_struct event_work;
struct edid *edid;
@@ -64,7 +64,6 @@ struct cdn_dp_device {
struct reset_control *dptx_rst;
struct reset_control *apb_rst;
struct reset_control *core_rst;
- struct audio_info audio_info;
struct cdn_dp_port *port[MAX_PHY];
u8 ports;
u8 lanes;
diff --git a/drivers/gpu/drm/rockchip/cdn-dp-reg.h b/include/drm/bridge/cdns-mhdp-common.h
similarity index 95%
rename from drivers/gpu/drm/rockchip/cdn-dp-reg.h
rename to include/drm/bridge/cdns-mhdp-common.h
index 3cb40d719515..c5a5c4fa7fc4 100644
--- a/drivers/gpu/drm/rockchip/cdn-dp-reg.h
+++ b/include/drm/bridge/cdns-mhdp-common.h
@@ -12,10 +12,13 @@
* GNU General Public License for more details.
*/
-#ifndef _CDN_DP_REG_H
-#define _CDN_DP_REG_H
+#ifndef CDNS_MHDP_COMMON_H_
+#define CDNS_MHDP_COMMON_H_
#include <linux/bitops.h>
+#include <drm/drm_dp_helper.h>
+#include <drm/drm_connector.h>
+#include <drm/drm_bridge.h>
#define ADDR_IMEM 0x10000
#define ADDR_DMEM 0x20000
@@ -327,6 +330,7 @@
#define GENERAL_TEST_ECHO 0x02
#define GENERAL_BUS_SETTINGS 0x03
#define GENERAL_TEST_ACCESS 0x04
+#define GENERAL_REGISTER_READ 0x07
#define DPTX_SET_POWER_MNG 0x00
#define DPTX_SET_HOST_CAPABILITIES 0x01
@@ -346,6 +350,7 @@
#define DPTX_SET_LINK_BREAK_POINT 0x0f
#define DPTX_FORCE_LANES 0x10
#define DPTX_HPD_STATE 0x11
+#define DPTX_ADJUST_LT 0x12
#define FW_STANDBY 0
#define FW_ACTIVE 1
@@ -517,6 +522,9 @@ struct cdns_mhdp_device {
struct clk *spdif_clk;
struct reset_control *spdif_rst;
+ struct platform_device *audio_pdev;
+ struct audio_info audio_info;
+
struct drm_dp_aux aux;
struct cdns_mhdp_host host;
struct cdns_mhdp_sink sink;
@@ -551,4 +559,11 @@ int cdns_mhdp_audio_stop(struct cdns_mhdp_device *mhdp,
int cdns_mhdp_audio_mute(struct cdns_mhdp_device *mhdp, bool enable);
int cdns_mhdp_audio_config(struct cdns_mhdp_device *mhdp,
struct audio_info *audio);
-#endif /* _CDN_DP_REG_H */
+int cdns_mhdp_reg_read(struct cdns_mhdp_device *mhdp, u32 addr, u32 *value);
+int cdns_mhdp_reg_write(struct cdns_mhdp_device *mhdp, u16 addr, u32 val);
+int cdns_mhdp_reg_write_bit(struct cdns_mhdp_device *mhdp, u16 addr,
+ u8 start_bit, u8 bits_no, u32 val);
+int cdns_mhdp_adjust_lt(struct cdns_mhdp_device *mhdp, u8 nlanes,
+ u16 udelay, u8 *lanes_data,
+ u8 *dpcd);
+#endif /* CDNS_MHDP_COMMON_H_ */
--
2.17.1
^ permalink raw reply related [flat|nested] 45+ messages in thread
* [PATCH v6 4/6] drm: bridge: add support for Cadence MHDP DPI/DP bridge
@ 2018-10-08 21:42 ` Damian Kos
0 siblings, 0 replies; 45+ messages in thread
From: Damian Kos @ 2018-10-08 21:42 UTC (permalink / raw)
To: David Airlie, Rob Herring, Mark Rutland, Archit Taneja,
Andrzej Hajda, Laurent Pinchart, Gustavo Padovan,
Maarten Lankhorst, Sean Paul, Sandy Huang, Heiko Stübner,
Quentin Schulz, Damian Kos, Piotr Sroka, dri-devel, devicetree,
linux-kernel, linux-arm-kernel, linux-rockchip
Cc: rafalc, quentin.schulz, jbergsagel
From: Quentin Schulz <quentin.schulz@free-electrons.com>
This adds basic support for Cadence MHDP DPI to DP bridge.
Basically, it takes a DPI stream as input and output it encoded in DP
format. It's missing proper HPD, HDCP and currently supports only
SST mode.
Changes made in the low level driver (cdn-dp-reg.*):
- moved it to from drivers/gpu/drm/rockchip to
drivers/gpu/drm/bridge/cdns-mhdp-common.c and
include/drm/bridge/cdns-mhdp-common.h
- functions for sending/receiving commands are now public
- added functions for reading registers and link training
adjustment
Changes made in RK's driver (cdn-dp-core.*):
- Moved audio_info and audio_pdev fields from cdn_dp_device to
cdns_mhdp_device structure.
Signed-off-by: Quentin Schulz <quentin.schulz@free-electrons.com>
Signed-off-by: Damian Kos <dkos@cadence.com>
---
drivers/gpu/drm/bridge/Kconfig | 9 +
drivers/gpu/drm/bridge/Makefile | 3 +
.../cdns-mhdp-common.c} | 136 +-
drivers/gpu/drm/bridge/cdns-mhdp.c | 1304 +++++++++++++++++
drivers/gpu/drm/rockchip/Kconfig | 4 +-
drivers/gpu/drm/rockchip/Makefile | 2 +-
drivers/gpu/drm/rockchip/cdn-dp-core.c | 16 +-
drivers/gpu/drm/rockchip/cdn-dp-core.h | 5 +-
.../drm/bridge/cdns-mhdp-common.h | 21 +-
9 files changed, 1480 insertions(+), 20 deletions(-)
rename drivers/gpu/drm/{rockchip/cdn-dp-reg.c => bridge/cdns-mhdp-common.c} (87%)
create mode 100644 drivers/gpu/drm/bridge/cdns-mhdp.c
rename drivers/gpu/drm/rockchip/cdn-dp-reg.h => include/drm/bridge/cdns-mhdp-common.h (95%)
diff --git a/drivers/gpu/drm/bridge/Kconfig b/drivers/gpu/drm/bridge/Kconfig
index 9eeb8ef0b174..90a4810a8c96 100644
--- a/drivers/gpu/drm/bridge/Kconfig
+++ b/drivers/gpu/drm/bridge/Kconfig
@@ -35,6 +35,15 @@ config DRM_CDNS_DSI
Support Cadence DPI to DSI bridge. This is an internal
bridge and is meant to be directly embedded in a SoC.
+config DRM_CDNS_MHDP
+ tristate "Cadence DPI/DP bridge"
+ select DRM_KMS_HELPER
+ select DRM_PANEL_BRIDGE
+ depends on OF
+ help
+ Support Cadence DPI to DP bridge. This is an internal
+ bridge and is meant to be directly embedded in a SoC.
+
config DRM_DUMB_VGA_DAC
tristate "Dumb VGA DAC Bridge support"
depends on OF
diff --git a/drivers/gpu/drm/bridge/Makefile b/drivers/gpu/drm/bridge/Makefile
index 4934fcf5a6f8..e802fdb85750 100644
--- a/drivers/gpu/drm/bridge/Makefile
+++ b/drivers/gpu/drm/bridge/Makefile
@@ -16,4 +16,7 @@ obj-$(CONFIG_DRM_ANALOGIX_DP) += analogix/
obj-$(CONFIG_DRM_I2C_ADV7511) += adv7511/
obj-$(CONFIG_DRM_TI_SN65DSI86) += ti-sn65dsi86.o
obj-$(CONFIG_DRM_TI_TFP410) += ti-tfp410.o
+obj-$(CONFIG_DRM_CDNS_MHDP) += mhdp8546.o
obj-y += synopsys/
+
+mhdp8546-objs := cdns-mhdp-common.o cdns-mhdp.o
diff --git a/drivers/gpu/drm/rockchip/cdn-dp-reg.c b/drivers/gpu/drm/bridge/cdns-mhdp-common.c
similarity index 87%
rename from drivers/gpu/drm/rockchip/cdn-dp-reg.c
rename to drivers/gpu/drm/bridge/cdns-mhdp-common.c
index c1a76e6fff88..fda1bee7adb5 100644
--- a/drivers/gpu/drm/rockchip/cdn-dp-reg.c
+++ b/drivers/gpu/drm/bridge/cdns-mhdp-common.c
@@ -19,8 +19,9 @@
#include <linux/iopoll.h>
#include <linux/reset.h>
-#include "cdn-dp-core.h"
-#include "cdn-dp-reg.h"
+#include <drm/drm_print.h>
+#include <drm/drm_modes.h>
+#include <drm/bridge/cdns-mhdp-common.h>
#define CDNS_DP_SPDIF_CLK 200000000
#define FW_ALIVE_TIMEOUT_US 1000000
@@ -33,6 +34,7 @@ void cdns_mhdp_set_fw_clk(struct cdns_mhdp_device *mhdp, unsigned long clk)
{
writel(clk / 1000000, mhdp->regs + SW_CLK_H);
}
+EXPORT_SYMBOL(cdns_mhdp_set_fw_clk);
void cdns_mhdp_clock_reset(struct cdns_mhdp_device *mhdp)
{
@@ -82,6 +84,7 @@ void cdns_mhdp_clock_reset(struct cdns_mhdp_device *mhdp)
/* enable Mailbox and PIF interrupt */
writel(0, mhdp->regs + APB_INT_MASK);
}
+EXPORT_SYMBOL(cdns_mhdp_clock_reset);
static int cdns_mhdp_mailbox_read(struct cdns_mhdp_device *mhdp)
{
@@ -189,7 +192,56 @@ static int cdns_mhdp_mailbox_send(struct cdns_mhdp_device *mhdp, u8 module_id,
return 0;
}
-static int cdns_mhdp_reg_write(struct cdns_mhdp_device *mhdp, u16 addr, u32 val)
+int cdns_mhdp_reg_read(struct cdns_mhdp_device *mhdp, u32 addr, u32 *value)
+{
+ u8 msg[4], resp[8];
+ int ret;
+
+ if (addr == 0) {
+ ret = -EINVAL;
+ goto err_reg_read;
+ }
+
+ msg[0] = (u8)(addr >> 24);
+ msg[1] = (u8)(addr >> 16);
+ msg[2] = (u8)(addr >> 8);
+ msg[3] = (u8)addr;
+
+ ret = cdns_mhdp_mailbox_send(mhdp, MB_MODULE_ID_GENERAL,
+ GENERAL_REGISTER_READ,
+ sizeof(msg), msg);
+ if (ret)
+ goto err_reg_read;
+
+ ret = cdns_mhdp_mailbox_validate_receive(mhdp, MB_MODULE_ID_GENERAL,
+ GENERAL_REGISTER_READ,
+ sizeof(resp));
+ if (ret)
+ goto err_reg_read;
+
+ ret = cdns_mhdp_mailbox_read_receive(mhdp, resp, sizeof(resp));
+ if (ret)
+ goto err_reg_read;
+
+ /* Returned address value should be the same as requested */
+ if (memcmp(msg, resp, sizeof(msg))) {
+ ret = -EINVAL;
+ goto err_reg_read;
+ }
+
+ *value = (resp[4] << 24) | (resp[5] << 16) | (resp[6] << 8) | resp[7];
+
+err_reg_read:
+ if (ret) {
+ DRM_DEV_ERROR(mhdp->dev, "Failed to read register.\n");
+ *value = 0;
+ }
+
+ return ret;
+}
+EXPORT_SYMBOL(cdns_mhdp_reg_read);
+
+int cdns_mhdp_reg_write(struct cdns_mhdp_device *mhdp, u16 addr, u32 val)
{
u8 msg[6];
@@ -202,8 +254,9 @@ static int cdns_mhdp_reg_write(struct cdns_mhdp_device *mhdp, u16 addr, u32 val)
return cdns_mhdp_mailbox_send(mhdp, MB_MODULE_ID_DP_TX,
DPTX_WRITE_REGISTER, sizeof(msg), msg);
}
+EXPORT_SYMBOL(cdns_mhdp_reg_write);
-static int cdns_mhdp_reg_write_bit(struct cdns_mhdp_device *mhdp, u16 addr,
+int cdns_mhdp_reg_write_bit(struct cdns_mhdp_device *mhdp, u16 addr,
u8 start_bit, u8 bits_no, u32 val)
{
u8 field[8];
@@ -220,6 +273,7 @@ static int cdns_mhdp_reg_write_bit(struct cdns_mhdp_device *mhdp, u16 addr,
return cdns_mhdp_mailbox_send(mhdp, MB_MODULE_ID_DP_TX,
DPTX_WRITE_FIELD, sizeof(field), field);
}
+EXPORT_SYMBOL(cdns_mhdp_reg_write_bit);
int cdns_mhdp_dpcd_read(struct cdns_mhdp_device *mhdp,
u32 addr, u8 *data, u16 len)
@@ -252,6 +306,7 @@ int cdns_mhdp_dpcd_read(struct cdns_mhdp_device *mhdp,
err_dpcd_read:
return ret;
}
+EXPORT_SYMBOL(cdns_mhdp_dpcd_read);
int cdns_mhdp_dpcd_write(struct cdns_mhdp_device *mhdp, u32 addr, u8 value)
{
@@ -286,6 +341,7 @@ int cdns_mhdp_dpcd_write(struct cdns_mhdp_device *mhdp, u32 addr, u8 value)
DRM_DEV_ERROR(mhdp->dev, "dpcd write failed: %d\n", ret);
return ret;
}
+EXPORT_SYMBOL(cdns_mhdp_dpcd_write);
int cdns_mhdp_load_firmware(struct cdns_mhdp_device *mhdp, const u32 *i_mem,
u32 i_size, const u32 *d_mem, u32 d_size)
@@ -328,6 +384,7 @@ int cdns_mhdp_load_firmware(struct cdns_mhdp_device *mhdp, const u32 *i_mem,
return 0;
}
+EXPORT_SYMBOL(cdns_mhdp_load_firmware);
int cdns_mhdp_set_firmware_active(struct cdns_mhdp_device *mhdp, bool enable)
{
@@ -362,6 +419,7 @@ int cdns_mhdp_set_firmware_active(struct cdns_mhdp_device *mhdp, bool enable)
DRM_DEV_ERROR(mhdp->dev, "set firmware active failed\n");
return ret;
}
+EXPORT_SYMBOL(cdns_mhdp_set_firmware_active);
int cdns_mhdp_set_host_cap(struct cdns_mhdp_device *mhdp, u8 lanes, bool flip)
{
@@ -391,6 +449,7 @@ int cdns_mhdp_set_host_cap(struct cdns_mhdp_device *mhdp, u8 lanes, bool flip)
DRM_DEV_ERROR(mhdp->dev, "set host cap failed: %d\n", ret);
return ret;
}
+EXPORT_SYMBOL(cdns_mhdp_set_host_cap);
int cdns_mhdp_event_config(struct cdns_mhdp_device *mhdp)
{
@@ -408,11 +467,13 @@ int cdns_mhdp_event_config(struct cdns_mhdp_device *mhdp)
return ret;
}
+EXPORT_SYMBOL(cdns_mhdp_event_config);
u32 cdns_mhdp_get_event(struct cdns_mhdp_device *mhdp)
{
return readl(mhdp->regs + SW_EVENTS0);
}
+EXPORT_SYMBOL(cdns_mhdp_get_event);
int cdns_mhdp_get_hpd_status(struct cdns_mhdp_device *mhdp)
{
@@ -440,6 +501,7 @@ int cdns_mhdp_get_hpd_status(struct cdns_mhdp_device *mhdp)
DRM_DEV_ERROR(mhdp->dev, "get hpd status failed: %d\n", ret);
return ret;
}
+EXPORT_SYMBOL(cdns_mhdp_get_hpd_status);
int cdns_mhdp_get_edid_block(void *data, u8 *edid,
unsigned int block, size_t length)
@@ -482,6 +544,7 @@ int cdns_mhdp_get_edid_block(void *data, u8 *edid,
return ret;
}
+EXPORT_SYMBOL(cdns_mhdp_get_edid_block);
static int cdns_mhdp_training_start(struct cdns_mhdp_device *mhdp)
{
@@ -580,6 +643,7 @@ int cdns_mhdp_train_link(struct cdns_mhdp_device *mhdp)
mhdp->link.num_lanes);
return ret;
}
+EXPORT_SYMBOL(cdns_mhdp_train_link);
int cdns_mhdp_set_video_status(struct cdns_mhdp_device *mhdp, int active)
{
@@ -595,6 +659,7 @@ int cdns_mhdp_set_video_status(struct cdns_mhdp_device *mhdp, int active)
return ret;
}
+EXPORT_SYMBOL(cdns_mhdp_set_video_status);
static int cdns_mhdp_get_msa_misc(struct video_info *video,
struct drm_display_mode *mode)
@@ -797,6 +862,7 @@ int cdns_mhdp_config_video(struct cdns_mhdp_device *mhdp)
DRM_DEV_ERROR(mhdp->dev, "config video failed: %d\n", ret);
return ret;
}
+EXPORT_SYMBOL(cdns_mhdp_config_video);
int cdns_mhdp_audio_stop(struct cdns_mhdp_device *mhdp,
struct audio_info *audio)
@@ -831,6 +897,7 @@ int cdns_mhdp_audio_stop(struct cdns_mhdp_device *mhdp,
return 0;
}
+EXPORT_SYMBOL(cdns_mhdp_audio_stop);
int cdns_mhdp_audio_mute(struct cdns_mhdp_device *mhdp, bool enable)
{
@@ -842,6 +909,7 @@ int cdns_mhdp_audio_mute(struct cdns_mhdp_device *mhdp, bool enable)
return ret;
}
+EXPORT_SYMBOL(cdns_mhdp_audio_mute);
static void cdns_mhdp_audio_config_i2s(struct cdns_mhdp_device *mhdp,
struct audio_info *audio)
@@ -977,3 +1045,63 @@ int cdns_mhdp_audio_config(struct cdns_mhdp_device *mhdp,
DRM_DEV_ERROR(mhdp->dev, "audio config failed: %d\n", ret);
return ret;
}
+EXPORT_SYMBOL(cdns_mhdp_audio_config);
+
+int cdns_mhdp_adjust_lt(struct cdns_mhdp_device *mhdp,
+ u8 nlanes, u16 udelay, u8 *lanes_data, u8 *dpcd)
+{
+ u8 payload[7];
+ u8 hdr[5]; /* For DPCD read response header */
+ u32 addr;
+ u8 const nregs = 6; /* Registers 0x202-0x207 */
+ int ret;
+
+ if (nlanes != 4 && nlanes != 2 && nlanes != 1) {
+ DRM_DEV_ERROR(mhdp->dev, "invalid number of lanes: %d\n",
+ nlanes);
+ ret = -EINVAL;
+ goto err_adjust_lt;
+ }
+
+ payload[0] = nlanes;
+ payload[1] = (u8)(udelay >> 8);
+ payload[2] = (u8)udelay;
+
+ payload[3] = lanes_data[0];
+ if (nlanes > 1)
+ payload[4] = lanes_data[1];
+ if (nlanes > 2) {
+ payload[5] = lanes_data[2];
+ payload[6] = lanes_data[3];
+ }
+
+ ret = cdns_mhdp_mailbox_send(mhdp, MB_MODULE_ID_DP_TX,
+ DPTX_ADJUST_LT,
+ sizeof(payload), payload);
+ if (ret)
+ goto err_adjust_lt;
+
+ /* Yes, read the DPCD read command response */
+ ret = cdns_mhdp_mailbox_validate_receive(mhdp, MB_MODULE_ID_DP_TX,
+ DPTX_READ_DPCD,
+ sizeof(hdr) + nregs);
+ if (ret)
+ goto err_adjust_lt;
+
+ ret = cdns_mhdp_mailbox_read_receive(mhdp, hdr, sizeof(hdr));
+ if (ret)
+ goto err_adjust_lt;
+
+ addr = (hdr[2] << 24) | (hdr[3] << 8) | hdr[4];
+ if (addr != DP_LANE0_1_STATUS)
+ goto err_adjust_lt;
+
+ ret = cdns_mhdp_mailbox_read_receive(mhdp, dpcd, nregs);
+
+err_adjust_lt:
+ if (ret)
+ DRM_DEV_ERROR(mhdp->dev, "Failed to adjust Link Training.\n");
+
+ return ret;
+}
+EXPORT_SYMBOL(cdns_mhdp_adjust_lt);
diff --git a/drivers/gpu/drm/bridge/cdns-mhdp.c b/drivers/gpu/drm/bridge/cdns-mhdp.c
new file mode 100644
index 000000000000..a3bbc0e809a5
--- /dev/null
+++ b/drivers/gpu/drm/bridge/cdns-mhdp.c
@@ -0,0 +1,1304 @@
+// SPDX-License-Identifier: GPL v2
+/*
+ * Cadence MHDP DP bridge driver.
+ *
+ * Copyright: 2018 Cadence Design Systems, Inc.
+ *
+ * Author: Quentin Schulz <quentin.schulz@free-electrons.com>
+ */
+
+#include <linux/clk.h>
+#include <linux/delay.h>
+#include <linux/err.h>
+#include <linux/firmware.h>
+#include <linux/io.h>
+#include <linux/iopoll.h>
+#include <linux/module.h>
+#include <linux/of.h>
+#include <linux/platform_device.h>
+#include <linux/slab.h>
+
+#include <drm/drm_atomic_helper.h>
+#include <drm/drm_bridge.h>
+#include <drm/drm_connector.h>
+#include <drm/drm_crtc_helper.h>
+#include <drm/drm_dp_helper.h>
+#include <drm/drm_modeset_helper_vtables.h>
+#include <drm/bridge/cdns-mhdp-common.h>
+
+#include <sound/hdmi-codec.h>
+
+
+#define DEBUG_MSG
+
+#define FW_NAME "cadence/mhdp8546.bin"
+
+#define CDNS_APB_CFG 0x00000
+#define CDNS_APB_CTRL (CDNS_APB_CFG + 0x00)
+#define CDNS_MAILBOX_FULL (CDNS_APB_CFG + 0x08)
+#define CDNS_MAILBOX_EMPTY (CDNS_APB_CFG + 0x0c)
+#define CDNS_MAILBOX_TX_DATA (CDNS_APB_CFG + 0x10)
+#define CDNS_MAILBOX_RX_DATA (CDNS_APB_CFG + 0x14)
+#define CDNS_KEEP_ALIVE (CDNS_APB_CFG + 0x18)
+#define CDNS_KEEP_ALIVE_MASK GENMASK(7, 0)
+
+#define CDNS_SW_CLK_L (CDNS_APB_CFG + 0x3c)
+#define CDNS_SW_CLK_H (CDNS_APB_CFG + 0x40)
+#define CDNS_SW_EVENT0 (CDNS_APB_CFG + 0x44)
+#define CDNS_DPTX_HPD BIT(0)
+
+#define CDNS_SW_EVENT1 (CDNS_APB_CFG + 0x48)
+#define CDNS_SW_EVENT2 (CDNS_APB_CFG + 0x4c)
+#define CDNS_SW_EVENT3 (CDNS_APB_CFG + 0x50)
+
+#define CDNS_DPTX_CAR (CDNS_APB_CFG + 0x904)
+#define CDNS_VIF_CLK_EN BIT(0)
+#define CDNS_VIF_CLK_RSTN BIT(1)
+
+#define CDNS_SOURCE_VIDEO_INTERFACE 0x00b00
+#define CDNS_BND_HSYNC2VSYNC (CDNS_SOURCE_VIDEO_INTERFACE + \
+ 0x00)
+#define CDNS_IP_DTCT_WIN GENMASK(11, 0)
+#define CDNS_IP_DET_INTERLACE_FORMAT BIT(12)
+#define CDNS_IP_BYPASS_V_INTERFACE BIT(13)
+
+#define CDNS_HSYNC2VSYNC_POL_CTRL (CDNS_SOURCE_VIDEO_INTERFACE + \
+ 0x10)
+#define CDNS_H2V_HSYNC_POL_ACTIVE_LOW BIT(1)
+#define CDNS_H2V_VSYNC_POL_ACTIVE_LOW BIT(2)
+
+#define CDNS_DPTX_PHY_CONFIG 0x02000
+#define CDNS_PHY_TRAINING_EN BIT(0)
+#define CDNS_PHY_TRAINING_TYPE(x) (((x) & GENMASK(3, 0)) << 1)
+#define CDNS_PHY_SCRAMBLER_BYPASS BIT(5)
+#define CDNS_PHY_ENCODER_BYPASS BIT(6)
+#define CDNS_PHY_SKEW_BYPASS BIT(7)
+#define CDNS_PHY_TRAINING_AUTO BIT(8)
+#define CDNS_PHY_LANE0_SKEW(x) (((x) & GENMASK(2, 0)) << 9)
+#define CDNS_PHY_LANE1_SKEW(x) (((x) & GENMASK(2, 0)) << 12)
+#define CDNS_PHY_LANE2_SKEW(x) (((x) & GENMASK(2, 0)) << 15)
+#define CDNS_PHY_LANE3_SKEW(x) (((x) & GENMASK(2, 0)) << 18)
+#define CDNS_PHY_COMMON_CONFIG (CDNS_PHY_LANE1_SKEW(1) | \
+ CDNS_PHY_LANE2_SKEW(2) | \
+ CDNS_PHY_LANE3_SKEW(3))
+#define CDNS_PHY_10BIT_EN BIT(21)
+
+#define CDNS_DPTX_FRAMER 0x02200
+#define CDNS_DP_FRAMER_GLOBAL_CONFIG (CDNS_DPTX_FRAMER + 0x00)
+#define CDNS_DP_NUM_LANES(x) (x - 1)
+#define CDNS_DP_FRAMER_EN BIT(3)
+#define CDNS_DP_RATE_GOVERNOR_EN BIT(4)
+#define CDNS_DP_NO_VIDEO_MODE BIT(5)
+#define CDNS_DP_DISABLE_PHY_RST BIT(6)
+#define CDNS_DP_WR_FAILING_EDGE_VSYNC BIT(7)
+
+#define CDNS_DP_SW_RESET (CDNS_DPTX_FRAMER + 0x04)
+#define CDNS_DP_FRAMER_TU (CDNS_DPTX_FRAMER + 0x08)
+#define CDNS_DP_FRAMER_TU_SIZE(x) (((x) & GENMASK(6, 0)) << 8)
+#define CDNS_DP_FRAMER_TU_VS(x) ((x) & GENMASK(5, 0))
+#define CDNS_DP_FRAMER_TU_CNT_RST_EN BIT(15)
+
+#define CDNS_DPTX_STREAM 0x03000
+#define CDNS_DP_MSA_HORIZONTAL_0 (CDNS_DPTX_STREAM + 0x00)
+#define CDNS_DP_MSAH0_H_TOTAL(x) (x)
+#define CDNS_DP_MSAH0_HSYNC_START(x) ((x) << 16)
+
+#define CDNS_DP_MSA_HORIZONTAL_1 (CDNS_DPTX_STREAM + 0x04)
+#define CDNS_DP_MSAH1_HSYNC_WIDTH(x) (x)
+#define CDNS_DP_MSAH1_HSYNC_POL_LOW BIT(15)
+#define CDNS_DP_MSAH1_HDISP_WIDTH(x) ((x) << 16)
+
+#define CDNS_DP_MSA_VERTICAL_0 (CDNS_DPTX_STREAM + 0x08)
+#define CDNS_DP_MSAV0_V_TOTAL(x) (x)
+#define CDNS_DP_MSAV0_VSYNC_START(x) ((x) << 16)
+
+#define CDNS_DP_MSA_VERTICAL_1 (CDNS_DPTX_STREAM + 0x0c)
+#define CDNS_DP_MSAV1_VSYNC_WIDTH(x) (x)
+#define CDNS_DP_MSAV1_VSYNC_POL_LOW BIT(15)
+#define CDNS_DP_MSAV1_VDISP_WIDTH(x) ((x) << 16)
+
+#define CDNS_DP_MSA_MISC (CDNS_DPTX_STREAM + 0x10)
+#define CDNS_DP_STREAM_CONFIG (CDNS_DPTX_STREAM + 0x14)
+#define CDNS_DP_RATE_GOVERNOR_STATUS (CDNS_DPTX_STREAM + 0x2c)
+#define CDNS_DP_RG_TU_VS_DIFF(x) ((x) << 8)
+
+#define CDNS_DP_HORIZONTAL (CDNS_DPTX_STREAM + 0x30)
+#define CDNS_DP_H_HSYNC_WIDTH(x) (x)
+#define CDNS_DP_H_H_TOTAL(x) ((x) << 16)
+
+#define CDNS_DP_VERTICAL_0 (CDNS_DPTX_STREAM + 0x34)
+#define CDNS_DP_V0_VHEIGHT(x) (x)
+#define CDNS_DP_V0_VSTART(x) ((x) << 16)
+
+#define CDNS_DP_VERTICAL_1 (CDNS_DPTX_STREAM + 0x38)
+#define CDNS_DP_V1_VTOTAL(x) (x)
+#define CDNS_DP_V1_VTOTAL_EVEN BIT(16)
+
+#define CDNS_DP_FRAMER_PXL_REPR (CDNS_DPTX_STREAM + 0x4c)
+#define CDNS_DP_FRAMER_6_BPC BIT(0)
+#define CDNS_DP_FRAMER_8_BPC BIT(1)
+#define CDNS_DP_FRAMER_10_BPC BIT(2)
+#define CDNS_DP_FRAMER_12_BPC BIT(3)
+#define CDNS_DP_FRAMER_16_BPC BIT(4)
+#define CDNS_DP_FRAMER_PXL_FORMAT 0x8
+#define CDNS_DP_FRAMER_RGB BIT(0)
+#define CDNS_DP_FRAMER_YCBCR444 BIT(1)
+#define CDNS_DP_FRAMER_YCBCR422 BIT(2)
+#define CDNS_DP_FRAMER_YCBCR420 BIT(3)
+#define CDNS_DP_FRAMER_Y_ONLY BIT(4)
+
+#define CDNS_DP_FRAMER_SP (CDNS_DPTX_STREAM + 0x10)
+#define CDNS_DP_FRAMER_VSYNC_POL_LOW BIT(0)
+#define CDNS_DP_FRAMER_HSYNC_POL_LOW BIT(1)
+#define CDNS_DP_FRAMER_INTERLACE BIT(2)
+
+#define CDNS_DP_LINE_THRESH (CDNS_DPTX_STREAM + 0x64)
+#define CDNS_DP_VB_ID (CDNS_DPTX_STREAM + 0x68)
+#define CDNS_DP_VB_ID_INTERLACED BIT(2)
+
+#define CDNS_DP_FRONT_BACK_PORCH (CDNS_DPTX_STREAM + 0x78)
+#define CDNS_DP_BACK_PORCH(x) (x)
+#define CDNS_DP_FRONT_PORCH(x) ((x) << 16)
+
+#define CDNS_DP_BYTE_COUNT (CDNS_DPTX_STREAM + 0x7c)
+
+#define CDNS_DPTX_GLOBAL 0x02300
+#define CDNS_DP_LANE_EN (CDNS_DPTX_GLOBAL + 0x00)
+#define CDNS_DP_LANE_EN_LANES(x) GENMASK(x - 1, 0)
+#define CDNS_DP_ENHNCD (CDNS_DPTX_GLOBAL + 0x04)
+
+#define CDNS_MHDP_IMEM 0x10000
+#define CDNS_MHDP_DMEM 0x20000
+
+#define CDNS_DP_TRAINING_PATTERN_4 0x7
+
+/* 3min delay because of EDID mb being VERY slow */
+/* FIXME: should be >615000 when upstreaming */
+#define CDNS_TIMEOUT_MAILBOX (1000 * 1000 * 60 * 3)
+
+/* FIXME: Should be 2000 */
+#define CDNS_KEEP_ALIVE_TIMEOUT 40000
+#define CDNS_SW_EVENT0_TIMEOUT 40000
+
+static const struct of_device_id mhdp_ids[] = {
+ { .compatible = "cdns,mhdp8546", },
+ { /* sentinel */ }
+};
+MODULE_DEVICE_TABLE(of, mhdp_ids);
+
+#define CDNS_LANE_1 BIT(0)
+#define CDNS_LANE_2 BIT(1)
+#define CDNS_LANE_4 BIT(2)
+#define CDNS_SSC BIT(3)
+#define CDNS_SCRAMBLER BIT(4)
+
+#define CDNS_VOLT_SWING(x) ((x) & GENMASK(1, 0))
+#define CDNS_FORCE_VOLT_SWING BIT(2)
+
+#define CDNS_PRE_EMPHASIS(x) ((x) & GENMASK(1, 0))
+#define CDNS_FORCE_PRE_EMPHASIS BIT(2)
+
+#define CDNS_SUPPORT_TPS(x) BIT((x) - 1)
+
+#define CDNS_FAST_LINK_TRAINING BIT(0)
+
+#define CDNS_LANE_MAPPING_TYPE_C_LANE_0(x) ((x) & GENMASK(1, 0))
+#define CDNS_LANE_MAPPING_TYPE_C_LANE_1(x) ((x) & GENMASK(3, 2))
+#define CDNS_LANE_MAPPING_TYPE_C_LANE_2(x) ((x) & GENMASK(5, 4))
+#define CDNS_LANE_MAPPING_TYPE_C_LANE_3(x) ((x) & GENMASK(7, 6))
+#define CDNS_LANE_MAPPING_NORMAL 0xe4
+#define CDNS_LANE_MAPPING_FLIPPED 0x1b
+
+#define CDNS_DP_MAX_NUM_LANES 4
+#define CDNS_DP_TEST_VSC_SDP (1 << 6) /* 1.3+ */
+#define CDNS_DP_TEST_COLOR_FORMAT_RAW_Y_ONLY (1 << 7)
+
+static inline struct cdns_mhdp_device *connector_to_mhdp(
+ struct drm_connector *conn)
+{
+ return container_of(conn, struct cdns_mhdp_device, connector);
+}
+
+static inline struct cdns_mhdp_device *bridge_to_mhdp(
+ struct drm_bridge *bridge)
+{
+ return container_of(bridge, struct cdns_mhdp_device, bridge);
+}
+
+static unsigned int max_link_rate(struct cdns_mhdp_host host,
+ struct cdns_mhdp_sink sink)
+{
+ return min(host.link_rate, sink.link_rate);
+}
+
+static u8 eq_training_pattern_supported(struct cdns_mhdp_host host,
+ struct cdns_mhdp_sink sink)
+{
+ return fls(host.pattern_supp & sink.pattern_supp);
+}
+
+static ssize_t mhdp_transfer(struct drm_dp_aux *aux,
+ struct drm_dp_aux_msg *msg)
+{
+ struct cdns_mhdp_device *mhdp = dev_get_drvdata(aux->dev);
+ int ret;
+
+ if (msg->request != DP_AUX_NATIVE_WRITE &&
+ msg->request != DP_AUX_NATIVE_READ)
+ return -ENOTSUPP;
+
+ if (msg->request == DP_AUX_NATIVE_WRITE) {
+ int i;
+
+ for (i = 0; i < msg->size; ++i) {
+ ret = cdns_mhdp_dpcd_write(mhdp,
+ msg->address + i,
+ *((u8 *)msg->buffer + i));
+ if (!ret)
+ continue;
+
+ DRM_DEV_ERROR(mhdp->dev, "Failed to write DPCD\n");
+
+ return i;
+ }
+ } else {
+ ret = cdns_mhdp_dpcd_read(mhdp, msg->address,
+ msg->buffer, msg->size);
+ if (ret) {
+ DRM_DEV_ERROR(mhdp->dev, "Failed to read DPCD\n");
+ return 0;
+ }
+ }
+
+ return msg->size;
+}
+
+static int cdns_mhdp_get_modes(struct drm_connector *connector)
+{
+ struct cdns_mhdp_device *mhdp = connector_to_mhdp(connector);
+ struct edid *edid;
+ int num_modes;
+
+ edid = drm_do_get_edid(connector, cdns_mhdp_get_edid_block, mhdp);
+
+ drm_connector_update_edid_property(connector, edid);
+
+ num_modes = drm_add_edid_modes(connector, edid);
+
+ return num_modes;
+}
+
+static const struct drm_connector_helper_funcs cdns_mhdp_conn_helper_funcs = {
+ .get_modes = cdns_mhdp_get_modes,
+};
+
+static enum drm_connector_status cdns_mhdp_detect(struct drm_connector *conn,
+ bool force)
+{
+ struct cdns_mhdp_device *mhdp = connector_to_mhdp(conn);
+ enum drm_connector_status status = connector_status_disconnected;
+ int ret;
+
+ ret = cdns_mhdp_get_hpd_status(mhdp);
+ if (ret > 0)
+ status = connector_status_connected;
+ else if (ret < 0)
+ dev_err(mhdp->dev, "Failed to obtain HPD state\n");
+
+ return status;
+}
+
+static const struct drm_connector_funcs cdns_mhdp_conn_funcs = {
+ .fill_modes = drm_helper_probe_single_connector_modes,
+ .atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state,
+ .atomic_destroy_state = drm_atomic_helper_connector_destroy_state,
+ .reset = drm_atomic_helper_connector_reset,
+ .destroy = drm_connector_cleanup,
+ .dpms = drm_helper_connector_dpms,
+ .detect = cdns_mhdp_detect,
+};
+
+static int cdns_mhdp_attach(struct drm_bridge *bridge)
+{
+ struct cdns_mhdp_device *mhdp = bridge_to_mhdp(bridge);
+ struct drm_connector *conn = &mhdp->connector;
+ int ret;
+
+ conn->polled = DRM_CONNECTOR_POLL_CONNECT |
+ DRM_CONNECTOR_POLL_DISCONNECT;
+
+ ret = drm_connector_init(bridge->dev, conn, &cdns_mhdp_conn_funcs,
+ DRM_MODE_CONNECTOR_DisplayPort);
+ if (ret) {
+ dev_err(mhdp->dev, "failed to init connector\n");
+ return ret;
+ }
+
+ drm_connector_helper_add(conn, &cdns_mhdp_conn_helper_funcs);
+
+ ret = drm_connector_attach_encoder(conn, bridge->encoder);
+ if (ret) {
+ dev_err(mhdp->dev, "failed to attach connector to encoder\n");
+ return ret;
+ }
+
+ return 0;
+}
+
+enum pixel_format {
+ PIXEL_FORMAT_RGB = 1,
+ PIXEL_FORMAT_YCBCR_444 = 2,
+ PIXEL_FORMAT_YCBCR_422 = 4,
+ PIXEL_FORMAT_YCBCR_420 = 8,
+ PIXEL_FORMAT_Y_ONLY = 16,
+};
+
+static void mhdp_link_training_init(struct cdns_mhdp_device *mhdp)
+{
+ u32 reg32;
+
+ drm_dp_dpcd_writeb(&mhdp->aux, DP_TRAINING_PATTERN_SET,
+ DP_TRAINING_PATTERN_DISABLE);
+
+ /* Reset PHY configuration */
+ reg32 = CDNS_PHY_COMMON_CONFIG | CDNS_PHY_TRAINING_TYPE(1);
+ if (!(mhdp->host.lanes_cnt & CDNS_SCRAMBLER))
+ reg32 |= CDNS_PHY_SCRAMBLER_BYPASS;
+
+ cdns_mhdp_reg_write(mhdp, CDNS_DPTX_PHY_CONFIG, reg32);
+
+ cdns_mhdp_reg_write(mhdp, CDNS_DP_ENHNCD,
+ mhdp->sink.enhanced & mhdp->host.enhanced);
+
+ cdns_mhdp_reg_write(mhdp, CDNS_DP_LANE_EN,
+ CDNS_DP_LANE_EN_LANES(mhdp->link.num_lanes));
+
+ drm_dp_link_configure(&mhdp->aux, &mhdp->link);
+
+ cdns_mhdp_reg_write(mhdp, CDNS_DPTX_PHY_CONFIG,
+ CDNS_PHY_COMMON_CONFIG |
+ CDNS_PHY_TRAINING_EN |
+ CDNS_PHY_TRAINING_TYPE(1) |
+ CDNS_PHY_SCRAMBLER_BYPASS);
+
+ drm_dp_dpcd_writeb(&mhdp->aux, DP_TRAINING_PATTERN_SET,
+ DP_TRAINING_PATTERN_1 | DP_LINK_SCRAMBLING_DISABLE);
+}
+
+static void mhdp_get_adjust_train(struct cdns_mhdp_device *mhdp,
+ u8 link_status[DP_LINK_STATUS_SIZE],
+ u8 lanes_data[CDNS_DP_MAX_NUM_LANES])
+{
+ unsigned int i;
+ u8 adjust, max_pre_emphasis, max_volt_swing;
+
+ max_pre_emphasis = CDNS_PRE_EMPHASIS(mhdp->host.pre_emphasis)
+ << DP_TRAIN_PRE_EMPHASIS_SHIFT;
+ max_volt_swing = CDNS_VOLT_SWING(mhdp->host.volt_swing);
+
+ for (i = 0; i < mhdp->link.num_lanes; i++) {
+ adjust = drm_dp_get_adjust_request_voltage(link_status, i);
+ lanes_data[i] = min_t(u8, adjust, max_volt_swing);
+ if (lanes_data[i] != adjust)
+ lanes_data[i] |= DP_TRAIN_MAX_SWING_REACHED;
+
+ adjust = drm_dp_get_adjust_request_pre_emphasis(link_status, i);
+ lanes_data[i] |= min_t(u8, adjust, max_pre_emphasis);
+ if ((lanes_data[i] >> DP_TRAIN_PRE_EMPHASIS_SHIFT) != adjust)
+ lanes_data[i] |= DP_TRAIN_MAX_PRE_EMPHASIS_REACHED;
+ }
+}
+
+static void mhdp_set_adjust_request_voltage(
+ u8 link_status[DP_LINK_STATUS_SIZE], int lane, u8 volt)
+{
+ int i = DP_ADJUST_REQUEST_LANE0_1 + (lane >> 1);
+ int s = ((lane & 1) ?
+ DP_ADJUST_VOLTAGE_SWING_LANE1_SHIFT :
+ DP_ADJUST_VOLTAGE_SWING_LANE0_SHIFT);
+ int idx = i - DP_LANE0_1_STATUS;
+
+ link_status[idx] &= ~(DP_ADJUST_VOLTAGE_SWING_LANE0_MASK << s);
+ link_status[idx] |= volt << s;
+}
+
+static void mhdp_set_adjust_request_pre_emphasis(
+ u8 link_status[DP_LINK_STATUS_SIZE], int lane, u8 pre_emphasis)
+{
+ int i = DP_ADJUST_REQUEST_LANE0_1 + (lane >> 1);
+ int s = ((lane & 1) ?
+ DP_ADJUST_PRE_EMPHASIS_LANE1_SHIFT :
+ DP_ADJUST_PRE_EMPHASIS_LANE0_SHIFT);
+ int idx = i - DP_LANE0_1_STATUS;
+
+ link_status[idx] &= ~(DP_ADJUST_PRE_EMPHASIS_LANE0_MASK << s);
+ link_status[idx] |= pre_emphasis << s;
+}
+
+static void mhdp_adjust_requested_eq(struct cdns_mhdp_device *mhdp,
+ u8 link_status[DP_LINK_STATUS_SIZE])
+{
+ unsigned int i;
+ u8 pre, volt, max_pre = CDNS_VOLT_SWING(mhdp->host.volt_swing),
+ max_volt = CDNS_PRE_EMPHASIS(mhdp->host.pre_emphasis);
+
+ for (i = 0; i < mhdp->link.num_lanes; i++) {
+ volt = drm_dp_get_adjust_request_voltage(link_status, i);
+ pre = drm_dp_get_adjust_request_pre_emphasis(link_status, i);
+ if (volt + pre > 3)
+ mhdp_set_adjust_request_voltage(link_status, i,
+ 3 - pre);
+ if (mhdp->host.volt_swing & CDNS_FORCE_VOLT_SWING)
+ mhdp_set_adjust_request_voltage(link_status, i,
+ max_volt);
+ if (mhdp->host.pre_emphasis & CDNS_FORCE_PRE_EMPHASIS)
+ mhdp_set_adjust_request_pre_emphasis(link_status, i,
+ max_pre);
+ }
+}
+
+static bool mhdp_link_training_channel_eq(struct cdns_mhdp_device *mhdp,
+ u8 eq_tps,
+ unsigned int training_interval)
+{
+ u8 lanes_data[CDNS_DP_MAX_NUM_LANES], fail_counter_short = 0;
+ u8 dpcd[DP_LINK_STATUS_SIZE];
+ u32 reg32;
+
+ dev_dbg(mhdp->dev, "Link training - Starting EQ phase\n");
+
+ /* Enable link training TPS[eq_tps] in PHY */
+ reg32 = CDNS_PHY_COMMON_CONFIG | CDNS_PHY_TRAINING_EN |
+ CDNS_PHY_TRAINING_TYPE(eq_tps);
+ if (eq_tps != 4)
+ reg32 |= CDNS_PHY_SCRAMBLER_BYPASS;
+ cdns_mhdp_reg_write(mhdp, CDNS_DPTX_PHY_CONFIG, reg32);
+
+ drm_dp_dpcd_writeb(&mhdp->aux, DP_TRAINING_PATTERN_SET,
+ (eq_tps != 4) ? eq_tps | DP_LINK_SCRAMBLING_DISABLE :
+ CDNS_DP_TRAINING_PATTERN_4);
+
+ drm_dp_dpcd_read_link_status(&mhdp->aux, dpcd);
+
+ do {
+ mhdp_get_adjust_train(mhdp, dpcd, lanes_data);
+
+ cdns_mhdp_adjust_lt(mhdp, mhdp->link.num_lanes,
+ training_interval, lanes_data, dpcd);
+
+ if (!drm_dp_clock_recovery_ok(dpcd, mhdp->link.num_lanes))
+ goto err;
+
+ if (drm_dp_channel_eq_ok(dpcd, mhdp->link.num_lanes)) {
+ dev_dbg(mhdp->dev,
+ "Link training: EQ phase succeeded\n");
+ return true;
+ }
+
+ fail_counter_short++;
+
+ mhdp_adjust_requested_eq(mhdp, dpcd);
+ } while (fail_counter_short < 5);
+
+err:
+ dev_dbg(mhdp->dev,
+ "Link training - EQ phase failed for %d lanes and %d rate\n",
+ mhdp->link.num_lanes, mhdp->link.rate);
+
+ return false;
+}
+
+static void mhdp_adjust_requested_cr(struct cdns_mhdp_device *mhdp,
+ u8 link_status[DP_LINK_STATUS_SIZE],
+ u8 *req_volt, u8 *req_pre)
+{
+ unsigned int i, max_volt = CDNS_VOLT_SWING(mhdp->host.volt_swing),
+ max_pre = CDNS_PRE_EMPHASIS(mhdp->host.pre_emphasis);
+
+ for (i = 0; i < mhdp->link.num_lanes; i++) {
+ if (mhdp->host.volt_swing & CDNS_FORCE_VOLT_SWING)
+ mhdp_set_adjust_request_voltage(link_status, i,
+ max_volt);
+ else
+ mhdp_set_adjust_request_voltage(link_status, i,
+ req_volt[i]);
+
+ if (mhdp->host.pre_emphasis & CDNS_FORCE_PRE_EMPHASIS)
+ mhdp_set_adjust_request_pre_emphasis(link_status, i,
+ max_pre);
+ else
+ mhdp_set_adjust_request_pre_emphasis(link_status, i,
+ req_pre[i]);
+ }
+}
+
+static void mhdp_validate_cr(struct cdns_mhdp_device *mhdp, bool *cr_done,
+ bool *same_before_adjust, bool *max_swing_reached,
+ u8 before_cr[DP_LINK_STATUS_SIZE],
+ u8 after_cr[DP_LINK_STATUS_SIZE], u8 *req_volt,
+ u8 *req_pre)
+{
+ unsigned int i;
+ u8 tmp, max_volt = CDNS_VOLT_SWING(mhdp->host.volt_swing),
+ max_pre = CDNS_PRE_EMPHASIS(mhdp->host.pre_emphasis);
+ bool same_pre, same_volt;
+
+ *same_before_adjust = false;
+ *max_swing_reached = false;
+ *cr_done = drm_dp_clock_recovery_ok(after_cr, mhdp->link.num_lanes);
+
+ for (i = 0; i < mhdp->link.num_lanes; i++) {
+ tmp = drm_dp_get_adjust_request_voltage(after_cr, i);
+ req_volt[i] = min_t(u8, tmp, max_volt);
+
+ tmp = drm_dp_get_adjust_request_pre_emphasis(after_cr, i) >>
+ DP_TRAIN_PRE_EMPHASIS_SHIFT;
+ req_pre[i] = min_t(u8, tmp, max_pre);
+
+ same_pre = (before_cr[i] & DP_TRAIN_PRE_EMPHASIS_MASK) ==
+ (req_pre[i] << DP_TRAIN_PRE_EMPHASIS_SHIFT);
+ same_volt = (before_cr[i] & DP_TRAIN_VOLTAGE_SWING_MASK) ==
+ req_volt[i];
+ if (same_pre && same_volt)
+ *same_before_adjust = true;
+
+ /* 3.1.5.2 in DP Standard v1.4. Table 3-1 */
+ if (!*cr_done && req_volt[i] + req_pre[i] >= 3) {
+ *max_swing_reached = true;
+ return;
+ }
+ }
+}
+
+static bool mhdp_link_training_clock_recovery(struct cdns_mhdp_device *mhdp)
+{
+ u8 lanes_data[CDNS_DP_MAX_NUM_LANES], fail_counter_short = 0,
+ fail_counter_cr_long = 0;
+ u8 dpcd[DP_LINK_STATUS_SIZE];
+ bool cr_done;
+
+ dev_dbg(mhdp->dev, "Link training starting CR phase\n");
+
+ mhdp_link_training_init(mhdp);
+
+ drm_dp_dpcd_read_link_status(&mhdp->aux, dpcd);
+
+ do {
+ u8 requested_adjust_volt_swing[CDNS_DP_MAX_NUM_LANES] = {},
+ requested_adjust_pre_emphasis[CDNS_DP_MAX_NUM_LANES] = {};
+ bool same_before_adjust, max_swing_reached;
+
+ mhdp_get_adjust_train(mhdp, dpcd, lanes_data);
+
+ cdns_mhdp_adjust_lt(mhdp, mhdp->link.num_lanes, 100,
+ lanes_data, dpcd);
+
+ mhdp_validate_cr(mhdp, &cr_done, &same_before_adjust,
+ &max_swing_reached, lanes_data, dpcd,
+ requested_adjust_volt_swing,
+ requested_adjust_pre_emphasis);
+
+ if (max_swing_reached)
+ goto err;
+
+ if (cr_done) {
+ dev_dbg(mhdp->dev,
+ "Link training: CR phase succeeded\n");
+ return true;
+ }
+
+ /* Not all CR_DONE bits set */
+ fail_counter_cr_long++;
+
+ if (same_before_adjust) {
+ fail_counter_short++;
+ continue;
+ }
+
+ fail_counter_short = 0;
+ /*
+ * Voltage swing/pre-emphasis adjust requested
+ * during CR phase
+ */
+ mhdp_adjust_requested_cr(mhdp, dpcd,
+ requested_adjust_volt_swing,
+ requested_adjust_pre_emphasis);
+ } while (fail_counter_short < 5 && fail_counter_cr_long < 10);
+
+err:
+ dev_dbg(mhdp->dev,
+ "Link training: CR phase failed for %d lanes and %d rate\n",
+ mhdp->link.num_lanes, mhdp->link.rate);
+
+ return false;
+}
+
+static void lower_link_rate(struct drm_dp_link *link)
+{
+ switch (drm_dp_link_rate_to_bw_code(link->rate)) {
+ case DP_LINK_BW_2_7:
+ link->rate = drm_dp_bw_code_to_link_rate(DP_LINK_BW_1_62);
+ break;
+ case DP_LINK_BW_5_4:
+ link->rate = drm_dp_bw_code_to_link_rate(DP_LINK_BW_2_7);
+ break;
+ case DP_LINK_BW_8_1:
+ link->rate = drm_dp_bw_code_to_link_rate(DP_LINK_BW_5_4);
+ break;
+ }
+}
+
+static int mhdp_link_training(struct cdns_mhdp_device *mhdp,
+ unsigned int video_mode,
+ unsigned int training_interval)
+{
+ u32 reg32;
+ u8 eq_tps = eq_training_pattern_supported(mhdp->host, mhdp->sink);
+
+ while (1) {
+ if (!mhdp_link_training_clock_recovery(mhdp)) {
+ if (drm_dp_link_rate_to_bw_code(mhdp->link.rate) !=
+ DP_LINK_BW_1_62) {
+ dev_dbg(mhdp->dev,
+ "Reducing link rate during CR phase\n");
+ lower_link_rate(&mhdp->link);
+ drm_dp_link_configure(&mhdp->aux, &mhdp->link);
+
+ continue;
+ } else if (mhdp->link.num_lanes > 1) {
+ dev_dbg(mhdp->dev,
+ "Reducing lanes number during CR phase\n");
+ mhdp->link.num_lanes >>= 1;
+ mhdp->link.rate = max_link_rate(mhdp->host,
+ mhdp->sink);
+ drm_dp_link_configure(&mhdp->aux, &mhdp->link);
+
+ continue;
+ }
+
+ dev_dbg(mhdp->dev,
+ "Link training failed during CR phase\n");
+ goto err;
+ }
+
+ if (mhdp_link_training_channel_eq(mhdp, eq_tps,
+ training_interval))
+ break;
+
+ if (mhdp->link.num_lanes > 1) {
+ dev_dbg(mhdp->dev,
+ "Reducing lanes number during EQ phase\n");
+ mhdp->link.num_lanes >>= 1;
+ drm_dp_link_configure(&mhdp->aux, &mhdp->link);
+
+ continue;
+ } else if (drm_dp_link_rate_to_bw_code(mhdp->link.rate) !=
+ DP_LINK_BW_1_62) {
+ dev_dbg(mhdp->dev,
+ "Reducing link rate during EQ phase\n");
+ lower_link_rate(&mhdp->link);
+ drm_dp_link_configure(&mhdp->aux, &mhdp->link);
+
+ continue;
+ }
+
+ dev_dbg(mhdp->dev, "Link training failed during EQ phase\n");
+ goto err;
+ }
+
+ dev_dbg(mhdp->dev, "Link training successful\n");
+
+ drm_dp_dpcd_writeb(&mhdp->aux, DP_TRAINING_PATTERN_SET,
+ (mhdp->host.lanes_cnt & CDNS_SCRAMBLER) ? 0 :
+ DP_LINK_SCRAMBLING_DISABLE);
+
+ /* SW reset DPTX framer */
+ cdns_mhdp_reg_write(mhdp, CDNS_DP_SW_RESET, 1);
+ cdns_mhdp_reg_write(mhdp, CDNS_DP_SW_RESET, 0);
+
+ /* Enable framer */
+ /* FIXME: update when MST supported, BIT(2) */
+ cdns_mhdp_reg_write(mhdp, CDNS_DP_FRAMER_GLOBAL_CONFIG,
+ CDNS_DP_FRAMER_EN |
+ CDNS_DP_NUM_LANES(mhdp->link.num_lanes) |
+ CDNS_DP_DISABLE_PHY_RST |
+ CDNS_DP_WR_FAILING_EDGE_VSYNC |
+ (!video_mode ? CDNS_DP_NO_VIDEO_MODE : 0));
+
+ /* Reset PHY config */
+ reg32 = CDNS_PHY_COMMON_CONFIG | CDNS_PHY_TRAINING_TYPE(1);
+ if (!(mhdp->host.lanes_cnt & CDNS_SCRAMBLER))
+ reg32 |= CDNS_PHY_SCRAMBLER_BYPASS;
+ cdns_mhdp_reg_write(mhdp, CDNS_DPTX_PHY_CONFIG, reg32);
+
+ return 0;
+err:
+ /* Reset PHY config */
+ reg32 = CDNS_PHY_COMMON_CONFIG | CDNS_PHY_TRAINING_TYPE(1);
+ if (!(mhdp->host.lanes_cnt & CDNS_SCRAMBLER))
+ reg32 |= CDNS_PHY_SCRAMBLER_BYPASS;
+ cdns_mhdp_reg_write(mhdp, CDNS_DPTX_PHY_CONFIG, reg32);
+
+ drm_dp_dpcd_writeb(&mhdp->aux, DP_TRAINING_PATTERN_SET,
+ DP_TRAINING_PATTERN_DISABLE);
+
+ return -EIO;
+}
+
+static void cdns_mhdp_disable(struct drm_bridge *bridge)
+{
+ struct cdns_mhdp_device *mhdp = bridge_to_mhdp(bridge);
+
+ cdns_mhdp_set_video_status(mhdp, 0);
+
+ drm_dp_link_power_down(&mhdp->aux, &mhdp->link);
+}
+
+static void cdns_mhdp_enable(struct drm_bridge *bridge)
+{
+ struct cdns_mhdp_device *mhdp = bridge_to_mhdp(bridge);
+ struct drm_display_mode *mode;
+ struct drm_display_info *disp_info = &mhdp->connector.display_info;
+ enum pixel_format pxlfmt;
+ int pxlclock;
+ unsigned int rate, tu_size = 30, vs, vs_f, bpp, required_bandwidth,
+ available_bandwidth, dp_framer_sp = 0, msa_horizontal_1,
+ msa_vertical_1, bnd_hsync2vsync, hsync2vsync_pol_ctrl,
+ misc0 = 0, misc1 = 0, line_thresh = 0, pxl_repr,
+ front_porch, back_porch, msa_h0, msa_v0, hsync, vsync,
+ dp_vertical_1, line_thresh1, line_thresh2;
+ u32 resp;
+
+ unsigned int size = DP_RECEIVER_CAP_SIZE, dp_framer_global_config,
+ video_mode, training_interval_us;
+ u8 reg0[size], reg8, amp[2];
+
+ mode = &bridge->encoder->crtc->state->adjusted_mode;
+ pxlclock = mode->crtc_clock;
+
+ /*
+ * Upon power-on reset/device disconnection: [2:0] bits should be 0b001
+ * and [7:5] bits 0b000.
+ */
+ drm_dp_dpcd_writeb(&mhdp->aux, DP_SET_POWER, 1);
+
+ drm_dp_link_probe(&mhdp->aux, &mhdp->link);
+
+ dev_dbg(mhdp->dev, "Set sink device power state via DPCD\n");
+ drm_dp_link_power_up(&mhdp->aux, &mhdp->link);
+ /* FIXME (CDNS): do we have to wait for 100ms before going on? */
+ mdelay(100);
+
+ mhdp->sink.link_rate = mhdp->link.rate;
+ mhdp->sink.lanes_cnt = mhdp->link.num_lanes;
+ mhdp->sink.enhanced = !!(mhdp->link.capabilities &
+ DP_LINK_CAP_ENHANCED_FRAMING);
+
+ drm_dp_dpcd_read(&mhdp->aux, DP_DPCD_REV, reg0, size);
+
+ mhdp->sink.pattern_supp = CDNS_SUPPORT_TPS(1) | CDNS_SUPPORT_TPS(2);
+ if (drm_dp_tps3_supported(reg0))
+ mhdp->sink.pattern_supp |= CDNS_SUPPORT_TPS(3);
+ if (drm_dp_tps4_supported(reg0))
+ mhdp->sink.pattern_supp |= CDNS_SUPPORT_TPS(4);
+
+ mhdp->sink.fast_link = !!(reg0[DP_MAX_DOWNSPREAD] &
+ DP_NO_AUX_HANDSHAKE_LINK_TRAINING);
+
+ mhdp->link.rate = max_link_rate(mhdp->host, mhdp->sink);
+ mhdp->link.num_lanes = min_t(u8, mhdp->sink.lanes_cnt,
+ mhdp->host.lanes_cnt & GENMASK(2, 0));
+
+ reg8 = reg0[DP_TRAINING_AUX_RD_INTERVAL] &
+ DP_TRAINING_AUX_RD_MASK;
+ switch (reg8) {
+ case 0:
+ training_interval_us = 400;
+ break;
+ case 1:
+ case 2:
+ case 3:
+ case 4:
+ training_interval_us = 4000 << (reg8 - 1);
+ break;
+ default:
+ dev_err(mhdp->dev,
+ "wrong training interval returned by DPCD: %d\n", reg8);
+ return;
+ }
+
+ cdns_mhdp_reg_read(mhdp, CDNS_DP_FRAMER_GLOBAL_CONFIG, &resp);
+
+ dp_framer_global_config = be32_to_cpu(resp);
+
+ video_mode = !(dp_framer_global_config & CDNS_DP_NO_VIDEO_MODE);
+
+ if (dp_framer_global_config & CDNS_DP_FRAMER_EN)
+ cdns_mhdp_reg_write(mhdp, CDNS_DP_FRAMER_GLOBAL_CONFIG,
+ dp_framer_global_config &
+ ~CDNS_DP_FRAMER_EN);
+
+ /* Spread AMP if required, enable 8b/10b coding */
+ amp[0] = (mhdp->host.lanes_cnt & CDNS_SSC) ? DP_SPREAD_AMP_0_5 : 0;
+ amp[1] = DP_SET_ANSI_8B10B;
+ drm_dp_dpcd_write(&mhdp->aux, DP_DOWNSPREAD_CTRL, amp, 2);
+
+ if (mhdp->host.fast_link & mhdp->sink.fast_link) {
+ /* FIXME: implement fastlink */
+ dev_dbg(mhdp->dev, "fastlink\n");
+ } else {
+ if (mhdp_link_training(mhdp, video_mode,
+ training_interval_us)) {
+ dev_err(mhdp->dev, "Link training failed. Exiting.\n");
+ return;
+ }
+ }
+
+ rate = mhdp->link.rate / 1000;
+
+ /* FIXME: what about Y_ONLY? how is it handled in the kernel? */
+ if (disp_info->color_formats & DRM_COLOR_FORMAT_YCRCB444)
+ pxlfmt = PIXEL_FORMAT_YCBCR_444;
+ else if (disp_info->color_formats & DRM_COLOR_FORMAT_YCRCB422)
+ pxlfmt = PIXEL_FORMAT_YCBCR_422;
+ else if (disp_info->color_formats & DRM_COLOR_FORMAT_YCRCB420)
+ pxlfmt = PIXEL_FORMAT_YCBCR_420;
+ else
+ pxlfmt = PIXEL_FORMAT_RGB;
+
+ /* if YCBCR supported and stream not SD, use ITU709 */
+ /* FIXME: handle ITU version with YCBCR420 when supported */
+ if ((pxlfmt == PIXEL_FORMAT_YCBCR_444 ||
+ pxlfmt == PIXEL_FORMAT_YCBCR_422) && mode->crtc_vdisplay >= 720)
+ misc0 = DP_YCBCR_COEFFICIENTS_ITU709;
+
+ switch (pxlfmt) {
+ case PIXEL_FORMAT_RGB:
+ bpp = disp_info->bpc * 3;
+ pxl_repr = CDNS_DP_FRAMER_RGB << CDNS_DP_FRAMER_PXL_FORMAT;
+ misc0 |= DP_COLOR_FORMAT_RGB;
+ break;
+ case PIXEL_FORMAT_YCBCR_444:
+ bpp = disp_info->bpc * 3;
+ pxl_repr = CDNS_DP_FRAMER_YCBCR444 << CDNS_DP_FRAMER_PXL_FORMAT;
+ misc0 |= DP_COLOR_FORMAT_YCbCr444 | DP_TEST_DYNAMIC_RANGE_CEA;
+ break;
+ case PIXEL_FORMAT_YCBCR_422:
+ bpp = disp_info->bpc * 2;
+ pxl_repr = CDNS_DP_FRAMER_YCBCR422 << CDNS_DP_FRAMER_PXL_FORMAT;
+ misc0 |= DP_COLOR_FORMAT_YCbCr422 | DP_TEST_DYNAMIC_RANGE_CEA;
+ break;
+ case PIXEL_FORMAT_YCBCR_420:
+ bpp = disp_info->bpc * 3 / 2;
+ pxl_repr = CDNS_DP_FRAMER_YCBCR420 << CDNS_DP_FRAMER_PXL_FORMAT;
+ break;
+ default:
+ bpp = disp_info->bpc;
+ pxl_repr = CDNS_DP_FRAMER_Y_ONLY << CDNS_DP_FRAMER_PXL_FORMAT;
+ }
+
+ switch (disp_info->bpc) {
+ case 6:
+ misc0 |= DP_TEST_BIT_DEPTH_6;
+ pxl_repr |= CDNS_DP_FRAMER_6_BPC;
+ break;
+ case 8:
+ misc0 |= DP_TEST_BIT_DEPTH_8;
+ pxl_repr |= CDNS_DP_FRAMER_8_BPC;
+ break;
+ case 10:
+ misc0 |= DP_TEST_BIT_DEPTH_10;
+ pxl_repr |= CDNS_DP_FRAMER_10_BPC;
+ break;
+ case 12:
+ misc0 |= DP_TEST_BIT_DEPTH_12;
+ pxl_repr |= CDNS_DP_FRAMER_12_BPC;
+ break;
+ case 16:
+ misc0 |= DP_TEST_BIT_DEPTH_16;
+ pxl_repr |= CDNS_DP_FRAMER_16_BPC;
+ break;
+ }
+
+ /* find optimal tu_size */
+ required_bandwidth = pxlclock * bpp / 8;
+ available_bandwidth = mhdp->link.num_lanes * rate;
+ do {
+ tu_size += 2;
+
+ vs_f = tu_size * required_bandwidth / available_bandwidth;
+ vs = vs_f / 1000;
+ vs_f = vs_f % 1000;
+ /*
+ * FIXME (CDNS): downspreading?
+ * It's unused is what I've been told.
+ */
+ } while ((vs == 1 || ((vs_f > 850 || vs_f < 100) && vs_f != 0) ||
+ tu_size - vs < 2) && tu_size < 64);
+
+ if (vs > 64)
+ return;
+
+ bnd_hsync2vsync = CDNS_IP_BYPASS_V_INTERFACE;
+ if (mode->flags & DRM_MODE_FLAG_INTERLACE)
+ bnd_hsync2vsync |= CDNS_IP_DET_INTERLACE_FORMAT;
+
+ cdns_mhdp_reg_write(mhdp, CDNS_BND_HSYNC2VSYNC, bnd_hsync2vsync);
+
+ if (mode->flags & DRM_MODE_FLAG_INTERLACE &&
+ mode->flags & DRM_MODE_FLAG_PHSYNC)
+ hsync2vsync_pol_ctrl = CDNS_H2V_HSYNC_POL_ACTIVE_LOW |
+ CDNS_H2V_VSYNC_POL_ACTIVE_LOW;
+ else
+ hsync2vsync_pol_ctrl = 0;
+
+ cdns_mhdp_reg_write(mhdp, CDNS_HSYNC2VSYNC_POL_CTRL,
+ hsync2vsync_pol_ctrl);
+
+ cdns_mhdp_reg_write(mhdp, CDNS_DP_FRAMER_TU,
+ CDNS_DP_FRAMER_TU_VS(vs) |
+ CDNS_DP_FRAMER_TU_SIZE(tu_size) |
+ CDNS_DP_FRAMER_TU_CNT_RST_EN);
+
+ cdns_mhdp_reg_write(mhdp, CDNS_DP_FRAMER_PXL_REPR, pxl_repr);
+
+ if (mode->flags & DRM_MODE_FLAG_INTERLACE)
+ dp_framer_sp |= CDNS_DP_FRAMER_INTERLACE;
+ if (mode->flags & DRM_MODE_FLAG_NHSYNC)
+ dp_framer_sp |= CDNS_DP_FRAMER_HSYNC_POL_LOW;
+ if (mode->flags & DRM_MODE_FLAG_NVSYNC)
+ dp_framer_sp |= CDNS_DP_FRAMER_VSYNC_POL_LOW;
+ cdns_mhdp_reg_write(mhdp, CDNS_DP_FRAMER_SP, dp_framer_sp);
+
+ front_porch = mode->crtc_hsync_start - mode->crtc_hdisplay;
+ back_porch = mode->crtc_htotal - mode->crtc_hsync_end;
+ cdns_mhdp_reg_write(mhdp, CDNS_DP_FRONT_BACK_PORCH,
+ CDNS_DP_FRONT_PORCH(front_porch) |
+ CDNS_DP_BACK_PORCH(back_porch));
+
+ cdns_mhdp_reg_write(mhdp, CDNS_DP_BYTE_COUNT,
+ mode->crtc_hdisplay * bpp / 8);
+
+ msa_h0 = mode->crtc_htotal - mode->crtc_hsync_start;
+ cdns_mhdp_reg_write(mhdp, CDNS_DP_MSA_HORIZONTAL_0,
+ CDNS_DP_MSAH0_H_TOTAL(mode->crtc_htotal) |
+ CDNS_DP_MSAH0_HSYNC_START(msa_h0));
+
+ hsync = mode->crtc_hsync_end - mode->crtc_hsync_start;
+ msa_horizontal_1 = CDNS_DP_MSAH1_HSYNC_WIDTH(hsync) |
+ CDNS_DP_MSAH1_HDISP_WIDTH(mode->crtc_hdisplay);
+ if (mode->flags & DRM_MODE_FLAG_NHSYNC)
+ msa_horizontal_1 |= CDNS_DP_MSAH1_HSYNC_POL_LOW;
+ cdns_mhdp_reg_write(mhdp, CDNS_DP_MSA_HORIZONTAL_1,
+ msa_horizontal_1);
+
+ msa_v0 = mode->crtc_vtotal - mode->crtc_vsync_start;
+ cdns_mhdp_reg_write(mhdp, CDNS_DP_MSA_VERTICAL_0,
+ CDNS_DP_MSAV0_V_TOTAL(mode->crtc_vtotal) |
+ CDNS_DP_MSAV0_VSYNC_START(msa_v0));
+
+ vsync = mode->crtc_vsync_end - mode->crtc_vsync_start;
+ msa_vertical_1 = CDNS_DP_MSAV1_VSYNC_WIDTH(vsync) |
+ CDNS_DP_MSAV1_VDISP_WIDTH(mode->crtc_vdisplay);
+ if (mode->flags & DRM_MODE_FLAG_NVSYNC)
+ msa_vertical_1 |= CDNS_DP_MSAV1_VSYNC_POL_LOW;
+ cdns_mhdp_reg_write(mhdp, CDNS_DP_MSA_VERTICAL_1, msa_vertical_1);
+
+ if ((mode->flags & DRM_MODE_FLAG_INTERLACE) &&
+ mode->crtc_vtotal % 2 == 0)
+ misc1 = DP_TEST_INTERLACED;
+ if (pxlfmt == PIXEL_FORMAT_Y_ONLY)
+ misc1 |= CDNS_DP_TEST_COLOR_FORMAT_RAW_Y_ONLY;
+ /* FIXME: use VSC SDP for Y420 */
+ /* FIXME: (CDNS) no code for Y420 in bare metal test */
+ if (pxlfmt == PIXEL_FORMAT_YCBCR_420)
+ misc1 = CDNS_DP_TEST_VSC_SDP;
+
+ cdns_mhdp_reg_write(mhdp, CDNS_DP_MSA_MISC, misc0 | (misc1 << 8));
+
+ /* FIXME: to be changed if MST mode */
+ cdns_mhdp_reg_write(mhdp, CDNS_DP_STREAM_CONFIG, 1);
+
+ cdns_mhdp_reg_write(mhdp, CDNS_DP_HORIZONTAL,
+ CDNS_DP_H_HSYNC_WIDTH(hsync) |
+ CDNS_DP_H_H_TOTAL(mode->crtc_hdisplay));
+
+ cdns_mhdp_reg_write(mhdp, CDNS_DP_VERTICAL_0,
+ CDNS_DP_V0_VHEIGHT(mode->crtc_vdisplay) |
+ CDNS_DP_V0_VSTART(msa_v0));
+
+ dp_vertical_1 = CDNS_DP_V1_VTOTAL(mode->crtc_vtotal);
+ if ((mode->flags & DRM_MODE_FLAG_INTERLACE) &&
+ mode->crtc_vtotal % 2 == 0)
+ dp_vertical_1 |= CDNS_DP_V1_VTOTAL_EVEN;
+
+ cdns_mhdp_reg_write(mhdp, CDNS_DP_VERTICAL_1, dp_vertical_1);
+
+ cdns_mhdp_reg_write_bit(mhdp, CDNS_DP_VB_ID, 2, 1,
+ (mode->flags & DRM_MODE_FLAG_INTERLACE) ?
+ CDNS_DP_VB_ID_INTERLACED : 0);
+
+ line_thresh1 = ((vs + 1) << 5) * 8 / bpp;
+ line_thresh2 = (pxlclock << 5) / 1000 / rate * (vs + 1) - (1 << 5);
+ line_thresh = line_thresh1 - line_thresh2 / mhdp->link.num_lanes;
+ line_thresh = (line_thresh >> 5) + 2;
+ cdns_mhdp_reg_write(mhdp, CDNS_DP_LINE_THRESH,
+ line_thresh & GENMASK(5, 0));
+
+ cdns_mhdp_reg_write(mhdp, CDNS_DP_RATE_GOVERNOR_STATUS,
+ CDNS_DP_RG_TU_VS_DIFF((tu_size - vs > 3) ?
+ 0 : tu_size - vs));
+
+ cdns_mhdp_set_video_status(mhdp, 1);
+}
+
+static const struct drm_bridge_funcs cdns_mhdp_bridge_funcs = {
+ .enable = cdns_mhdp_enable,
+ .disable = cdns_mhdp_disable,
+ .attach = cdns_mhdp_attach,
+};
+
+static int load_firmware(struct cdns_mhdp_device *mhdp, const char *name,
+ unsigned int addr)
+{
+ const struct firmware *fw;
+ int ret;
+
+ ret = request_firmware(&fw, name, mhdp->dev);
+ if (ret) {
+ dev_err(mhdp->dev, "failed to load firmware (%s), ret: %d\n",
+ name, ret);
+ return ret;
+ }
+
+ memcpy_toio(mhdp->regs + addr, fw->data, fw->size);
+
+ release_firmware(fw);
+
+ return 0;
+}
+
+static int cdns_mhdp_audio_hw_params(struct device *dev, void *data,
+ struct hdmi_codec_daifmt *daifmt,
+ struct hdmi_codec_params *params)
+{
+ struct cdns_mhdp_device *mhdp = dev_get_drvdata(dev);
+ struct audio_info audio = {
+ .sample_width = params->sample_width,
+ .sample_rate = params->sample_rate,
+ .channels = params->channels,
+ };
+ int ret;
+
+ if (daifmt->fmt != HDMI_I2S) {
+ DRM_DEV_ERROR(dev, "Invalid format %d\n", daifmt->fmt);
+ return -EINVAL;
+ }
+
+ audio.format = AFMT_I2S;
+
+ ret = cdns_mhdp_audio_config(mhdp, &audio);
+ if (!ret)
+ mhdp->audio_info = audio;
+
+ return 0;
+}
+
+static void cdns_mhdp_audio_shutdown(struct device *dev, void *data)
+{
+ struct cdns_mhdp_device *mhdp = dev_get_drvdata(dev);
+ int ret;
+
+ ret = cdns_mhdp_audio_stop(mhdp, &mhdp->audio_info);
+ if (!ret)
+ mhdp->audio_info.format = AFMT_UNUSED;
+}
+
+static int cdns_mhdp_audio_digital_mute(struct device *dev, void *data,
+ bool enable)
+{
+ struct cdns_mhdp_device *mhdp = dev_get_drvdata(dev);
+
+ return cdns_mhdp_audio_mute(mhdp, enable);
+}
+
+static int cdns_mhdp_audio_get_eld(struct device *dev, void *data,
+ u8 *buf, size_t len)
+{
+ struct cdns_mhdp_device *mhdp = dev_get_drvdata(dev);
+
+ memcpy(buf, mhdp->connector.eld,
+ min(sizeof(mhdp->connector.eld), len));
+
+ return 0;
+}
+
+static const struct hdmi_codec_ops audio_codec_ops = {
+ .hw_params = cdns_mhdp_audio_hw_params,
+ .audio_shutdown = cdns_mhdp_audio_shutdown,
+ .digital_mute = cdns_mhdp_audio_digital_mute,
+ .get_eld = cdns_mhdp_audio_get_eld,
+};
+
+static int mhdp_probe(struct platform_device *pdev)
+{
+ struct resource *regs;
+ struct cdns_mhdp_device *mhdp;
+ struct clk *clk;
+ int ret;
+ unsigned int reg;
+ unsigned long rate;
+ u32 resp;
+
+ struct hdmi_codec_pdata codec_data = {
+ .i2s = 1,
+ .max_i2s_channels = 8,
+ .ops = &audio_codec_ops,
+ };
+
+ mhdp = devm_kzalloc(&pdev->dev, sizeof(struct cdns_mhdp_device),
+ GFP_KERNEL);
+ if (!mhdp)
+ return -ENOMEM;
+
+ clk = devm_clk_get(&pdev->dev, NULL);
+ if (IS_ERR(clk)) {
+ dev_err(&pdev->dev, "couldn't get clk: %ld\n", PTR_ERR(clk));
+ return PTR_ERR(clk);
+ }
+
+ mhdp->dev = &pdev->dev;
+ dev_set_drvdata(&pdev->dev, mhdp);
+
+ drm_dp_aux_init(&mhdp->aux);
+ mhdp->aux.dev = &pdev->dev;
+ mhdp->aux.transfer = mhdp_transfer;
+
+ regs = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+ mhdp->regs = devm_ioremap_resource(&pdev->dev, regs);
+ if (IS_ERR(mhdp->regs))
+ return PTR_ERR(mhdp->regs);
+
+ platform_set_drvdata(pdev, mhdp);
+
+ ret = load_firmware(mhdp, FW_NAME, CDNS_MHDP_IMEM);
+ if (ret)
+ return ret;
+
+ rate = clk_get_rate(clk);
+ writel(rate % 1000000, mhdp->regs + CDNS_SW_CLK_L);
+ writel(rate / 1000000, mhdp->regs + CDNS_SW_CLK_H);
+
+ /* Leave debug mode */
+ writel(0, mhdp->regs + CDNS_APB_CTRL);
+
+ /*
+ * Wait for the KEEP_ALIVE "message" on the first 8 bits.
+ * Updated each sched "tick" (~2ms)
+ */
+ ret = readl_poll_timeout(mhdp->regs + CDNS_KEEP_ALIVE, reg,
+ reg & CDNS_KEEP_ALIVE_MASK, 500,
+ CDNS_KEEP_ALIVE_TIMEOUT);
+ if (ret) {
+ dev_err(&pdev->dev,
+ "device didn't give any life sign: reg %d\n", reg);
+ return -EIO;
+ }
+
+ /*
+ * FIXME (CDNS): how are the characteristics/features of the host
+ * defined? Will they be always hardcoded?
+ */
+ /* FIXME: link rate 2.7; num_lanes = 2, */
+ /* FIXME: read capabilities from PHY */
+ mhdp->host.link_rate = drm_dp_bw_code_to_link_rate(DP_LINK_BW_5_4);
+ mhdp->host.lanes_cnt = CDNS_LANE_4 | CDNS_SCRAMBLER;
+ mhdp->host.volt_swing = CDNS_VOLT_SWING(3);
+ mhdp->host.pre_emphasis = CDNS_PRE_EMPHASIS(2);
+ mhdp->host.pattern_supp = CDNS_SUPPORT_TPS(1) |
+ CDNS_SUPPORT_TPS(2) | CDNS_SUPPORT_TPS(3) |
+ CDNS_SUPPORT_TPS(4);
+ mhdp->host.fast_link = 0;
+ mhdp->host.lane_mapping = CDNS_LANE_MAPPING_FLIPPED;
+ mhdp->host.enhanced = true;
+
+ mhdp->bridge.of_node = pdev->dev.of_node;
+ mhdp->bridge.funcs = &cdns_mhdp_bridge_funcs;
+
+ /* Init events to 0 as it's not cleared by FW at boot but on read */
+ readl(mhdp->regs + CDNS_SW_EVENT0);
+ readl(mhdp->regs + CDNS_SW_EVENT1);
+ readl(mhdp->regs + CDNS_SW_EVENT2);
+ readl(mhdp->regs + CDNS_SW_EVENT3);
+
+ /* Activate uCPU */
+ ret = cdns_mhdp_set_firmware_active(mhdp, true);
+ if (ret) {
+ dev_err(mhdp->dev, "Failed to activate DP\n");
+ return ret;
+ }
+
+ mhdp->audio_pdev = platform_device_register_data(
+ mhdp->dev, HDMI_CODEC_DRV_NAME, PLATFORM_DEVID_AUTO,
+ &codec_data, sizeof(codec_data));
+
+ /* Enable VIF clock for stream 0 */
+ cdns_mhdp_reg_read(mhdp, CDNS_DPTX_CAR, &resp);
+ cdns_mhdp_reg_write(mhdp, CDNS_DPTX_CAR,
+ resp | CDNS_VIF_CLK_EN | CDNS_VIF_CLK_RSTN);
+
+ /* Loop over HDP change */
+ /*
+ * FIXME: does not work when put in mhdp_bridge_enable.
+ * Where should we put it?
+ */
+ /* Is it still needed with use of mb message HPD STATUS? */
+ ret = readl_poll_timeout(mhdp->regs + CDNS_SW_EVENT0, reg,
+ reg & CDNS_DPTX_HPD, 500,
+ CDNS_SW_EVENT0_TIMEOUT);
+ if (ret) {
+ dev_err(mhdp->dev, "no HPD received %d\n", reg);
+ return -ENODEV;
+ }
+
+ drm_bridge_add(&mhdp->bridge);
+
+ return 0;
+}
+
+MODULE_FIRMWARE(FW_NAME);
+
+static int mhdp_remove(struct platform_device *pdev)
+{
+ struct cdns_mhdp_device *mhdp = dev_get_drvdata(&pdev->dev);
+ int ret;
+
+ platform_device_unregister(mhdp->audio_pdev);
+
+ drm_bridge_remove(&mhdp->bridge);
+
+ ret = cdns_mhdp_set_firmware_active(mhdp, false);
+ if (ret) {
+ dev_err(mhdp->dev, "Failed to de-activate DP\n");
+ return ret;
+ }
+
+ /* FIXME: check for missing functions */
+
+ return 0;
+}
+
+static struct platform_driver mhdp_driver = {
+ .driver = {
+ .name = "cdns-mhdp",
+ .of_match_table = of_match_ptr(mhdp_ids),
+ },
+ .probe = mhdp_probe,
+ .remove = mhdp_remove,
+};
+module_platform_driver(mhdp_driver);
+
+MODULE_AUTHOR("Quentin Schulz <quentin.schulz@free-electrons.com>");
+MODULE_DESCRIPTION("Cadence MHDP DP bridge driver");
+MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:cdns-mhdp");
diff --git a/drivers/gpu/drm/rockchip/Kconfig b/drivers/gpu/drm/rockchip/Kconfig
index 26438d45732b..bd6454b590a2 100644
--- a/drivers/gpu/drm/rockchip/Kconfig
+++ b/drivers/gpu/drm/rockchip/Kconfig
@@ -28,7 +28,9 @@ config ROCKCHIP_ANALOGIX_DP
config ROCKCHIP_CDN_DP
bool "Rockchip cdn DP"
- depends on EXTCON=y || (EXTCON=m && DRM_ROCKCHIP=m)
+ depends on DRM_ROCKCHIP
+ select EXTCON
+ select DRM_CDNS_MHDP
help
This selects support for Rockchip SoC specific extensions
for the cdn DP driver. If you want to enable Dp on
diff --git a/drivers/gpu/drm/rockchip/Makefile b/drivers/gpu/drm/rockchip/Makefile
index 868263ff0302..c908a4fb8a47 100644
--- a/drivers/gpu/drm/rockchip/Makefile
+++ b/drivers/gpu/drm/rockchip/Makefile
@@ -9,7 +9,7 @@ rockchipdrm-y := rockchip_drm_drv.o rockchip_drm_fb.o \
rockchipdrm-$(CONFIG_DRM_FBDEV_EMULATION) += rockchip_drm_fbdev.o
rockchipdrm-$(CONFIG_ROCKCHIP_ANALOGIX_DP) += analogix_dp-rockchip.o
-rockchipdrm-$(CONFIG_ROCKCHIP_CDN_DP) += cdn-dp-core.o cdn-dp-reg.o
+rockchipdrm-$(CONFIG_ROCKCHIP_CDN_DP) += cdn-dp-core.o
rockchipdrm-$(CONFIG_ROCKCHIP_DW_HDMI) += dw_hdmi-rockchip.o
rockchipdrm-$(CONFIG_ROCKCHIP_DW_MIPI_DSI) += dw-mipi-dsi.o
rockchipdrm-$(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
index bf7e206326f0..343f381e3440 100644
--- a/drivers/gpu/drm/rockchip/cdn-dp-core.c
+++ b/drivers/gpu/drm/rockchip/cdn-dp-core.c
@@ -816,7 +816,7 @@ static int cdn_dp_audio_hw_params(struct device *dev, void *data,
ret = cdns_mhdp_audio_config(&dp->mhdp, &audio);
if (!ret)
- dp->audio_info = audio;
+ dp->mhdp.audio_info = audio;
out:
mutex_unlock(&dp->lock);
@@ -832,9 +832,9 @@ static void cdn_dp_audio_shutdown(struct device *dev, void *data)
if (!dp->active)
goto out;
- ret = cdns_mhdp_audio_stop(&dp->mhdp, &dp->audio_info);
+ ret = cdns_mhdp_audio_stop(&dp->mhdp, &dp->mhdp.audio_info);
if (!ret)
- dp->audio_info.format = AFMT_UNUSED;
+ dp->mhdp.audio_info.format = AFMT_UNUSED;
out:
mutex_unlock(&dp->lock);
}
@@ -886,11 +886,11 @@ static int cdn_dp_audio_codec_init(struct cdn_dp_device *dp,
.max_i2s_channels = 8,
};
- dp->audio_pdev = platform_device_register_data(
- dev, HDMI_CODEC_DRV_NAME, PLATFORM_DEVID_AUTO,
- &codec_data, sizeof(codec_data));
+ dp->mhdp.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);
+ return PTR_ERR_OR_ZERO(dp->mhdp.audio_pdev);
}
static int cdn_dp_request_firmware(struct cdn_dp_device *dp)
@@ -1217,7 +1217,7 @@ static int cdn_dp_remove(struct platform_device *pdev)
{
struct cdn_dp_device *dp = platform_get_drvdata(pdev);
- platform_device_unregister(dp->audio_pdev);
+ platform_device_unregister(dp->mhdp.audio_pdev);
cdn_dp_suspend(dp->mhdp.dev);
component_del(&pdev->dev, &cdn_dp_component_ops);
diff --git a/drivers/gpu/drm/rockchip/cdn-dp-core.h b/drivers/gpu/drm/rockchip/cdn-dp-core.h
index bad65c2fe610..a086dad31287 100644
--- a/drivers/gpu/drm/rockchip/cdn-dp-core.h
+++ b/drivers/gpu/drm/rockchip/cdn-dp-core.h
@@ -19,8 +19,9 @@
#include <drm/drm_crtc_helper.h>
#include <drm/drm_dp_helper.h>
#include <drm/drm_panel.h>
+#include <drm/bridge/cdns-mhdp-common.h>
+
#include "rockchip_drm_drv.h"
-#include "cdn-dp-reg.h"
#define MAX_PHY 2
@@ -45,7 +46,6 @@ struct cdn_dp_device {
struct cdns_mhdp_device mhdp;
struct drm_device *drm_dev;
struct drm_encoder encoder;
- struct platform_device *audio_pdev;
struct work_struct event_work;
struct edid *edid;
@@ -64,7 +64,6 @@ struct cdn_dp_device {
struct reset_control *dptx_rst;
struct reset_control *apb_rst;
struct reset_control *core_rst;
- struct audio_info audio_info;
struct cdn_dp_port *port[MAX_PHY];
u8 ports;
u8 lanes;
diff --git a/drivers/gpu/drm/rockchip/cdn-dp-reg.h b/include/drm/bridge/cdns-mhdp-common.h
similarity index 95%
rename from drivers/gpu/drm/rockchip/cdn-dp-reg.h
rename to include/drm/bridge/cdns-mhdp-common.h
index 3cb40d719515..c5a5c4fa7fc4 100644
--- a/drivers/gpu/drm/rockchip/cdn-dp-reg.h
+++ b/include/drm/bridge/cdns-mhdp-common.h
@@ -12,10 +12,13 @@
* GNU General Public License for more details.
*/
-#ifndef _CDN_DP_REG_H
-#define _CDN_DP_REG_H
+#ifndef CDNS_MHDP_COMMON_H_
+#define CDNS_MHDP_COMMON_H_
#include <linux/bitops.h>
+#include <drm/drm_dp_helper.h>
+#include <drm/drm_connector.h>
+#include <drm/drm_bridge.h>
#define ADDR_IMEM 0x10000
#define ADDR_DMEM 0x20000
@@ -327,6 +330,7 @@
#define GENERAL_TEST_ECHO 0x02
#define GENERAL_BUS_SETTINGS 0x03
#define GENERAL_TEST_ACCESS 0x04
+#define GENERAL_REGISTER_READ 0x07
#define DPTX_SET_POWER_MNG 0x00
#define DPTX_SET_HOST_CAPABILITIES 0x01
@@ -346,6 +350,7 @@
#define DPTX_SET_LINK_BREAK_POINT 0x0f
#define DPTX_FORCE_LANES 0x10
#define DPTX_HPD_STATE 0x11
+#define DPTX_ADJUST_LT 0x12
#define FW_STANDBY 0
#define FW_ACTIVE 1
@@ -517,6 +522,9 @@ struct cdns_mhdp_device {
struct clk *spdif_clk;
struct reset_control *spdif_rst;
+ struct platform_device *audio_pdev;
+ struct audio_info audio_info;
+
struct drm_dp_aux aux;
struct cdns_mhdp_host host;
struct cdns_mhdp_sink sink;
@@ -551,4 +559,11 @@ int cdns_mhdp_audio_stop(struct cdns_mhdp_device *mhdp,
int cdns_mhdp_audio_mute(struct cdns_mhdp_device *mhdp, bool enable);
int cdns_mhdp_audio_config(struct cdns_mhdp_device *mhdp,
struct audio_info *audio);
-#endif /* _CDN_DP_REG_H */
+int cdns_mhdp_reg_read(struct cdns_mhdp_device *mhdp, u32 addr, u32 *value);
+int cdns_mhdp_reg_write(struct cdns_mhdp_device *mhdp, u16 addr, u32 val);
+int cdns_mhdp_reg_write_bit(struct cdns_mhdp_device *mhdp, u16 addr,
+ u8 start_bit, u8 bits_no, u32 val);
+int cdns_mhdp_adjust_lt(struct cdns_mhdp_device *mhdp, u8 nlanes,
+ u16 udelay, u8 *lanes_data,
+ u8 *dpcd);
+#endif /* CDNS_MHDP_COMMON_H_ */
--
2.17.1
^ permalink raw reply related [flat|nested] 45+ messages in thread
* [PATCH v6 4/6] drm: bridge: add support for Cadence MHDP DPI/DP bridge
@ 2018-10-08 21:42 ` Damian Kos
0 siblings, 0 replies; 45+ messages in thread
From: Damian Kos @ 2018-10-08 21:42 UTC (permalink / raw)
To: linux-arm-kernel
From: Quentin Schulz <quentin.schulz@free-electrons.com>
This adds basic support for Cadence MHDP DPI to DP bridge.
Basically, it takes a DPI stream as input and output it encoded in DP
format. It's missing proper HPD, HDCP and currently supports only
SST mode.
Changes made in the low level driver (cdn-dp-reg.*):
- moved it to from drivers/gpu/drm/rockchip to
drivers/gpu/drm/bridge/cdns-mhdp-common.c and
include/drm/bridge/cdns-mhdp-common.h
- functions for sending/receiving commands are now public
- added functions for reading registers and link training
adjustment
Changes made in RK's driver (cdn-dp-core.*):
- Moved audio_info and audio_pdev fields from cdn_dp_device to
cdns_mhdp_device structure.
Signed-off-by: Quentin Schulz <quentin.schulz@free-electrons.com>
Signed-off-by: Damian Kos <dkos@cadence.com>
---
drivers/gpu/drm/bridge/Kconfig | 9 +
drivers/gpu/drm/bridge/Makefile | 3 +
.../cdns-mhdp-common.c} | 136 +-
drivers/gpu/drm/bridge/cdns-mhdp.c | 1304 +++++++++++++++++
drivers/gpu/drm/rockchip/Kconfig | 4 +-
drivers/gpu/drm/rockchip/Makefile | 2 +-
drivers/gpu/drm/rockchip/cdn-dp-core.c | 16 +-
drivers/gpu/drm/rockchip/cdn-dp-core.h | 5 +-
.../drm/bridge/cdns-mhdp-common.h | 21 +-
9 files changed, 1480 insertions(+), 20 deletions(-)
rename drivers/gpu/drm/{rockchip/cdn-dp-reg.c => bridge/cdns-mhdp-common.c} (87%)
create mode 100644 drivers/gpu/drm/bridge/cdns-mhdp.c
rename drivers/gpu/drm/rockchip/cdn-dp-reg.h => include/drm/bridge/cdns-mhdp-common.h (95%)
diff --git a/drivers/gpu/drm/bridge/Kconfig b/drivers/gpu/drm/bridge/Kconfig
index 9eeb8ef0b174..90a4810a8c96 100644
--- a/drivers/gpu/drm/bridge/Kconfig
+++ b/drivers/gpu/drm/bridge/Kconfig
@@ -35,6 +35,15 @@ config DRM_CDNS_DSI
Support Cadence DPI to DSI bridge. This is an internal
bridge and is meant to be directly embedded in a SoC.
+config DRM_CDNS_MHDP
+ tristate "Cadence DPI/DP bridge"
+ select DRM_KMS_HELPER
+ select DRM_PANEL_BRIDGE
+ depends on OF
+ help
+ Support Cadence DPI to DP bridge. This is an internal
+ bridge and is meant to be directly embedded in a SoC.
+
config DRM_DUMB_VGA_DAC
tristate "Dumb VGA DAC Bridge support"
depends on OF
diff --git a/drivers/gpu/drm/bridge/Makefile b/drivers/gpu/drm/bridge/Makefile
index 4934fcf5a6f8..e802fdb85750 100644
--- a/drivers/gpu/drm/bridge/Makefile
+++ b/drivers/gpu/drm/bridge/Makefile
@@ -16,4 +16,7 @@ obj-$(CONFIG_DRM_ANALOGIX_DP) += analogix/
obj-$(CONFIG_DRM_I2C_ADV7511) += adv7511/
obj-$(CONFIG_DRM_TI_SN65DSI86) += ti-sn65dsi86.o
obj-$(CONFIG_DRM_TI_TFP410) += ti-tfp410.o
+obj-$(CONFIG_DRM_CDNS_MHDP) += mhdp8546.o
obj-y += synopsys/
+
+mhdp8546-objs := cdns-mhdp-common.o cdns-mhdp.o
diff --git a/drivers/gpu/drm/rockchip/cdn-dp-reg.c b/drivers/gpu/drm/bridge/cdns-mhdp-common.c
similarity index 87%
rename from drivers/gpu/drm/rockchip/cdn-dp-reg.c
rename to drivers/gpu/drm/bridge/cdns-mhdp-common.c
index c1a76e6fff88..fda1bee7adb5 100644
--- a/drivers/gpu/drm/rockchip/cdn-dp-reg.c
+++ b/drivers/gpu/drm/bridge/cdns-mhdp-common.c
@@ -19,8 +19,9 @@
#include <linux/iopoll.h>
#include <linux/reset.h>
-#include "cdn-dp-core.h"
-#include "cdn-dp-reg.h"
+#include <drm/drm_print.h>
+#include <drm/drm_modes.h>
+#include <drm/bridge/cdns-mhdp-common.h>
#define CDNS_DP_SPDIF_CLK 200000000
#define FW_ALIVE_TIMEOUT_US 1000000
@@ -33,6 +34,7 @@ void cdns_mhdp_set_fw_clk(struct cdns_mhdp_device *mhdp, unsigned long clk)
{
writel(clk / 1000000, mhdp->regs + SW_CLK_H);
}
+EXPORT_SYMBOL(cdns_mhdp_set_fw_clk);
void cdns_mhdp_clock_reset(struct cdns_mhdp_device *mhdp)
{
@@ -82,6 +84,7 @@ void cdns_mhdp_clock_reset(struct cdns_mhdp_device *mhdp)
/* enable Mailbox and PIF interrupt */
writel(0, mhdp->regs + APB_INT_MASK);
}
+EXPORT_SYMBOL(cdns_mhdp_clock_reset);
static int cdns_mhdp_mailbox_read(struct cdns_mhdp_device *mhdp)
{
@@ -189,7 +192,56 @@ static int cdns_mhdp_mailbox_send(struct cdns_mhdp_device *mhdp, u8 module_id,
return 0;
}
-static int cdns_mhdp_reg_write(struct cdns_mhdp_device *mhdp, u16 addr, u32 val)
+int cdns_mhdp_reg_read(struct cdns_mhdp_device *mhdp, u32 addr, u32 *value)
+{
+ u8 msg[4], resp[8];
+ int ret;
+
+ if (addr == 0) {
+ ret = -EINVAL;
+ goto err_reg_read;
+ }
+
+ msg[0] = (u8)(addr >> 24);
+ msg[1] = (u8)(addr >> 16);
+ msg[2] = (u8)(addr >> 8);
+ msg[3] = (u8)addr;
+
+ ret = cdns_mhdp_mailbox_send(mhdp, MB_MODULE_ID_GENERAL,
+ GENERAL_REGISTER_READ,
+ sizeof(msg), msg);
+ if (ret)
+ goto err_reg_read;
+
+ ret = cdns_mhdp_mailbox_validate_receive(mhdp, MB_MODULE_ID_GENERAL,
+ GENERAL_REGISTER_READ,
+ sizeof(resp));
+ if (ret)
+ goto err_reg_read;
+
+ ret = cdns_mhdp_mailbox_read_receive(mhdp, resp, sizeof(resp));
+ if (ret)
+ goto err_reg_read;
+
+ /* Returned address value should be the same as requested */
+ if (memcmp(msg, resp, sizeof(msg))) {
+ ret = -EINVAL;
+ goto err_reg_read;
+ }
+
+ *value = (resp[4] << 24) | (resp[5] << 16) | (resp[6] << 8) | resp[7];
+
+err_reg_read:
+ if (ret) {
+ DRM_DEV_ERROR(mhdp->dev, "Failed to read register.\n");
+ *value = 0;
+ }
+
+ return ret;
+}
+EXPORT_SYMBOL(cdns_mhdp_reg_read);
+
+int cdns_mhdp_reg_write(struct cdns_mhdp_device *mhdp, u16 addr, u32 val)
{
u8 msg[6];
@@ -202,8 +254,9 @@ static int cdns_mhdp_reg_write(struct cdns_mhdp_device *mhdp, u16 addr, u32 val)
return cdns_mhdp_mailbox_send(mhdp, MB_MODULE_ID_DP_TX,
DPTX_WRITE_REGISTER, sizeof(msg), msg);
}
+EXPORT_SYMBOL(cdns_mhdp_reg_write);
-static int cdns_mhdp_reg_write_bit(struct cdns_mhdp_device *mhdp, u16 addr,
+int cdns_mhdp_reg_write_bit(struct cdns_mhdp_device *mhdp, u16 addr,
u8 start_bit, u8 bits_no, u32 val)
{
u8 field[8];
@@ -220,6 +273,7 @@ static int cdns_mhdp_reg_write_bit(struct cdns_mhdp_device *mhdp, u16 addr,
return cdns_mhdp_mailbox_send(mhdp, MB_MODULE_ID_DP_TX,
DPTX_WRITE_FIELD, sizeof(field), field);
}
+EXPORT_SYMBOL(cdns_mhdp_reg_write_bit);
int cdns_mhdp_dpcd_read(struct cdns_mhdp_device *mhdp,
u32 addr, u8 *data, u16 len)
@@ -252,6 +306,7 @@ int cdns_mhdp_dpcd_read(struct cdns_mhdp_device *mhdp,
err_dpcd_read:
return ret;
}
+EXPORT_SYMBOL(cdns_mhdp_dpcd_read);
int cdns_mhdp_dpcd_write(struct cdns_mhdp_device *mhdp, u32 addr, u8 value)
{
@@ -286,6 +341,7 @@ int cdns_mhdp_dpcd_write(struct cdns_mhdp_device *mhdp, u32 addr, u8 value)
DRM_DEV_ERROR(mhdp->dev, "dpcd write failed: %d\n", ret);
return ret;
}
+EXPORT_SYMBOL(cdns_mhdp_dpcd_write);
int cdns_mhdp_load_firmware(struct cdns_mhdp_device *mhdp, const u32 *i_mem,
u32 i_size, const u32 *d_mem, u32 d_size)
@@ -328,6 +384,7 @@ int cdns_mhdp_load_firmware(struct cdns_mhdp_device *mhdp, const u32 *i_mem,
return 0;
}
+EXPORT_SYMBOL(cdns_mhdp_load_firmware);
int cdns_mhdp_set_firmware_active(struct cdns_mhdp_device *mhdp, bool enable)
{
@@ -362,6 +419,7 @@ int cdns_mhdp_set_firmware_active(struct cdns_mhdp_device *mhdp, bool enable)
DRM_DEV_ERROR(mhdp->dev, "set firmware active failed\n");
return ret;
}
+EXPORT_SYMBOL(cdns_mhdp_set_firmware_active);
int cdns_mhdp_set_host_cap(struct cdns_mhdp_device *mhdp, u8 lanes, bool flip)
{
@@ -391,6 +449,7 @@ int cdns_mhdp_set_host_cap(struct cdns_mhdp_device *mhdp, u8 lanes, bool flip)
DRM_DEV_ERROR(mhdp->dev, "set host cap failed: %d\n", ret);
return ret;
}
+EXPORT_SYMBOL(cdns_mhdp_set_host_cap);
int cdns_mhdp_event_config(struct cdns_mhdp_device *mhdp)
{
@@ -408,11 +467,13 @@ int cdns_mhdp_event_config(struct cdns_mhdp_device *mhdp)
return ret;
}
+EXPORT_SYMBOL(cdns_mhdp_event_config);
u32 cdns_mhdp_get_event(struct cdns_mhdp_device *mhdp)
{
return readl(mhdp->regs + SW_EVENTS0);
}
+EXPORT_SYMBOL(cdns_mhdp_get_event);
int cdns_mhdp_get_hpd_status(struct cdns_mhdp_device *mhdp)
{
@@ -440,6 +501,7 @@ int cdns_mhdp_get_hpd_status(struct cdns_mhdp_device *mhdp)
DRM_DEV_ERROR(mhdp->dev, "get hpd status failed: %d\n", ret);
return ret;
}
+EXPORT_SYMBOL(cdns_mhdp_get_hpd_status);
int cdns_mhdp_get_edid_block(void *data, u8 *edid,
unsigned int block, size_t length)
@@ -482,6 +544,7 @@ int cdns_mhdp_get_edid_block(void *data, u8 *edid,
return ret;
}
+EXPORT_SYMBOL(cdns_mhdp_get_edid_block);
static int cdns_mhdp_training_start(struct cdns_mhdp_device *mhdp)
{
@@ -580,6 +643,7 @@ int cdns_mhdp_train_link(struct cdns_mhdp_device *mhdp)
mhdp->link.num_lanes);
return ret;
}
+EXPORT_SYMBOL(cdns_mhdp_train_link);
int cdns_mhdp_set_video_status(struct cdns_mhdp_device *mhdp, int active)
{
@@ -595,6 +659,7 @@ int cdns_mhdp_set_video_status(struct cdns_mhdp_device *mhdp, int active)
return ret;
}
+EXPORT_SYMBOL(cdns_mhdp_set_video_status);
static int cdns_mhdp_get_msa_misc(struct video_info *video,
struct drm_display_mode *mode)
@@ -797,6 +862,7 @@ int cdns_mhdp_config_video(struct cdns_mhdp_device *mhdp)
DRM_DEV_ERROR(mhdp->dev, "config video failed: %d\n", ret);
return ret;
}
+EXPORT_SYMBOL(cdns_mhdp_config_video);
int cdns_mhdp_audio_stop(struct cdns_mhdp_device *mhdp,
struct audio_info *audio)
@@ -831,6 +897,7 @@ int cdns_mhdp_audio_stop(struct cdns_mhdp_device *mhdp,
return 0;
}
+EXPORT_SYMBOL(cdns_mhdp_audio_stop);
int cdns_mhdp_audio_mute(struct cdns_mhdp_device *mhdp, bool enable)
{
@@ -842,6 +909,7 @@ int cdns_mhdp_audio_mute(struct cdns_mhdp_device *mhdp, bool enable)
return ret;
}
+EXPORT_SYMBOL(cdns_mhdp_audio_mute);
static void cdns_mhdp_audio_config_i2s(struct cdns_mhdp_device *mhdp,
struct audio_info *audio)
@@ -977,3 +1045,63 @@ int cdns_mhdp_audio_config(struct cdns_mhdp_device *mhdp,
DRM_DEV_ERROR(mhdp->dev, "audio config failed: %d\n", ret);
return ret;
}
+EXPORT_SYMBOL(cdns_mhdp_audio_config);
+
+int cdns_mhdp_adjust_lt(struct cdns_mhdp_device *mhdp,
+ u8 nlanes, u16 udelay, u8 *lanes_data, u8 *dpcd)
+{
+ u8 payload[7];
+ u8 hdr[5]; /* For DPCD read response header */
+ u32 addr;
+ u8 const nregs = 6; /* Registers 0x202-0x207 */
+ int ret;
+
+ if (nlanes != 4 && nlanes != 2 && nlanes != 1) {
+ DRM_DEV_ERROR(mhdp->dev, "invalid number of lanes: %d\n",
+ nlanes);
+ ret = -EINVAL;
+ goto err_adjust_lt;
+ }
+
+ payload[0] = nlanes;
+ payload[1] = (u8)(udelay >> 8);
+ payload[2] = (u8)udelay;
+
+ payload[3] = lanes_data[0];
+ if (nlanes > 1)
+ payload[4] = lanes_data[1];
+ if (nlanes > 2) {
+ payload[5] = lanes_data[2];
+ payload[6] = lanes_data[3];
+ }
+
+ ret = cdns_mhdp_mailbox_send(mhdp, MB_MODULE_ID_DP_TX,
+ DPTX_ADJUST_LT,
+ sizeof(payload), payload);
+ if (ret)
+ goto err_adjust_lt;
+
+ /* Yes, read the DPCD read command response */
+ ret = cdns_mhdp_mailbox_validate_receive(mhdp, MB_MODULE_ID_DP_TX,
+ DPTX_READ_DPCD,
+ sizeof(hdr) + nregs);
+ if (ret)
+ goto err_adjust_lt;
+
+ ret = cdns_mhdp_mailbox_read_receive(mhdp, hdr, sizeof(hdr));
+ if (ret)
+ goto err_adjust_lt;
+
+ addr = (hdr[2] << 24) | (hdr[3] << 8) | hdr[4];
+ if (addr != DP_LANE0_1_STATUS)
+ goto err_adjust_lt;
+
+ ret = cdns_mhdp_mailbox_read_receive(mhdp, dpcd, nregs);
+
+err_adjust_lt:
+ if (ret)
+ DRM_DEV_ERROR(mhdp->dev, "Failed to adjust Link Training.\n");
+
+ return ret;
+}
+EXPORT_SYMBOL(cdns_mhdp_adjust_lt);
diff --git a/drivers/gpu/drm/bridge/cdns-mhdp.c b/drivers/gpu/drm/bridge/cdns-mhdp.c
new file mode 100644
index 000000000000..a3bbc0e809a5
--- /dev/null
+++ b/drivers/gpu/drm/bridge/cdns-mhdp.c
@@ -0,0 +1,1304 @@
+// SPDX-License-Identifier: GPL v2
+/*
+ * Cadence MHDP DP bridge driver.
+ *
+ * Copyright: 2018 Cadence Design Systems, Inc.
+ *
+ * Author: Quentin Schulz <quentin.schulz@free-electrons.com>
+ */
+
+#include <linux/clk.h>
+#include <linux/delay.h>
+#include <linux/err.h>
+#include <linux/firmware.h>
+#include <linux/io.h>
+#include <linux/iopoll.h>
+#include <linux/module.h>
+#include <linux/of.h>
+#include <linux/platform_device.h>
+#include <linux/slab.h>
+
+#include <drm/drm_atomic_helper.h>
+#include <drm/drm_bridge.h>
+#include <drm/drm_connector.h>
+#include <drm/drm_crtc_helper.h>
+#include <drm/drm_dp_helper.h>
+#include <drm/drm_modeset_helper_vtables.h>
+#include <drm/bridge/cdns-mhdp-common.h>
+
+#include <sound/hdmi-codec.h>
+
+
+#define DEBUG_MSG
+
+#define FW_NAME "cadence/mhdp8546.bin"
+
+#define CDNS_APB_CFG 0x00000
+#define CDNS_APB_CTRL (CDNS_APB_CFG + 0x00)
+#define CDNS_MAILBOX_FULL (CDNS_APB_CFG + 0x08)
+#define CDNS_MAILBOX_EMPTY (CDNS_APB_CFG + 0x0c)
+#define CDNS_MAILBOX_TX_DATA (CDNS_APB_CFG + 0x10)
+#define CDNS_MAILBOX_RX_DATA (CDNS_APB_CFG + 0x14)
+#define CDNS_KEEP_ALIVE (CDNS_APB_CFG + 0x18)
+#define CDNS_KEEP_ALIVE_MASK GENMASK(7, 0)
+
+#define CDNS_SW_CLK_L (CDNS_APB_CFG + 0x3c)
+#define CDNS_SW_CLK_H (CDNS_APB_CFG + 0x40)
+#define CDNS_SW_EVENT0 (CDNS_APB_CFG + 0x44)
+#define CDNS_DPTX_HPD BIT(0)
+
+#define CDNS_SW_EVENT1 (CDNS_APB_CFG + 0x48)
+#define CDNS_SW_EVENT2 (CDNS_APB_CFG + 0x4c)
+#define CDNS_SW_EVENT3 (CDNS_APB_CFG + 0x50)
+
+#define CDNS_DPTX_CAR (CDNS_APB_CFG + 0x904)
+#define CDNS_VIF_CLK_EN BIT(0)
+#define CDNS_VIF_CLK_RSTN BIT(1)
+
+#define CDNS_SOURCE_VIDEO_INTERFACE 0x00b00
+#define CDNS_BND_HSYNC2VSYNC (CDNS_SOURCE_VIDEO_INTERFACE + \
+ 0x00)
+#define CDNS_IP_DTCT_WIN GENMASK(11, 0)
+#define CDNS_IP_DET_INTERLACE_FORMAT BIT(12)
+#define CDNS_IP_BYPASS_V_INTERFACE BIT(13)
+
+#define CDNS_HSYNC2VSYNC_POL_CTRL (CDNS_SOURCE_VIDEO_INTERFACE + \
+ 0x10)
+#define CDNS_H2V_HSYNC_POL_ACTIVE_LOW BIT(1)
+#define CDNS_H2V_VSYNC_POL_ACTIVE_LOW BIT(2)
+
+#define CDNS_DPTX_PHY_CONFIG 0x02000
+#define CDNS_PHY_TRAINING_EN BIT(0)
+#define CDNS_PHY_TRAINING_TYPE(x) (((x) & GENMASK(3, 0)) << 1)
+#define CDNS_PHY_SCRAMBLER_BYPASS BIT(5)
+#define CDNS_PHY_ENCODER_BYPASS BIT(6)
+#define CDNS_PHY_SKEW_BYPASS BIT(7)
+#define CDNS_PHY_TRAINING_AUTO BIT(8)
+#define CDNS_PHY_LANE0_SKEW(x) (((x) & GENMASK(2, 0)) << 9)
+#define CDNS_PHY_LANE1_SKEW(x) (((x) & GENMASK(2, 0)) << 12)
+#define CDNS_PHY_LANE2_SKEW(x) (((x) & GENMASK(2, 0)) << 15)
+#define CDNS_PHY_LANE3_SKEW(x) (((x) & GENMASK(2, 0)) << 18)
+#define CDNS_PHY_COMMON_CONFIG (CDNS_PHY_LANE1_SKEW(1) | \
+ CDNS_PHY_LANE2_SKEW(2) | \
+ CDNS_PHY_LANE3_SKEW(3))
+#define CDNS_PHY_10BIT_EN BIT(21)
+
+#define CDNS_DPTX_FRAMER 0x02200
+#define CDNS_DP_FRAMER_GLOBAL_CONFIG (CDNS_DPTX_FRAMER + 0x00)
+#define CDNS_DP_NUM_LANES(x) (x - 1)
+#define CDNS_DP_FRAMER_EN BIT(3)
+#define CDNS_DP_RATE_GOVERNOR_EN BIT(4)
+#define CDNS_DP_NO_VIDEO_MODE BIT(5)
+#define CDNS_DP_DISABLE_PHY_RST BIT(6)
+#define CDNS_DP_WR_FAILING_EDGE_VSYNC BIT(7)
+
+#define CDNS_DP_SW_RESET (CDNS_DPTX_FRAMER + 0x04)
+#define CDNS_DP_FRAMER_TU (CDNS_DPTX_FRAMER + 0x08)
+#define CDNS_DP_FRAMER_TU_SIZE(x) (((x) & GENMASK(6, 0)) << 8)
+#define CDNS_DP_FRAMER_TU_VS(x) ((x) & GENMASK(5, 0))
+#define CDNS_DP_FRAMER_TU_CNT_RST_EN BIT(15)
+
+#define CDNS_DPTX_STREAM 0x03000
+#define CDNS_DP_MSA_HORIZONTAL_0 (CDNS_DPTX_STREAM + 0x00)
+#define CDNS_DP_MSAH0_H_TOTAL(x) (x)
+#define CDNS_DP_MSAH0_HSYNC_START(x) ((x) << 16)
+
+#define CDNS_DP_MSA_HORIZONTAL_1 (CDNS_DPTX_STREAM + 0x04)
+#define CDNS_DP_MSAH1_HSYNC_WIDTH(x) (x)
+#define CDNS_DP_MSAH1_HSYNC_POL_LOW BIT(15)
+#define CDNS_DP_MSAH1_HDISP_WIDTH(x) ((x) << 16)
+
+#define CDNS_DP_MSA_VERTICAL_0 (CDNS_DPTX_STREAM + 0x08)
+#define CDNS_DP_MSAV0_V_TOTAL(x) (x)
+#define CDNS_DP_MSAV0_VSYNC_START(x) ((x) << 16)
+
+#define CDNS_DP_MSA_VERTICAL_1 (CDNS_DPTX_STREAM + 0x0c)
+#define CDNS_DP_MSAV1_VSYNC_WIDTH(x) (x)
+#define CDNS_DP_MSAV1_VSYNC_POL_LOW BIT(15)
+#define CDNS_DP_MSAV1_VDISP_WIDTH(x) ((x) << 16)
+
+#define CDNS_DP_MSA_MISC (CDNS_DPTX_STREAM + 0x10)
+#define CDNS_DP_STREAM_CONFIG (CDNS_DPTX_STREAM + 0x14)
+#define CDNS_DP_RATE_GOVERNOR_STATUS (CDNS_DPTX_STREAM + 0x2c)
+#define CDNS_DP_RG_TU_VS_DIFF(x) ((x) << 8)
+
+#define CDNS_DP_HORIZONTAL (CDNS_DPTX_STREAM + 0x30)
+#define CDNS_DP_H_HSYNC_WIDTH(x) (x)
+#define CDNS_DP_H_H_TOTAL(x) ((x) << 16)
+
+#define CDNS_DP_VERTICAL_0 (CDNS_DPTX_STREAM + 0x34)
+#define CDNS_DP_V0_VHEIGHT(x) (x)
+#define CDNS_DP_V0_VSTART(x) ((x) << 16)
+
+#define CDNS_DP_VERTICAL_1 (CDNS_DPTX_STREAM + 0x38)
+#define CDNS_DP_V1_VTOTAL(x) (x)
+#define CDNS_DP_V1_VTOTAL_EVEN BIT(16)
+
+#define CDNS_DP_FRAMER_PXL_REPR (CDNS_DPTX_STREAM + 0x4c)
+#define CDNS_DP_FRAMER_6_BPC BIT(0)
+#define CDNS_DP_FRAMER_8_BPC BIT(1)
+#define CDNS_DP_FRAMER_10_BPC BIT(2)
+#define CDNS_DP_FRAMER_12_BPC BIT(3)
+#define CDNS_DP_FRAMER_16_BPC BIT(4)
+#define CDNS_DP_FRAMER_PXL_FORMAT 0x8
+#define CDNS_DP_FRAMER_RGB BIT(0)
+#define CDNS_DP_FRAMER_YCBCR444 BIT(1)
+#define CDNS_DP_FRAMER_YCBCR422 BIT(2)
+#define CDNS_DP_FRAMER_YCBCR420 BIT(3)
+#define CDNS_DP_FRAMER_Y_ONLY BIT(4)
+
+#define CDNS_DP_FRAMER_SP (CDNS_DPTX_STREAM + 0x10)
+#define CDNS_DP_FRAMER_VSYNC_POL_LOW BIT(0)
+#define CDNS_DP_FRAMER_HSYNC_POL_LOW BIT(1)
+#define CDNS_DP_FRAMER_INTERLACE BIT(2)
+
+#define CDNS_DP_LINE_THRESH (CDNS_DPTX_STREAM + 0x64)
+#define CDNS_DP_VB_ID (CDNS_DPTX_STREAM + 0x68)
+#define CDNS_DP_VB_ID_INTERLACED BIT(2)
+
+#define CDNS_DP_FRONT_BACK_PORCH (CDNS_DPTX_STREAM + 0x78)
+#define CDNS_DP_BACK_PORCH(x) (x)
+#define CDNS_DP_FRONT_PORCH(x) ((x) << 16)
+
+#define CDNS_DP_BYTE_COUNT (CDNS_DPTX_STREAM + 0x7c)
+
+#define CDNS_DPTX_GLOBAL 0x02300
+#define CDNS_DP_LANE_EN (CDNS_DPTX_GLOBAL + 0x00)
+#define CDNS_DP_LANE_EN_LANES(x) GENMASK(x - 1, 0)
+#define CDNS_DP_ENHNCD (CDNS_DPTX_GLOBAL + 0x04)
+
+#define CDNS_MHDP_IMEM 0x10000
+#define CDNS_MHDP_DMEM 0x20000
+
+#define CDNS_DP_TRAINING_PATTERN_4 0x7
+
+/* 3min delay because of EDID mb being VERY slow */
+/* FIXME: should be >615000 when upstreaming */
+#define CDNS_TIMEOUT_MAILBOX (1000 * 1000 * 60 * 3)
+
+/* FIXME: Should be 2000 */
+#define CDNS_KEEP_ALIVE_TIMEOUT 40000
+#define CDNS_SW_EVENT0_TIMEOUT 40000
+
+static const struct of_device_id mhdp_ids[] = {
+ { .compatible = "cdns,mhdp8546", },
+ { /* sentinel */ }
+};
+MODULE_DEVICE_TABLE(of, mhdp_ids);
+
+#define CDNS_LANE_1 BIT(0)
+#define CDNS_LANE_2 BIT(1)
+#define CDNS_LANE_4 BIT(2)
+#define CDNS_SSC BIT(3)
+#define CDNS_SCRAMBLER BIT(4)
+
+#define CDNS_VOLT_SWING(x) ((x) & GENMASK(1, 0))
+#define CDNS_FORCE_VOLT_SWING BIT(2)
+
+#define CDNS_PRE_EMPHASIS(x) ((x) & GENMASK(1, 0))
+#define CDNS_FORCE_PRE_EMPHASIS BIT(2)
+
+#define CDNS_SUPPORT_TPS(x) BIT((x) - 1)
+
+#define CDNS_FAST_LINK_TRAINING BIT(0)
+
+#define CDNS_LANE_MAPPING_TYPE_C_LANE_0(x) ((x) & GENMASK(1, 0))
+#define CDNS_LANE_MAPPING_TYPE_C_LANE_1(x) ((x) & GENMASK(3, 2))
+#define CDNS_LANE_MAPPING_TYPE_C_LANE_2(x) ((x) & GENMASK(5, 4))
+#define CDNS_LANE_MAPPING_TYPE_C_LANE_3(x) ((x) & GENMASK(7, 6))
+#define CDNS_LANE_MAPPING_NORMAL 0xe4
+#define CDNS_LANE_MAPPING_FLIPPED 0x1b
+
+#define CDNS_DP_MAX_NUM_LANES 4
+#define CDNS_DP_TEST_VSC_SDP (1 << 6) /* 1.3+ */
+#define CDNS_DP_TEST_COLOR_FORMAT_RAW_Y_ONLY (1 << 7)
+
+static inline struct cdns_mhdp_device *connector_to_mhdp(
+ struct drm_connector *conn)
+{
+ return container_of(conn, struct cdns_mhdp_device, connector);
+}
+
+static inline struct cdns_mhdp_device *bridge_to_mhdp(
+ struct drm_bridge *bridge)
+{
+ return container_of(bridge, struct cdns_mhdp_device, bridge);
+}
+
+static unsigned int max_link_rate(struct cdns_mhdp_host host,
+ struct cdns_mhdp_sink sink)
+{
+ return min(host.link_rate, sink.link_rate);
+}
+
+static u8 eq_training_pattern_supported(struct cdns_mhdp_host host,
+ struct cdns_mhdp_sink sink)
+{
+ return fls(host.pattern_supp & sink.pattern_supp);
+}
+
+static ssize_t mhdp_transfer(struct drm_dp_aux *aux,
+ struct drm_dp_aux_msg *msg)
+{
+ struct cdns_mhdp_device *mhdp = dev_get_drvdata(aux->dev);
+ int ret;
+
+ if (msg->request != DP_AUX_NATIVE_WRITE &&
+ msg->request != DP_AUX_NATIVE_READ)
+ return -ENOTSUPP;
+
+ if (msg->request == DP_AUX_NATIVE_WRITE) {
+ int i;
+
+ for (i = 0; i < msg->size; ++i) {
+ ret = cdns_mhdp_dpcd_write(mhdp,
+ msg->address + i,
+ *((u8 *)msg->buffer + i));
+ if (!ret)
+ continue;
+
+ DRM_DEV_ERROR(mhdp->dev, "Failed to write DPCD\n");
+
+ return i;
+ }
+ } else {
+ ret = cdns_mhdp_dpcd_read(mhdp, msg->address,
+ msg->buffer, msg->size);
+ if (ret) {
+ DRM_DEV_ERROR(mhdp->dev, "Failed to read DPCD\n");
+ return 0;
+ }
+ }
+
+ return msg->size;
+}
+
+static int cdns_mhdp_get_modes(struct drm_connector *connector)
+{
+ struct cdns_mhdp_device *mhdp = connector_to_mhdp(connector);
+ struct edid *edid;
+ int num_modes;
+
+ edid = drm_do_get_edid(connector, cdns_mhdp_get_edid_block, mhdp);
+
+ drm_connector_update_edid_property(connector, edid);
+
+ num_modes = drm_add_edid_modes(connector, edid);
+
+ return num_modes;
+}
+
+static const struct drm_connector_helper_funcs cdns_mhdp_conn_helper_funcs = {
+ .get_modes = cdns_mhdp_get_modes,
+};
+
+static enum drm_connector_status cdns_mhdp_detect(struct drm_connector *conn,
+ bool force)
+{
+ struct cdns_mhdp_device *mhdp = connector_to_mhdp(conn);
+ enum drm_connector_status status = connector_status_disconnected;
+ int ret;
+
+ ret = cdns_mhdp_get_hpd_status(mhdp);
+ if (ret > 0)
+ status = connector_status_connected;
+ else if (ret < 0)
+ dev_err(mhdp->dev, "Failed to obtain HPD state\n");
+
+ return status;
+}
+
+static const struct drm_connector_funcs cdns_mhdp_conn_funcs = {
+ .fill_modes = drm_helper_probe_single_connector_modes,
+ .atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state,
+ .atomic_destroy_state = drm_atomic_helper_connector_destroy_state,
+ .reset = drm_atomic_helper_connector_reset,
+ .destroy = drm_connector_cleanup,
+ .dpms = drm_helper_connector_dpms,
+ .detect = cdns_mhdp_detect,
+};
+
+static int cdns_mhdp_attach(struct drm_bridge *bridge)
+{
+ struct cdns_mhdp_device *mhdp = bridge_to_mhdp(bridge);
+ struct drm_connector *conn = &mhdp->connector;
+ int ret;
+
+ conn->polled = DRM_CONNECTOR_POLL_CONNECT |
+ DRM_CONNECTOR_POLL_DISCONNECT;
+
+ ret = drm_connector_init(bridge->dev, conn, &cdns_mhdp_conn_funcs,
+ DRM_MODE_CONNECTOR_DisplayPort);
+ if (ret) {
+ dev_err(mhdp->dev, "failed to init connector\n");
+ return ret;
+ }
+
+ drm_connector_helper_add(conn, &cdns_mhdp_conn_helper_funcs);
+
+ ret = drm_connector_attach_encoder(conn, bridge->encoder);
+ if (ret) {
+ dev_err(mhdp->dev, "failed to attach connector to encoder\n");
+ return ret;
+ }
+
+ return 0;
+}
+
+enum pixel_format {
+ PIXEL_FORMAT_RGB = 1,
+ PIXEL_FORMAT_YCBCR_444 = 2,
+ PIXEL_FORMAT_YCBCR_422 = 4,
+ PIXEL_FORMAT_YCBCR_420 = 8,
+ PIXEL_FORMAT_Y_ONLY = 16,
+};
+
+static void mhdp_link_training_init(struct cdns_mhdp_device *mhdp)
+{
+ u32 reg32;
+
+ drm_dp_dpcd_writeb(&mhdp->aux, DP_TRAINING_PATTERN_SET,
+ DP_TRAINING_PATTERN_DISABLE);
+
+ /* Reset PHY configuration */
+ reg32 = CDNS_PHY_COMMON_CONFIG | CDNS_PHY_TRAINING_TYPE(1);
+ if (!(mhdp->host.lanes_cnt & CDNS_SCRAMBLER))
+ reg32 |= CDNS_PHY_SCRAMBLER_BYPASS;
+
+ cdns_mhdp_reg_write(mhdp, CDNS_DPTX_PHY_CONFIG, reg32);
+
+ cdns_mhdp_reg_write(mhdp, CDNS_DP_ENHNCD,
+ mhdp->sink.enhanced & mhdp->host.enhanced);
+
+ cdns_mhdp_reg_write(mhdp, CDNS_DP_LANE_EN,
+ CDNS_DP_LANE_EN_LANES(mhdp->link.num_lanes));
+
+ drm_dp_link_configure(&mhdp->aux, &mhdp->link);
+
+ cdns_mhdp_reg_write(mhdp, CDNS_DPTX_PHY_CONFIG,
+ CDNS_PHY_COMMON_CONFIG |
+ CDNS_PHY_TRAINING_EN |
+ CDNS_PHY_TRAINING_TYPE(1) |
+ CDNS_PHY_SCRAMBLER_BYPASS);
+
+ drm_dp_dpcd_writeb(&mhdp->aux, DP_TRAINING_PATTERN_SET,
+ DP_TRAINING_PATTERN_1 | DP_LINK_SCRAMBLING_DISABLE);
+}
+
+static void mhdp_get_adjust_train(struct cdns_mhdp_device *mhdp,
+ u8 link_status[DP_LINK_STATUS_SIZE],
+ u8 lanes_data[CDNS_DP_MAX_NUM_LANES])
+{
+ unsigned int i;
+ u8 adjust, max_pre_emphasis, max_volt_swing;
+
+ max_pre_emphasis = CDNS_PRE_EMPHASIS(mhdp->host.pre_emphasis)
+ << DP_TRAIN_PRE_EMPHASIS_SHIFT;
+ max_volt_swing = CDNS_VOLT_SWING(mhdp->host.volt_swing);
+
+ for (i = 0; i < mhdp->link.num_lanes; i++) {
+ adjust = drm_dp_get_adjust_request_voltage(link_status, i);
+ lanes_data[i] = min_t(u8, adjust, max_volt_swing);
+ if (lanes_data[i] != adjust)
+ lanes_data[i] |= DP_TRAIN_MAX_SWING_REACHED;
+
+ adjust = drm_dp_get_adjust_request_pre_emphasis(link_status, i);
+ lanes_data[i] |= min_t(u8, adjust, max_pre_emphasis);
+ if ((lanes_data[i] >> DP_TRAIN_PRE_EMPHASIS_SHIFT) != adjust)
+ lanes_data[i] |= DP_TRAIN_MAX_PRE_EMPHASIS_REACHED;
+ }
+}
+
+static void mhdp_set_adjust_request_voltage(
+ u8 link_status[DP_LINK_STATUS_SIZE], int lane, u8 volt)
+{
+ int i = DP_ADJUST_REQUEST_LANE0_1 + (lane >> 1);
+ int s = ((lane & 1) ?
+ DP_ADJUST_VOLTAGE_SWING_LANE1_SHIFT :
+ DP_ADJUST_VOLTAGE_SWING_LANE0_SHIFT);
+ int idx = i - DP_LANE0_1_STATUS;
+
+ link_status[idx] &= ~(DP_ADJUST_VOLTAGE_SWING_LANE0_MASK << s);
+ link_status[idx] |= volt << s;
+}
+
+static void mhdp_set_adjust_request_pre_emphasis(
+ u8 link_status[DP_LINK_STATUS_SIZE], int lane, u8 pre_emphasis)
+{
+ int i = DP_ADJUST_REQUEST_LANE0_1 + (lane >> 1);
+ int s = ((lane & 1) ?
+ DP_ADJUST_PRE_EMPHASIS_LANE1_SHIFT :
+ DP_ADJUST_PRE_EMPHASIS_LANE0_SHIFT);
+ int idx = i - DP_LANE0_1_STATUS;
+
+ link_status[idx] &= ~(DP_ADJUST_PRE_EMPHASIS_LANE0_MASK << s);
+ link_status[idx] |= pre_emphasis << s;
+}
+
+static void mhdp_adjust_requested_eq(struct cdns_mhdp_device *mhdp,
+ u8 link_status[DP_LINK_STATUS_SIZE])
+{
+ unsigned int i;
+ u8 pre, volt, max_pre = CDNS_VOLT_SWING(mhdp->host.volt_swing),
+ max_volt = CDNS_PRE_EMPHASIS(mhdp->host.pre_emphasis);
+
+ for (i = 0; i < mhdp->link.num_lanes; i++) {
+ volt = drm_dp_get_adjust_request_voltage(link_status, i);
+ pre = drm_dp_get_adjust_request_pre_emphasis(link_status, i);
+ if (volt + pre > 3)
+ mhdp_set_adjust_request_voltage(link_status, i,
+ 3 - pre);
+ if (mhdp->host.volt_swing & CDNS_FORCE_VOLT_SWING)
+ mhdp_set_adjust_request_voltage(link_status, i,
+ max_volt);
+ if (mhdp->host.pre_emphasis & CDNS_FORCE_PRE_EMPHASIS)
+ mhdp_set_adjust_request_pre_emphasis(link_status, i,
+ max_pre);
+ }
+}
+
+static bool mhdp_link_training_channel_eq(struct cdns_mhdp_device *mhdp,
+ u8 eq_tps,
+ unsigned int training_interval)
+{
+ u8 lanes_data[CDNS_DP_MAX_NUM_LANES], fail_counter_short = 0;
+ u8 dpcd[DP_LINK_STATUS_SIZE];
+ u32 reg32;
+
+ dev_dbg(mhdp->dev, "Link training - Starting EQ phase\n");
+
+ /* Enable link training TPS[eq_tps] in PHY */
+ reg32 = CDNS_PHY_COMMON_CONFIG | CDNS_PHY_TRAINING_EN |
+ CDNS_PHY_TRAINING_TYPE(eq_tps);
+ if (eq_tps != 4)
+ reg32 |= CDNS_PHY_SCRAMBLER_BYPASS;
+ cdns_mhdp_reg_write(mhdp, CDNS_DPTX_PHY_CONFIG, reg32);
+
+ drm_dp_dpcd_writeb(&mhdp->aux, DP_TRAINING_PATTERN_SET,
+ (eq_tps != 4) ? eq_tps | DP_LINK_SCRAMBLING_DISABLE :
+ CDNS_DP_TRAINING_PATTERN_4);
+
+ drm_dp_dpcd_read_link_status(&mhdp->aux, dpcd);
+
+ do {
+ mhdp_get_adjust_train(mhdp, dpcd, lanes_data);
+
+ cdns_mhdp_adjust_lt(mhdp, mhdp->link.num_lanes,
+ training_interval, lanes_data, dpcd);
+
+ if (!drm_dp_clock_recovery_ok(dpcd, mhdp->link.num_lanes))
+ goto err;
+
+ if (drm_dp_channel_eq_ok(dpcd, mhdp->link.num_lanes)) {
+ dev_dbg(mhdp->dev,
+ "Link training: EQ phase succeeded\n");
+ return true;
+ }
+
+ fail_counter_short++;
+
+ mhdp_adjust_requested_eq(mhdp, dpcd);
+ } while (fail_counter_short < 5);
+
+err:
+ dev_dbg(mhdp->dev,
+ "Link training - EQ phase failed for %d lanes and %d rate\n",
+ mhdp->link.num_lanes, mhdp->link.rate);
+
+ return false;
+}
+
+static void mhdp_adjust_requested_cr(struct cdns_mhdp_device *mhdp,
+ u8 link_status[DP_LINK_STATUS_SIZE],
+ u8 *req_volt, u8 *req_pre)
+{
+ unsigned int i, max_volt = CDNS_VOLT_SWING(mhdp->host.volt_swing),
+ max_pre = CDNS_PRE_EMPHASIS(mhdp->host.pre_emphasis);
+
+ for (i = 0; i < mhdp->link.num_lanes; i++) {
+ if (mhdp->host.volt_swing & CDNS_FORCE_VOLT_SWING)
+ mhdp_set_adjust_request_voltage(link_status, i,
+ max_volt);
+ else
+ mhdp_set_adjust_request_voltage(link_status, i,
+ req_volt[i]);
+
+ if (mhdp->host.pre_emphasis & CDNS_FORCE_PRE_EMPHASIS)
+ mhdp_set_adjust_request_pre_emphasis(link_status, i,
+ max_pre);
+ else
+ mhdp_set_adjust_request_pre_emphasis(link_status, i,
+ req_pre[i]);
+ }
+}
+
+static void mhdp_validate_cr(struct cdns_mhdp_device *mhdp, bool *cr_done,
+ bool *same_before_adjust, bool *max_swing_reached,
+ u8 before_cr[DP_LINK_STATUS_SIZE],
+ u8 after_cr[DP_LINK_STATUS_SIZE], u8 *req_volt,
+ u8 *req_pre)
+{
+ unsigned int i;
+ u8 tmp, max_volt = CDNS_VOLT_SWING(mhdp->host.volt_swing),
+ max_pre = CDNS_PRE_EMPHASIS(mhdp->host.pre_emphasis);
+ bool same_pre, same_volt;
+
+ *same_before_adjust = false;
+ *max_swing_reached = false;
+ *cr_done = drm_dp_clock_recovery_ok(after_cr, mhdp->link.num_lanes);
+
+ for (i = 0; i < mhdp->link.num_lanes; i++) {
+ tmp = drm_dp_get_adjust_request_voltage(after_cr, i);
+ req_volt[i] = min_t(u8, tmp, max_volt);
+
+ tmp = drm_dp_get_adjust_request_pre_emphasis(after_cr, i) >>
+ DP_TRAIN_PRE_EMPHASIS_SHIFT;
+ req_pre[i] = min_t(u8, tmp, max_pre);
+
+ same_pre = (before_cr[i] & DP_TRAIN_PRE_EMPHASIS_MASK) ==
+ (req_pre[i] << DP_TRAIN_PRE_EMPHASIS_SHIFT);
+ same_volt = (before_cr[i] & DP_TRAIN_VOLTAGE_SWING_MASK) ==
+ req_volt[i];
+ if (same_pre && same_volt)
+ *same_before_adjust = true;
+
+ /* 3.1.5.2 in DP Standard v1.4. Table 3-1 */
+ if (!*cr_done && req_volt[i] + req_pre[i] >= 3) {
+ *max_swing_reached = true;
+ return;
+ }
+ }
+}
+
+static bool mhdp_link_training_clock_recovery(struct cdns_mhdp_device *mhdp)
+{
+ u8 lanes_data[CDNS_DP_MAX_NUM_LANES], fail_counter_short = 0,
+ fail_counter_cr_long = 0;
+ u8 dpcd[DP_LINK_STATUS_SIZE];
+ bool cr_done;
+
+ dev_dbg(mhdp->dev, "Link training starting CR phase\n");
+
+ mhdp_link_training_init(mhdp);
+
+ drm_dp_dpcd_read_link_status(&mhdp->aux, dpcd);
+
+ do {
+ u8 requested_adjust_volt_swing[CDNS_DP_MAX_NUM_LANES] = {},
+ requested_adjust_pre_emphasis[CDNS_DP_MAX_NUM_LANES] = {};
+ bool same_before_adjust, max_swing_reached;
+
+ mhdp_get_adjust_train(mhdp, dpcd, lanes_data);
+
+ cdns_mhdp_adjust_lt(mhdp, mhdp->link.num_lanes, 100,
+ lanes_data, dpcd);
+
+ mhdp_validate_cr(mhdp, &cr_done, &same_before_adjust,
+ &max_swing_reached, lanes_data, dpcd,
+ requested_adjust_volt_swing,
+ requested_adjust_pre_emphasis);
+
+ if (max_swing_reached)
+ goto err;
+
+ if (cr_done) {
+ dev_dbg(mhdp->dev,
+ "Link training: CR phase succeeded\n");
+ return true;
+ }
+
+ /* Not all CR_DONE bits set */
+ fail_counter_cr_long++;
+
+ if (same_before_adjust) {
+ fail_counter_short++;
+ continue;
+ }
+
+ fail_counter_short = 0;
+ /*
+ * Voltage swing/pre-emphasis adjust requested
+ * during CR phase
+ */
+ mhdp_adjust_requested_cr(mhdp, dpcd,
+ requested_adjust_volt_swing,
+ requested_adjust_pre_emphasis);
+ } while (fail_counter_short < 5 && fail_counter_cr_long < 10);
+
+err:
+ dev_dbg(mhdp->dev,
+ "Link training: CR phase failed for %d lanes and %d rate\n",
+ mhdp->link.num_lanes, mhdp->link.rate);
+
+ return false;
+}
+
+static void lower_link_rate(struct drm_dp_link *link)
+{
+ switch (drm_dp_link_rate_to_bw_code(link->rate)) {
+ case DP_LINK_BW_2_7:
+ link->rate = drm_dp_bw_code_to_link_rate(DP_LINK_BW_1_62);
+ break;
+ case DP_LINK_BW_5_4:
+ link->rate = drm_dp_bw_code_to_link_rate(DP_LINK_BW_2_7);
+ break;
+ case DP_LINK_BW_8_1:
+ link->rate = drm_dp_bw_code_to_link_rate(DP_LINK_BW_5_4);
+ break;
+ }
+}
+
+static int mhdp_link_training(struct cdns_mhdp_device *mhdp,
+ unsigned int video_mode,
+ unsigned int training_interval)
+{
+ u32 reg32;
+ u8 eq_tps = eq_training_pattern_supported(mhdp->host, mhdp->sink);
+
+ while (1) {
+ if (!mhdp_link_training_clock_recovery(mhdp)) {
+ if (drm_dp_link_rate_to_bw_code(mhdp->link.rate) !=
+ DP_LINK_BW_1_62) {
+ dev_dbg(mhdp->dev,
+ "Reducing link rate during CR phase\n");
+ lower_link_rate(&mhdp->link);
+ drm_dp_link_configure(&mhdp->aux, &mhdp->link);
+
+ continue;
+ } else if (mhdp->link.num_lanes > 1) {
+ dev_dbg(mhdp->dev,
+ "Reducing lanes number during CR phase\n");
+ mhdp->link.num_lanes >>= 1;
+ mhdp->link.rate = max_link_rate(mhdp->host,
+ mhdp->sink);
+ drm_dp_link_configure(&mhdp->aux, &mhdp->link);
+
+ continue;
+ }
+
+ dev_dbg(mhdp->dev,
+ "Link training failed during CR phase\n");
+ goto err;
+ }
+
+ if (mhdp_link_training_channel_eq(mhdp, eq_tps,
+ training_interval))
+ break;
+
+ if (mhdp->link.num_lanes > 1) {
+ dev_dbg(mhdp->dev,
+ "Reducing lanes number during EQ phase\n");
+ mhdp->link.num_lanes >>= 1;
+ drm_dp_link_configure(&mhdp->aux, &mhdp->link);
+
+ continue;
+ } else if (drm_dp_link_rate_to_bw_code(mhdp->link.rate) !=
+ DP_LINK_BW_1_62) {
+ dev_dbg(mhdp->dev,
+ "Reducing link rate during EQ phase\n");
+ lower_link_rate(&mhdp->link);
+ drm_dp_link_configure(&mhdp->aux, &mhdp->link);
+
+ continue;
+ }
+
+ dev_dbg(mhdp->dev, "Link training failed during EQ phase\n");
+ goto err;
+ }
+
+ dev_dbg(mhdp->dev, "Link training successful\n");
+
+ drm_dp_dpcd_writeb(&mhdp->aux, DP_TRAINING_PATTERN_SET,
+ (mhdp->host.lanes_cnt & CDNS_SCRAMBLER) ? 0 :
+ DP_LINK_SCRAMBLING_DISABLE);
+
+ /* SW reset DPTX framer */
+ cdns_mhdp_reg_write(mhdp, CDNS_DP_SW_RESET, 1);
+ cdns_mhdp_reg_write(mhdp, CDNS_DP_SW_RESET, 0);
+
+ /* Enable framer */
+ /* FIXME: update when MST supported, BIT(2) */
+ cdns_mhdp_reg_write(mhdp, CDNS_DP_FRAMER_GLOBAL_CONFIG,
+ CDNS_DP_FRAMER_EN |
+ CDNS_DP_NUM_LANES(mhdp->link.num_lanes) |
+ CDNS_DP_DISABLE_PHY_RST |
+ CDNS_DP_WR_FAILING_EDGE_VSYNC |
+ (!video_mode ? CDNS_DP_NO_VIDEO_MODE : 0));
+
+ /* Reset PHY config */
+ reg32 = CDNS_PHY_COMMON_CONFIG | CDNS_PHY_TRAINING_TYPE(1);
+ if (!(mhdp->host.lanes_cnt & CDNS_SCRAMBLER))
+ reg32 |= CDNS_PHY_SCRAMBLER_BYPASS;
+ cdns_mhdp_reg_write(mhdp, CDNS_DPTX_PHY_CONFIG, reg32);
+
+ return 0;
+err:
+ /* Reset PHY config */
+ reg32 = CDNS_PHY_COMMON_CONFIG | CDNS_PHY_TRAINING_TYPE(1);
+ if (!(mhdp->host.lanes_cnt & CDNS_SCRAMBLER))
+ reg32 |= CDNS_PHY_SCRAMBLER_BYPASS;
+ cdns_mhdp_reg_write(mhdp, CDNS_DPTX_PHY_CONFIG, reg32);
+
+ drm_dp_dpcd_writeb(&mhdp->aux, DP_TRAINING_PATTERN_SET,
+ DP_TRAINING_PATTERN_DISABLE);
+
+ return -EIO;
+}
+
+static void cdns_mhdp_disable(struct drm_bridge *bridge)
+{
+ struct cdns_mhdp_device *mhdp = bridge_to_mhdp(bridge);
+
+ cdns_mhdp_set_video_status(mhdp, 0);
+
+ drm_dp_link_power_down(&mhdp->aux, &mhdp->link);
+}
+
+static void cdns_mhdp_enable(struct drm_bridge *bridge)
+{
+ struct cdns_mhdp_device *mhdp = bridge_to_mhdp(bridge);
+ struct drm_display_mode *mode;
+ struct drm_display_info *disp_info = &mhdp->connector.display_info;
+ enum pixel_format pxlfmt;
+ int pxlclock;
+ unsigned int rate, tu_size = 30, vs, vs_f, bpp, required_bandwidth,
+ available_bandwidth, dp_framer_sp = 0, msa_horizontal_1,
+ msa_vertical_1, bnd_hsync2vsync, hsync2vsync_pol_ctrl,
+ misc0 = 0, misc1 = 0, line_thresh = 0, pxl_repr,
+ front_porch, back_porch, msa_h0, msa_v0, hsync, vsync,
+ dp_vertical_1, line_thresh1, line_thresh2;
+ u32 resp;
+
+ unsigned int size = DP_RECEIVER_CAP_SIZE, dp_framer_global_config,
+ video_mode, training_interval_us;
+ u8 reg0[size], reg8, amp[2];
+
+ mode = &bridge->encoder->crtc->state->adjusted_mode;
+ pxlclock = mode->crtc_clock;
+
+ /*
+ * Upon power-on reset/device disconnection: [2:0] bits should be 0b001
+ * and [7:5] bits 0b000.
+ */
+ drm_dp_dpcd_writeb(&mhdp->aux, DP_SET_POWER, 1);
+
+ drm_dp_link_probe(&mhdp->aux, &mhdp->link);
+
+ dev_dbg(mhdp->dev, "Set sink device power state via DPCD\n");
+ drm_dp_link_power_up(&mhdp->aux, &mhdp->link);
+ /* FIXME (CDNS): do we have to wait for 100ms before going on? */
+ mdelay(100);
+
+ mhdp->sink.link_rate = mhdp->link.rate;
+ mhdp->sink.lanes_cnt = mhdp->link.num_lanes;
+ mhdp->sink.enhanced = !!(mhdp->link.capabilities &
+ DP_LINK_CAP_ENHANCED_FRAMING);
+
+ drm_dp_dpcd_read(&mhdp->aux, DP_DPCD_REV, reg0, size);
+
+ mhdp->sink.pattern_supp = CDNS_SUPPORT_TPS(1) | CDNS_SUPPORT_TPS(2);
+ if (drm_dp_tps3_supported(reg0))
+ mhdp->sink.pattern_supp |= CDNS_SUPPORT_TPS(3);
+ if (drm_dp_tps4_supported(reg0))
+ mhdp->sink.pattern_supp |= CDNS_SUPPORT_TPS(4);
+
+ mhdp->sink.fast_link = !!(reg0[DP_MAX_DOWNSPREAD] &
+ DP_NO_AUX_HANDSHAKE_LINK_TRAINING);
+
+ mhdp->link.rate = max_link_rate(mhdp->host, mhdp->sink);
+ mhdp->link.num_lanes = min_t(u8, mhdp->sink.lanes_cnt,
+ mhdp->host.lanes_cnt & GENMASK(2, 0));
+
+ reg8 = reg0[DP_TRAINING_AUX_RD_INTERVAL] &
+ DP_TRAINING_AUX_RD_MASK;
+ switch (reg8) {
+ case 0:
+ training_interval_us = 400;
+ break;
+ case 1:
+ case 2:
+ case 3:
+ case 4:
+ training_interval_us = 4000 << (reg8 - 1);
+ break;
+ default:
+ dev_err(mhdp->dev,
+ "wrong training interval returned by DPCD: %d\n", reg8);
+ return;
+ }
+
+ cdns_mhdp_reg_read(mhdp, CDNS_DP_FRAMER_GLOBAL_CONFIG, &resp);
+
+ dp_framer_global_config = be32_to_cpu(resp);
+
+ video_mode = !(dp_framer_global_config & CDNS_DP_NO_VIDEO_MODE);
+
+ if (dp_framer_global_config & CDNS_DP_FRAMER_EN)
+ cdns_mhdp_reg_write(mhdp, CDNS_DP_FRAMER_GLOBAL_CONFIG,
+ dp_framer_global_config &
+ ~CDNS_DP_FRAMER_EN);
+
+ /* Spread AMP if required, enable 8b/10b coding */
+ amp[0] = (mhdp->host.lanes_cnt & CDNS_SSC) ? DP_SPREAD_AMP_0_5 : 0;
+ amp[1] = DP_SET_ANSI_8B10B;
+ drm_dp_dpcd_write(&mhdp->aux, DP_DOWNSPREAD_CTRL, amp, 2);
+
+ if (mhdp->host.fast_link & mhdp->sink.fast_link) {
+ /* FIXME: implement fastlink */
+ dev_dbg(mhdp->dev, "fastlink\n");
+ } else {
+ if (mhdp_link_training(mhdp, video_mode,
+ training_interval_us)) {
+ dev_err(mhdp->dev, "Link training failed. Exiting.\n");
+ return;
+ }
+ }
+
+ rate = mhdp->link.rate / 1000;
+
+ /* FIXME: what about Y_ONLY? how is it handled in the kernel? */
+ if (disp_info->color_formats & DRM_COLOR_FORMAT_YCRCB444)
+ pxlfmt = PIXEL_FORMAT_YCBCR_444;
+ else if (disp_info->color_formats & DRM_COLOR_FORMAT_YCRCB422)
+ pxlfmt = PIXEL_FORMAT_YCBCR_422;
+ else if (disp_info->color_formats & DRM_COLOR_FORMAT_YCRCB420)
+ pxlfmt = PIXEL_FORMAT_YCBCR_420;
+ else
+ pxlfmt = PIXEL_FORMAT_RGB;
+
+ /* if YCBCR supported and stream not SD, use ITU709 */
+ /* FIXME: handle ITU version with YCBCR420 when supported */
+ if ((pxlfmt == PIXEL_FORMAT_YCBCR_444 ||
+ pxlfmt == PIXEL_FORMAT_YCBCR_422) && mode->crtc_vdisplay >= 720)
+ misc0 = DP_YCBCR_COEFFICIENTS_ITU709;
+
+ switch (pxlfmt) {
+ case PIXEL_FORMAT_RGB:
+ bpp = disp_info->bpc * 3;
+ pxl_repr = CDNS_DP_FRAMER_RGB << CDNS_DP_FRAMER_PXL_FORMAT;
+ misc0 |= DP_COLOR_FORMAT_RGB;
+ break;
+ case PIXEL_FORMAT_YCBCR_444:
+ bpp = disp_info->bpc * 3;
+ pxl_repr = CDNS_DP_FRAMER_YCBCR444 << CDNS_DP_FRAMER_PXL_FORMAT;
+ misc0 |= DP_COLOR_FORMAT_YCbCr444 | DP_TEST_DYNAMIC_RANGE_CEA;
+ break;
+ case PIXEL_FORMAT_YCBCR_422:
+ bpp = disp_info->bpc * 2;
+ pxl_repr = CDNS_DP_FRAMER_YCBCR422 << CDNS_DP_FRAMER_PXL_FORMAT;
+ misc0 |= DP_COLOR_FORMAT_YCbCr422 | DP_TEST_DYNAMIC_RANGE_CEA;
+ break;
+ case PIXEL_FORMAT_YCBCR_420:
+ bpp = disp_info->bpc * 3 / 2;
+ pxl_repr = CDNS_DP_FRAMER_YCBCR420 << CDNS_DP_FRAMER_PXL_FORMAT;
+ break;
+ default:
+ bpp = disp_info->bpc;
+ pxl_repr = CDNS_DP_FRAMER_Y_ONLY << CDNS_DP_FRAMER_PXL_FORMAT;
+ }
+
+ switch (disp_info->bpc) {
+ case 6:
+ misc0 |= DP_TEST_BIT_DEPTH_6;
+ pxl_repr |= CDNS_DP_FRAMER_6_BPC;
+ break;
+ case 8:
+ misc0 |= DP_TEST_BIT_DEPTH_8;
+ pxl_repr |= CDNS_DP_FRAMER_8_BPC;
+ break;
+ case 10:
+ misc0 |= DP_TEST_BIT_DEPTH_10;
+ pxl_repr |= CDNS_DP_FRAMER_10_BPC;
+ break;
+ case 12:
+ misc0 |= DP_TEST_BIT_DEPTH_12;
+ pxl_repr |= CDNS_DP_FRAMER_12_BPC;
+ break;
+ case 16:
+ misc0 |= DP_TEST_BIT_DEPTH_16;
+ pxl_repr |= CDNS_DP_FRAMER_16_BPC;
+ break;
+ }
+
+ /* find optimal tu_size */
+ required_bandwidth = pxlclock * bpp / 8;
+ available_bandwidth = mhdp->link.num_lanes * rate;
+ do {
+ tu_size += 2;
+
+ vs_f = tu_size * required_bandwidth / available_bandwidth;
+ vs = vs_f / 1000;
+ vs_f = vs_f % 1000;
+ /*
+ * FIXME (CDNS): downspreading?
+ * It's unused is what I've been told.
+ */
+ } while ((vs == 1 || ((vs_f > 850 || vs_f < 100) && vs_f != 0) ||
+ tu_size - vs < 2) && tu_size < 64);
+
+ if (vs > 64)
+ return;
+
+ bnd_hsync2vsync = CDNS_IP_BYPASS_V_INTERFACE;
+ if (mode->flags & DRM_MODE_FLAG_INTERLACE)
+ bnd_hsync2vsync |= CDNS_IP_DET_INTERLACE_FORMAT;
+
+ cdns_mhdp_reg_write(mhdp, CDNS_BND_HSYNC2VSYNC, bnd_hsync2vsync);
+
+ if (mode->flags & DRM_MODE_FLAG_INTERLACE &&
+ mode->flags & DRM_MODE_FLAG_PHSYNC)
+ hsync2vsync_pol_ctrl = CDNS_H2V_HSYNC_POL_ACTIVE_LOW |
+ CDNS_H2V_VSYNC_POL_ACTIVE_LOW;
+ else
+ hsync2vsync_pol_ctrl = 0;
+
+ cdns_mhdp_reg_write(mhdp, CDNS_HSYNC2VSYNC_POL_CTRL,
+ hsync2vsync_pol_ctrl);
+
+ cdns_mhdp_reg_write(mhdp, CDNS_DP_FRAMER_TU,
+ CDNS_DP_FRAMER_TU_VS(vs) |
+ CDNS_DP_FRAMER_TU_SIZE(tu_size) |
+ CDNS_DP_FRAMER_TU_CNT_RST_EN);
+
+ cdns_mhdp_reg_write(mhdp, CDNS_DP_FRAMER_PXL_REPR, pxl_repr);
+
+ if (mode->flags & DRM_MODE_FLAG_INTERLACE)
+ dp_framer_sp |= CDNS_DP_FRAMER_INTERLACE;
+ if (mode->flags & DRM_MODE_FLAG_NHSYNC)
+ dp_framer_sp |= CDNS_DP_FRAMER_HSYNC_POL_LOW;
+ if (mode->flags & DRM_MODE_FLAG_NVSYNC)
+ dp_framer_sp |= CDNS_DP_FRAMER_VSYNC_POL_LOW;
+ cdns_mhdp_reg_write(mhdp, CDNS_DP_FRAMER_SP, dp_framer_sp);
+
+ front_porch = mode->crtc_hsync_start - mode->crtc_hdisplay;
+ back_porch = mode->crtc_htotal - mode->crtc_hsync_end;
+ cdns_mhdp_reg_write(mhdp, CDNS_DP_FRONT_BACK_PORCH,
+ CDNS_DP_FRONT_PORCH(front_porch) |
+ CDNS_DP_BACK_PORCH(back_porch));
+
+ cdns_mhdp_reg_write(mhdp, CDNS_DP_BYTE_COUNT,
+ mode->crtc_hdisplay * bpp / 8);
+
+ msa_h0 = mode->crtc_htotal - mode->crtc_hsync_start;
+ cdns_mhdp_reg_write(mhdp, CDNS_DP_MSA_HORIZONTAL_0,
+ CDNS_DP_MSAH0_H_TOTAL(mode->crtc_htotal) |
+ CDNS_DP_MSAH0_HSYNC_START(msa_h0));
+
+ hsync = mode->crtc_hsync_end - mode->crtc_hsync_start;
+ msa_horizontal_1 = CDNS_DP_MSAH1_HSYNC_WIDTH(hsync) |
+ CDNS_DP_MSAH1_HDISP_WIDTH(mode->crtc_hdisplay);
+ if (mode->flags & DRM_MODE_FLAG_NHSYNC)
+ msa_horizontal_1 |= CDNS_DP_MSAH1_HSYNC_POL_LOW;
+ cdns_mhdp_reg_write(mhdp, CDNS_DP_MSA_HORIZONTAL_1,
+ msa_horizontal_1);
+
+ msa_v0 = mode->crtc_vtotal - mode->crtc_vsync_start;
+ cdns_mhdp_reg_write(mhdp, CDNS_DP_MSA_VERTICAL_0,
+ CDNS_DP_MSAV0_V_TOTAL(mode->crtc_vtotal) |
+ CDNS_DP_MSAV0_VSYNC_START(msa_v0));
+
+ vsync = mode->crtc_vsync_end - mode->crtc_vsync_start;
+ msa_vertical_1 = CDNS_DP_MSAV1_VSYNC_WIDTH(vsync) |
+ CDNS_DP_MSAV1_VDISP_WIDTH(mode->crtc_vdisplay);
+ if (mode->flags & DRM_MODE_FLAG_NVSYNC)
+ msa_vertical_1 |= CDNS_DP_MSAV1_VSYNC_POL_LOW;
+ cdns_mhdp_reg_write(mhdp, CDNS_DP_MSA_VERTICAL_1, msa_vertical_1);
+
+ if ((mode->flags & DRM_MODE_FLAG_INTERLACE) &&
+ mode->crtc_vtotal % 2 == 0)
+ misc1 = DP_TEST_INTERLACED;
+ if (pxlfmt == PIXEL_FORMAT_Y_ONLY)
+ misc1 |= CDNS_DP_TEST_COLOR_FORMAT_RAW_Y_ONLY;
+ /* FIXME: use VSC SDP for Y420 */
+ /* FIXME: (CDNS) no code for Y420 in bare metal test */
+ if (pxlfmt == PIXEL_FORMAT_YCBCR_420)
+ misc1 = CDNS_DP_TEST_VSC_SDP;
+
+ cdns_mhdp_reg_write(mhdp, CDNS_DP_MSA_MISC, misc0 | (misc1 << 8));
+
+ /* FIXME: to be changed if MST mode */
+ cdns_mhdp_reg_write(mhdp, CDNS_DP_STREAM_CONFIG, 1);
+
+ cdns_mhdp_reg_write(mhdp, CDNS_DP_HORIZONTAL,
+ CDNS_DP_H_HSYNC_WIDTH(hsync) |
+ CDNS_DP_H_H_TOTAL(mode->crtc_hdisplay));
+
+ cdns_mhdp_reg_write(mhdp, CDNS_DP_VERTICAL_0,
+ CDNS_DP_V0_VHEIGHT(mode->crtc_vdisplay) |
+ CDNS_DP_V0_VSTART(msa_v0));
+
+ dp_vertical_1 = CDNS_DP_V1_VTOTAL(mode->crtc_vtotal);
+ if ((mode->flags & DRM_MODE_FLAG_INTERLACE) &&
+ mode->crtc_vtotal % 2 == 0)
+ dp_vertical_1 |= CDNS_DP_V1_VTOTAL_EVEN;
+
+ cdns_mhdp_reg_write(mhdp, CDNS_DP_VERTICAL_1, dp_vertical_1);
+
+ cdns_mhdp_reg_write_bit(mhdp, CDNS_DP_VB_ID, 2, 1,
+ (mode->flags & DRM_MODE_FLAG_INTERLACE) ?
+ CDNS_DP_VB_ID_INTERLACED : 0);
+
+ line_thresh1 = ((vs + 1) << 5) * 8 / bpp;
+ line_thresh2 = (pxlclock << 5) / 1000 / rate * (vs + 1) - (1 << 5);
+ line_thresh = line_thresh1 - line_thresh2 / mhdp->link.num_lanes;
+ line_thresh = (line_thresh >> 5) + 2;
+ cdns_mhdp_reg_write(mhdp, CDNS_DP_LINE_THRESH,
+ line_thresh & GENMASK(5, 0));
+
+ cdns_mhdp_reg_write(mhdp, CDNS_DP_RATE_GOVERNOR_STATUS,
+ CDNS_DP_RG_TU_VS_DIFF((tu_size - vs > 3) ?
+ 0 : tu_size - vs));
+
+ cdns_mhdp_set_video_status(mhdp, 1);
+}
+
+static const struct drm_bridge_funcs cdns_mhdp_bridge_funcs = {
+ .enable = cdns_mhdp_enable,
+ .disable = cdns_mhdp_disable,
+ .attach = cdns_mhdp_attach,
+};
+
+static int load_firmware(struct cdns_mhdp_device *mhdp, const char *name,
+ unsigned int addr)
+{
+ const struct firmware *fw;
+ int ret;
+
+ ret = request_firmware(&fw, name, mhdp->dev);
+ if (ret) {
+ dev_err(mhdp->dev, "failed to load firmware (%s), ret: %d\n",
+ name, ret);
+ return ret;
+ }
+
+ memcpy_toio(mhdp->regs + addr, fw->data, fw->size);
+
+ release_firmware(fw);
+
+ return 0;
+}
+
+static int cdns_mhdp_audio_hw_params(struct device *dev, void *data,
+ struct hdmi_codec_daifmt *daifmt,
+ struct hdmi_codec_params *params)
+{
+ struct cdns_mhdp_device *mhdp = dev_get_drvdata(dev);
+ struct audio_info audio = {
+ .sample_width = params->sample_width,
+ .sample_rate = params->sample_rate,
+ .channels = params->channels,
+ };
+ int ret;
+
+ if (daifmt->fmt != HDMI_I2S) {
+ DRM_DEV_ERROR(dev, "Invalid format %d\n", daifmt->fmt);
+ return -EINVAL;
+ }
+
+ audio.format = AFMT_I2S;
+
+ ret = cdns_mhdp_audio_config(mhdp, &audio);
+ if (!ret)
+ mhdp->audio_info = audio;
+
+ return 0;
+}
+
+static void cdns_mhdp_audio_shutdown(struct device *dev, void *data)
+{
+ struct cdns_mhdp_device *mhdp = dev_get_drvdata(dev);
+ int ret;
+
+ ret = cdns_mhdp_audio_stop(mhdp, &mhdp->audio_info);
+ if (!ret)
+ mhdp->audio_info.format = AFMT_UNUSED;
+}
+
+static int cdns_mhdp_audio_digital_mute(struct device *dev, void *data,
+ bool enable)
+{
+ struct cdns_mhdp_device *mhdp = dev_get_drvdata(dev);
+
+ return cdns_mhdp_audio_mute(mhdp, enable);
+}
+
+static int cdns_mhdp_audio_get_eld(struct device *dev, void *data,
+ u8 *buf, size_t len)
+{
+ struct cdns_mhdp_device *mhdp = dev_get_drvdata(dev);
+
+ memcpy(buf, mhdp->connector.eld,
+ min(sizeof(mhdp->connector.eld), len));
+
+ return 0;
+}
+
+static const struct hdmi_codec_ops audio_codec_ops = {
+ .hw_params = cdns_mhdp_audio_hw_params,
+ .audio_shutdown = cdns_mhdp_audio_shutdown,
+ .digital_mute = cdns_mhdp_audio_digital_mute,
+ .get_eld = cdns_mhdp_audio_get_eld,
+};
+
+static int mhdp_probe(struct platform_device *pdev)
+{
+ struct resource *regs;
+ struct cdns_mhdp_device *mhdp;
+ struct clk *clk;
+ int ret;
+ unsigned int reg;
+ unsigned long rate;
+ u32 resp;
+
+ struct hdmi_codec_pdata codec_data = {
+ .i2s = 1,
+ .max_i2s_channels = 8,
+ .ops = &audio_codec_ops,
+ };
+
+ mhdp = devm_kzalloc(&pdev->dev, sizeof(struct cdns_mhdp_device),
+ GFP_KERNEL);
+ if (!mhdp)
+ return -ENOMEM;
+
+ clk = devm_clk_get(&pdev->dev, NULL);
+ if (IS_ERR(clk)) {
+ dev_err(&pdev->dev, "couldn't get clk: %ld\n", PTR_ERR(clk));
+ return PTR_ERR(clk);
+ }
+
+ mhdp->dev = &pdev->dev;
+ dev_set_drvdata(&pdev->dev, mhdp);
+
+ drm_dp_aux_init(&mhdp->aux);
+ mhdp->aux.dev = &pdev->dev;
+ mhdp->aux.transfer = mhdp_transfer;
+
+ regs = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+ mhdp->regs = devm_ioremap_resource(&pdev->dev, regs);
+ if (IS_ERR(mhdp->regs))
+ return PTR_ERR(mhdp->regs);
+
+ platform_set_drvdata(pdev, mhdp);
+
+ ret = load_firmware(mhdp, FW_NAME, CDNS_MHDP_IMEM);
+ if (ret)
+ return ret;
+
+ rate = clk_get_rate(clk);
+ writel(rate % 1000000, mhdp->regs + CDNS_SW_CLK_L);
+ writel(rate / 1000000, mhdp->regs + CDNS_SW_CLK_H);
+
+ /* Leave debug mode */
+ writel(0, mhdp->regs + CDNS_APB_CTRL);
+
+ /*
+ * Wait for the KEEP_ALIVE "message" on the first 8 bits.
+ * Updated each sched "tick" (~2ms)
+ */
+ ret = readl_poll_timeout(mhdp->regs + CDNS_KEEP_ALIVE, reg,
+ reg & CDNS_KEEP_ALIVE_MASK, 500,
+ CDNS_KEEP_ALIVE_TIMEOUT);
+ if (ret) {
+ dev_err(&pdev->dev,
+ "device didn't give any life sign: reg %d\n", reg);
+ return -EIO;
+ }
+
+ /*
+ * FIXME (CDNS): how are the characteristics/features of the host
+ * defined? Will they be always hardcoded?
+ */
+ /* FIXME: link rate 2.7; num_lanes = 2, */
+ /* FIXME: read capabilities from PHY */
+ mhdp->host.link_rate = drm_dp_bw_code_to_link_rate(DP_LINK_BW_5_4);
+ mhdp->host.lanes_cnt = CDNS_LANE_4 | CDNS_SCRAMBLER;
+ mhdp->host.volt_swing = CDNS_VOLT_SWING(3);
+ mhdp->host.pre_emphasis = CDNS_PRE_EMPHASIS(2);
+ mhdp->host.pattern_supp = CDNS_SUPPORT_TPS(1) |
+ CDNS_SUPPORT_TPS(2) | CDNS_SUPPORT_TPS(3) |
+ CDNS_SUPPORT_TPS(4);
+ mhdp->host.fast_link = 0;
+ mhdp->host.lane_mapping = CDNS_LANE_MAPPING_FLIPPED;
+ mhdp->host.enhanced = true;
+
+ mhdp->bridge.of_node = pdev->dev.of_node;
+ mhdp->bridge.funcs = &cdns_mhdp_bridge_funcs;
+
+ /* Init events to 0 as it's not cleared by FW at boot but on read */
+ readl(mhdp->regs + CDNS_SW_EVENT0);
+ readl(mhdp->regs + CDNS_SW_EVENT1);
+ readl(mhdp->regs + CDNS_SW_EVENT2);
+ readl(mhdp->regs + CDNS_SW_EVENT3);
+
+ /* Activate uCPU */
+ ret = cdns_mhdp_set_firmware_active(mhdp, true);
+ if (ret) {
+ dev_err(mhdp->dev, "Failed to activate DP\n");
+ return ret;
+ }
+
+ mhdp->audio_pdev = platform_device_register_data(
+ mhdp->dev, HDMI_CODEC_DRV_NAME, PLATFORM_DEVID_AUTO,
+ &codec_data, sizeof(codec_data));
+
+ /* Enable VIF clock for stream 0 */
+ cdns_mhdp_reg_read(mhdp, CDNS_DPTX_CAR, &resp);
+ cdns_mhdp_reg_write(mhdp, CDNS_DPTX_CAR,
+ resp | CDNS_VIF_CLK_EN | CDNS_VIF_CLK_RSTN);
+
+ /* Loop over HDP change */
+ /*
+ * FIXME: does not work when put in mhdp_bridge_enable.
+ * Where should we put it?
+ */
+ /* Is it still needed with use of mb message HPD STATUS? */
+ ret = readl_poll_timeout(mhdp->regs + CDNS_SW_EVENT0, reg,
+ reg & CDNS_DPTX_HPD, 500,
+ CDNS_SW_EVENT0_TIMEOUT);
+ if (ret) {
+ dev_err(mhdp->dev, "no HPD received %d\n", reg);
+ return -ENODEV;
+ }
+
+ drm_bridge_add(&mhdp->bridge);
+
+ return 0;
+}
+
+MODULE_FIRMWARE(FW_NAME);
+
+static int mhdp_remove(struct platform_device *pdev)
+{
+ struct cdns_mhdp_device *mhdp = dev_get_drvdata(&pdev->dev);
+ int ret;
+
+ platform_device_unregister(mhdp->audio_pdev);
+
+ drm_bridge_remove(&mhdp->bridge);
+
+ ret = cdns_mhdp_set_firmware_active(mhdp, false);
+ if (ret) {
+ dev_err(mhdp->dev, "Failed to de-activate DP\n");
+ return ret;
+ }
+
+ /* FIXME: check for missing functions */
+
+ return 0;
+}
+
+static struct platform_driver mhdp_driver = {
+ .driver = {
+ .name = "cdns-mhdp",
+ .of_match_table = of_match_ptr(mhdp_ids),
+ },
+ .probe = mhdp_probe,
+ .remove = mhdp_remove,
+};
+module_platform_driver(mhdp_driver);
+
+MODULE_AUTHOR("Quentin Schulz <quentin.schulz@free-electrons.com>");
+MODULE_DESCRIPTION("Cadence MHDP DP bridge driver");
+MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:cdns-mhdp");
diff --git a/drivers/gpu/drm/rockchip/Kconfig b/drivers/gpu/drm/rockchip/Kconfig
index 26438d45732b..bd6454b590a2 100644
--- a/drivers/gpu/drm/rockchip/Kconfig
+++ b/drivers/gpu/drm/rockchip/Kconfig
@@ -28,7 +28,9 @@ config ROCKCHIP_ANALOGIX_DP
config ROCKCHIP_CDN_DP
bool "Rockchip cdn DP"
- depends on EXTCON=y || (EXTCON=m && DRM_ROCKCHIP=m)
+ depends on DRM_ROCKCHIP
+ select EXTCON
+ select DRM_CDNS_MHDP
help
This selects support for Rockchip SoC specific extensions
for the cdn DP driver. If you want to enable Dp on
diff --git a/drivers/gpu/drm/rockchip/Makefile b/drivers/gpu/drm/rockchip/Makefile
index 868263ff0302..c908a4fb8a47 100644
--- a/drivers/gpu/drm/rockchip/Makefile
+++ b/drivers/gpu/drm/rockchip/Makefile
@@ -9,7 +9,7 @@ rockchipdrm-y := rockchip_drm_drv.o rockchip_drm_fb.o \
rockchipdrm-$(CONFIG_DRM_FBDEV_EMULATION) += rockchip_drm_fbdev.o
rockchipdrm-$(CONFIG_ROCKCHIP_ANALOGIX_DP) += analogix_dp-rockchip.o
-rockchipdrm-$(CONFIG_ROCKCHIP_CDN_DP) += cdn-dp-core.o cdn-dp-reg.o
+rockchipdrm-$(CONFIG_ROCKCHIP_CDN_DP) += cdn-dp-core.o
rockchipdrm-$(CONFIG_ROCKCHIP_DW_HDMI) += dw_hdmi-rockchip.o
rockchipdrm-$(CONFIG_ROCKCHIP_DW_MIPI_DSI) += dw-mipi-dsi.o
rockchipdrm-$(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
index bf7e206326f0..343f381e3440 100644
--- a/drivers/gpu/drm/rockchip/cdn-dp-core.c
+++ b/drivers/gpu/drm/rockchip/cdn-dp-core.c
@@ -816,7 +816,7 @@ static int cdn_dp_audio_hw_params(struct device *dev, void *data,
ret = cdns_mhdp_audio_config(&dp->mhdp, &audio);
if (!ret)
- dp->audio_info = audio;
+ dp->mhdp.audio_info = audio;
out:
mutex_unlock(&dp->lock);
@@ -832,9 +832,9 @@ static void cdn_dp_audio_shutdown(struct device *dev, void *data)
if (!dp->active)
goto out;
- ret = cdns_mhdp_audio_stop(&dp->mhdp, &dp->audio_info);
+ ret = cdns_mhdp_audio_stop(&dp->mhdp, &dp->mhdp.audio_info);
if (!ret)
- dp->audio_info.format = AFMT_UNUSED;
+ dp->mhdp.audio_info.format = AFMT_UNUSED;
out:
mutex_unlock(&dp->lock);
}
@@ -886,11 +886,11 @@ static int cdn_dp_audio_codec_init(struct cdn_dp_device *dp,
.max_i2s_channels = 8,
};
- dp->audio_pdev = platform_device_register_data(
- dev, HDMI_CODEC_DRV_NAME, PLATFORM_DEVID_AUTO,
- &codec_data, sizeof(codec_data));
+ dp->mhdp.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);
+ return PTR_ERR_OR_ZERO(dp->mhdp.audio_pdev);
}
static int cdn_dp_request_firmware(struct cdn_dp_device *dp)
@@ -1217,7 +1217,7 @@ static int cdn_dp_remove(struct platform_device *pdev)
{
struct cdn_dp_device *dp = platform_get_drvdata(pdev);
- platform_device_unregister(dp->audio_pdev);
+ platform_device_unregister(dp->mhdp.audio_pdev);
cdn_dp_suspend(dp->mhdp.dev);
component_del(&pdev->dev, &cdn_dp_component_ops);
diff --git a/drivers/gpu/drm/rockchip/cdn-dp-core.h b/drivers/gpu/drm/rockchip/cdn-dp-core.h
index bad65c2fe610..a086dad31287 100644
--- a/drivers/gpu/drm/rockchip/cdn-dp-core.h
+++ b/drivers/gpu/drm/rockchip/cdn-dp-core.h
@@ -19,8 +19,9 @@
#include <drm/drm_crtc_helper.h>
#include <drm/drm_dp_helper.h>
#include <drm/drm_panel.h>
+#include <drm/bridge/cdns-mhdp-common.h>
+
#include "rockchip_drm_drv.h"
-#include "cdn-dp-reg.h"
#define MAX_PHY 2
@@ -45,7 +46,6 @@ struct cdn_dp_device {
struct cdns_mhdp_device mhdp;
struct drm_device *drm_dev;
struct drm_encoder encoder;
- struct platform_device *audio_pdev;
struct work_struct event_work;
struct edid *edid;
@@ -64,7 +64,6 @@ struct cdn_dp_device {
struct reset_control *dptx_rst;
struct reset_control *apb_rst;
struct reset_control *core_rst;
- struct audio_info audio_info;
struct cdn_dp_port *port[MAX_PHY];
u8 ports;
u8 lanes;
diff --git a/drivers/gpu/drm/rockchip/cdn-dp-reg.h b/include/drm/bridge/cdns-mhdp-common.h
similarity index 95%
rename from drivers/gpu/drm/rockchip/cdn-dp-reg.h
rename to include/drm/bridge/cdns-mhdp-common.h
index 3cb40d719515..c5a5c4fa7fc4 100644
--- a/drivers/gpu/drm/rockchip/cdn-dp-reg.h
+++ b/include/drm/bridge/cdns-mhdp-common.h
@@ -12,10 +12,13 @@
* GNU General Public License for more details.
*/
-#ifndef _CDN_DP_REG_H
-#define _CDN_DP_REG_H
+#ifndef CDNS_MHDP_COMMON_H_
+#define CDNS_MHDP_COMMON_H_
#include <linux/bitops.h>
+#include <drm/drm_dp_helper.h>
+#include <drm/drm_connector.h>
+#include <drm/drm_bridge.h>
#define ADDR_IMEM 0x10000
#define ADDR_DMEM 0x20000
@@ -327,6 +330,7 @@
#define GENERAL_TEST_ECHO 0x02
#define GENERAL_BUS_SETTINGS 0x03
#define GENERAL_TEST_ACCESS 0x04
+#define GENERAL_REGISTER_READ 0x07
#define DPTX_SET_POWER_MNG 0x00
#define DPTX_SET_HOST_CAPABILITIES 0x01
@@ -346,6 +350,7 @@
#define DPTX_SET_LINK_BREAK_POINT 0x0f
#define DPTX_FORCE_LANES 0x10
#define DPTX_HPD_STATE 0x11
+#define DPTX_ADJUST_LT 0x12
#define FW_STANDBY 0
#define FW_ACTIVE 1
@@ -517,6 +522,9 @@ struct cdns_mhdp_device {
struct clk *spdif_clk;
struct reset_control *spdif_rst;
+ struct platform_device *audio_pdev;
+ struct audio_info audio_info;
+
struct drm_dp_aux aux;
struct cdns_mhdp_host host;
struct cdns_mhdp_sink sink;
@@ -551,4 +559,11 @@ int cdns_mhdp_audio_stop(struct cdns_mhdp_device *mhdp,
int cdns_mhdp_audio_mute(struct cdns_mhdp_device *mhdp, bool enable);
int cdns_mhdp_audio_config(struct cdns_mhdp_device *mhdp,
struct audio_info *audio);
-#endif /* _CDN_DP_REG_H */
+int cdns_mhdp_reg_read(struct cdns_mhdp_device *mhdp, u32 addr, u32 *value);
+int cdns_mhdp_reg_write(struct cdns_mhdp_device *mhdp, u16 addr, u32 val);
+int cdns_mhdp_reg_write_bit(struct cdns_mhdp_device *mhdp, u16 addr,
+ u8 start_bit, u8 bits_no, u32 val);
+int cdns_mhdp_adjust_lt(struct cdns_mhdp_device *mhdp, u8 nlanes,
+ u16 udelay, u8 *lanes_data,
+ u8 *dpcd);
+#endif /* CDNS_MHDP_COMMON_H_ */
--
2.17.1
^ permalink raw reply related [flat|nested] 45+ messages in thread
* [PATCH v6 5/6] drm/bridge: add support for MST in mhdp8546 driver
2018-10-08 21:42 ` Damian Kos
(?)
@ 2018-10-08 21:42 ` Damian Kos
-1 siblings, 0 replies; 45+ messages in thread
From: Damian Kos @ 2018-10-08 21:42 UTC (permalink / raw)
To: David Airlie, Rob Herring, Mark Rutland, Archit Taneja,
Andrzej Hajda, Laurent Pinchart, Gustavo Padovan,
Maarten Lankhorst, Sean Paul, Sandy Huang, Heiko Stübner,
Quentin Schulz, Damian Kos, Piotr Sroka, dri-devel, devicetree,
linux-kernel, linux-arm-kernel, linux-rockchip
Cc: rafalc, quentin.schulz, jbergsagel
From: Piotr Sroka <piotrs@cadence.com>
- add hot plug support to handle HDP IRQ interrupts in case sideband
message is ready to read.
- there is only one connector created at initialization stage. It is
used as SST connector when controller works in SST mode. If controller
works in MST mode then the SST connector status is disconnected all the
time. MST connectors are created/destroyed in runtime depends on what
devices are connected to the DP controller.
- add callbacks functions to be able to inform module managing encoders
objects to create or destroy an encoder in case new a MST connector is
created/destroyed
Signed-off-by: Piotr Sroka <piotrs@cadence.com>
Signed-off-by: Damian Kos <dkos@cadence.com>
---
drivers/gpu/drm/bridge/Makefile | 2 +-
drivers/gpu/drm/bridge/cdns-mhdp-mst.c | 594 +++++++++++++++++++++++++
drivers/gpu/drm/bridge/cdns-mhdp.c | 560 ++++++++++++-----------
drivers/gpu/drm/bridge/cdns-mhdp.h | 209 +++++++++
drivers/gpu/drm/rockchip/cdn-dp-core.c | 18 +-
include/drm/bridge/cdns-mhdp-cbs.h | 27 ++
include/drm/bridge/cdns-mhdp-common.h | 48 +-
7 files changed, 1189 insertions(+), 269 deletions(-)
create mode 100644 drivers/gpu/drm/bridge/cdns-mhdp-mst.c
create mode 100644 drivers/gpu/drm/bridge/cdns-mhdp.h
create mode 100644 include/drm/bridge/cdns-mhdp-cbs.h
diff --git a/drivers/gpu/drm/bridge/Makefile b/drivers/gpu/drm/bridge/Makefile
index e802fdb85750..b80f3d6ed2a6 100644
--- a/drivers/gpu/drm/bridge/Makefile
+++ b/drivers/gpu/drm/bridge/Makefile
@@ -19,4 +19,4 @@ obj-$(CONFIG_DRM_TI_TFP410) += ti-tfp410.o
obj-$(CONFIG_DRM_CDNS_MHDP) += mhdp8546.o
obj-y += synopsys/
-mhdp8546-objs := cdns-mhdp-common.o cdns-mhdp.o
+mhdp8546-objs := cdns-mhdp-common.o cdns-mhdp.o cdns-mhdp-mst.o
diff --git a/drivers/gpu/drm/bridge/cdns-mhdp-mst.c b/drivers/gpu/drm/bridge/cdns-mhdp-mst.c
new file mode 100644
index 000000000000..782d4bf9b667
--- /dev/null
+++ b/drivers/gpu/drm/bridge/cdns-mhdp-mst.c
@@ -0,0 +1,594 @@
+// SPDX-License-Identifier: GPL v2
+/*
+ * Cadence MHDP DP MST bridge driver.
+ *
+ * Copyright: 2018 Cadence Design Systems, Inc.
+ *
+ * Author: Piotr Sroka <piotrs@cadence.com>
+ */
+#include <drm/drm_print.h>
+#include <drm/drm_crtc_helper.h>
+#include <drm/drm_atomic_helper.h>
+#include <drm/drm_fixed.h>
+#include <drm/drm_connector.h>
+#include <linux/iopoll.h>
+
+#include <drm/bridge/cdns-mhdp-common.h>
+#include "cdns-mhdp.h"
+
+
+static void cdns_mhdp_mst_stream_enable(struct cdns_mhdp_bridge *mhdp_bridge,
+ bool enable)
+{
+ u32 reg;
+ struct cdns_mhdp_device *mhdp = mhdp_bridge->mhdp;
+ u8 stream_id = mhdp_bridge->stream_id;
+
+ cdns_mhdp_reg_read(mhdp, CDNS_DP_MST_STREAM_CONFIG(stream_id), ®);
+
+ if (enable) {
+ reg |= CDNS_DP_MST_STRM_CFG_STREAM_EN;
+ reg &= ~CDNS_DP_MST_STRM_CFG_NO_VIDEO;
+ } else {
+ reg &= ~CDNS_DP_MST_STRM_CFG_STREAM_EN;
+ reg |= CDNS_DP_MST_STRM_CFG_NO_VIDEO;
+ }
+
+ cdns_mhdp_reg_write(mhdp, CDNS_DP_MST_STREAM_CONFIG(stream_id), reg);
+}
+
+static inline s64 calc_fixed_avg_slots(u32 pbn, u32 pbn_div)
+{
+ s64 fixed_pbn, fixed_pbn_div, fixed_targ_avg_slots;
+
+ fixed_pbn = drm_int2fixp(pbn);
+ fixed_pbn_div = drm_int2fixp(pbn_div);
+ fixed_targ_avg_slots = drm_fixp_div(fixed_pbn, fixed_pbn_div);
+
+ return fixed_targ_avg_slots;
+}
+
+static void cdns_mhdp_mst_set_threshold(struct cdns_mhdp_bridge *bridge)
+{
+ u32 threshold;
+ u8 stream_id = bridge->stream_id;
+ struct cdns_mhdp_device *mhdp = bridge->mhdp;
+ s64 fixed_targ_avg_slots, fixed_thresh, fixed_targ_entries;
+
+ fixed_targ_avg_slots = calc_fixed_avg_slots(bridge->pbn,
+ mhdp->mst_mgr.pbn_div);
+
+ fixed_targ_entries = drm_fixp_div(fixed_targ_avg_slots,
+ drm_int2fixp(2));
+ fixed_thresh = drm_fixp_mul(fixed_targ_entries, fixed_targ_entries);
+ fixed_thresh = drm_fixp_div(fixed_thresh, drm_int2fixp(32));
+ fixed_thresh = fixed_targ_entries - fixed_thresh;
+ fixed_thresh = drm_fixp_mul(fixed_thresh,
+ drm_int2fixp(mhdp->link.num_lanes));
+ fixed_thresh = drm_fixp_div(fixed_thresh, drm_int2fixp(4));
+
+ threshold = drm_fixp2int_ceil(fixed_thresh);
+ if (threshold < 2)
+ threshold = 2;
+
+ cdns_mhdp_reg_write(mhdp, CDNS_DP_LINE_THRESH(stream_id),
+ CDNS_DP_ACTIVE_LINE_THRESH(threshold));
+}
+
+static void cdns_mhdp_set_rate_governing(struct cdns_mhdp_bridge *bridge,
+ bool enable)
+{
+ struct cdns_mhdp_device *mhdp = bridge->mhdp;
+ u8 stream_id = bridge->stream_id;
+
+ if (enable) {
+ s64 fixed_targ_avg_slots, fixed_y;
+ u32 x, y;
+
+ fixed_targ_avg_slots =
+ calc_fixed_avg_slots(bridge->pbn,
+ mhdp->mst_mgr.pbn_div);
+
+ x = drm_fixp2int(fixed_targ_avg_slots);
+
+ fixed_y = (fixed_targ_avg_slots - drm_int2fixp(x));
+ fixed_y = drm_fixp_mul(fixed_y, drm_int2fixp(16));
+ y = drm_fixp2int_ceil(fixed_y);
+
+ cdns_mhdp_reg_write(mhdp, CDNS_DP_RATE_GOVERNING(stream_id),
+ CDNS_DP_RG_TARG_AV_SLOTS_Y(y) |
+ CDNS_DP_RG_TARG_AV_SLOTS_X(x) |
+ CDNS_DP_RG_ENABLE);
+ } else
+ cdns_mhdp_reg_write(mhdp, CDNS_DP_RATE_GOVERNING(stream_id), 0);
+}
+
+
+static struct drm_dp_payload *
+cdns_mhdp_get_payload(struct cdns_mhdp_bridge *bridge)
+{
+ int vcpi = bridge->connector->port->vcpi.vcpi, i;
+ struct cdns_mhdp_device *mhdp = bridge->mhdp;
+
+ for (i = 0; i < mhdp->mst_mgr.max_payloads; i++) {
+ struct drm_dp_payload *payload = &mhdp->mst_mgr.payloads[i];
+
+ if (payload->vcpi == vcpi)
+ return payload;
+ }
+
+ return NULL;
+}
+
+
+static int
+cdns_mhdp_set_act_enable(struct cdns_mhdp_device *mhdp)
+{
+ u32 reg;
+ int ret;
+
+ cdns_mhdp_reg_read(mhdp, CDNS_DP_MTPH_CONTROL, ®);
+ cdns_mhdp_reg_write(mhdp, CDNS_DP_MTPH_CONTROL,
+ reg | CDNS_DP_MTPH_ACT_EN);
+
+ ret = readl_poll_timeout(mhdp->regs + CDNS_DP_MTPH_STATUS, reg,
+ ((reg & CDNS_DP_MTPH_ACT_STATUS) == 0), 0,
+ 30);
+ if (ret) {
+ dev_err(mhdp->dev,
+ "ACT sequence cannot complete in 30us\n");
+ return -EIO;
+ }
+
+ return drm_dp_check_act_status(&mhdp->mst_mgr);
+}
+
+
+static int
+cdns_mhdp_apply_slot_allocation(struct cdns_mhdp_bridge *mhdp_bridge)
+{
+ struct drm_dp_payload *payload;
+ struct cdns_mhdp_device *mhdp = mhdp_bridge->mhdp;
+ u8 stream_id = mhdp_bridge->stream_id;
+
+ payload = cdns_mhdp_get_payload(mhdp_bridge);
+
+ if (!payload) {
+ DRM_ERROR("payload is not found\n");
+ return -EIO;
+ }
+
+ cdns_mhdp_reg_write(mhdp, CDNS_DP_MST_SLOT_ALLOCATE(stream_id),
+ CDNS_DP_S_ALLOC_START_SLOT(payload->start_slot) |
+ CDNS_DP_S_ALLOC_END_SLOT(payload->start_slot
+ + payload->num_slots - 1));
+
+ return 0;
+}
+
+static void
+cdns_mhdp_update_slot_allocation(struct cdns_mhdp_bridge *mhdp_bridge)
+{
+ struct drm_device *dev = mhdp_bridge->base.dev;
+ struct drm_connector *connector;
+
+ list_for_each_entry(connector, &dev->mode_config.connector_list, head) {
+ struct cdns_mhdp_connector *mhdp_connector;
+
+ mhdp_connector = to_mhdp_connector(connector);
+ if (!connector->encoder)
+ continue;
+ if (!mhdp_connector->is_mst_connector)
+ continue;
+
+ if (mhdp_connector->bridge->stream_id != -1)
+ cdns_mhdp_apply_slot_allocation(mhdp_connector->bridge);
+ }
+}
+
+static enum drm_connector_status
+cdns_dp_mst_detect(struct drm_connector *connector, bool force)
+{
+ enum drm_connector_status stat;
+ struct cdns_mhdp_connector *mhdp_connector;
+ struct cdns_mhdp_device *mhdp;
+
+ mhdp_connector = to_mhdp_connector(connector);
+ mhdp = mhdp_connector->bridge->mhdp;
+
+ stat = drm_dp_mst_detect_port(connector, &mhdp->mst_mgr,
+ mhdp_connector->port);
+ return stat;
+}
+
+static void
+cdns_dp_mst_connector_destroy(struct drm_connector *connector)
+{
+ struct cdns_mhdp_connector *mhdp_connector;
+ struct cdns_mhdp_bridge *mhdp_bridge;
+
+ mhdp_connector = to_mhdp_connector(connector);
+ mhdp_bridge = mhdp_connector->bridge;
+
+ drm_connector_cleanup(&mhdp_connector->base);
+ drm_bridge_remove(&mhdp_bridge->base);
+ kfree(mhdp_connector);
+ kfree(mhdp_bridge);
+}
+
+static const struct drm_connector_funcs cdns_mhdp_mst_connector_funcs = {
+ .atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state,
+ .atomic_destroy_state = drm_atomic_helper_connector_destroy_state,
+ .reset = drm_atomic_helper_connector_reset,
+ .dpms = drm_helper_connector_dpms,
+ .detect = cdns_dp_mst_detect,
+ .fill_modes = drm_helper_probe_single_connector_modes,
+ .destroy = cdns_dp_mst_connector_destroy,
+};
+
+
+static int cdns_mhdp_mst_get_ddc_modes(struct drm_connector *connector)
+{
+ struct cdns_mhdp_connector *mhdp_connector;
+ struct cdns_mhdp_device *mhdp;
+ struct edid *edid;
+ int ret = 0;
+
+ mhdp_connector = to_mhdp_connector(connector);
+ mhdp = mhdp_connector->bridge->mhdp;
+
+ edid = drm_dp_mst_get_edid(connector, &mhdp->mst_mgr,
+ mhdp_connector->port);
+
+ DRM_DEBUG_KMS("edid retrieved %p\n", edid);
+ if (edid) {
+ drm_connector_update_edid_property(connector, edid);
+ ret = drm_add_edid_modes(connector, edid);
+ return ret;
+ }
+ drm_connector_update_edid_property(connector, NULL);
+
+ return ret;
+}
+
+static int cdns_mhdp_mst_get_modes(struct drm_connector *connector)
+{
+ return cdns_mhdp_mst_get_ddc_modes(connector);
+}
+
+
+static struct
+drm_encoder *cdns_mhdp_mst_best_encoder(struct drm_connector *connector)
+{
+ struct cdns_mhdp_connector *mhdp_connector;
+
+ mhdp_connector = to_mhdp_connector(connector);
+
+ return mhdp_connector->bridge->base.encoder;
+}
+
+static const struct drm_connector_helper_funcs cdns_mhdp_mst_conn_helper_fun = {
+ .get_modes = cdns_mhdp_mst_get_modes,
+ .best_encoder = cdns_mhdp_mst_best_encoder,
+};
+
+void cdns_mhdp_mst_enable(struct drm_bridge *bridge)
+{
+ struct cdns_mhdp_bridge *mhdp_bridge = to_mhdp_bridge(bridge);
+ struct cdns_mhdp_device *mhdp = mhdp_bridge->mhdp;
+ struct drm_display_info *disp_info;
+ struct drm_display_mode *mode;
+ struct cdns_mhdp_connector *mhdp_connector;
+ u32 bpp;
+ enum pixel_format pxlfmt;
+ int ret, slots, stream_id;
+
+ disp_info = &mhdp_bridge->connector->base.display_info;
+
+ pxlfmt = cdns_mhdp_get_pxlfmt(disp_info->color_formats);
+ bpp = cdns_mhdp_get_bpp(disp_info->bpc, pxlfmt);
+
+ mhdp_connector = mhdp_bridge->connector;
+ if (mhdp_bridge->stream_id > -1) {
+ DRM_ERROR("ERROR stream id is attached before bridge is enabled\n");
+ return;
+ }
+
+ stream_id = bridge->encoder->crtc->index;
+
+ mode = &bridge->encoder->crtc->state->adjusted_mode;
+ mhdp_bridge->pbn = drm_dp_calc_pbn_mode(mode->clock, bpp);
+
+ slots = drm_dp_find_vcpi_slots(&mhdp->mst_mgr, mhdp_bridge->pbn);
+ ret = drm_dp_mst_allocate_vcpi(&mhdp->mst_mgr,
+ mhdp_connector->port,
+ mhdp_bridge->pbn, slots);
+ if (ret == false) {
+ DRM_ERROR("failed to allocate vcpi\n");
+ return;
+ }
+ ret = drm_dp_update_payload_part1(&mhdp->mst_mgr);
+ if (ret < 0)
+ DRM_ERROR("failed update_payload_part1\n");
+
+ mhdp_bridge->stream_id = stream_id;
+ mhdp_bridge->is_active = true;
+
+ cdns_mhdp_mst_stream_enable(mhdp_bridge, true);
+ cdns_mhdp_configure_video(bridge);
+
+ ret = cdns_mhdp_apply_slot_allocation(mhdp_bridge);
+ if (ret < 0) {
+ cdns_mhdp_mst_stream_enable(mhdp_bridge, false);
+ mhdp_bridge->stream_id = -1;
+ mhdp_bridge->is_active = false;
+ return;
+ }
+
+ ret = cdns_mhdp_set_act_enable(mhdp);
+ if (ret)
+ DRM_ERROR("failed ACT sequence\n");
+
+ cdns_mhdp_set_rate_governing(mhdp_bridge, true);
+
+ cdns_mhdp_mst_set_threshold(mhdp_bridge);
+
+ drm_dp_update_payload_part2(&mhdp->mst_mgr);
+}
+
+void cdns_mhdp_mst_disable(struct drm_bridge *bridge)
+{
+ struct cdns_mhdp_bridge *mhdp_bridge = to_mhdp_bridge(bridge);
+ struct cdns_mhdp_device *mhdp = mhdp_bridge->mhdp;
+ struct cdns_mhdp_connector *connector = mhdp_bridge->connector;
+
+ drm_dp_mst_reset_vcpi_slots(&mhdp->mst_mgr, connector->port);
+ drm_dp_update_payload_part1(&mhdp->mst_mgr);
+
+ cdns_mhdp_update_slot_allocation(mhdp_bridge);
+
+ drm_dp_check_act_status(&mhdp->mst_mgr);
+
+ drm_dp_update_payload_part2(&mhdp->mst_mgr);
+
+ drm_dp_mst_deallocate_vcpi(&mhdp->mst_mgr, connector->port);
+
+ cdns_mhdp_set_rate_governing(mhdp_bridge, false);
+ cdns_mhdp_mst_stream_enable(mhdp_bridge, false);
+ mhdp_bridge->stream_id = -1;
+ mhdp_bridge->is_active = false;
+}
+
+static const struct drm_bridge_funcs cdns_mhdp_mst_bridge_funcs = {
+ .enable = cdns_mhdp_enable,
+ .disable = cdns_mhdp_mst_disable,
+};
+
+
+static struct cdns_mhdp_bridge*
+cdns_mhpd_create_fake_mst_bridge(struct cdns_mhdp_device *mhdp,
+ struct cdns_mhdp_connector *mhdp_connector)
+{
+ struct cdns_mhdp_bridge *mhdp_bridge;
+ struct drm_encoder *encoder = NULL;
+ struct cdns_mhdp_mst_cbs *cbs = &mhdp->cbs;
+
+ mhdp_bridge = kzalloc(sizeof(*mhdp_bridge), GFP_KERNEL);
+ if (!mhdp_bridge)
+ return NULL;
+
+ mhdp_bridge->mhdp = mhdp;
+ mhdp_bridge->stream_id = -1;
+ mhdp_bridge->connector = mhdp_connector;
+ mhdp_bridge->is_active = false;
+
+ mhdp_bridge->base.funcs = &cdns_mhdp_mst_bridge_funcs;
+
+ drm_bridge_add(&mhdp_bridge->base);
+
+ if (cbs->funcs.create_mst_encoder)
+ encoder = cbs->funcs.create_mst_encoder(cbs->priv_data,
+ &mhdp_bridge->base);
+ if (encoder) {
+ int ret;
+ /* use the same drm device as is in the first encoder */
+ encoder->dev = mhdp->bridge.base.encoder->dev;
+ encoder->possible_crtcs &= ((1 << CDNS_MHDP_MAX_STREAMS) - 1);
+ ret = drm_bridge_attach(encoder, &mhdp_bridge->base, NULL);
+ if (ret) {
+ dev_err(mhdp->dev, "bridge attaching error %d\n", ret);
+ return NULL;
+ }
+
+ ret = drm_connector_attach_encoder(&mhdp_connector->base,
+ encoder);
+ if (ret) {
+ dev_err(mhdp->dev, "failed to attach connector to encoder\n");
+ return NULL;
+ }
+ }
+
+ return mhdp_bridge;
+}
+
+static struct drm_connector *
+cdns_mhdp_mst_cbs_add_connector(struct drm_dp_mst_topology_mgr *mgr,
+ struct drm_dp_mst_port *port,
+ const char *pathprop)
+{
+ struct cdns_mhdp_device *mhdp = mgr_to_mhdp(mgr);
+ struct drm_device *dev = mhdp->bridge.base.dev;
+ struct cdns_mhdp_connector *mhdp_connector;
+ struct drm_connector *connector;
+ struct drm_connector_state *conn_state;
+ int ret;
+
+ mhdp_connector = kzalloc(sizeof(struct cdns_mhdp_connector),
+ GFP_KERNEL);
+ if (!mhdp_connector)
+ return NULL;
+
+ mhdp_connector->is_mst_connector = true;
+ connector = &mhdp_connector->base;
+ mhdp_connector->port = port;
+ DRM_DEBUG_KMS("\n");
+
+ conn_state = kzalloc(sizeof(*conn_state), GFP_KERNEL);
+ if (!conn_state)
+ return NULL;
+
+ __drm_atomic_helper_connector_reset(connector,
+ conn_state);
+
+ drm_connector_init(dev, connector, &cdns_mhdp_mst_connector_funcs,
+ DRM_MODE_CONNECTOR_DisplayPort);
+ drm_connector_helper_add(connector, &cdns_mhdp_mst_conn_helper_fun);
+ mhdp_connector->bridge =
+ cdns_mhpd_create_fake_mst_bridge(mhdp, mhdp_connector);
+
+ drm_object_attach_property(&connector->base,
+ dev->mode_config.path_property, 0);
+ drm_object_attach_property(&connector->base,
+ dev->mode_config.tile_property, 0);
+ ret = drm_connector_set_path_property(connector, pathprop);
+
+ if (ret)
+ DRM_ERROR("ERROR set path propertty failed\n");
+
+ return connector;
+}
+
+static void
+cdns_mhdp_mst_cbs_destroy_connector(struct drm_dp_mst_topology_mgr *mgr,
+ struct drm_connector *connector)
+{
+ struct cdns_mhdp_connector *mhdp_connector;
+ struct cdns_mhdp_device *mhdp;
+ struct cdns_mhdp_bridge *mhdp_bridge;
+
+ mhdp_connector = to_mhdp_connector(connector);
+ mhdp_bridge = mhdp_connector->bridge;
+ mhdp = mhdp_bridge->mhdp;
+
+ drm_connector_unregister(&mhdp_connector->base);
+
+ if (mhdp->cbs.funcs.create_mst_encoder)
+ mhdp->cbs.funcs.destroy_mst_encoder(mhdp->cbs.priv_data,
+ &mhdp_bridge->base);
+ drm_connector_unreference(&mhdp_connector->base);
+}
+
+static void cdns_mhdp_mst_cbs_hotplug(struct drm_dp_mst_topology_mgr *mgr)
+{
+ struct cdns_mhdp_device *mhdp = mgr_to_mhdp(mgr);
+ struct drm_device *dev = mhdp->bridge.base.encoder->dev;
+
+ drm_kms_helper_hotplug_event(dev);
+}
+
+static void
+cdns_mhdp_mst_cbs_register_connector(struct drm_connector *connector)
+{
+ int ret;
+
+ ret = drm_connector_register(connector);
+ if (ret)
+ DRM_ERROR("Register connector failed\n");
+
+}
+
+static const struct drm_dp_mst_topology_cbs mst_cbs = {
+ .add_connector = cdns_mhdp_mst_cbs_add_connector,
+ .register_connector = cdns_mhdp_mst_cbs_register_connector,
+ .destroy_connector = cdns_mhdp_mst_cbs_destroy_connector,
+ .hotplug = cdns_mhdp_mst_cbs_hotplug,
+};
+
+
+static void cdns_mhdp_set_mst_enable(struct cdns_mhdp_device *mhdp, bool enable)
+{
+ u32 reg_val;
+
+ cdns_mhdp_reg_read(mhdp, CDNS_DP_FRAMER_GLOBAL_CONFIG, ®_val);
+
+ if (enable)
+ reg_val |= CDNS_DP_MST_EN;
+ else
+ reg_val &= ~CDNS_DP_MST_EN;
+
+ cdns_mhdp_reg_write(mhdp, CDNS_DP_FRAMER_GLOBAL_CONFIG, reg_val);
+}
+
+bool cdns_mhdp_mst_probe(struct cdns_mhdp_device *mhdp)
+{
+ u8 mstm_cap;
+ u8 dpcd_cap[DP_RECEIVER_CAP_SIZE];
+
+ bool is_mst;
+
+ if (!mhdp->can_mst)
+ return false;
+
+ drm_dp_dpcd_read(&mhdp->aux, DP_DPCD_REV, dpcd_cap,
+ DP_RECEIVER_CAP_SIZE);
+
+ if (dpcd_cap[DP_DPCD_REV] < 0x12)
+ return false;
+
+ if (drm_dp_dpcd_readb(&mhdp->aux, DP_MSTM_CAP, &mstm_cap) != 1)
+ return false;
+
+ if (mstm_cap & DP_MST_CAP) {
+ DRM_DEBUG_KMS("Sink is MST capable\n");
+ is_mst = true;
+ } else {
+ DRM_DEBUG_KMS("Sink is not MST capable\n");
+ is_mst = false;
+ }
+
+ if (is_mst != mhdp->is_mst) {
+ mhdp->is_mst = is_mst;
+ cdns_mhdp_set_mst_enable(mhdp, mhdp->is_mst);
+
+ drm_dp_mst_topology_mgr_set_mst(&mhdp->mst_mgr,
+ mhdp->is_mst);
+ }
+
+ return mhdp->is_mst;
+}
+
+int cdns_mhdp_mst_init(struct cdns_mhdp_device *mhdp)
+{
+ struct cdns_mhdp_bridge *bridge = &mhdp->bridge;
+ struct drm_device *dev = bridge->base.dev;
+ struct cdns_mhdp_connector *connector = bridge->connector;
+ int ret;
+
+ mhdp->mst_mgr.cbs = &mst_cbs;
+ ret = drm_dp_mst_topology_mgr_init(&mhdp->mst_mgr, dev,
+ &mhdp->aux, 16,
+ CDNS_MHDP_MAX_STREAMS,
+ connector->base.base.id);
+ if (ret)
+ mhdp->can_mst = false;
+ else
+ mhdp->can_mst = true;
+
+ mhdp->is_mst = false;
+
+ bridge->stream_id = -1;
+
+ return ret;
+}
+
+void cdns_mhdp_mst_deinit(struct cdns_mhdp_device *mhdp)
+{
+ if (mhdp->is_mst) {
+ mhdp->is_mst = false;
+ drm_dp_mst_topology_mgr_set_mst(&mhdp->mst_mgr,
+ mhdp->is_mst);
+ }
+
+ if (mhdp->can_mst)
+ drm_dp_mst_topology_mgr_destroy(&mhdp->mst_mgr);
+}
diff --git a/drivers/gpu/drm/bridge/cdns-mhdp.c b/drivers/gpu/drm/bridge/cdns-mhdp.c
index a3bbc0e809a5..48ac5cf1e031 100644
--- a/drivers/gpu/drm/bridge/cdns-mhdp.c
+++ b/drivers/gpu/drm/bridge/cdns-mhdp.c
@@ -27,146 +27,15 @@
#include <drm/bridge/cdns-mhdp-common.h>
#include <sound/hdmi-codec.h>
+#include <linux/irq.h>
+#include <linux/of_irq.h>
+#include "cdns-mhdp.h"
#define DEBUG_MSG
#define FW_NAME "cadence/mhdp8546.bin"
-#define CDNS_APB_CFG 0x00000
-#define CDNS_APB_CTRL (CDNS_APB_CFG + 0x00)
-#define CDNS_MAILBOX_FULL (CDNS_APB_CFG + 0x08)
-#define CDNS_MAILBOX_EMPTY (CDNS_APB_CFG + 0x0c)
-#define CDNS_MAILBOX_TX_DATA (CDNS_APB_CFG + 0x10)
-#define CDNS_MAILBOX_RX_DATA (CDNS_APB_CFG + 0x14)
-#define CDNS_KEEP_ALIVE (CDNS_APB_CFG + 0x18)
-#define CDNS_KEEP_ALIVE_MASK GENMASK(7, 0)
-
-#define CDNS_SW_CLK_L (CDNS_APB_CFG + 0x3c)
-#define CDNS_SW_CLK_H (CDNS_APB_CFG + 0x40)
-#define CDNS_SW_EVENT0 (CDNS_APB_CFG + 0x44)
-#define CDNS_DPTX_HPD BIT(0)
-
-#define CDNS_SW_EVENT1 (CDNS_APB_CFG + 0x48)
-#define CDNS_SW_EVENT2 (CDNS_APB_CFG + 0x4c)
-#define CDNS_SW_EVENT3 (CDNS_APB_CFG + 0x50)
-
-#define CDNS_DPTX_CAR (CDNS_APB_CFG + 0x904)
-#define CDNS_VIF_CLK_EN BIT(0)
-#define CDNS_VIF_CLK_RSTN BIT(1)
-
-#define CDNS_SOURCE_VIDEO_INTERFACE 0x00b00
-#define CDNS_BND_HSYNC2VSYNC (CDNS_SOURCE_VIDEO_INTERFACE + \
- 0x00)
-#define CDNS_IP_DTCT_WIN GENMASK(11, 0)
-#define CDNS_IP_DET_INTERLACE_FORMAT BIT(12)
-#define CDNS_IP_BYPASS_V_INTERFACE BIT(13)
-
-#define CDNS_HSYNC2VSYNC_POL_CTRL (CDNS_SOURCE_VIDEO_INTERFACE + \
- 0x10)
-#define CDNS_H2V_HSYNC_POL_ACTIVE_LOW BIT(1)
-#define CDNS_H2V_VSYNC_POL_ACTIVE_LOW BIT(2)
-
-#define CDNS_DPTX_PHY_CONFIG 0x02000
-#define CDNS_PHY_TRAINING_EN BIT(0)
-#define CDNS_PHY_TRAINING_TYPE(x) (((x) & GENMASK(3, 0)) << 1)
-#define CDNS_PHY_SCRAMBLER_BYPASS BIT(5)
-#define CDNS_PHY_ENCODER_BYPASS BIT(6)
-#define CDNS_PHY_SKEW_BYPASS BIT(7)
-#define CDNS_PHY_TRAINING_AUTO BIT(8)
-#define CDNS_PHY_LANE0_SKEW(x) (((x) & GENMASK(2, 0)) << 9)
-#define CDNS_PHY_LANE1_SKEW(x) (((x) & GENMASK(2, 0)) << 12)
-#define CDNS_PHY_LANE2_SKEW(x) (((x) & GENMASK(2, 0)) << 15)
-#define CDNS_PHY_LANE3_SKEW(x) (((x) & GENMASK(2, 0)) << 18)
-#define CDNS_PHY_COMMON_CONFIG (CDNS_PHY_LANE1_SKEW(1) | \
- CDNS_PHY_LANE2_SKEW(2) | \
- CDNS_PHY_LANE3_SKEW(3))
-#define CDNS_PHY_10BIT_EN BIT(21)
-
-#define CDNS_DPTX_FRAMER 0x02200
-#define CDNS_DP_FRAMER_GLOBAL_CONFIG (CDNS_DPTX_FRAMER + 0x00)
-#define CDNS_DP_NUM_LANES(x) (x - 1)
-#define CDNS_DP_FRAMER_EN BIT(3)
-#define CDNS_DP_RATE_GOVERNOR_EN BIT(4)
-#define CDNS_DP_NO_VIDEO_MODE BIT(5)
-#define CDNS_DP_DISABLE_PHY_RST BIT(6)
-#define CDNS_DP_WR_FAILING_EDGE_VSYNC BIT(7)
-
-#define CDNS_DP_SW_RESET (CDNS_DPTX_FRAMER + 0x04)
-#define CDNS_DP_FRAMER_TU (CDNS_DPTX_FRAMER + 0x08)
-#define CDNS_DP_FRAMER_TU_SIZE(x) (((x) & GENMASK(6, 0)) << 8)
-#define CDNS_DP_FRAMER_TU_VS(x) ((x) & GENMASK(5, 0))
-#define CDNS_DP_FRAMER_TU_CNT_RST_EN BIT(15)
-
-#define CDNS_DPTX_STREAM 0x03000
-#define CDNS_DP_MSA_HORIZONTAL_0 (CDNS_DPTX_STREAM + 0x00)
-#define CDNS_DP_MSAH0_H_TOTAL(x) (x)
-#define CDNS_DP_MSAH0_HSYNC_START(x) ((x) << 16)
-
-#define CDNS_DP_MSA_HORIZONTAL_1 (CDNS_DPTX_STREAM + 0x04)
-#define CDNS_DP_MSAH1_HSYNC_WIDTH(x) (x)
-#define CDNS_DP_MSAH1_HSYNC_POL_LOW BIT(15)
-#define CDNS_DP_MSAH1_HDISP_WIDTH(x) ((x) << 16)
-
-#define CDNS_DP_MSA_VERTICAL_0 (CDNS_DPTX_STREAM + 0x08)
-#define CDNS_DP_MSAV0_V_TOTAL(x) (x)
-#define CDNS_DP_MSAV0_VSYNC_START(x) ((x) << 16)
-
-#define CDNS_DP_MSA_VERTICAL_1 (CDNS_DPTX_STREAM + 0x0c)
-#define CDNS_DP_MSAV1_VSYNC_WIDTH(x) (x)
-#define CDNS_DP_MSAV1_VSYNC_POL_LOW BIT(15)
-#define CDNS_DP_MSAV1_VDISP_WIDTH(x) ((x) << 16)
-
-#define CDNS_DP_MSA_MISC (CDNS_DPTX_STREAM + 0x10)
-#define CDNS_DP_STREAM_CONFIG (CDNS_DPTX_STREAM + 0x14)
-#define CDNS_DP_RATE_GOVERNOR_STATUS (CDNS_DPTX_STREAM + 0x2c)
-#define CDNS_DP_RG_TU_VS_DIFF(x) ((x) << 8)
-
-#define CDNS_DP_HORIZONTAL (CDNS_DPTX_STREAM + 0x30)
-#define CDNS_DP_H_HSYNC_WIDTH(x) (x)
-#define CDNS_DP_H_H_TOTAL(x) ((x) << 16)
-
-#define CDNS_DP_VERTICAL_0 (CDNS_DPTX_STREAM + 0x34)
-#define CDNS_DP_V0_VHEIGHT(x) (x)
-#define CDNS_DP_V0_VSTART(x) ((x) << 16)
-
-#define CDNS_DP_VERTICAL_1 (CDNS_DPTX_STREAM + 0x38)
-#define CDNS_DP_V1_VTOTAL(x) (x)
-#define CDNS_DP_V1_VTOTAL_EVEN BIT(16)
-
-#define CDNS_DP_FRAMER_PXL_REPR (CDNS_DPTX_STREAM + 0x4c)
-#define CDNS_DP_FRAMER_6_BPC BIT(0)
-#define CDNS_DP_FRAMER_8_BPC BIT(1)
-#define CDNS_DP_FRAMER_10_BPC BIT(2)
-#define CDNS_DP_FRAMER_12_BPC BIT(3)
-#define CDNS_DP_FRAMER_16_BPC BIT(4)
-#define CDNS_DP_FRAMER_PXL_FORMAT 0x8
-#define CDNS_DP_FRAMER_RGB BIT(0)
-#define CDNS_DP_FRAMER_YCBCR444 BIT(1)
-#define CDNS_DP_FRAMER_YCBCR422 BIT(2)
-#define CDNS_DP_FRAMER_YCBCR420 BIT(3)
-#define CDNS_DP_FRAMER_Y_ONLY BIT(4)
-
-#define CDNS_DP_FRAMER_SP (CDNS_DPTX_STREAM + 0x10)
-#define CDNS_DP_FRAMER_VSYNC_POL_LOW BIT(0)
-#define CDNS_DP_FRAMER_HSYNC_POL_LOW BIT(1)
-#define CDNS_DP_FRAMER_INTERLACE BIT(2)
-
-#define CDNS_DP_LINE_THRESH (CDNS_DPTX_STREAM + 0x64)
-#define CDNS_DP_VB_ID (CDNS_DPTX_STREAM + 0x68)
-#define CDNS_DP_VB_ID_INTERLACED BIT(2)
-
-#define CDNS_DP_FRONT_BACK_PORCH (CDNS_DPTX_STREAM + 0x78)
-#define CDNS_DP_BACK_PORCH(x) (x)
-#define CDNS_DP_FRONT_PORCH(x) ((x) << 16)
-
-#define CDNS_DP_BYTE_COUNT (CDNS_DPTX_STREAM + 0x7c)
-
-#define CDNS_DPTX_GLOBAL 0x02300
-#define CDNS_DP_LANE_EN (CDNS_DPTX_GLOBAL + 0x00)
-#define CDNS_DP_LANE_EN_LANES(x) GENMASK(x - 1, 0)
-#define CDNS_DP_ENHNCD (CDNS_DPTX_GLOBAL + 0x04)
-
#define CDNS_MHDP_IMEM 0x10000
#define CDNS_MHDP_DMEM 0x20000
@@ -216,13 +85,17 @@ MODULE_DEVICE_TABLE(of, mhdp_ids);
static inline struct cdns_mhdp_device *connector_to_mhdp(
struct drm_connector *conn)
{
- return container_of(conn, struct cdns_mhdp_device, connector);
+ struct cdns_mhdp_connector *mhdp_connector = to_mhdp_connector(conn);
+
+ return mhdp_connector->bridge->mhdp;
}
static inline struct cdns_mhdp_device *bridge_to_mhdp(
struct drm_bridge *bridge)
{
- return container_of(bridge, struct cdns_mhdp_device, bridge);
+ struct cdns_mhdp_bridge *mhdp_bridge = to_mhdp_bridge(bridge);
+
+ return mhdp_bridge->mhdp;
}
static unsigned int max_link_rate(struct cdns_mhdp_host host,
@@ -237,6 +110,62 @@ static u8 eq_training_pattern_supported(struct cdns_mhdp_host host,
return fls(host.pattern_supp & sink.pattern_supp);
}
+static void mhdp_hotplug_work_func(struct work_struct *work)
+{
+ struct cdns_mhdp_device *mhdp;
+ int dret, retry;
+ u8 esi[16] = { 0 };
+ bool new_irq_handled;
+ struct drm_connector *connector;
+ bool old_plugged;
+
+
+ mhdp = container_of(work, struct cdns_mhdp_device,
+ hotplug_work.work);
+ connector = &mhdp->connector.base;
+
+ old_plugged = mhdp->plugged;
+ connector->status = connector->funcs->detect(connector, false);
+ if (old_plugged != mhdp->plugged) {
+ drm_kms_helper_hotplug_event(mhdp->bridge.base.dev);
+ return;
+ }
+
+ if (mhdp->plugged) {
+ dret = drm_dp_dpcd_read(&mhdp->aux,
+ DP_SINK_COUNT_ESI, esi, 8);
+
+ if (dret == 8) {
+ drm_dp_mst_hpd_irq(&mhdp->mst_mgr,
+ esi,
+ &new_irq_handled);
+ }
+
+ if (new_irq_handled) {
+ for (retry = 0; retry < 3; retry++) {
+ int wret;
+
+ wret = drm_dp_dpcd_write(&mhdp->aux,
+ DP_SINK_COUNT_ESI+1,
+ &esi[1], 3);
+ if (wret == 3)
+ break;
+ }
+ }
+ }
+
+}
+
+static irqreturn_t mhdp_irq_handler(int irq, void *data)
+{
+ struct cdns_mhdp_device *mhdp = (struct cdns_mhdp_device *)data;
+
+ if (readl(mhdp->regs + CDNS_SW_EVENT0) & CDNS_DPTX_HPD)
+ schedule_delayed_work(&mhdp->hotplug_work, 0);
+
+ return IRQ_HANDLED;
+}
+
static ssize_t mhdp_transfer(struct drm_dp_aux *aux,
struct drm_dp_aux_msg *msg)
{
@@ -300,10 +229,16 @@ static enum drm_connector_status cdns_mhdp_detect(struct drm_connector *conn,
int ret;
ret = cdns_mhdp_get_hpd_status(mhdp);
- if (ret > 0)
- status = connector_status_connected;
- else if (ret < 0)
+ if (ret > 0) {
+ mhdp->plugged = true;
+ cdns_mhdp_mst_probe(mhdp);
+ // for MST mode this connector will be always disconnected
+ if (!mhdp->is_mst)
+ status = connector_status_connected;
+ } else if (ret < 0)
dev_err(mhdp->dev, "Failed to obtain HPD state\n");
+ else
+ mhdp->plugged = false;
return status;
}
@@ -321,11 +256,15 @@ static const struct drm_connector_funcs cdns_mhdp_conn_funcs = {
static int cdns_mhdp_attach(struct drm_bridge *bridge)
{
struct cdns_mhdp_device *mhdp = bridge_to_mhdp(bridge);
- struct drm_connector *conn = &mhdp->connector;
+ struct drm_connector *conn = &mhdp->connector.base;
int ret;
- conn->polled = DRM_CONNECTOR_POLL_CONNECT |
- DRM_CONNECTOR_POLL_DISCONNECT;
+ if (&mhdp->bridge.base != bridge)
+ return -ENODEV;
+
+ cdns_mhdp_mst_init(mhdp);
+
+ conn->polled = DRM_CONNECTOR_POLL_HPD;
ret = drm_connector_init(bridge->dev, conn, &cdns_mhdp_conn_funcs,
DRM_MODE_CONNECTOR_DisplayPort);
@@ -342,17 +281,12 @@ static int cdns_mhdp_attach(struct drm_bridge *bridge)
return ret;
}
+ /* enable interrupts */
+ writel(~CDNS_APB_INT_MASK_SW_EVENT_INT, mhdp->regs + CDNS_APB_INT_MASK);
+
return 0;
}
-enum pixel_format {
- PIXEL_FORMAT_RGB = 1,
- PIXEL_FORMAT_YCBCR_444 = 2,
- PIXEL_FORMAT_YCBCR_422 = 4,
- PIXEL_FORMAT_YCBCR_420 = 8,
- PIXEL_FORMAT_Y_ONLY = 16,
-};
-
static void mhdp_link_training_init(struct cdns_mhdp_device *mhdp)
{
u32 reg32;
@@ -716,13 +650,11 @@ static int mhdp_link_training(struct cdns_mhdp_device *mhdp,
cdns_mhdp_reg_write(mhdp, CDNS_DP_SW_RESET, 1);
cdns_mhdp_reg_write(mhdp, CDNS_DP_SW_RESET, 0);
- /* Enable framer */
- /* FIXME: update when MST supported, BIT(2) */
cdns_mhdp_reg_write(mhdp, CDNS_DP_FRAMER_GLOBAL_CONFIG,
- CDNS_DP_FRAMER_EN |
CDNS_DP_NUM_LANES(mhdp->link.num_lanes) |
CDNS_DP_DISABLE_PHY_RST |
CDNS_DP_WR_FAILING_EDGE_VSYNC |
+ (mhdp->is_mst ? CDNS_DP_MST_EN : 0) |
(!video_mode ? CDNS_DP_NO_VIDEO_MODE : 0));
/* Reset PHY config */
@@ -751,31 +683,20 @@ static void cdns_mhdp_disable(struct drm_bridge *bridge)
cdns_mhdp_set_video_status(mhdp, 0);
+ mhdp->link_up = false;
+
drm_dp_link_power_down(&mhdp->aux, &mhdp->link);
+ if (mhdp->is_mst)
+ cdns_mhdp_mst_disable(bridge);
}
-static void cdns_mhdp_enable(struct drm_bridge *bridge)
+static int cdns_mhdp_link_up(struct cdns_mhdp_device *mhdp)
{
- struct cdns_mhdp_device *mhdp = bridge_to_mhdp(bridge);
- struct drm_display_mode *mode;
- struct drm_display_info *disp_info = &mhdp->connector.display_info;
- enum pixel_format pxlfmt;
- int pxlclock;
- unsigned int rate, tu_size = 30, vs, vs_f, bpp, required_bandwidth,
- available_bandwidth, dp_framer_sp = 0, msa_horizontal_1,
- msa_vertical_1, bnd_hsync2vsync, hsync2vsync_pol_ctrl,
- misc0 = 0, misc1 = 0, line_thresh = 0, pxl_repr,
- front_porch, back_porch, msa_h0, msa_v0, hsync, vsync,
- dp_vertical_1, line_thresh1, line_thresh2;
u32 resp;
-
- unsigned int size = DP_RECEIVER_CAP_SIZE, dp_framer_global_config,
+ u32 size = DP_RECEIVER_CAP_SIZE, dp_framer_global_config,
video_mode, training_interval_us;
u8 reg0[size], reg8, amp[2];
- mode = &bridge->encoder->crtc->state->adjusted_mode;
- pxlclock = mode->crtc_clock;
-
/*
* Upon power-on reset/device disconnection: [2:0] bits should be 0b001
* and [7:5] bits 0b000.
@@ -824,13 +745,17 @@ static void cdns_mhdp_enable(struct drm_bridge *bridge)
default:
dev_err(mhdp->dev,
"wrong training interval returned by DPCD: %d\n", reg8);
- return;
+ return -EIO;
}
cdns_mhdp_reg_read(mhdp, CDNS_DP_FRAMER_GLOBAL_CONFIG, &resp);
dp_framer_global_config = be32_to_cpu(resp);
+ cdns_mhdp_mst_probe(mhdp);
+ if (mhdp->is_mst)
+ dp_framer_global_config |= CDNS_DP_MST_EN;
+
video_mode = !(dp_framer_global_config & CDNS_DP_NO_VIDEO_MODE);
if (dp_framer_global_config & CDNS_DP_FRAMER_EN)
@@ -850,50 +775,168 @@ static void cdns_mhdp_enable(struct drm_bridge *bridge)
if (mhdp_link_training(mhdp, video_mode,
training_interval_us)) {
dev_err(mhdp->dev, "Link training failed. Exiting.\n");
- return;
+ return -EIO;
}
}
+ mhdp->link_up = true;
+
+ return 0;
+}
+
+static int cdns_mhdp_sst_enable(struct drm_bridge *bridge)
+{
+ struct cdns_mhdp_bridge *mhdp_bridge = to_mhdp_bridge(bridge);
+ struct cdns_mhdp_device *mhdp = mhdp_bridge->mhdp;
+ u32 rate, vs, vs_f, required_bandwidth, available_bandwidth;
+ u32 bpp, tu_size = 30, line_thresh1, line_thresh2, line_thresh = 0;
+ struct drm_display_mode *mode;
+ int pxlclock;
+ enum pixel_format pxlfmt;
+ struct drm_display_info *disp_info = &mhdp->connector.base.display_info;
+
+
+ mode = &bridge->encoder->crtc->state->adjusted_mode;
+ pxlclock = mode->crtc_clock;
+
+ mhdp_bridge->stream_id = 0;
+
rate = mhdp->link.rate / 1000;
+ pxlfmt = cdns_mhdp_get_pxlfmt(disp_info->color_formats);
+ bpp = cdns_mhdp_get_bpp(disp_info->bpc, pxlfmt);
+
+ /* find optimal tu_size */
+ required_bandwidth = pxlclock * bpp / 8;
+ available_bandwidth = mhdp->link.num_lanes * rate;
+ do {
+ tu_size += 2;
+
+ vs_f = tu_size * required_bandwidth / available_bandwidth;
+ vs = vs_f / 1000;
+ vs_f = vs_f % 1000;
+ /*
+ * FIXME (CDNS): downspreading?
+ * It's unused is what I've been told.
+ */
+ } while ((vs == 1 || ((vs_f > 850 || vs_f < 100) && vs_f != 0) ||
+ tu_size - vs < 2) && tu_size < 64);
+
+ if (vs > 64)
+ return -EINVAL;
+
+
+ cdns_mhdp_reg_write(mhdp, CDNS_DP_FRAMER_TU,
+ CDNS_DP_FRAMER_TU_VS(vs) |
+ CDNS_DP_FRAMER_TU_SIZE(tu_size) |
+ CDNS_DP_FRAMER_TU_CNT_RST_EN);
+
+ line_thresh1 = ((vs + 1) << 5) * 8 / bpp;
+ line_thresh2 = (pxlclock << 5) / 1000 / rate * (vs + 1) - (1 << 5);
+ line_thresh = line_thresh1 - line_thresh2 / mhdp->link.num_lanes;
+ line_thresh = (line_thresh >> 5) + 2;
+ cdns_mhdp_reg_write(mhdp, CDNS_DP_LINE_THRESH(0),
+ line_thresh & GENMASK(5, 0));
+
+ cdns_mhdp_reg_write(mhdp, CDNS_DP_STREAM_CONFIG_2(0),
+ CDNS_DP_SC2_TU_VS_DIFF((tu_size - vs > 3) ?
+ 0 : tu_size - vs));
+
+ cdns_mhdp_configure_video(bridge);
+
+ cdns_mhdp_set_video_status(mhdp, 1);
+
+ return 0;
+}
+
+enum pixel_format cdns_mhdp_get_pxlfmt(u32 color_formats)
+{
+ enum pixel_format pxlfmt;
+
/* FIXME: what about Y_ONLY? how is it handled in the kernel? */
- if (disp_info->color_formats & DRM_COLOR_FORMAT_YCRCB444)
+ if (color_formats & DRM_COLOR_FORMAT_YCRCB444)
pxlfmt = PIXEL_FORMAT_YCBCR_444;
- else if (disp_info->color_formats & DRM_COLOR_FORMAT_YCRCB422)
+ else if (color_formats & DRM_COLOR_FORMAT_YCRCB422)
pxlfmt = PIXEL_FORMAT_YCBCR_422;
- else if (disp_info->color_formats & DRM_COLOR_FORMAT_YCRCB420)
+ else if (color_formats & DRM_COLOR_FORMAT_YCRCB420)
pxlfmt = PIXEL_FORMAT_YCBCR_420;
else
pxlfmt = PIXEL_FORMAT_RGB;
+ return pxlfmt;
+}
+
+
+u32 cdns_mhdp_get_bpp(u32 bpc, enum pixel_format pxlfmt)
+{
+ u32 bpp;
+
+ switch (pxlfmt) {
+ case PIXEL_FORMAT_RGB:
+ bpp = bpc * 3;
+ break;
+ case PIXEL_FORMAT_YCBCR_444:
+ bpp = bpc * 3;
+ break;
+ case PIXEL_FORMAT_YCBCR_422:
+ bpp = bpc * 2;
+ break;
+ case PIXEL_FORMAT_YCBCR_420:
+ bpp = bpc * 3 / 2;
+ break;
+ default:
+ bpp = bpc;
+ }
+ return bpp;
+}
+
+void cdns_mhdp_configure_video(struct drm_bridge *bridge)
+{
+ struct cdns_mhdp_bridge *mhdp_bridge = to_mhdp_bridge(bridge);
+ struct cdns_mhdp_device *mhdp = mhdp_bridge->mhdp;
+ struct drm_display_info *disp_info;
+ unsigned int bpp, dp_framer_sp = 0, msa_horizontal_1,
+ msa_vertical_1, bnd_hsync2vsync, hsync2vsync_pol_ctrl,
+ misc0 = 0, misc1 = 0, pxl_repr,
+ front_porch, back_porch, msa_h0, msa_v0, hsync, vsync,
+ dp_vertical_1;
+ struct drm_display_mode *mode;
+ enum pixel_format pxlfmt;
+ int pxlclock;
+ u32 tmp;
+ u8 stream_id = mhdp_bridge->stream_id;
+
+ mode = &bridge->encoder->crtc->state->adjusted_mode;
+ pxlclock = mode->crtc_clock;
+
+ disp_info = &mhdp_bridge->connector->base.display_info;
+ pxlfmt = cdns_mhdp_get_pxlfmt(disp_info->color_formats);
+
/* if YCBCR supported and stream not SD, use ITU709 */
/* FIXME: handle ITU version with YCBCR420 when supported */
if ((pxlfmt == PIXEL_FORMAT_YCBCR_444 ||
pxlfmt == PIXEL_FORMAT_YCBCR_422) && mode->crtc_vdisplay >= 720)
misc0 = DP_YCBCR_COEFFICIENTS_ITU709;
+ bpp = cdns_mhdp_get_bpp(disp_info->bpc, pxlfmt);
+
switch (pxlfmt) {
case PIXEL_FORMAT_RGB:
- bpp = disp_info->bpc * 3;
pxl_repr = CDNS_DP_FRAMER_RGB << CDNS_DP_FRAMER_PXL_FORMAT;
misc0 |= DP_COLOR_FORMAT_RGB;
break;
case PIXEL_FORMAT_YCBCR_444:
- bpp = disp_info->bpc * 3;
pxl_repr = CDNS_DP_FRAMER_YCBCR444 << CDNS_DP_FRAMER_PXL_FORMAT;
misc0 |= DP_COLOR_FORMAT_YCbCr444 | DP_TEST_DYNAMIC_RANGE_CEA;
break;
case PIXEL_FORMAT_YCBCR_422:
- bpp = disp_info->bpc * 2;
pxl_repr = CDNS_DP_FRAMER_YCBCR422 << CDNS_DP_FRAMER_PXL_FORMAT;
misc0 |= DP_COLOR_FORMAT_YCbCr422 | DP_TEST_DYNAMIC_RANGE_CEA;
break;
case PIXEL_FORMAT_YCBCR_420:
- bpp = disp_info->bpc * 3 / 2;
pxl_repr = CDNS_DP_FRAMER_YCBCR420 << CDNS_DP_FRAMER_PXL_FORMAT;
break;
default:
- bpp = disp_info->bpc;
pxl_repr = CDNS_DP_FRAMER_Y_ONLY << CDNS_DP_FRAMER_PXL_FORMAT;
}
@@ -920,30 +963,12 @@ static void cdns_mhdp_enable(struct drm_bridge *bridge)
break;
}
- /* find optimal tu_size */
- required_bandwidth = pxlclock * bpp / 8;
- available_bandwidth = mhdp->link.num_lanes * rate;
- do {
- tu_size += 2;
-
- vs_f = tu_size * required_bandwidth / available_bandwidth;
- vs = vs_f / 1000;
- vs_f = vs_f % 1000;
- /*
- * FIXME (CDNS): downspreading?
- * It's unused is what I've been told.
- */
- } while ((vs == 1 || ((vs_f > 850 || vs_f < 100) && vs_f != 0) ||
- tu_size - vs < 2) && tu_size < 64);
-
- if (vs > 64)
- return;
-
bnd_hsync2vsync = CDNS_IP_BYPASS_V_INTERFACE;
if (mode->flags & DRM_MODE_FLAG_INTERLACE)
bnd_hsync2vsync |= CDNS_IP_DET_INTERLACE_FORMAT;
- cdns_mhdp_reg_write(mhdp, CDNS_BND_HSYNC2VSYNC, bnd_hsync2vsync);
+ cdns_mhdp_reg_write(mhdp, CDNS_BND_HSYNC2VSYNC(stream_id),
+ bnd_hsync2vsync);
if (mode->flags & DRM_MODE_FLAG_INTERLACE &&
mode->flags & DRM_MODE_FLAG_PHSYNC)
@@ -952,15 +977,10 @@ static void cdns_mhdp_enable(struct drm_bridge *bridge)
else
hsync2vsync_pol_ctrl = 0;
- cdns_mhdp_reg_write(mhdp, CDNS_HSYNC2VSYNC_POL_CTRL,
+ cdns_mhdp_reg_write(mhdp, CDNS_HSYNC2VSYNC_POL_CTRL(stream_id),
hsync2vsync_pol_ctrl);
- cdns_mhdp_reg_write(mhdp, CDNS_DP_FRAMER_TU,
- CDNS_DP_FRAMER_TU_VS(vs) |
- CDNS_DP_FRAMER_TU_SIZE(tu_size) |
- CDNS_DP_FRAMER_TU_CNT_RST_EN);
-
- cdns_mhdp_reg_write(mhdp, CDNS_DP_FRAMER_PXL_REPR, pxl_repr);
+ cdns_mhdp_reg_write(mhdp, CDNS_DP_FRAMER_PXL_REPR(stream_id), pxl_repr);
if (mode->flags & DRM_MODE_FLAG_INTERLACE)
dp_framer_sp |= CDNS_DP_FRAMER_INTERLACE;
@@ -968,19 +988,19 @@ static void cdns_mhdp_enable(struct drm_bridge *bridge)
dp_framer_sp |= CDNS_DP_FRAMER_HSYNC_POL_LOW;
if (mode->flags & DRM_MODE_FLAG_NVSYNC)
dp_framer_sp |= CDNS_DP_FRAMER_VSYNC_POL_LOW;
- cdns_mhdp_reg_write(mhdp, CDNS_DP_FRAMER_SP, dp_framer_sp);
+ cdns_mhdp_reg_write(mhdp, CDNS_DP_FRAMER_SP(stream_id), dp_framer_sp);
front_porch = mode->crtc_hsync_start - mode->crtc_hdisplay;
back_porch = mode->crtc_htotal - mode->crtc_hsync_end;
- cdns_mhdp_reg_write(mhdp, CDNS_DP_FRONT_BACK_PORCH,
+ cdns_mhdp_reg_write(mhdp, CDNS_DP_FRONT_BACK_PORCH(stream_id),
CDNS_DP_FRONT_PORCH(front_porch) |
CDNS_DP_BACK_PORCH(back_porch));
- cdns_mhdp_reg_write(mhdp, CDNS_DP_BYTE_COUNT,
+ cdns_mhdp_reg_write(mhdp, CDNS_DP_BYTE_COUNT(stream_id),
mode->crtc_hdisplay * bpp / 8);
msa_h0 = mode->crtc_htotal - mode->crtc_hsync_start;
- cdns_mhdp_reg_write(mhdp, CDNS_DP_MSA_HORIZONTAL_0,
+ cdns_mhdp_reg_write(mhdp, CDNS_DP_MSA_HORIZONTAL_0(stream_id),
CDNS_DP_MSAH0_H_TOTAL(mode->crtc_htotal) |
CDNS_DP_MSAH0_HSYNC_START(msa_h0));
@@ -989,11 +1009,11 @@ static void cdns_mhdp_enable(struct drm_bridge *bridge)
CDNS_DP_MSAH1_HDISP_WIDTH(mode->crtc_hdisplay);
if (mode->flags & DRM_MODE_FLAG_NHSYNC)
msa_horizontal_1 |= CDNS_DP_MSAH1_HSYNC_POL_LOW;
- cdns_mhdp_reg_write(mhdp, CDNS_DP_MSA_HORIZONTAL_1,
+ cdns_mhdp_reg_write(mhdp, CDNS_DP_MSA_HORIZONTAL_1(stream_id),
msa_horizontal_1);
msa_v0 = mode->crtc_vtotal - mode->crtc_vsync_start;
- cdns_mhdp_reg_write(mhdp, CDNS_DP_MSA_VERTICAL_0,
+ cdns_mhdp_reg_write(mhdp, CDNS_DP_MSA_VERTICAL_0(stream_id),
CDNS_DP_MSAV0_V_TOTAL(mode->crtc_vtotal) |
CDNS_DP_MSAV0_VSYNC_START(msa_v0));
@@ -1002,7 +1022,8 @@ static void cdns_mhdp_enable(struct drm_bridge *bridge)
CDNS_DP_MSAV1_VDISP_WIDTH(mode->crtc_vdisplay);
if (mode->flags & DRM_MODE_FLAG_NVSYNC)
msa_vertical_1 |= CDNS_DP_MSAV1_VSYNC_POL_LOW;
- cdns_mhdp_reg_write(mhdp, CDNS_DP_MSA_VERTICAL_1, msa_vertical_1);
+ cdns_mhdp_reg_write(mhdp, CDNS_DP_MSA_VERTICAL_1(stream_id),
+ msa_vertical_1);
if ((mode->flags & DRM_MODE_FLAG_INTERLACE) &&
mode->crtc_vtotal % 2 == 0)
@@ -1014,16 +1035,14 @@ static void cdns_mhdp_enable(struct drm_bridge *bridge)
if (pxlfmt == PIXEL_FORMAT_YCBCR_420)
misc1 = CDNS_DP_TEST_VSC_SDP;
- cdns_mhdp_reg_write(mhdp, CDNS_DP_MSA_MISC, misc0 | (misc1 << 8));
+ cdns_mhdp_reg_write(mhdp, CDNS_DP_MSA_MISC(stream_id),
+ misc0 | (misc1 << 8));
- /* FIXME: to be changed if MST mode */
- cdns_mhdp_reg_write(mhdp, CDNS_DP_STREAM_CONFIG, 1);
-
- cdns_mhdp_reg_write(mhdp, CDNS_DP_HORIZONTAL,
+ cdns_mhdp_reg_write(mhdp, CDNS_DP_HORIZONTAL(stream_id),
CDNS_DP_H_HSYNC_WIDTH(hsync) |
CDNS_DP_H_H_TOTAL(mode->crtc_hdisplay));
- cdns_mhdp_reg_write(mhdp, CDNS_DP_VERTICAL_0,
+ cdns_mhdp_reg_write(mhdp, CDNS_DP_VERTICAL_0(stream_id),
CDNS_DP_V0_VHEIGHT(mode->crtc_vdisplay) |
CDNS_DP_V0_VSTART(msa_v0));
@@ -1032,30 +1051,51 @@ static void cdns_mhdp_enable(struct drm_bridge *bridge)
mode->crtc_vtotal % 2 == 0)
dp_vertical_1 |= CDNS_DP_V1_VTOTAL_EVEN;
- cdns_mhdp_reg_write(mhdp, CDNS_DP_VERTICAL_1, dp_vertical_1);
+ cdns_mhdp_reg_write(mhdp, CDNS_DP_VERTICAL_1(stream_id), dp_vertical_1);
- cdns_mhdp_reg_write_bit(mhdp, CDNS_DP_VB_ID, 2, 1,
+ cdns_mhdp_reg_write_bit(mhdp, CDNS_DP_VB_ID(stream_id), 2, 1,
(mode->flags & DRM_MODE_FLAG_INTERLACE) ?
CDNS_DP_VB_ID_INTERLACED : 0);
- line_thresh1 = ((vs + 1) << 5) * 8 / bpp;
- line_thresh2 = (pxlclock << 5) / 1000 / rate * (vs + 1) - (1 << 5);
- line_thresh = line_thresh1 - line_thresh2 / mhdp->link.num_lanes;
- line_thresh = (line_thresh >> 5) + 2;
- cdns_mhdp_reg_write(mhdp, CDNS_DP_LINE_THRESH,
- line_thresh & GENMASK(5, 0));
- cdns_mhdp_reg_write(mhdp, CDNS_DP_RATE_GOVERNOR_STATUS,
- CDNS_DP_RG_TU_VS_DIFF((tu_size - vs > 3) ?
- 0 : tu_size - vs));
+ cdns_mhdp_reg_read(mhdp, CDNS_DP_FRAMER_GLOBAL_CONFIG, &tmp);
+ tmp |= CDNS_DP_FRAMER_EN;
+ cdns_mhdp_reg_write(mhdp, CDNS_DP_FRAMER_GLOBAL_CONFIG, tmp);
+}
- cdns_mhdp_set_video_status(mhdp, 1);
+void cdns_mhdp_enable(struct drm_bridge *bridge)
+{
+ struct cdns_mhdp_bridge *mhdp_bridge = to_mhdp_bridge(bridge);
+ struct cdns_mhdp_device *mhdp = mhdp_bridge->mhdp;
+ int ret = 0;
+
+ bool link_up = mhdp->link_up;
+
+ if (!link_up)
+ cdns_mhdp_link_up(mhdp);
+
+
+ if (!mhdp->is_mst)
+ ret = cdns_mhdp_sst_enable(bridge);
+ else
+ cdns_mhdp_mst_enable(bridge);
+
+}
+
+static void cdns_mhdp_detach(struct drm_bridge *bridge)
+{
+ struct cdns_mhdp_device *mhdp = bridge_to_mhdp(bridge);
+ struct cdns_mhdp_mst_cbs cbs_null = {0};
+
+ cdns_mhdp_mst_deinit(mhdp);
+ mhdp->cbs = cbs_null;
}
static const struct drm_bridge_funcs cdns_mhdp_bridge_funcs = {
.enable = cdns_mhdp_enable,
.disable = cdns_mhdp_disable,
.attach = cdns_mhdp_attach,
+ .detach = cdns_mhdp_detach,
};
static int load_firmware(struct cdns_mhdp_device *mhdp, const char *name,
@@ -1127,8 +1167,8 @@ static int cdns_mhdp_audio_get_eld(struct device *dev, void *data,
{
struct cdns_mhdp_device *mhdp = dev_get_drvdata(dev);
- memcpy(buf, mhdp->connector.eld,
- min(sizeof(mhdp->connector.eld), len));
+ memcpy(buf, mhdp->connector.base.eld,
+ min(sizeof(mhdp->connector.base.eld), len));
return 0;
}
@@ -1149,6 +1189,7 @@ static int mhdp_probe(struct platform_device *pdev)
unsigned int reg;
unsigned long rate;
u32 resp;
+ int irq;
struct hdmi_codec_pdata codec_data = {
.i2s = 1,
@@ -1192,6 +1233,14 @@ static int mhdp_probe(struct platform_device *pdev)
/* Leave debug mode */
writel(0, mhdp->regs + CDNS_APB_CTRL);
+ irq = platform_get_irq(pdev, 0);
+ ret = request_irq(irq, mhdp_irq_handler, 0, "mhdp8546", mhdp);
+ if (ret) {
+ dev_err(&pdev->dev,
+ "cannot install IRQ %d\n", irq);
+ return -EIO;
+ }
+
/*
* Wait for the KEEP_ALIVE "message" on the first 8 bits.
* Updated each sched "tick" (~2ms)
@@ -1222,8 +1271,8 @@ static int mhdp_probe(struct platform_device *pdev)
mhdp->host.lane_mapping = CDNS_LANE_MAPPING_FLIPPED;
mhdp->host.enhanced = true;
- mhdp->bridge.of_node = pdev->dev.of_node;
- mhdp->bridge.funcs = &cdns_mhdp_bridge_funcs;
+ mhdp->bridge.base.of_node = pdev->dev.of_node;
+ mhdp->bridge.base.funcs = &cdns_mhdp_bridge_funcs;
/* Init events to 0 as it's not cleared by FW at boot but on read */
readl(mhdp->regs + CDNS_SW_EVENT0);
@@ -1247,21 +1296,14 @@ static int mhdp_probe(struct platform_device *pdev)
cdns_mhdp_reg_write(mhdp, CDNS_DPTX_CAR,
resp | CDNS_VIF_CLK_EN | CDNS_VIF_CLK_RSTN);
- /* Loop over HDP change */
- /*
- * FIXME: does not work when put in mhdp_bridge_enable.
- * Where should we put it?
- */
- /* Is it still needed with use of mb message HPD STATUS? */
- ret = readl_poll_timeout(mhdp->regs + CDNS_SW_EVENT0, reg,
- reg & CDNS_DPTX_HPD, 500,
- CDNS_SW_EVENT0_TIMEOUT);
- if (ret) {
- dev_err(mhdp->dev, "no HPD received %d\n", reg);
- return -ENODEV;
- }
+ INIT_DELAYED_WORK(&mhdp->hotplug_work, mhdp_hotplug_work_func);
+
+ mhdp->bridge.connector = &mhdp->connector;
+ mhdp->connector.bridge = &mhdp->bridge;
+ mhdp->bridge.mhdp = mhdp;
+ mhdp->bridge.is_active = false;
- drm_bridge_add(&mhdp->bridge);
+ drm_bridge_add(&mhdp->bridge.base);
return 0;
}
@@ -1273,9 +1315,11 @@ static int mhdp_remove(struct platform_device *pdev)
struct cdns_mhdp_device *mhdp = dev_get_drvdata(&pdev->dev);
int ret;
+ flush_delayed_work(&mhdp->hotplug_work);
platform_device_unregister(mhdp->audio_pdev);
- drm_bridge_remove(&mhdp->bridge);
+ cdns_mhdp_mst_deinit(mhdp);
+ drm_bridge_remove(&mhdp->bridge.base);
ret = cdns_mhdp_set_firmware_active(mhdp, false);
if (ret) {
@@ -1288,6 +1332,17 @@ static int mhdp_remove(struct platform_device *pdev)
return 0;
}
+int mhdp_bridge_attach_mst_cbs(struct drm_bridge *bridge,
+ struct cdns_mhdp_mst_cbs *cbs)
+{
+ struct cdns_mhdp_device *mhdp = bridge_to_mhdp(bridge);
+
+ mhdp->cbs = *cbs;
+
+ return 0;
+}
+EXPORT_SYMBOL_GPL(mhdp_bridge_attach_mst_cbs);
+
static struct platform_driver mhdp_driver = {
.driver = {
.name = "cdns-mhdp",
@@ -1299,6 +1354,9 @@ static struct platform_driver mhdp_driver = {
module_platform_driver(mhdp_driver);
MODULE_AUTHOR("Quentin Schulz <quentin.schulz@free-electrons.com>");
+MODULE_AUTHOR("Przemyslaw Gaj <pgaj@cadence.com>");
+MODULE_AUTHOR("Damian Kos <dkos@cadence.com>");
+MODULE_AUTHOR("Piotr Sroka <piotrs@cadence.com>");
MODULE_DESCRIPTION("Cadence MHDP DP bridge driver");
MODULE_LICENSE("GPL");
MODULE_ALIAS("platform:cdns-mhdp");
diff --git a/drivers/gpu/drm/bridge/cdns-mhdp.h b/drivers/gpu/drm/bridge/cdns-mhdp.h
new file mode 100644
index 000000000000..abc1fa3f51a6
--- /dev/null
+++ b/drivers/gpu/drm/bridge/cdns-mhdp.h
@@ -0,0 +1,209 @@
+/* SPDX-License-Identifier: GPL v2 */
+/*
+ * Cadence MHDP DP MST bridge driver.
+ *
+ * Copyright: 2018 Cadence Design Systems, Inc.
+ *
+ * Author: Quentin Schulz <quentin.schulz@free-electrons.com>
+ */
+
+
+#ifndef CDNS_MHDP_H
+#define CDNS_MHDP_H
+
+#include <drm/drm_dp_mst_helper.h>
+
+#define CDNS_APB_CFG 0x00000
+#define CDNS_APB_CTRL (CDNS_APB_CFG + 0x00)
+#define CDNS_MAILBOX_FULL (CDNS_APB_CFG + 0x08)
+#define CDNS_MAILBOX_EMPTY (CDNS_APB_CFG + 0x0c)
+#define CDNS_MAILBOX_TX_DATA (CDNS_APB_CFG + 0x10)
+#define CDNS_MAILBOX_RX_DATA (CDNS_APB_CFG + 0x14)
+#define CDNS_KEEP_ALIVE (CDNS_APB_CFG + 0x18)
+#define CDNS_KEEP_ALIVE_MASK GENMASK(7, 0)
+
+#define CDNS_MB_INT_MASK (CDNS_APB_CFG + 0x34)
+
+#define CDNS_SW_CLK_L (CDNS_APB_CFG + 0x3c)
+#define CDNS_SW_CLK_H (CDNS_APB_CFG + 0x40)
+#define CDNS_SW_EVENT0 (CDNS_APB_CFG + 0x44)
+#define CDNS_DPTX_HPD BIT(0)
+
+#define CDNS_SW_EVENT1 (CDNS_APB_CFG + 0x48)
+#define CDNS_SW_EVENT2 (CDNS_APB_CFG + 0x4c)
+#define CDNS_SW_EVENT3 (CDNS_APB_CFG + 0x50)
+
+#define CDNS_APB_INT_MASK (CDNS_APB_CFG + 0x6C)
+#define CDNS_APB_INT_MASK_MAILBOX_INT BIT(0)
+#define CDNS_APB_INT_MASK_SW_EVENT_INT BIT(1)
+
+#define CDNS_DPTX_CAR (CDNS_APB_CFG + 0x904)
+#define CDNS_VIF_CLK_EN BIT(0)
+#define CDNS_VIF_CLK_RSTN BIT(1)
+
+#define CDNS_SOURCE_VIDEO_IF(s) (0x00b00 + (s * 0x20))
+#define CDNS_BND_HSYNC2VSYNC(s) (CDNS_SOURCE_VIDEO_IF(s) + \
+ 0x00)
+#define CDNS_IP_DTCT_WIN GENMASK(11, 0)
+#define CDNS_IP_DET_INTERLACE_FORMAT BIT(12)
+#define CDNS_IP_BYPASS_V_INTERFACE BIT(13)
+
+#define CDNS_HSYNC2VSYNC_POL_CTRL(s) (CDNS_SOURCE_VIDEO_IF(s) + \
+ 0x10)
+#define CDNS_H2V_HSYNC_POL_ACTIVE_LOW BIT(1)
+#define CDNS_H2V_VSYNC_POL_ACTIVE_LOW BIT(2)
+
+#define CDNS_DPTX_PHY_CONFIG 0x02000
+#define CDNS_PHY_TRAINING_EN BIT(0)
+#define CDNS_PHY_TRAINING_TYPE(x) (((x) & GENMASK(3, 0)) << 1)
+#define CDNS_PHY_SCRAMBLER_BYPASS BIT(5)
+#define CDNS_PHY_ENCODER_BYPASS BIT(6)
+#define CDNS_PHY_SKEW_BYPASS BIT(7)
+#define CDNS_PHY_TRAINING_AUTO BIT(8)
+#define CDNS_PHY_LANE0_SKEW(x) (((x) & GENMASK(2, 0)) << 9)
+#define CDNS_PHY_LANE1_SKEW(x) (((x) & GENMASK(2, 0)) << 12)
+#define CDNS_PHY_LANE2_SKEW(x) (((x) & GENMASK(2, 0)) << 15)
+#define CDNS_PHY_LANE3_SKEW(x) (((x) & GENMASK(2, 0)) << 18)
+#define CDNS_PHY_COMMON_CONFIG (CDNS_PHY_LANE1_SKEW(1) | \
+ CDNS_PHY_LANE2_SKEW(2) | \
+ CDNS_PHY_LANE3_SKEW(3))
+#define CDNS_PHY_10BIT_EN BIT(21)
+
+#define CDNS_DPTX_FRAMER 0x02200
+#define CDNS_DP_FRAMER_GLOBAL_CONFIG (CDNS_DPTX_FRAMER + 0x00)
+#define CDNS_DP_NUM_LANES(x) (x - 1)
+#define CDNS_DP_MST_EN BIT(2)
+#define CDNS_DP_FRAMER_EN BIT(3)
+#define CDNS_DP_RATE_GOVERNOR_EN BIT(4)
+#define CDNS_DP_NO_VIDEO_MODE BIT(5)
+#define CDNS_DP_DISABLE_PHY_RST BIT(6)
+#define CDNS_DP_WR_FAILING_EDGE_VSYNC BIT(7)
+
+#define CDNS_DP_SW_RESET (CDNS_DPTX_FRAMER + 0x04)
+#define CDNS_DP_FRAMER_TU (CDNS_DPTX_FRAMER + 0x08)
+#define CDNS_DP_FRAMER_TU_SIZE(x) (((x) & GENMASK(6, 0)) << 8)
+#define CDNS_DP_FRAMER_TU_VS(x) ((x) & GENMASK(5, 0))
+#define CDNS_DP_FRAMER_TU_CNT_RST_EN BIT(15)
+
+#define CDNS_DPTX_STREAM(s) (0x03000 + s * 0x80)
+#define CDNS_DP_MSA_HORIZONTAL_0(s) (CDNS_DPTX_STREAM(s) + 0x00)
+#define CDNS_DP_MSAH0_H_TOTAL(x) (x)
+#define CDNS_DP_MSAH0_HSYNC_START(x) ((x) << 16)
+
+#define CDNS_DP_MSA_HORIZONTAL_1(s) (CDNS_DPTX_STREAM(s) + 0x04)
+#define CDNS_DP_MSAH1_HSYNC_WIDTH(x) (x)
+#define CDNS_DP_MSAH1_HSYNC_POL_LOW BIT(15)
+#define CDNS_DP_MSAH1_HDISP_WIDTH(x) ((x) << 16)
+
+#define CDNS_DP_MSA_VERTICAL_0(s) (CDNS_DPTX_STREAM(s) + 0x08)
+#define CDNS_DP_MSAV0_V_TOTAL(x) (x)
+#define CDNS_DP_MSAV0_VSYNC_START(x) ((x) << 16)
+
+#define CDNS_DP_MSA_VERTICAL_1(s) (CDNS_DPTX_STREAM(s) + 0x0c)
+#define CDNS_DP_MSAV1_VSYNC_WIDTH(x) (x)
+#define CDNS_DP_MSAV1_VSYNC_POL_LOW BIT(15)
+#define CDNS_DP_MSAV1_VDISP_WIDTH(x) ((x) << 16)
+
+#define CDNS_DP_MSA_MISC(s) (CDNS_DPTX_STREAM(s) + 0x10)
+#define CDNS_DP_STREAM_CONFIGs(s) (CDNS_DPTX_STREAM(s) + 0x14)
+#define CDNS_DP_STREAM_CONFIG_2(s) (CDNS_DPTX_STREAM(s) + 0x2c)
+#define CDNS_DP_SC2_TU_VS_DIFF(x) ((x) << 8)
+
+#define CDNS_DP_HORIZONTAL(s) (CDNS_DPTX_STREAM(s) + 0x30)
+#define CDNS_DP_H_HSYNC_WIDTH(x) (x)
+#define CDNS_DP_H_H_TOTAL(x) ((x) << 16)
+
+#define CDNS_DP_VERTICAL_0(s) (CDNS_DPTX_STREAM(s) + 0x34)
+#define CDNS_DP_V0_VHEIGHT(x) (x)
+#define CDNS_DP_V0_VSTART(x) ((x) << 16)
+
+#define CDNS_DP_VERTICAL_1(s) (CDNS_DPTX_STREAM(s) + 0x38)
+#define CDNS_DP_V1_VTOTAL(x) (x)
+#define CDNS_DP_V1_VTOTAL_EVEN BIT(16)
+
+#define CDNS_DP_FRAMER_PXL_REPR(s) (CDNS_DPTX_STREAM(s) + 0x4c)
+#define CDNS_DP_FRAMER_6_BPC BIT(0)
+#define CDNS_DP_FRAMER_8_BPC BIT(1)
+#define CDNS_DP_FRAMER_10_BPC BIT(2)
+#define CDNS_DP_FRAMER_12_BPC BIT(3)
+#define CDNS_DP_FRAMER_16_BPC BIT(4)
+#define CDNS_DP_FRAMER_PXL_FORMAT 0x8
+#define CDNS_DP_FRAMER_RGB BIT(0)
+#define CDNS_DP_FRAMER_YCBCR444 BIT(1)
+#define CDNS_DP_FRAMER_YCBCR422 BIT(2)
+#define CDNS_DP_FRAMER_YCBCR420 BIT(3)
+#define CDNS_DP_FRAMER_Y_ONLY BIT(4)
+
+#define CDNS_DP_FRAMER_SP(s) (CDNS_DPTX_STREAM(s) + 0x10)
+#define CDNS_DP_FRAMER_VSYNC_POL_LOW BIT(0)
+#define CDNS_DP_FRAMER_HSYNC_POL_LOW BIT(1)
+#define CDNS_DP_FRAMER_INTERLACE BIT(2)
+
+#define CDNS_DP_LINE_THRESH(s) (CDNS_DPTX_STREAM(s) + 0x64)
+#define CDNS_DP_ACTIVE_LINE_THRESH(x) (x)
+
+#define CDNS_DP_VB_ID(s) (CDNS_DPTX_STREAM(s) + 0x68)
+#define CDNS_DP_VB_ID_INTERLACED BIT(2)
+#define CDNS_DP_VB_ID_COMPRESSED BIT(6)
+
+#define CDNS_DP_FRONT_BACK_PORCH(s) (CDNS_DPTX_STREAM(s) + 0x78)
+#define CDNS_DP_BACK_PORCH(x) (x)
+#define CDNS_DP_FRONT_PORCH(x) ((x) << 16)
+
+#define CDNS_DP_BYTE_COUNT(s) (CDNS_DPTX_STREAM(s) + 0x7c)
+#define CDNS_DP_BYTE_COUNT_BYTES_IN_CHUNK_SHIFT 16
+
+#define CDNS_DP_MST_STREAM_CONFIG(s) (CDNS_DPTX_STREAM(s) + 0x14)
+#define CDNS_DP_MST_STRM_CFG_STREAM_EN BIT(0)
+#define CDNS_DP_MST_STRM_CFG_NO_VIDEO BIT(1)
+
+#define CDNS_DP_MST_SLOT_ALLOCATE(s) (CDNS_DPTX_STREAM(s) + 0x44)
+#define CDNS_DP_S_ALLOC_START_SLOT(x) (x)
+#define CDNS_DP_S_ALLOC_END_SLOT(x) ((x) << 8)
+
+#define CDNS_DP_RATE_GOVERNING(s) (CDNS_DPTX_STREAM(s) + 0x48)
+#define CDNS_DP_RG_TARG_AV_SLOTS_Y(x) (x)
+#define CDNS_DP_RG_TARG_AV_SLOTS_X(x) (x << 4)
+#define CDNS_DP_RG_ENABLE BIT(10)
+
+#define CDNS_DP_MTPH_CONTROL 0x2264
+#define CDNS_DP_MTPH_ECF_EN BIT(0)
+#define CDNS_DP_MTPH_ACT_EN BIT(1)
+#define CDNS_DP_MTPH_LVP_EN BIT(2)
+
+#define CDNS_DP_MTPH_STATUS 0x226C
+#define CDNS_DP_MTPH_ACT_STATUS BIT(0)
+
+
+#define CDNS_DPTX_GLOBAL 0x02300
+#define CDNS_DP_LANE_EN (CDNS_DPTX_GLOBAL + 0x00)
+#define CDNS_DP_LANE_EN_LANES(x) GENMASK(x - 1, 0)
+#define CDNS_DP_ENHNCD (CDNS_DPTX_GLOBAL + 0x04)
+
+
+#define to_mhdp_connector(x) container_of(x, struct cdns_mhdp_connector, base)
+#define to_mhdp_bridge(x) container_of(x, struct cdns_mhdp_bridge, base)
+#define mgr_to_mhdp(x) container_of(x, struct cdns_mhdp_device, mst_mgr)
+
+#define CDNS_MHDP_MAX_STREAMS 4
+
+enum pixel_format {
+ PIXEL_FORMAT_RGB = 1,
+ PIXEL_FORMAT_YCBCR_444 = 2,
+ PIXEL_FORMAT_YCBCR_422 = 4,
+ PIXEL_FORMAT_YCBCR_420 = 8,
+ PIXEL_FORMAT_Y_ONLY = 16,
+};
+
+
+int cdns_mhdp_mst_init(struct cdns_mhdp_device *mhdp);
+void cdns_mhdp_mst_deinit(struct cdns_mhdp_device *mhdp);
+bool cdns_mhdp_mst_probe(struct cdns_mhdp_device *mhdp);
+enum pixel_format cdns_mhdp_get_pxlfmt(u32 color_formats);
+u32 cdns_mhdp_get_bpp(u32 bpc, u32 color_formats);
+void cdns_mhdp_configure_video(struct drm_bridge *bridge);
+void cdns_mhdp_mst_enable(struct drm_bridge *bridge);
+void cdns_mhdp_mst_disable(struct drm_bridge *bridge);
+void cdns_mhdp_enable(struct drm_bridge *bridge);
+
+#endif
diff --git a/drivers/gpu/drm/rockchip/cdn-dp-core.c b/drivers/gpu/drm/rockchip/cdn-dp-core.c
index 343f381e3440..a5a668f1912b 100644
--- a/drivers/gpu/drm/rockchip/cdn-dp-core.c
+++ b/drivers/gpu/drm/rockchip/cdn-dp-core.c
@@ -34,7 +34,7 @@
#include "rockchip_drm_vop.h"
#define connector_to_dp(c) \
- container_of(c, struct cdn_dp_device, mhdp.connector)
+ container_of(c, struct cdn_dp_device, mhdp.connector.base)
#define encoder_to_dp(c) \
container_of(c, struct cdn_dp_device, encoder)
@@ -291,7 +291,7 @@ static int cdn_dp_connector_mode_valid(struct drm_connector *connector,
{
struct cdn_dp_device *dp = connector_to_dp(connector);
struct drm_display_info *display_info =
- &dp->mhdp.connector.display_info;
+ &dp->mhdp.connector.base.display_info;
u32 requested, actual, rate, sink_max, source_max = 0;
u8 lanes, bpc;
@@ -387,7 +387,7 @@ static int cdn_dp_get_sink_capability(struct cdn_dp_device *dp)
}
kfree(dp->edid);
- dp->edid = drm_do_get_edid(&dp->mhdp.connector,
+ dp->edid = drm_do_get_edid(&dp->mhdp.connector.base,
cdns_mhdp_get_edid_block, &dp->mhdp);
return 0;
}
@@ -559,7 +559,7 @@ static void cdn_dp_encoder_mode_set(struct drm_encoder *encoder,
{
struct cdn_dp_device *dp = encoder_to_dp(encoder);
struct drm_display_info *display_info =
- &dp->mhdp.connector.display_info;
+ &dp->mhdp.connector.base.display_info;
struct video_info *video = &dp->mhdp.video_info;
switch (display_info->bpc) {
@@ -863,8 +863,8 @@ static int cdn_dp_audio_get_eld(struct device *dev, void *data,
{
struct cdn_dp_device *dp = dev_get_drvdata(dev);
- memcpy(buf, dp->mhdp.connector.eld,
- min(sizeof(dp->mhdp.connector.eld), len));
+ memcpy(buf, dp->mhdp.connector.base.eld,
+ min(sizeof(dp->mhdp.connector.base.eld), len));
return 0;
}
@@ -936,7 +936,7 @@ static void cdn_dp_pd_event_work(struct work_struct *work)
{
struct cdn_dp_device *dp = container_of(work, struct cdn_dp_device,
event_work);
- struct drm_connector *connector = &dp->mhdp.connector;
+ struct drm_connector *connector = &dp->mhdp.connector.base;
enum drm_connector_status old_status;
struct device *dev = dp->mhdp.dev;
@@ -1062,7 +1062,7 @@ static int cdn_dp_bind(struct device *dev, struct device *master, void *data)
drm_encoder_helper_add(encoder, &cdn_dp_encoder_helper_funcs);
- connector = &dp->mhdp.connector;
+ connector = &dp->mhdp.connector.base;
connector->polled = DRM_CONNECTOR_POLL_HPD;
connector->dpms = DRM_MODE_DPMS_OFF;
@@ -1113,7 +1113,7 @@ 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;
- struct drm_connector *connector = &dp->mhdp.connector;
+ struct drm_connector *connector = &dp->mhdp.connector.base;
cancel_work_sync(&dp->event_work);
cdn_dp_encoder_disable(encoder);
diff --git a/include/drm/bridge/cdns-mhdp-cbs.h b/include/drm/bridge/cdns-mhdp-cbs.h
new file mode 100644
index 000000000000..af07cbfcb729
--- /dev/null
+++ b/include/drm/bridge/cdns-mhdp-cbs.h
@@ -0,0 +1,27 @@
+/* SPDX-License-Identifier: GPL v2 */
+/*
+ * Cadence MHDP DP bridge callbacks.
+ *
+ * Copyright: 2018 Cadence Design Systems, Inc.
+ *
+ * Author: Piotr Sroka <piotrs@cadence.com>
+ */
+
+#ifndef CDNS_MHDP_CBS_H
+#define CDNS_MHDP_CBS_H
+
+struct cdns_mhdp_mst_cbs_funcs {
+ struct drm_encoder *(*create_mst_encoder)(void *priv_data,
+ struct drm_bridge *bridge);
+ void (*destroy_mst_encoder)(void *priv_data, struct drm_bridge *bridge);
+};
+
+struct cdns_mhdp_mst_cbs {
+ struct cdns_mhdp_mst_cbs_funcs funcs;
+ void *priv_data;
+};
+
+int mhdp_bridge_attach_mst_cbs(struct drm_bridge *bridge,
+ struct cdns_mhdp_mst_cbs *cbs);
+
+#endif
diff --git a/include/drm/bridge/cdns-mhdp-common.h b/include/drm/bridge/cdns-mhdp-common.h
index c5a5c4fa7fc4..d4711091ff2b 100644
--- a/include/drm/bridge/cdns-mhdp-common.h
+++ b/include/drm/bridge/cdns-mhdp-common.h
@@ -15,10 +15,12 @@
#ifndef CDNS_MHDP_COMMON_H_
#define CDNS_MHDP_COMMON_H_
+#include <drm/drm_dp_mst_helper.h>
#include <linux/bitops.h>
#include <drm/drm_dp_helper.h>
#include <drm/drm_connector.h>
#include <drm/drm_bridge.h>
+#include <drm/bridge/cdns-mhdp-cbs.h>
#define ADDR_IMEM 0x10000
#define ADDR_DMEM 0x20000
@@ -326,11 +328,11 @@
#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 GENERAL_REGISTER_READ 0x07
+#define GENERAL_MAIN_CONTROL 0x01
+#define GENERAL_TEST_ECHO 0x02
+#define GENERAL_BUS_SETTINGS 0x03
+#define GENERAL_TEST_ACCESS 0x04
+#define GENERAL_REGISTER_READ 0x07
#define DPTX_SET_POWER_MNG 0x00
#define DPTX_SET_HOST_CAPABILITIES 0x01
@@ -512,13 +514,34 @@ struct cdns_mhdp_sink {
u8 enhanced;
};
+struct cdns_mhdp_bridge;
+struct cdns_mhdp_connector;
+
+struct cdns_mhdp_bridge {
+ struct cdns_mhdp_device *mhdp;
+ struct drm_bridge base;
+ int pbn;
+ int8_t stream_id;
+ struct cdns_mhdp_connector *connector;
+ bool is_active;
+};
+
+
+struct cdns_mhdp_connector {
+ struct drm_connector base;
+ bool is_mst_connector;
+ struct drm_dp_mst_port *port;
+ struct cdns_mhdp_bridge *bridge;
+};
+
+
struct cdns_mhdp_device {
void __iomem *regs;
struct device *dev;
struct drm_dp_link link;
- struct drm_connector connector;
+ struct cdns_mhdp_connector connector;
struct clk *spdif_clk;
struct reset_control *spdif_rst;
@@ -528,13 +551,22 @@ struct cdns_mhdp_device {
struct drm_dp_aux aux;
struct cdns_mhdp_host host;
struct cdns_mhdp_sink sink;
- struct drm_bridge bridge;
+ struct cdns_mhdp_bridge bridge;
struct phy *phy;
void __iomem *dbg_regs;
struct video_info video_info;
struct drm_display_mode mode;
unsigned int fw_version;
+
+ struct drm_dp_mst_topology_mgr mst_mgr;
+ struct delayed_work hotplug_work;
+
+ struct cdns_mhdp_mst_cbs cbs;
+ bool is_mst;
+ bool can_mst;
+ bool link_up;
+ bool plugged;
};
void cdns_mhdp_clock_reset(struct cdns_mhdp_device *mhdp);
@@ -562,7 +594,7 @@ int cdns_mhdp_audio_config(struct cdns_mhdp_device *mhdp,
int cdns_mhdp_reg_read(struct cdns_mhdp_device *mhdp, u32 addr, u32 *value);
int cdns_mhdp_reg_write(struct cdns_mhdp_device *mhdp, u16 addr, u32 val);
int cdns_mhdp_reg_write_bit(struct cdns_mhdp_device *mhdp, u16 addr,
- u8 start_bit, u8 bits_no, u32 val);
+ u8 start_bit, u8 bits_no, u32 val);
int cdns_mhdp_adjust_lt(struct cdns_mhdp_device *mhdp, u8 nlanes,
u16 udelay, u8 *lanes_data,
u8 *dpcd);
--
2.17.1
^ permalink raw reply related [flat|nested] 45+ messages in thread
* [PATCH v6 5/6] drm/bridge: add support for MST in mhdp8546 driver
@ 2018-10-08 21:42 ` Damian Kos
0 siblings, 0 replies; 45+ messages in thread
From: Damian Kos @ 2018-10-08 21:42 UTC (permalink / raw)
To: David Airlie, Rob Herring, Mark Rutland, Archit Taneja,
Andrzej Hajda, Laurent Pinchart, Gustavo Padovan,
Maarten Lankhorst, Sean Paul, Sandy Huang, Heiko Stübner,
Quentin Schulz, Damian Kos, Piotr Sroka, dri-devel, devicetree,
linux-kernel, linux-arm-kernel, linux-rockchip
Cc: rafalc, quentin.schulz, jbergsagel
From: Piotr Sroka <piotrs@cadence.com>
- add hot plug support to handle HDP IRQ interrupts in case sideband
message is ready to read.
- there is only one connector created at initialization stage. It is
used as SST connector when controller works in SST mode. If controller
works in MST mode then the SST connector status is disconnected all the
time. MST connectors are created/destroyed in runtime depends on what
devices are connected to the DP controller.
- add callbacks functions to be able to inform module managing encoders
objects to create or destroy an encoder in case new a MST connector is
created/destroyed
Signed-off-by: Piotr Sroka <piotrs@cadence.com>
Signed-off-by: Damian Kos <dkos@cadence.com>
---
drivers/gpu/drm/bridge/Makefile | 2 +-
drivers/gpu/drm/bridge/cdns-mhdp-mst.c | 594 +++++++++++++++++++++++++
drivers/gpu/drm/bridge/cdns-mhdp.c | 560 ++++++++++++-----------
drivers/gpu/drm/bridge/cdns-mhdp.h | 209 +++++++++
drivers/gpu/drm/rockchip/cdn-dp-core.c | 18 +-
include/drm/bridge/cdns-mhdp-cbs.h | 27 ++
include/drm/bridge/cdns-mhdp-common.h | 48 +-
7 files changed, 1189 insertions(+), 269 deletions(-)
create mode 100644 drivers/gpu/drm/bridge/cdns-mhdp-mst.c
create mode 100644 drivers/gpu/drm/bridge/cdns-mhdp.h
create mode 100644 include/drm/bridge/cdns-mhdp-cbs.h
diff --git a/drivers/gpu/drm/bridge/Makefile b/drivers/gpu/drm/bridge/Makefile
index e802fdb85750..b80f3d6ed2a6 100644
--- a/drivers/gpu/drm/bridge/Makefile
+++ b/drivers/gpu/drm/bridge/Makefile
@@ -19,4 +19,4 @@ obj-$(CONFIG_DRM_TI_TFP410) += ti-tfp410.o
obj-$(CONFIG_DRM_CDNS_MHDP) += mhdp8546.o
obj-y += synopsys/
-mhdp8546-objs := cdns-mhdp-common.o cdns-mhdp.o
+mhdp8546-objs := cdns-mhdp-common.o cdns-mhdp.o cdns-mhdp-mst.o
diff --git a/drivers/gpu/drm/bridge/cdns-mhdp-mst.c b/drivers/gpu/drm/bridge/cdns-mhdp-mst.c
new file mode 100644
index 000000000000..782d4bf9b667
--- /dev/null
+++ b/drivers/gpu/drm/bridge/cdns-mhdp-mst.c
@@ -0,0 +1,594 @@
+// SPDX-License-Identifier: GPL v2
+/*
+ * Cadence MHDP DP MST bridge driver.
+ *
+ * Copyright: 2018 Cadence Design Systems, Inc.
+ *
+ * Author: Piotr Sroka <piotrs@cadence.com>
+ */
+#include <drm/drm_print.h>
+#include <drm/drm_crtc_helper.h>
+#include <drm/drm_atomic_helper.h>
+#include <drm/drm_fixed.h>
+#include <drm/drm_connector.h>
+#include <linux/iopoll.h>
+
+#include <drm/bridge/cdns-mhdp-common.h>
+#include "cdns-mhdp.h"
+
+
+static void cdns_mhdp_mst_stream_enable(struct cdns_mhdp_bridge *mhdp_bridge,
+ bool enable)
+{
+ u32 reg;
+ struct cdns_mhdp_device *mhdp = mhdp_bridge->mhdp;
+ u8 stream_id = mhdp_bridge->stream_id;
+
+ cdns_mhdp_reg_read(mhdp, CDNS_DP_MST_STREAM_CONFIG(stream_id), ®);
+
+ if (enable) {
+ reg |= CDNS_DP_MST_STRM_CFG_STREAM_EN;
+ reg &= ~CDNS_DP_MST_STRM_CFG_NO_VIDEO;
+ } else {
+ reg &= ~CDNS_DP_MST_STRM_CFG_STREAM_EN;
+ reg |= CDNS_DP_MST_STRM_CFG_NO_VIDEO;
+ }
+
+ cdns_mhdp_reg_write(mhdp, CDNS_DP_MST_STREAM_CONFIG(stream_id), reg);
+}
+
+static inline s64 calc_fixed_avg_slots(u32 pbn, u32 pbn_div)
+{
+ s64 fixed_pbn, fixed_pbn_div, fixed_targ_avg_slots;
+
+ fixed_pbn = drm_int2fixp(pbn);
+ fixed_pbn_div = drm_int2fixp(pbn_div);
+ fixed_targ_avg_slots = drm_fixp_div(fixed_pbn, fixed_pbn_div);
+
+ return fixed_targ_avg_slots;
+}
+
+static void cdns_mhdp_mst_set_threshold(struct cdns_mhdp_bridge *bridge)
+{
+ u32 threshold;
+ u8 stream_id = bridge->stream_id;
+ struct cdns_mhdp_device *mhdp = bridge->mhdp;
+ s64 fixed_targ_avg_slots, fixed_thresh, fixed_targ_entries;
+
+ fixed_targ_avg_slots = calc_fixed_avg_slots(bridge->pbn,
+ mhdp->mst_mgr.pbn_div);
+
+ fixed_targ_entries = drm_fixp_div(fixed_targ_avg_slots,
+ drm_int2fixp(2));
+ fixed_thresh = drm_fixp_mul(fixed_targ_entries, fixed_targ_entries);
+ fixed_thresh = drm_fixp_div(fixed_thresh, drm_int2fixp(32));
+ fixed_thresh = fixed_targ_entries - fixed_thresh;
+ fixed_thresh = drm_fixp_mul(fixed_thresh,
+ drm_int2fixp(mhdp->link.num_lanes));
+ fixed_thresh = drm_fixp_div(fixed_thresh, drm_int2fixp(4));
+
+ threshold = drm_fixp2int_ceil(fixed_thresh);
+ if (threshold < 2)
+ threshold = 2;
+
+ cdns_mhdp_reg_write(mhdp, CDNS_DP_LINE_THRESH(stream_id),
+ CDNS_DP_ACTIVE_LINE_THRESH(threshold));
+}
+
+static void cdns_mhdp_set_rate_governing(struct cdns_mhdp_bridge *bridge,
+ bool enable)
+{
+ struct cdns_mhdp_device *mhdp = bridge->mhdp;
+ u8 stream_id = bridge->stream_id;
+
+ if (enable) {
+ s64 fixed_targ_avg_slots, fixed_y;
+ u32 x, y;
+
+ fixed_targ_avg_slots =
+ calc_fixed_avg_slots(bridge->pbn,
+ mhdp->mst_mgr.pbn_div);
+
+ x = drm_fixp2int(fixed_targ_avg_slots);
+
+ fixed_y = (fixed_targ_avg_slots - drm_int2fixp(x));
+ fixed_y = drm_fixp_mul(fixed_y, drm_int2fixp(16));
+ y = drm_fixp2int_ceil(fixed_y);
+
+ cdns_mhdp_reg_write(mhdp, CDNS_DP_RATE_GOVERNING(stream_id),
+ CDNS_DP_RG_TARG_AV_SLOTS_Y(y) |
+ CDNS_DP_RG_TARG_AV_SLOTS_X(x) |
+ CDNS_DP_RG_ENABLE);
+ } else
+ cdns_mhdp_reg_write(mhdp, CDNS_DP_RATE_GOVERNING(stream_id), 0);
+}
+
+
+static struct drm_dp_payload *
+cdns_mhdp_get_payload(struct cdns_mhdp_bridge *bridge)
+{
+ int vcpi = bridge->connector->port->vcpi.vcpi, i;
+ struct cdns_mhdp_device *mhdp = bridge->mhdp;
+
+ for (i = 0; i < mhdp->mst_mgr.max_payloads; i++) {
+ struct drm_dp_payload *payload = &mhdp->mst_mgr.payloads[i];
+
+ if (payload->vcpi == vcpi)
+ return payload;
+ }
+
+ return NULL;
+}
+
+
+static int
+cdns_mhdp_set_act_enable(struct cdns_mhdp_device *mhdp)
+{
+ u32 reg;
+ int ret;
+
+ cdns_mhdp_reg_read(mhdp, CDNS_DP_MTPH_CONTROL, ®);
+ cdns_mhdp_reg_write(mhdp, CDNS_DP_MTPH_CONTROL,
+ reg | CDNS_DP_MTPH_ACT_EN);
+
+ ret = readl_poll_timeout(mhdp->regs + CDNS_DP_MTPH_STATUS, reg,
+ ((reg & CDNS_DP_MTPH_ACT_STATUS) == 0), 0,
+ 30);
+ if (ret) {
+ dev_err(mhdp->dev,
+ "ACT sequence cannot complete in 30us\n");
+ return -EIO;
+ }
+
+ return drm_dp_check_act_status(&mhdp->mst_mgr);
+}
+
+
+static int
+cdns_mhdp_apply_slot_allocation(struct cdns_mhdp_bridge *mhdp_bridge)
+{
+ struct drm_dp_payload *payload;
+ struct cdns_mhdp_device *mhdp = mhdp_bridge->mhdp;
+ u8 stream_id = mhdp_bridge->stream_id;
+
+ payload = cdns_mhdp_get_payload(mhdp_bridge);
+
+ if (!payload) {
+ DRM_ERROR("payload is not found\n");
+ return -EIO;
+ }
+
+ cdns_mhdp_reg_write(mhdp, CDNS_DP_MST_SLOT_ALLOCATE(stream_id),
+ CDNS_DP_S_ALLOC_START_SLOT(payload->start_slot) |
+ CDNS_DP_S_ALLOC_END_SLOT(payload->start_slot
+ + payload->num_slots - 1));
+
+ return 0;
+}
+
+static void
+cdns_mhdp_update_slot_allocation(struct cdns_mhdp_bridge *mhdp_bridge)
+{
+ struct drm_device *dev = mhdp_bridge->base.dev;
+ struct drm_connector *connector;
+
+ list_for_each_entry(connector, &dev->mode_config.connector_list, head) {
+ struct cdns_mhdp_connector *mhdp_connector;
+
+ mhdp_connector = to_mhdp_connector(connector);
+ if (!connector->encoder)
+ continue;
+ if (!mhdp_connector->is_mst_connector)
+ continue;
+
+ if (mhdp_connector->bridge->stream_id != -1)
+ cdns_mhdp_apply_slot_allocation(mhdp_connector->bridge);
+ }
+}
+
+static enum drm_connector_status
+cdns_dp_mst_detect(struct drm_connector *connector, bool force)
+{
+ enum drm_connector_status stat;
+ struct cdns_mhdp_connector *mhdp_connector;
+ struct cdns_mhdp_device *mhdp;
+
+ mhdp_connector = to_mhdp_connector(connector);
+ mhdp = mhdp_connector->bridge->mhdp;
+
+ stat = drm_dp_mst_detect_port(connector, &mhdp->mst_mgr,
+ mhdp_connector->port);
+ return stat;
+}
+
+static void
+cdns_dp_mst_connector_destroy(struct drm_connector *connector)
+{
+ struct cdns_mhdp_connector *mhdp_connector;
+ struct cdns_mhdp_bridge *mhdp_bridge;
+
+ mhdp_connector = to_mhdp_connector(connector);
+ mhdp_bridge = mhdp_connector->bridge;
+
+ drm_connector_cleanup(&mhdp_connector->base);
+ drm_bridge_remove(&mhdp_bridge->base);
+ kfree(mhdp_connector);
+ kfree(mhdp_bridge);
+}
+
+static const struct drm_connector_funcs cdns_mhdp_mst_connector_funcs = {
+ .atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state,
+ .atomic_destroy_state = drm_atomic_helper_connector_destroy_state,
+ .reset = drm_atomic_helper_connector_reset,
+ .dpms = drm_helper_connector_dpms,
+ .detect = cdns_dp_mst_detect,
+ .fill_modes = drm_helper_probe_single_connector_modes,
+ .destroy = cdns_dp_mst_connector_destroy,
+};
+
+
+static int cdns_mhdp_mst_get_ddc_modes(struct drm_connector *connector)
+{
+ struct cdns_mhdp_connector *mhdp_connector;
+ struct cdns_mhdp_device *mhdp;
+ struct edid *edid;
+ int ret = 0;
+
+ mhdp_connector = to_mhdp_connector(connector);
+ mhdp = mhdp_connector->bridge->mhdp;
+
+ edid = drm_dp_mst_get_edid(connector, &mhdp->mst_mgr,
+ mhdp_connector->port);
+
+ DRM_DEBUG_KMS("edid retrieved %p\n", edid);
+ if (edid) {
+ drm_connector_update_edid_property(connector, edid);
+ ret = drm_add_edid_modes(connector, edid);
+ return ret;
+ }
+ drm_connector_update_edid_property(connector, NULL);
+
+ return ret;
+}
+
+static int cdns_mhdp_mst_get_modes(struct drm_connector *connector)
+{
+ return cdns_mhdp_mst_get_ddc_modes(connector);
+}
+
+
+static struct
+drm_encoder *cdns_mhdp_mst_best_encoder(struct drm_connector *connector)
+{
+ struct cdns_mhdp_connector *mhdp_connector;
+
+ mhdp_connector = to_mhdp_connector(connector);
+
+ return mhdp_connector->bridge->base.encoder;
+}
+
+static const struct drm_connector_helper_funcs cdns_mhdp_mst_conn_helper_fun = {
+ .get_modes = cdns_mhdp_mst_get_modes,
+ .best_encoder = cdns_mhdp_mst_best_encoder,
+};
+
+void cdns_mhdp_mst_enable(struct drm_bridge *bridge)
+{
+ struct cdns_mhdp_bridge *mhdp_bridge = to_mhdp_bridge(bridge);
+ struct cdns_mhdp_device *mhdp = mhdp_bridge->mhdp;
+ struct drm_display_info *disp_info;
+ struct drm_display_mode *mode;
+ struct cdns_mhdp_connector *mhdp_connector;
+ u32 bpp;
+ enum pixel_format pxlfmt;
+ int ret, slots, stream_id;
+
+ disp_info = &mhdp_bridge->connector->base.display_info;
+
+ pxlfmt = cdns_mhdp_get_pxlfmt(disp_info->color_formats);
+ bpp = cdns_mhdp_get_bpp(disp_info->bpc, pxlfmt);
+
+ mhdp_connector = mhdp_bridge->connector;
+ if (mhdp_bridge->stream_id > -1) {
+ DRM_ERROR("ERROR stream id is attached before bridge is enabled\n");
+ return;
+ }
+
+ stream_id = bridge->encoder->crtc->index;
+
+ mode = &bridge->encoder->crtc->state->adjusted_mode;
+ mhdp_bridge->pbn = drm_dp_calc_pbn_mode(mode->clock, bpp);
+
+ slots = drm_dp_find_vcpi_slots(&mhdp->mst_mgr, mhdp_bridge->pbn);
+ ret = drm_dp_mst_allocate_vcpi(&mhdp->mst_mgr,
+ mhdp_connector->port,
+ mhdp_bridge->pbn, slots);
+ if (ret == false) {
+ DRM_ERROR("failed to allocate vcpi\n");
+ return;
+ }
+ ret = drm_dp_update_payload_part1(&mhdp->mst_mgr);
+ if (ret < 0)
+ DRM_ERROR("failed update_payload_part1\n");
+
+ mhdp_bridge->stream_id = stream_id;
+ mhdp_bridge->is_active = true;
+
+ cdns_mhdp_mst_stream_enable(mhdp_bridge, true);
+ cdns_mhdp_configure_video(bridge);
+
+ ret = cdns_mhdp_apply_slot_allocation(mhdp_bridge);
+ if (ret < 0) {
+ cdns_mhdp_mst_stream_enable(mhdp_bridge, false);
+ mhdp_bridge->stream_id = -1;
+ mhdp_bridge->is_active = false;
+ return;
+ }
+
+ ret = cdns_mhdp_set_act_enable(mhdp);
+ if (ret)
+ DRM_ERROR("failed ACT sequence\n");
+
+ cdns_mhdp_set_rate_governing(mhdp_bridge, true);
+
+ cdns_mhdp_mst_set_threshold(mhdp_bridge);
+
+ drm_dp_update_payload_part2(&mhdp->mst_mgr);
+}
+
+void cdns_mhdp_mst_disable(struct drm_bridge *bridge)
+{
+ struct cdns_mhdp_bridge *mhdp_bridge = to_mhdp_bridge(bridge);
+ struct cdns_mhdp_device *mhdp = mhdp_bridge->mhdp;
+ struct cdns_mhdp_connector *connector = mhdp_bridge->connector;
+
+ drm_dp_mst_reset_vcpi_slots(&mhdp->mst_mgr, connector->port);
+ drm_dp_update_payload_part1(&mhdp->mst_mgr);
+
+ cdns_mhdp_update_slot_allocation(mhdp_bridge);
+
+ drm_dp_check_act_status(&mhdp->mst_mgr);
+
+ drm_dp_update_payload_part2(&mhdp->mst_mgr);
+
+ drm_dp_mst_deallocate_vcpi(&mhdp->mst_mgr, connector->port);
+
+ cdns_mhdp_set_rate_governing(mhdp_bridge, false);
+ cdns_mhdp_mst_stream_enable(mhdp_bridge, false);
+ mhdp_bridge->stream_id = -1;
+ mhdp_bridge->is_active = false;
+}
+
+static const struct drm_bridge_funcs cdns_mhdp_mst_bridge_funcs = {
+ .enable = cdns_mhdp_enable,
+ .disable = cdns_mhdp_mst_disable,
+};
+
+
+static struct cdns_mhdp_bridge*
+cdns_mhpd_create_fake_mst_bridge(struct cdns_mhdp_device *mhdp,
+ struct cdns_mhdp_connector *mhdp_connector)
+{
+ struct cdns_mhdp_bridge *mhdp_bridge;
+ struct drm_encoder *encoder = NULL;
+ struct cdns_mhdp_mst_cbs *cbs = &mhdp->cbs;
+
+ mhdp_bridge = kzalloc(sizeof(*mhdp_bridge), GFP_KERNEL);
+ if (!mhdp_bridge)
+ return NULL;
+
+ mhdp_bridge->mhdp = mhdp;
+ mhdp_bridge->stream_id = -1;
+ mhdp_bridge->connector = mhdp_connector;
+ mhdp_bridge->is_active = false;
+
+ mhdp_bridge->base.funcs = &cdns_mhdp_mst_bridge_funcs;
+
+ drm_bridge_add(&mhdp_bridge->base);
+
+ if (cbs->funcs.create_mst_encoder)
+ encoder = cbs->funcs.create_mst_encoder(cbs->priv_data,
+ &mhdp_bridge->base);
+ if (encoder) {
+ int ret;
+ /* use the same drm device as is in the first encoder */
+ encoder->dev = mhdp->bridge.base.encoder->dev;
+ encoder->possible_crtcs &= ((1 << CDNS_MHDP_MAX_STREAMS) - 1);
+ ret = drm_bridge_attach(encoder, &mhdp_bridge->base, NULL);
+ if (ret) {
+ dev_err(mhdp->dev, "bridge attaching error %d\n", ret);
+ return NULL;
+ }
+
+ ret = drm_connector_attach_encoder(&mhdp_connector->base,
+ encoder);
+ if (ret) {
+ dev_err(mhdp->dev, "failed to attach connector to encoder\n");
+ return NULL;
+ }
+ }
+
+ return mhdp_bridge;
+}
+
+static struct drm_connector *
+cdns_mhdp_mst_cbs_add_connector(struct drm_dp_mst_topology_mgr *mgr,
+ struct drm_dp_mst_port *port,
+ const char *pathprop)
+{
+ struct cdns_mhdp_device *mhdp = mgr_to_mhdp(mgr);
+ struct drm_device *dev = mhdp->bridge.base.dev;
+ struct cdns_mhdp_connector *mhdp_connector;
+ struct drm_connector *connector;
+ struct drm_connector_state *conn_state;
+ int ret;
+
+ mhdp_connector = kzalloc(sizeof(struct cdns_mhdp_connector),
+ GFP_KERNEL);
+ if (!mhdp_connector)
+ return NULL;
+
+ mhdp_connector->is_mst_connector = true;
+ connector = &mhdp_connector->base;
+ mhdp_connector->port = port;
+ DRM_DEBUG_KMS("\n");
+
+ conn_state = kzalloc(sizeof(*conn_state), GFP_KERNEL);
+ if (!conn_state)
+ return NULL;
+
+ __drm_atomic_helper_connector_reset(connector,
+ conn_state);
+
+ drm_connector_init(dev, connector, &cdns_mhdp_mst_connector_funcs,
+ DRM_MODE_CONNECTOR_DisplayPort);
+ drm_connector_helper_add(connector, &cdns_mhdp_mst_conn_helper_fun);
+ mhdp_connector->bridge =
+ cdns_mhpd_create_fake_mst_bridge(mhdp, mhdp_connector);
+
+ drm_object_attach_property(&connector->base,
+ dev->mode_config.path_property, 0);
+ drm_object_attach_property(&connector->base,
+ dev->mode_config.tile_property, 0);
+ ret = drm_connector_set_path_property(connector, pathprop);
+
+ if (ret)
+ DRM_ERROR("ERROR set path propertty failed\n");
+
+ return connector;
+}
+
+static void
+cdns_mhdp_mst_cbs_destroy_connector(struct drm_dp_mst_topology_mgr *mgr,
+ struct drm_connector *connector)
+{
+ struct cdns_mhdp_connector *mhdp_connector;
+ struct cdns_mhdp_device *mhdp;
+ struct cdns_mhdp_bridge *mhdp_bridge;
+
+ mhdp_connector = to_mhdp_connector(connector);
+ mhdp_bridge = mhdp_connector->bridge;
+ mhdp = mhdp_bridge->mhdp;
+
+ drm_connector_unregister(&mhdp_connector->base);
+
+ if (mhdp->cbs.funcs.create_mst_encoder)
+ mhdp->cbs.funcs.destroy_mst_encoder(mhdp->cbs.priv_data,
+ &mhdp_bridge->base);
+ drm_connector_unreference(&mhdp_connector->base);
+}
+
+static void cdns_mhdp_mst_cbs_hotplug(struct drm_dp_mst_topology_mgr *mgr)
+{
+ struct cdns_mhdp_device *mhdp = mgr_to_mhdp(mgr);
+ struct drm_device *dev = mhdp->bridge.base.encoder->dev;
+
+ drm_kms_helper_hotplug_event(dev);
+}
+
+static void
+cdns_mhdp_mst_cbs_register_connector(struct drm_connector *connector)
+{
+ int ret;
+
+ ret = drm_connector_register(connector);
+ if (ret)
+ DRM_ERROR("Register connector failed\n");
+
+}
+
+static const struct drm_dp_mst_topology_cbs mst_cbs = {
+ .add_connector = cdns_mhdp_mst_cbs_add_connector,
+ .register_connector = cdns_mhdp_mst_cbs_register_connector,
+ .destroy_connector = cdns_mhdp_mst_cbs_destroy_connector,
+ .hotplug = cdns_mhdp_mst_cbs_hotplug,
+};
+
+
+static void cdns_mhdp_set_mst_enable(struct cdns_mhdp_device *mhdp, bool enable)
+{
+ u32 reg_val;
+
+ cdns_mhdp_reg_read(mhdp, CDNS_DP_FRAMER_GLOBAL_CONFIG, ®_val);
+
+ if (enable)
+ reg_val |= CDNS_DP_MST_EN;
+ else
+ reg_val &= ~CDNS_DP_MST_EN;
+
+ cdns_mhdp_reg_write(mhdp, CDNS_DP_FRAMER_GLOBAL_CONFIG, reg_val);
+}
+
+bool cdns_mhdp_mst_probe(struct cdns_mhdp_device *mhdp)
+{
+ u8 mstm_cap;
+ u8 dpcd_cap[DP_RECEIVER_CAP_SIZE];
+
+ bool is_mst;
+
+ if (!mhdp->can_mst)
+ return false;
+
+ drm_dp_dpcd_read(&mhdp->aux, DP_DPCD_REV, dpcd_cap,
+ DP_RECEIVER_CAP_SIZE);
+
+ if (dpcd_cap[DP_DPCD_REV] < 0x12)
+ return false;
+
+ if (drm_dp_dpcd_readb(&mhdp->aux, DP_MSTM_CAP, &mstm_cap) != 1)
+ return false;
+
+ if (mstm_cap & DP_MST_CAP) {
+ DRM_DEBUG_KMS("Sink is MST capable\n");
+ is_mst = true;
+ } else {
+ DRM_DEBUG_KMS("Sink is not MST capable\n");
+ is_mst = false;
+ }
+
+ if (is_mst != mhdp->is_mst) {
+ mhdp->is_mst = is_mst;
+ cdns_mhdp_set_mst_enable(mhdp, mhdp->is_mst);
+
+ drm_dp_mst_topology_mgr_set_mst(&mhdp->mst_mgr,
+ mhdp->is_mst);
+ }
+
+ return mhdp->is_mst;
+}
+
+int cdns_mhdp_mst_init(struct cdns_mhdp_device *mhdp)
+{
+ struct cdns_mhdp_bridge *bridge = &mhdp->bridge;
+ struct drm_device *dev = bridge->base.dev;
+ struct cdns_mhdp_connector *connector = bridge->connector;
+ int ret;
+
+ mhdp->mst_mgr.cbs = &mst_cbs;
+ ret = drm_dp_mst_topology_mgr_init(&mhdp->mst_mgr, dev,
+ &mhdp->aux, 16,
+ CDNS_MHDP_MAX_STREAMS,
+ connector->base.base.id);
+ if (ret)
+ mhdp->can_mst = false;
+ else
+ mhdp->can_mst = true;
+
+ mhdp->is_mst = false;
+
+ bridge->stream_id = -1;
+
+ return ret;
+}
+
+void cdns_mhdp_mst_deinit(struct cdns_mhdp_device *mhdp)
+{
+ if (mhdp->is_mst) {
+ mhdp->is_mst = false;
+ drm_dp_mst_topology_mgr_set_mst(&mhdp->mst_mgr,
+ mhdp->is_mst);
+ }
+
+ if (mhdp->can_mst)
+ drm_dp_mst_topology_mgr_destroy(&mhdp->mst_mgr);
+}
diff --git a/drivers/gpu/drm/bridge/cdns-mhdp.c b/drivers/gpu/drm/bridge/cdns-mhdp.c
index a3bbc0e809a5..48ac5cf1e031 100644
--- a/drivers/gpu/drm/bridge/cdns-mhdp.c
+++ b/drivers/gpu/drm/bridge/cdns-mhdp.c
@@ -27,146 +27,15 @@
#include <drm/bridge/cdns-mhdp-common.h>
#include <sound/hdmi-codec.h>
+#include <linux/irq.h>
+#include <linux/of_irq.h>
+#include "cdns-mhdp.h"
#define DEBUG_MSG
#define FW_NAME "cadence/mhdp8546.bin"
-#define CDNS_APB_CFG 0x00000
-#define CDNS_APB_CTRL (CDNS_APB_CFG + 0x00)
-#define CDNS_MAILBOX_FULL (CDNS_APB_CFG + 0x08)
-#define CDNS_MAILBOX_EMPTY (CDNS_APB_CFG + 0x0c)
-#define CDNS_MAILBOX_TX_DATA (CDNS_APB_CFG + 0x10)
-#define CDNS_MAILBOX_RX_DATA (CDNS_APB_CFG + 0x14)
-#define CDNS_KEEP_ALIVE (CDNS_APB_CFG + 0x18)
-#define CDNS_KEEP_ALIVE_MASK GENMASK(7, 0)
-
-#define CDNS_SW_CLK_L (CDNS_APB_CFG + 0x3c)
-#define CDNS_SW_CLK_H (CDNS_APB_CFG + 0x40)
-#define CDNS_SW_EVENT0 (CDNS_APB_CFG + 0x44)
-#define CDNS_DPTX_HPD BIT(0)
-
-#define CDNS_SW_EVENT1 (CDNS_APB_CFG + 0x48)
-#define CDNS_SW_EVENT2 (CDNS_APB_CFG + 0x4c)
-#define CDNS_SW_EVENT3 (CDNS_APB_CFG + 0x50)
-
-#define CDNS_DPTX_CAR (CDNS_APB_CFG + 0x904)
-#define CDNS_VIF_CLK_EN BIT(0)
-#define CDNS_VIF_CLK_RSTN BIT(1)
-
-#define CDNS_SOURCE_VIDEO_INTERFACE 0x00b00
-#define CDNS_BND_HSYNC2VSYNC (CDNS_SOURCE_VIDEO_INTERFACE + \
- 0x00)
-#define CDNS_IP_DTCT_WIN GENMASK(11, 0)
-#define CDNS_IP_DET_INTERLACE_FORMAT BIT(12)
-#define CDNS_IP_BYPASS_V_INTERFACE BIT(13)
-
-#define CDNS_HSYNC2VSYNC_POL_CTRL (CDNS_SOURCE_VIDEO_INTERFACE + \
- 0x10)
-#define CDNS_H2V_HSYNC_POL_ACTIVE_LOW BIT(1)
-#define CDNS_H2V_VSYNC_POL_ACTIVE_LOW BIT(2)
-
-#define CDNS_DPTX_PHY_CONFIG 0x02000
-#define CDNS_PHY_TRAINING_EN BIT(0)
-#define CDNS_PHY_TRAINING_TYPE(x) (((x) & GENMASK(3, 0)) << 1)
-#define CDNS_PHY_SCRAMBLER_BYPASS BIT(5)
-#define CDNS_PHY_ENCODER_BYPASS BIT(6)
-#define CDNS_PHY_SKEW_BYPASS BIT(7)
-#define CDNS_PHY_TRAINING_AUTO BIT(8)
-#define CDNS_PHY_LANE0_SKEW(x) (((x) & GENMASK(2, 0)) << 9)
-#define CDNS_PHY_LANE1_SKEW(x) (((x) & GENMASK(2, 0)) << 12)
-#define CDNS_PHY_LANE2_SKEW(x) (((x) & GENMASK(2, 0)) << 15)
-#define CDNS_PHY_LANE3_SKEW(x) (((x) & GENMASK(2, 0)) << 18)
-#define CDNS_PHY_COMMON_CONFIG (CDNS_PHY_LANE1_SKEW(1) | \
- CDNS_PHY_LANE2_SKEW(2) | \
- CDNS_PHY_LANE3_SKEW(3))
-#define CDNS_PHY_10BIT_EN BIT(21)
-
-#define CDNS_DPTX_FRAMER 0x02200
-#define CDNS_DP_FRAMER_GLOBAL_CONFIG (CDNS_DPTX_FRAMER + 0x00)
-#define CDNS_DP_NUM_LANES(x) (x - 1)
-#define CDNS_DP_FRAMER_EN BIT(3)
-#define CDNS_DP_RATE_GOVERNOR_EN BIT(4)
-#define CDNS_DP_NO_VIDEO_MODE BIT(5)
-#define CDNS_DP_DISABLE_PHY_RST BIT(6)
-#define CDNS_DP_WR_FAILING_EDGE_VSYNC BIT(7)
-
-#define CDNS_DP_SW_RESET (CDNS_DPTX_FRAMER + 0x04)
-#define CDNS_DP_FRAMER_TU (CDNS_DPTX_FRAMER + 0x08)
-#define CDNS_DP_FRAMER_TU_SIZE(x) (((x) & GENMASK(6, 0)) << 8)
-#define CDNS_DP_FRAMER_TU_VS(x) ((x) & GENMASK(5, 0))
-#define CDNS_DP_FRAMER_TU_CNT_RST_EN BIT(15)
-
-#define CDNS_DPTX_STREAM 0x03000
-#define CDNS_DP_MSA_HORIZONTAL_0 (CDNS_DPTX_STREAM + 0x00)
-#define CDNS_DP_MSAH0_H_TOTAL(x) (x)
-#define CDNS_DP_MSAH0_HSYNC_START(x) ((x) << 16)
-
-#define CDNS_DP_MSA_HORIZONTAL_1 (CDNS_DPTX_STREAM + 0x04)
-#define CDNS_DP_MSAH1_HSYNC_WIDTH(x) (x)
-#define CDNS_DP_MSAH1_HSYNC_POL_LOW BIT(15)
-#define CDNS_DP_MSAH1_HDISP_WIDTH(x) ((x) << 16)
-
-#define CDNS_DP_MSA_VERTICAL_0 (CDNS_DPTX_STREAM + 0x08)
-#define CDNS_DP_MSAV0_V_TOTAL(x) (x)
-#define CDNS_DP_MSAV0_VSYNC_START(x) ((x) << 16)
-
-#define CDNS_DP_MSA_VERTICAL_1 (CDNS_DPTX_STREAM + 0x0c)
-#define CDNS_DP_MSAV1_VSYNC_WIDTH(x) (x)
-#define CDNS_DP_MSAV1_VSYNC_POL_LOW BIT(15)
-#define CDNS_DP_MSAV1_VDISP_WIDTH(x) ((x) << 16)
-
-#define CDNS_DP_MSA_MISC (CDNS_DPTX_STREAM + 0x10)
-#define CDNS_DP_STREAM_CONFIG (CDNS_DPTX_STREAM + 0x14)
-#define CDNS_DP_RATE_GOVERNOR_STATUS (CDNS_DPTX_STREAM + 0x2c)
-#define CDNS_DP_RG_TU_VS_DIFF(x) ((x) << 8)
-
-#define CDNS_DP_HORIZONTAL (CDNS_DPTX_STREAM + 0x30)
-#define CDNS_DP_H_HSYNC_WIDTH(x) (x)
-#define CDNS_DP_H_H_TOTAL(x) ((x) << 16)
-
-#define CDNS_DP_VERTICAL_0 (CDNS_DPTX_STREAM + 0x34)
-#define CDNS_DP_V0_VHEIGHT(x) (x)
-#define CDNS_DP_V0_VSTART(x) ((x) << 16)
-
-#define CDNS_DP_VERTICAL_1 (CDNS_DPTX_STREAM + 0x38)
-#define CDNS_DP_V1_VTOTAL(x) (x)
-#define CDNS_DP_V1_VTOTAL_EVEN BIT(16)
-
-#define CDNS_DP_FRAMER_PXL_REPR (CDNS_DPTX_STREAM + 0x4c)
-#define CDNS_DP_FRAMER_6_BPC BIT(0)
-#define CDNS_DP_FRAMER_8_BPC BIT(1)
-#define CDNS_DP_FRAMER_10_BPC BIT(2)
-#define CDNS_DP_FRAMER_12_BPC BIT(3)
-#define CDNS_DP_FRAMER_16_BPC BIT(4)
-#define CDNS_DP_FRAMER_PXL_FORMAT 0x8
-#define CDNS_DP_FRAMER_RGB BIT(0)
-#define CDNS_DP_FRAMER_YCBCR444 BIT(1)
-#define CDNS_DP_FRAMER_YCBCR422 BIT(2)
-#define CDNS_DP_FRAMER_YCBCR420 BIT(3)
-#define CDNS_DP_FRAMER_Y_ONLY BIT(4)
-
-#define CDNS_DP_FRAMER_SP (CDNS_DPTX_STREAM + 0x10)
-#define CDNS_DP_FRAMER_VSYNC_POL_LOW BIT(0)
-#define CDNS_DP_FRAMER_HSYNC_POL_LOW BIT(1)
-#define CDNS_DP_FRAMER_INTERLACE BIT(2)
-
-#define CDNS_DP_LINE_THRESH (CDNS_DPTX_STREAM + 0x64)
-#define CDNS_DP_VB_ID (CDNS_DPTX_STREAM + 0x68)
-#define CDNS_DP_VB_ID_INTERLACED BIT(2)
-
-#define CDNS_DP_FRONT_BACK_PORCH (CDNS_DPTX_STREAM + 0x78)
-#define CDNS_DP_BACK_PORCH(x) (x)
-#define CDNS_DP_FRONT_PORCH(x) ((x) << 16)
-
-#define CDNS_DP_BYTE_COUNT (CDNS_DPTX_STREAM + 0x7c)
-
-#define CDNS_DPTX_GLOBAL 0x02300
-#define CDNS_DP_LANE_EN (CDNS_DPTX_GLOBAL + 0x00)
-#define CDNS_DP_LANE_EN_LANES(x) GENMASK(x - 1, 0)
-#define CDNS_DP_ENHNCD (CDNS_DPTX_GLOBAL + 0x04)
-
#define CDNS_MHDP_IMEM 0x10000
#define CDNS_MHDP_DMEM 0x20000
@@ -216,13 +85,17 @@ MODULE_DEVICE_TABLE(of, mhdp_ids);
static inline struct cdns_mhdp_device *connector_to_mhdp(
struct drm_connector *conn)
{
- return container_of(conn, struct cdns_mhdp_device, connector);
+ struct cdns_mhdp_connector *mhdp_connector = to_mhdp_connector(conn);
+
+ return mhdp_connector->bridge->mhdp;
}
static inline struct cdns_mhdp_device *bridge_to_mhdp(
struct drm_bridge *bridge)
{
- return container_of(bridge, struct cdns_mhdp_device, bridge);
+ struct cdns_mhdp_bridge *mhdp_bridge = to_mhdp_bridge(bridge);
+
+ return mhdp_bridge->mhdp;
}
static unsigned int max_link_rate(struct cdns_mhdp_host host,
@@ -237,6 +110,62 @@ static u8 eq_training_pattern_supported(struct cdns_mhdp_host host,
return fls(host.pattern_supp & sink.pattern_supp);
}
+static void mhdp_hotplug_work_func(struct work_struct *work)
+{
+ struct cdns_mhdp_device *mhdp;
+ int dret, retry;
+ u8 esi[16] = { 0 };
+ bool new_irq_handled;
+ struct drm_connector *connector;
+ bool old_plugged;
+
+
+ mhdp = container_of(work, struct cdns_mhdp_device,
+ hotplug_work.work);
+ connector = &mhdp->connector.base;
+
+ old_plugged = mhdp->plugged;
+ connector->status = connector->funcs->detect(connector, false);
+ if (old_plugged != mhdp->plugged) {
+ drm_kms_helper_hotplug_event(mhdp->bridge.base.dev);
+ return;
+ }
+
+ if (mhdp->plugged) {
+ dret = drm_dp_dpcd_read(&mhdp->aux,
+ DP_SINK_COUNT_ESI, esi, 8);
+
+ if (dret == 8) {
+ drm_dp_mst_hpd_irq(&mhdp->mst_mgr,
+ esi,
+ &new_irq_handled);
+ }
+
+ if (new_irq_handled) {
+ for (retry = 0; retry < 3; retry++) {
+ int wret;
+
+ wret = drm_dp_dpcd_write(&mhdp->aux,
+ DP_SINK_COUNT_ESI+1,
+ &esi[1], 3);
+ if (wret == 3)
+ break;
+ }
+ }
+ }
+
+}
+
+static irqreturn_t mhdp_irq_handler(int irq, void *data)
+{
+ struct cdns_mhdp_device *mhdp = (struct cdns_mhdp_device *)data;
+
+ if (readl(mhdp->regs + CDNS_SW_EVENT0) & CDNS_DPTX_HPD)
+ schedule_delayed_work(&mhdp->hotplug_work, 0);
+
+ return IRQ_HANDLED;
+}
+
static ssize_t mhdp_transfer(struct drm_dp_aux *aux,
struct drm_dp_aux_msg *msg)
{
@@ -300,10 +229,16 @@ static enum drm_connector_status cdns_mhdp_detect(struct drm_connector *conn,
int ret;
ret = cdns_mhdp_get_hpd_status(mhdp);
- if (ret > 0)
- status = connector_status_connected;
- else if (ret < 0)
+ if (ret > 0) {
+ mhdp->plugged = true;
+ cdns_mhdp_mst_probe(mhdp);
+ // for MST mode this connector will be always disconnected
+ if (!mhdp->is_mst)
+ status = connector_status_connected;
+ } else if (ret < 0)
dev_err(mhdp->dev, "Failed to obtain HPD state\n");
+ else
+ mhdp->plugged = false;
return status;
}
@@ -321,11 +256,15 @@ static const struct drm_connector_funcs cdns_mhdp_conn_funcs = {
static int cdns_mhdp_attach(struct drm_bridge *bridge)
{
struct cdns_mhdp_device *mhdp = bridge_to_mhdp(bridge);
- struct drm_connector *conn = &mhdp->connector;
+ struct drm_connector *conn = &mhdp->connector.base;
int ret;
- conn->polled = DRM_CONNECTOR_POLL_CONNECT |
- DRM_CONNECTOR_POLL_DISCONNECT;
+ if (&mhdp->bridge.base != bridge)
+ return -ENODEV;
+
+ cdns_mhdp_mst_init(mhdp);
+
+ conn->polled = DRM_CONNECTOR_POLL_HPD;
ret = drm_connector_init(bridge->dev, conn, &cdns_mhdp_conn_funcs,
DRM_MODE_CONNECTOR_DisplayPort);
@@ -342,17 +281,12 @@ static int cdns_mhdp_attach(struct drm_bridge *bridge)
return ret;
}
+ /* enable interrupts */
+ writel(~CDNS_APB_INT_MASK_SW_EVENT_INT, mhdp->regs + CDNS_APB_INT_MASK);
+
return 0;
}
-enum pixel_format {
- PIXEL_FORMAT_RGB = 1,
- PIXEL_FORMAT_YCBCR_444 = 2,
- PIXEL_FORMAT_YCBCR_422 = 4,
- PIXEL_FORMAT_YCBCR_420 = 8,
- PIXEL_FORMAT_Y_ONLY = 16,
-};
-
static void mhdp_link_training_init(struct cdns_mhdp_device *mhdp)
{
u32 reg32;
@@ -716,13 +650,11 @@ static int mhdp_link_training(struct cdns_mhdp_device *mhdp,
cdns_mhdp_reg_write(mhdp, CDNS_DP_SW_RESET, 1);
cdns_mhdp_reg_write(mhdp, CDNS_DP_SW_RESET, 0);
- /* Enable framer */
- /* FIXME: update when MST supported, BIT(2) */
cdns_mhdp_reg_write(mhdp, CDNS_DP_FRAMER_GLOBAL_CONFIG,
- CDNS_DP_FRAMER_EN |
CDNS_DP_NUM_LANES(mhdp->link.num_lanes) |
CDNS_DP_DISABLE_PHY_RST |
CDNS_DP_WR_FAILING_EDGE_VSYNC |
+ (mhdp->is_mst ? CDNS_DP_MST_EN : 0) |
(!video_mode ? CDNS_DP_NO_VIDEO_MODE : 0));
/* Reset PHY config */
@@ -751,31 +683,20 @@ static void cdns_mhdp_disable(struct drm_bridge *bridge)
cdns_mhdp_set_video_status(mhdp, 0);
+ mhdp->link_up = false;
+
drm_dp_link_power_down(&mhdp->aux, &mhdp->link);
+ if (mhdp->is_mst)
+ cdns_mhdp_mst_disable(bridge);
}
-static void cdns_mhdp_enable(struct drm_bridge *bridge)
+static int cdns_mhdp_link_up(struct cdns_mhdp_device *mhdp)
{
- struct cdns_mhdp_device *mhdp = bridge_to_mhdp(bridge);
- struct drm_display_mode *mode;
- struct drm_display_info *disp_info = &mhdp->connector.display_info;
- enum pixel_format pxlfmt;
- int pxlclock;
- unsigned int rate, tu_size = 30, vs, vs_f, bpp, required_bandwidth,
- available_bandwidth, dp_framer_sp = 0, msa_horizontal_1,
- msa_vertical_1, bnd_hsync2vsync, hsync2vsync_pol_ctrl,
- misc0 = 0, misc1 = 0, line_thresh = 0, pxl_repr,
- front_porch, back_porch, msa_h0, msa_v0, hsync, vsync,
- dp_vertical_1, line_thresh1, line_thresh2;
u32 resp;
-
- unsigned int size = DP_RECEIVER_CAP_SIZE, dp_framer_global_config,
+ u32 size = DP_RECEIVER_CAP_SIZE, dp_framer_global_config,
video_mode, training_interval_us;
u8 reg0[size], reg8, amp[2];
- mode = &bridge->encoder->crtc->state->adjusted_mode;
- pxlclock = mode->crtc_clock;
-
/*
* Upon power-on reset/device disconnection: [2:0] bits should be 0b001
* and [7:5] bits 0b000.
@@ -824,13 +745,17 @@ static void cdns_mhdp_enable(struct drm_bridge *bridge)
default:
dev_err(mhdp->dev,
"wrong training interval returned by DPCD: %d\n", reg8);
- return;
+ return -EIO;
}
cdns_mhdp_reg_read(mhdp, CDNS_DP_FRAMER_GLOBAL_CONFIG, &resp);
dp_framer_global_config = be32_to_cpu(resp);
+ cdns_mhdp_mst_probe(mhdp);
+ if (mhdp->is_mst)
+ dp_framer_global_config |= CDNS_DP_MST_EN;
+
video_mode = !(dp_framer_global_config & CDNS_DP_NO_VIDEO_MODE);
if (dp_framer_global_config & CDNS_DP_FRAMER_EN)
@@ -850,50 +775,168 @@ static void cdns_mhdp_enable(struct drm_bridge *bridge)
if (mhdp_link_training(mhdp, video_mode,
training_interval_us)) {
dev_err(mhdp->dev, "Link training failed. Exiting.\n");
- return;
+ return -EIO;
}
}
+ mhdp->link_up = true;
+
+ return 0;
+}
+
+static int cdns_mhdp_sst_enable(struct drm_bridge *bridge)
+{
+ struct cdns_mhdp_bridge *mhdp_bridge = to_mhdp_bridge(bridge);
+ struct cdns_mhdp_device *mhdp = mhdp_bridge->mhdp;
+ u32 rate, vs, vs_f, required_bandwidth, available_bandwidth;
+ u32 bpp, tu_size = 30, line_thresh1, line_thresh2, line_thresh = 0;
+ struct drm_display_mode *mode;
+ int pxlclock;
+ enum pixel_format pxlfmt;
+ struct drm_display_info *disp_info = &mhdp->connector.base.display_info;
+
+
+ mode = &bridge->encoder->crtc->state->adjusted_mode;
+ pxlclock = mode->crtc_clock;
+
+ mhdp_bridge->stream_id = 0;
+
rate = mhdp->link.rate / 1000;
+ pxlfmt = cdns_mhdp_get_pxlfmt(disp_info->color_formats);
+ bpp = cdns_mhdp_get_bpp(disp_info->bpc, pxlfmt);
+
+ /* find optimal tu_size */
+ required_bandwidth = pxlclock * bpp / 8;
+ available_bandwidth = mhdp->link.num_lanes * rate;
+ do {
+ tu_size += 2;
+
+ vs_f = tu_size * required_bandwidth / available_bandwidth;
+ vs = vs_f / 1000;
+ vs_f = vs_f % 1000;
+ /*
+ * FIXME (CDNS): downspreading?
+ * It's unused is what I've been told.
+ */
+ } while ((vs == 1 || ((vs_f > 850 || vs_f < 100) && vs_f != 0) ||
+ tu_size - vs < 2) && tu_size < 64);
+
+ if (vs > 64)
+ return -EINVAL;
+
+
+ cdns_mhdp_reg_write(mhdp, CDNS_DP_FRAMER_TU,
+ CDNS_DP_FRAMER_TU_VS(vs) |
+ CDNS_DP_FRAMER_TU_SIZE(tu_size) |
+ CDNS_DP_FRAMER_TU_CNT_RST_EN);
+
+ line_thresh1 = ((vs + 1) << 5) * 8 / bpp;
+ line_thresh2 = (pxlclock << 5) / 1000 / rate * (vs + 1) - (1 << 5);
+ line_thresh = line_thresh1 - line_thresh2 / mhdp->link.num_lanes;
+ line_thresh = (line_thresh >> 5) + 2;
+ cdns_mhdp_reg_write(mhdp, CDNS_DP_LINE_THRESH(0),
+ line_thresh & GENMASK(5, 0));
+
+ cdns_mhdp_reg_write(mhdp, CDNS_DP_STREAM_CONFIG_2(0),
+ CDNS_DP_SC2_TU_VS_DIFF((tu_size - vs > 3) ?
+ 0 : tu_size - vs));
+
+ cdns_mhdp_configure_video(bridge);
+
+ cdns_mhdp_set_video_status(mhdp, 1);
+
+ return 0;
+}
+
+enum pixel_format cdns_mhdp_get_pxlfmt(u32 color_formats)
+{
+ enum pixel_format pxlfmt;
+
/* FIXME: what about Y_ONLY? how is it handled in the kernel? */
- if (disp_info->color_formats & DRM_COLOR_FORMAT_YCRCB444)
+ if (color_formats & DRM_COLOR_FORMAT_YCRCB444)
pxlfmt = PIXEL_FORMAT_YCBCR_444;
- else if (disp_info->color_formats & DRM_COLOR_FORMAT_YCRCB422)
+ else if (color_formats & DRM_COLOR_FORMAT_YCRCB422)
pxlfmt = PIXEL_FORMAT_YCBCR_422;
- else if (disp_info->color_formats & DRM_COLOR_FORMAT_YCRCB420)
+ else if (color_formats & DRM_COLOR_FORMAT_YCRCB420)
pxlfmt = PIXEL_FORMAT_YCBCR_420;
else
pxlfmt = PIXEL_FORMAT_RGB;
+ return pxlfmt;
+}
+
+
+u32 cdns_mhdp_get_bpp(u32 bpc, enum pixel_format pxlfmt)
+{
+ u32 bpp;
+
+ switch (pxlfmt) {
+ case PIXEL_FORMAT_RGB:
+ bpp = bpc * 3;
+ break;
+ case PIXEL_FORMAT_YCBCR_444:
+ bpp = bpc * 3;
+ break;
+ case PIXEL_FORMAT_YCBCR_422:
+ bpp = bpc * 2;
+ break;
+ case PIXEL_FORMAT_YCBCR_420:
+ bpp = bpc * 3 / 2;
+ break;
+ default:
+ bpp = bpc;
+ }
+ return bpp;
+}
+
+void cdns_mhdp_configure_video(struct drm_bridge *bridge)
+{
+ struct cdns_mhdp_bridge *mhdp_bridge = to_mhdp_bridge(bridge);
+ struct cdns_mhdp_device *mhdp = mhdp_bridge->mhdp;
+ struct drm_display_info *disp_info;
+ unsigned int bpp, dp_framer_sp = 0, msa_horizontal_1,
+ msa_vertical_1, bnd_hsync2vsync, hsync2vsync_pol_ctrl,
+ misc0 = 0, misc1 = 0, pxl_repr,
+ front_porch, back_porch, msa_h0, msa_v0, hsync, vsync,
+ dp_vertical_1;
+ struct drm_display_mode *mode;
+ enum pixel_format pxlfmt;
+ int pxlclock;
+ u32 tmp;
+ u8 stream_id = mhdp_bridge->stream_id;
+
+ mode = &bridge->encoder->crtc->state->adjusted_mode;
+ pxlclock = mode->crtc_clock;
+
+ disp_info = &mhdp_bridge->connector->base.display_info;
+ pxlfmt = cdns_mhdp_get_pxlfmt(disp_info->color_formats);
+
/* if YCBCR supported and stream not SD, use ITU709 */
/* FIXME: handle ITU version with YCBCR420 when supported */
if ((pxlfmt == PIXEL_FORMAT_YCBCR_444 ||
pxlfmt == PIXEL_FORMAT_YCBCR_422) && mode->crtc_vdisplay >= 720)
misc0 = DP_YCBCR_COEFFICIENTS_ITU709;
+ bpp = cdns_mhdp_get_bpp(disp_info->bpc, pxlfmt);
+
switch (pxlfmt) {
case PIXEL_FORMAT_RGB:
- bpp = disp_info->bpc * 3;
pxl_repr = CDNS_DP_FRAMER_RGB << CDNS_DP_FRAMER_PXL_FORMAT;
misc0 |= DP_COLOR_FORMAT_RGB;
break;
case PIXEL_FORMAT_YCBCR_444:
- bpp = disp_info->bpc * 3;
pxl_repr = CDNS_DP_FRAMER_YCBCR444 << CDNS_DP_FRAMER_PXL_FORMAT;
misc0 |= DP_COLOR_FORMAT_YCbCr444 | DP_TEST_DYNAMIC_RANGE_CEA;
break;
case PIXEL_FORMAT_YCBCR_422:
- bpp = disp_info->bpc * 2;
pxl_repr = CDNS_DP_FRAMER_YCBCR422 << CDNS_DP_FRAMER_PXL_FORMAT;
misc0 |= DP_COLOR_FORMAT_YCbCr422 | DP_TEST_DYNAMIC_RANGE_CEA;
break;
case PIXEL_FORMAT_YCBCR_420:
- bpp = disp_info->bpc * 3 / 2;
pxl_repr = CDNS_DP_FRAMER_YCBCR420 << CDNS_DP_FRAMER_PXL_FORMAT;
break;
default:
- bpp = disp_info->bpc;
pxl_repr = CDNS_DP_FRAMER_Y_ONLY << CDNS_DP_FRAMER_PXL_FORMAT;
}
@@ -920,30 +963,12 @@ static void cdns_mhdp_enable(struct drm_bridge *bridge)
break;
}
- /* find optimal tu_size */
- required_bandwidth = pxlclock * bpp / 8;
- available_bandwidth = mhdp->link.num_lanes * rate;
- do {
- tu_size += 2;
-
- vs_f = tu_size * required_bandwidth / available_bandwidth;
- vs = vs_f / 1000;
- vs_f = vs_f % 1000;
- /*
- * FIXME (CDNS): downspreading?
- * It's unused is what I've been told.
- */
- } while ((vs == 1 || ((vs_f > 850 || vs_f < 100) && vs_f != 0) ||
- tu_size - vs < 2) && tu_size < 64);
-
- if (vs > 64)
- return;
-
bnd_hsync2vsync = CDNS_IP_BYPASS_V_INTERFACE;
if (mode->flags & DRM_MODE_FLAG_INTERLACE)
bnd_hsync2vsync |= CDNS_IP_DET_INTERLACE_FORMAT;
- cdns_mhdp_reg_write(mhdp, CDNS_BND_HSYNC2VSYNC, bnd_hsync2vsync);
+ cdns_mhdp_reg_write(mhdp, CDNS_BND_HSYNC2VSYNC(stream_id),
+ bnd_hsync2vsync);
if (mode->flags & DRM_MODE_FLAG_INTERLACE &&
mode->flags & DRM_MODE_FLAG_PHSYNC)
@@ -952,15 +977,10 @@ static void cdns_mhdp_enable(struct drm_bridge *bridge)
else
hsync2vsync_pol_ctrl = 0;
- cdns_mhdp_reg_write(mhdp, CDNS_HSYNC2VSYNC_POL_CTRL,
+ cdns_mhdp_reg_write(mhdp, CDNS_HSYNC2VSYNC_POL_CTRL(stream_id),
hsync2vsync_pol_ctrl);
- cdns_mhdp_reg_write(mhdp, CDNS_DP_FRAMER_TU,
- CDNS_DP_FRAMER_TU_VS(vs) |
- CDNS_DP_FRAMER_TU_SIZE(tu_size) |
- CDNS_DP_FRAMER_TU_CNT_RST_EN);
-
- cdns_mhdp_reg_write(mhdp, CDNS_DP_FRAMER_PXL_REPR, pxl_repr);
+ cdns_mhdp_reg_write(mhdp, CDNS_DP_FRAMER_PXL_REPR(stream_id), pxl_repr);
if (mode->flags & DRM_MODE_FLAG_INTERLACE)
dp_framer_sp |= CDNS_DP_FRAMER_INTERLACE;
@@ -968,19 +988,19 @@ static void cdns_mhdp_enable(struct drm_bridge *bridge)
dp_framer_sp |= CDNS_DP_FRAMER_HSYNC_POL_LOW;
if (mode->flags & DRM_MODE_FLAG_NVSYNC)
dp_framer_sp |= CDNS_DP_FRAMER_VSYNC_POL_LOW;
- cdns_mhdp_reg_write(mhdp, CDNS_DP_FRAMER_SP, dp_framer_sp);
+ cdns_mhdp_reg_write(mhdp, CDNS_DP_FRAMER_SP(stream_id), dp_framer_sp);
front_porch = mode->crtc_hsync_start - mode->crtc_hdisplay;
back_porch = mode->crtc_htotal - mode->crtc_hsync_end;
- cdns_mhdp_reg_write(mhdp, CDNS_DP_FRONT_BACK_PORCH,
+ cdns_mhdp_reg_write(mhdp, CDNS_DP_FRONT_BACK_PORCH(stream_id),
CDNS_DP_FRONT_PORCH(front_porch) |
CDNS_DP_BACK_PORCH(back_porch));
- cdns_mhdp_reg_write(mhdp, CDNS_DP_BYTE_COUNT,
+ cdns_mhdp_reg_write(mhdp, CDNS_DP_BYTE_COUNT(stream_id),
mode->crtc_hdisplay * bpp / 8);
msa_h0 = mode->crtc_htotal - mode->crtc_hsync_start;
- cdns_mhdp_reg_write(mhdp, CDNS_DP_MSA_HORIZONTAL_0,
+ cdns_mhdp_reg_write(mhdp, CDNS_DP_MSA_HORIZONTAL_0(stream_id),
CDNS_DP_MSAH0_H_TOTAL(mode->crtc_htotal) |
CDNS_DP_MSAH0_HSYNC_START(msa_h0));
@@ -989,11 +1009,11 @@ static void cdns_mhdp_enable(struct drm_bridge *bridge)
CDNS_DP_MSAH1_HDISP_WIDTH(mode->crtc_hdisplay);
if (mode->flags & DRM_MODE_FLAG_NHSYNC)
msa_horizontal_1 |= CDNS_DP_MSAH1_HSYNC_POL_LOW;
- cdns_mhdp_reg_write(mhdp, CDNS_DP_MSA_HORIZONTAL_1,
+ cdns_mhdp_reg_write(mhdp, CDNS_DP_MSA_HORIZONTAL_1(stream_id),
msa_horizontal_1);
msa_v0 = mode->crtc_vtotal - mode->crtc_vsync_start;
- cdns_mhdp_reg_write(mhdp, CDNS_DP_MSA_VERTICAL_0,
+ cdns_mhdp_reg_write(mhdp, CDNS_DP_MSA_VERTICAL_0(stream_id),
CDNS_DP_MSAV0_V_TOTAL(mode->crtc_vtotal) |
CDNS_DP_MSAV0_VSYNC_START(msa_v0));
@@ -1002,7 +1022,8 @@ static void cdns_mhdp_enable(struct drm_bridge *bridge)
CDNS_DP_MSAV1_VDISP_WIDTH(mode->crtc_vdisplay);
if (mode->flags & DRM_MODE_FLAG_NVSYNC)
msa_vertical_1 |= CDNS_DP_MSAV1_VSYNC_POL_LOW;
- cdns_mhdp_reg_write(mhdp, CDNS_DP_MSA_VERTICAL_1, msa_vertical_1);
+ cdns_mhdp_reg_write(mhdp, CDNS_DP_MSA_VERTICAL_1(stream_id),
+ msa_vertical_1);
if ((mode->flags & DRM_MODE_FLAG_INTERLACE) &&
mode->crtc_vtotal % 2 == 0)
@@ -1014,16 +1035,14 @@ static void cdns_mhdp_enable(struct drm_bridge *bridge)
if (pxlfmt == PIXEL_FORMAT_YCBCR_420)
misc1 = CDNS_DP_TEST_VSC_SDP;
- cdns_mhdp_reg_write(mhdp, CDNS_DP_MSA_MISC, misc0 | (misc1 << 8));
+ cdns_mhdp_reg_write(mhdp, CDNS_DP_MSA_MISC(stream_id),
+ misc0 | (misc1 << 8));
- /* FIXME: to be changed if MST mode */
- cdns_mhdp_reg_write(mhdp, CDNS_DP_STREAM_CONFIG, 1);
-
- cdns_mhdp_reg_write(mhdp, CDNS_DP_HORIZONTAL,
+ cdns_mhdp_reg_write(mhdp, CDNS_DP_HORIZONTAL(stream_id),
CDNS_DP_H_HSYNC_WIDTH(hsync) |
CDNS_DP_H_H_TOTAL(mode->crtc_hdisplay));
- cdns_mhdp_reg_write(mhdp, CDNS_DP_VERTICAL_0,
+ cdns_mhdp_reg_write(mhdp, CDNS_DP_VERTICAL_0(stream_id),
CDNS_DP_V0_VHEIGHT(mode->crtc_vdisplay) |
CDNS_DP_V0_VSTART(msa_v0));
@@ -1032,30 +1051,51 @@ static void cdns_mhdp_enable(struct drm_bridge *bridge)
mode->crtc_vtotal % 2 == 0)
dp_vertical_1 |= CDNS_DP_V1_VTOTAL_EVEN;
- cdns_mhdp_reg_write(mhdp, CDNS_DP_VERTICAL_1, dp_vertical_1);
+ cdns_mhdp_reg_write(mhdp, CDNS_DP_VERTICAL_1(stream_id), dp_vertical_1);
- cdns_mhdp_reg_write_bit(mhdp, CDNS_DP_VB_ID, 2, 1,
+ cdns_mhdp_reg_write_bit(mhdp, CDNS_DP_VB_ID(stream_id), 2, 1,
(mode->flags & DRM_MODE_FLAG_INTERLACE) ?
CDNS_DP_VB_ID_INTERLACED : 0);
- line_thresh1 = ((vs + 1) << 5) * 8 / bpp;
- line_thresh2 = (pxlclock << 5) / 1000 / rate * (vs + 1) - (1 << 5);
- line_thresh = line_thresh1 - line_thresh2 / mhdp->link.num_lanes;
- line_thresh = (line_thresh >> 5) + 2;
- cdns_mhdp_reg_write(mhdp, CDNS_DP_LINE_THRESH,
- line_thresh & GENMASK(5, 0));
- cdns_mhdp_reg_write(mhdp, CDNS_DP_RATE_GOVERNOR_STATUS,
- CDNS_DP_RG_TU_VS_DIFF((tu_size - vs > 3) ?
- 0 : tu_size - vs));
+ cdns_mhdp_reg_read(mhdp, CDNS_DP_FRAMER_GLOBAL_CONFIG, &tmp);
+ tmp |= CDNS_DP_FRAMER_EN;
+ cdns_mhdp_reg_write(mhdp, CDNS_DP_FRAMER_GLOBAL_CONFIG, tmp);
+}
- cdns_mhdp_set_video_status(mhdp, 1);
+void cdns_mhdp_enable(struct drm_bridge *bridge)
+{
+ struct cdns_mhdp_bridge *mhdp_bridge = to_mhdp_bridge(bridge);
+ struct cdns_mhdp_device *mhdp = mhdp_bridge->mhdp;
+ int ret = 0;
+
+ bool link_up = mhdp->link_up;
+
+ if (!link_up)
+ cdns_mhdp_link_up(mhdp);
+
+
+ if (!mhdp->is_mst)
+ ret = cdns_mhdp_sst_enable(bridge);
+ else
+ cdns_mhdp_mst_enable(bridge);
+
+}
+
+static void cdns_mhdp_detach(struct drm_bridge *bridge)
+{
+ struct cdns_mhdp_device *mhdp = bridge_to_mhdp(bridge);
+ struct cdns_mhdp_mst_cbs cbs_null = {0};
+
+ cdns_mhdp_mst_deinit(mhdp);
+ mhdp->cbs = cbs_null;
}
static const struct drm_bridge_funcs cdns_mhdp_bridge_funcs = {
.enable = cdns_mhdp_enable,
.disable = cdns_mhdp_disable,
.attach = cdns_mhdp_attach,
+ .detach = cdns_mhdp_detach,
};
static int load_firmware(struct cdns_mhdp_device *mhdp, const char *name,
@@ -1127,8 +1167,8 @@ static int cdns_mhdp_audio_get_eld(struct device *dev, void *data,
{
struct cdns_mhdp_device *mhdp = dev_get_drvdata(dev);
- memcpy(buf, mhdp->connector.eld,
- min(sizeof(mhdp->connector.eld), len));
+ memcpy(buf, mhdp->connector.base.eld,
+ min(sizeof(mhdp->connector.base.eld), len));
return 0;
}
@@ -1149,6 +1189,7 @@ static int mhdp_probe(struct platform_device *pdev)
unsigned int reg;
unsigned long rate;
u32 resp;
+ int irq;
struct hdmi_codec_pdata codec_data = {
.i2s = 1,
@@ -1192,6 +1233,14 @@ static int mhdp_probe(struct platform_device *pdev)
/* Leave debug mode */
writel(0, mhdp->regs + CDNS_APB_CTRL);
+ irq = platform_get_irq(pdev, 0);
+ ret = request_irq(irq, mhdp_irq_handler, 0, "mhdp8546", mhdp);
+ if (ret) {
+ dev_err(&pdev->dev,
+ "cannot install IRQ %d\n", irq);
+ return -EIO;
+ }
+
/*
* Wait for the KEEP_ALIVE "message" on the first 8 bits.
* Updated each sched "tick" (~2ms)
@@ -1222,8 +1271,8 @@ static int mhdp_probe(struct platform_device *pdev)
mhdp->host.lane_mapping = CDNS_LANE_MAPPING_FLIPPED;
mhdp->host.enhanced = true;
- mhdp->bridge.of_node = pdev->dev.of_node;
- mhdp->bridge.funcs = &cdns_mhdp_bridge_funcs;
+ mhdp->bridge.base.of_node = pdev->dev.of_node;
+ mhdp->bridge.base.funcs = &cdns_mhdp_bridge_funcs;
/* Init events to 0 as it's not cleared by FW at boot but on read */
readl(mhdp->regs + CDNS_SW_EVENT0);
@@ -1247,21 +1296,14 @@ static int mhdp_probe(struct platform_device *pdev)
cdns_mhdp_reg_write(mhdp, CDNS_DPTX_CAR,
resp | CDNS_VIF_CLK_EN | CDNS_VIF_CLK_RSTN);
- /* Loop over HDP change */
- /*
- * FIXME: does not work when put in mhdp_bridge_enable.
- * Where should we put it?
- */
- /* Is it still needed with use of mb message HPD STATUS? */
- ret = readl_poll_timeout(mhdp->regs + CDNS_SW_EVENT0, reg,
- reg & CDNS_DPTX_HPD, 500,
- CDNS_SW_EVENT0_TIMEOUT);
- if (ret) {
- dev_err(mhdp->dev, "no HPD received %d\n", reg);
- return -ENODEV;
- }
+ INIT_DELAYED_WORK(&mhdp->hotplug_work, mhdp_hotplug_work_func);
+
+ mhdp->bridge.connector = &mhdp->connector;
+ mhdp->connector.bridge = &mhdp->bridge;
+ mhdp->bridge.mhdp = mhdp;
+ mhdp->bridge.is_active = false;
- drm_bridge_add(&mhdp->bridge);
+ drm_bridge_add(&mhdp->bridge.base);
return 0;
}
@@ -1273,9 +1315,11 @@ static int mhdp_remove(struct platform_device *pdev)
struct cdns_mhdp_device *mhdp = dev_get_drvdata(&pdev->dev);
int ret;
+ flush_delayed_work(&mhdp->hotplug_work);
platform_device_unregister(mhdp->audio_pdev);
- drm_bridge_remove(&mhdp->bridge);
+ cdns_mhdp_mst_deinit(mhdp);
+ drm_bridge_remove(&mhdp->bridge.base);
ret = cdns_mhdp_set_firmware_active(mhdp, false);
if (ret) {
@@ -1288,6 +1332,17 @@ static int mhdp_remove(struct platform_device *pdev)
return 0;
}
+int mhdp_bridge_attach_mst_cbs(struct drm_bridge *bridge,
+ struct cdns_mhdp_mst_cbs *cbs)
+{
+ struct cdns_mhdp_device *mhdp = bridge_to_mhdp(bridge);
+
+ mhdp->cbs = *cbs;
+
+ return 0;
+}
+EXPORT_SYMBOL_GPL(mhdp_bridge_attach_mst_cbs);
+
static struct platform_driver mhdp_driver = {
.driver = {
.name = "cdns-mhdp",
@@ -1299,6 +1354,9 @@ static struct platform_driver mhdp_driver = {
module_platform_driver(mhdp_driver);
MODULE_AUTHOR("Quentin Schulz <quentin.schulz@free-electrons.com>");
+MODULE_AUTHOR("Przemyslaw Gaj <pgaj@cadence.com>");
+MODULE_AUTHOR("Damian Kos <dkos@cadence.com>");
+MODULE_AUTHOR("Piotr Sroka <piotrs@cadence.com>");
MODULE_DESCRIPTION("Cadence MHDP DP bridge driver");
MODULE_LICENSE("GPL");
MODULE_ALIAS("platform:cdns-mhdp");
diff --git a/drivers/gpu/drm/bridge/cdns-mhdp.h b/drivers/gpu/drm/bridge/cdns-mhdp.h
new file mode 100644
index 000000000000..abc1fa3f51a6
--- /dev/null
+++ b/drivers/gpu/drm/bridge/cdns-mhdp.h
@@ -0,0 +1,209 @@
+/* SPDX-License-Identifier: GPL v2 */
+/*
+ * Cadence MHDP DP MST bridge driver.
+ *
+ * Copyright: 2018 Cadence Design Systems, Inc.
+ *
+ * Author: Quentin Schulz <quentin.schulz@free-electrons.com>
+ */
+
+
+#ifndef CDNS_MHDP_H
+#define CDNS_MHDP_H
+
+#include <drm/drm_dp_mst_helper.h>
+
+#define CDNS_APB_CFG 0x00000
+#define CDNS_APB_CTRL (CDNS_APB_CFG + 0x00)
+#define CDNS_MAILBOX_FULL (CDNS_APB_CFG + 0x08)
+#define CDNS_MAILBOX_EMPTY (CDNS_APB_CFG + 0x0c)
+#define CDNS_MAILBOX_TX_DATA (CDNS_APB_CFG + 0x10)
+#define CDNS_MAILBOX_RX_DATA (CDNS_APB_CFG + 0x14)
+#define CDNS_KEEP_ALIVE (CDNS_APB_CFG + 0x18)
+#define CDNS_KEEP_ALIVE_MASK GENMASK(7, 0)
+
+#define CDNS_MB_INT_MASK (CDNS_APB_CFG + 0x34)
+
+#define CDNS_SW_CLK_L (CDNS_APB_CFG + 0x3c)
+#define CDNS_SW_CLK_H (CDNS_APB_CFG + 0x40)
+#define CDNS_SW_EVENT0 (CDNS_APB_CFG + 0x44)
+#define CDNS_DPTX_HPD BIT(0)
+
+#define CDNS_SW_EVENT1 (CDNS_APB_CFG + 0x48)
+#define CDNS_SW_EVENT2 (CDNS_APB_CFG + 0x4c)
+#define CDNS_SW_EVENT3 (CDNS_APB_CFG + 0x50)
+
+#define CDNS_APB_INT_MASK (CDNS_APB_CFG + 0x6C)
+#define CDNS_APB_INT_MASK_MAILBOX_INT BIT(0)
+#define CDNS_APB_INT_MASK_SW_EVENT_INT BIT(1)
+
+#define CDNS_DPTX_CAR (CDNS_APB_CFG + 0x904)
+#define CDNS_VIF_CLK_EN BIT(0)
+#define CDNS_VIF_CLK_RSTN BIT(1)
+
+#define CDNS_SOURCE_VIDEO_IF(s) (0x00b00 + (s * 0x20))
+#define CDNS_BND_HSYNC2VSYNC(s) (CDNS_SOURCE_VIDEO_IF(s) + \
+ 0x00)
+#define CDNS_IP_DTCT_WIN GENMASK(11, 0)
+#define CDNS_IP_DET_INTERLACE_FORMAT BIT(12)
+#define CDNS_IP_BYPASS_V_INTERFACE BIT(13)
+
+#define CDNS_HSYNC2VSYNC_POL_CTRL(s) (CDNS_SOURCE_VIDEO_IF(s) + \
+ 0x10)
+#define CDNS_H2V_HSYNC_POL_ACTIVE_LOW BIT(1)
+#define CDNS_H2V_VSYNC_POL_ACTIVE_LOW BIT(2)
+
+#define CDNS_DPTX_PHY_CONFIG 0x02000
+#define CDNS_PHY_TRAINING_EN BIT(0)
+#define CDNS_PHY_TRAINING_TYPE(x) (((x) & GENMASK(3, 0)) << 1)
+#define CDNS_PHY_SCRAMBLER_BYPASS BIT(5)
+#define CDNS_PHY_ENCODER_BYPASS BIT(6)
+#define CDNS_PHY_SKEW_BYPASS BIT(7)
+#define CDNS_PHY_TRAINING_AUTO BIT(8)
+#define CDNS_PHY_LANE0_SKEW(x) (((x) & GENMASK(2, 0)) << 9)
+#define CDNS_PHY_LANE1_SKEW(x) (((x) & GENMASK(2, 0)) << 12)
+#define CDNS_PHY_LANE2_SKEW(x) (((x) & GENMASK(2, 0)) << 15)
+#define CDNS_PHY_LANE3_SKEW(x) (((x) & GENMASK(2, 0)) << 18)
+#define CDNS_PHY_COMMON_CONFIG (CDNS_PHY_LANE1_SKEW(1) | \
+ CDNS_PHY_LANE2_SKEW(2) | \
+ CDNS_PHY_LANE3_SKEW(3))
+#define CDNS_PHY_10BIT_EN BIT(21)
+
+#define CDNS_DPTX_FRAMER 0x02200
+#define CDNS_DP_FRAMER_GLOBAL_CONFIG (CDNS_DPTX_FRAMER + 0x00)
+#define CDNS_DP_NUM_LANES(x) (x - 1)
+#define CDNS_DP_MST_EN BIT(2)
+#define CDNS_DP_FRAMER_EN BIT(3)
+#define CDNS_DP_RATE_GOVERNOR_EN BIT(4)
+#define CDNS_DP_NO_VIDEO_MODE BIT(5)
+#define CDNS_DP_DISABLE_PHY_RST BIT(6)
+#define CDNS_DP_WR_FAILING_EDGE_VSYNC BIT(7)
+
+#define CDNS_DP_SW_RESET (CDNS_DPTX_FRAMER + 0x04)
+#define CDNS_DP_FRAMER_TU (CDNS_DPTX_FRAMER + 0x08)
+#define CDNS_DP_FRAMER_TU_SIZE(x) (((x) & GENMASK(6, 0)) << 8)
+#define CDNS_DP_FRAMER_TU_VS(x) ((x) & GENMASK(5, 0))
+#define CDNS_DP_FRAMER_TU_CNT_RST_EN BIT(15)
+
+#define CDNS_DPTX_STREAM(s) (0x03000 + s * 0x80)
+#define CDNS_DP_MSA_HORIZONTAL_0(s) (CDNS_DPTX_STREAM(s) + 0x00)
+#define CDNS_DP_MSAH0_H_TOTAL(x) (x)
+#define CDNS_DP_MSAH0_HSYNC_START(x) ((x) << 16)
+
+#define CDNS_DP_MSA_HORIZONTAL_1(s) (CDNS_DPTX_STREAM(s) + 0x04)
+#define CDNS_DP_MSAH1_HSYNC_WIDTH(x) (x)
+#define CDNS_DP_MSAH1_HSYNC_POL_LOW BIT(15)
+#define CDNS_DP_MSAH1_HDISP_WIDTH(x) ((x) << 16)
+
+#define CDNS_DP_MSA_VERTICAL_0(s) (CDNS_DPTX_STREAM(s) + 0x08)
+#define CDNS_DP_MSAV0_V_TOTAL(x) (x)
+#define CDNS_DP_MSAV0_VSYNC_START(x) ((x) << 16)
+
+#define CDNS_DP_MSA_VERTICAL_1(s) (CDNS_DPTX_STREAM(s) + 0x0c)
+#define CDNS_DP_MSAV1_VSYNC_WIDTH(x) (x)
+#define CDNS_DP_MSAV1_VSYNC_POL_LOW BIT(15)
+#define CDNS_DP_MSAV1_VDISP_WIDTH(x) ((x) << 16)
+
+#define CDNS_DP_MSA_MISC(s) (CDNS_DPTX_STREAM(s) + 0x10)
+#define CDNS_DP_STREAM_CONFIGs(s) (CDNS_DPTX_STREAM(s) + 0x14)
+#define CDNS_DP_STREAM_CONFIG_2(s) (CDNS_DPTX_STREAM(s) + 0x2c)
+#define CDNS_DP_SC2_TU_VS_DIFF(x) ((x) << 8)
+
+#define CDNS_DP_HORIZONTAL(s) (CDNS_DPTX_STREAM(s) + 0x30)
+#define CDNS_DP_H_HSYNC_WIDTH(x) (x)
+#define CDNS_DP_H_H_TOTAL(x) ((x) << 16)
+
+#define CDNS_DP_VERTICAL_0(s) (CDNS_DPTX_STREAM(s) + 0x34)
+#define CDNS_DP_V0_VHEIGHT(x) (x)
+#define CDNS_DP_V0_VSTART(x) ((x) << 16)
+
+#define CDNS_DP_VERTICAL_1(s) (CDNS_DPTX_STREAM(s) + 0x38)
+#define CDNS_DP_V1_VTOTAL(x) (x)
+#define CDNS_DP_V1_VTOTAL_EVEN BIT(16)
+
+#define CDNS_DP_FRAMER_PXL_REPR(s) (CDNS_DPTX_STREAM(s) + 0x4c)
+#define CDNS_DP_FRAMER_6_BPC BIT(0)
+#define CDNS_DP_FRAMER_8_BPC BIT(1)
+#define CDNS_DP_FRAMER_10_BPC BIT(2)
+#define CDNS_DP_FRAMER_12_BPC BIT(3)
+#define CDNS_DP_FRAMER_16_BPC BIT(4)
+#define CDNS_DP_FRAMER_PXL_FORMAT 0x8
+#define CDNS_DP_FRAMER_RGB BIT(0)
+#define CDNS_DP_FRAMER_YCBCR444 BIT(1)
+#define CDNS_DP_FRAMER_YCBCR422 BIT(2)
+#define CDNS_DP_FRAMER_YCBCR420 BIT(3)
+#define CDNS_DP_FRAMER_Y_ONLY BIT(4)
+
+#define CDNS_DP_FRAMER_SP(s) (CDNS_DPTX_STREAM(s) + 0x10)
+#define CDNS_DP_FRAMER_VSYNC_POL_LOW BIT(0)
+#define CDNS_DP_FRAMER_HSYNC_POL_LOW BIT(1)
+#define CDNS_DP_FRAMER_INTERLACE BIT(2)
+
+#define CDNS_DP_LINE_THRESH(s) (CDNS_DPTX_STREAM(s) + 0x64)
+#define CDNS_DP_ACTIVE_LINE_THRESH(x) (x)
+
+#define CDNS_DP_VB_ID(s) (CDNS_DPTX_STREAM(s) + 0x68)
+#define CDNS_DP_VB_ID_INTERLACED BIT(2)
+#define CDNS_DP_VB_ID_COMPRESSED BIT(6)
+
+#define CDNS_DP_FRONT_BACK_PORCH(s) (CDNS_DPTX_STREAM(s) + 0x78)
+#define CDNS_DP_BACK_PORCH(x) (x)
+#define CDNS_DP_FRONT_PORCH(x) ((x) << 16)
+
+#define CDNS_DP_BYTE_COUNT(s) (CDNS_DPTX_STREAM(s) + 0x7c)
+#define CDNS_DP_BYTE_COUNT_BYTES_IN_CHUNK_SHIFT 16
+
+#define CDNS_DP_MST_STREAM_CONFIG(s) (CDNS_DPTX_STREAM(s) + 0x14)
+#define CDNS_DP_MST_STRM_CFG_STREAM_EN BIT(0)
+#define CDNS_DP_MST_STRM_CFG_NO_VIDEO BIT(1)
+
+#define CDNS_DP_MST_SLOT_ALLOCATE(s) (CDNS_DPTX_STREAM(s) + 0x44)
+#define CDNS_DP_S_ALLOC_START_SLOT(x) (x)
+#define CDNS_DP_S_ALLOC_END_SLOT(x) ((x) << 8)
+
+#define CDNS_DP_RATE_GOVERNING(s) (CDNS_DPTX_STREAM(s) + 0x48)
+#define CDNS_DP_RG_TARG_AV_SLOTS_Y(x) (x)
+#define CDNS_DP_RG_TARG_AV_SLOTS_X(x) (x << 4)
+#define CDNS_DP_RG_ENABLE BIT(10)
+
+#define CDNS_DP_MTPH_CONTROL 0x2264
+#define CDNS_DP_MTPH_ECF_EN BIT(0)
+#define CDNS_DP_MTPH_ACT_EN BIT(1)
+#define CDNS_DP_MTPH_LVP_EN BIT(2)
+
+#define CDNS_DP_MTPH_STATUS 0x226C
+#define CDNS_DP_MTPH_ACT_STATUS BIT(0)
+
+
+#define CDNS_DPTX_GLOBAL 0x02300
+#define CDNS_DP_LANE_EN (CDNS_DPTX_GLOBAL + 0x00)
+#define CDNS_DP_LANE_EN_LANES(x) GENMASK(x - 1, 0)
+#define CDNS_DP_ENHNCD (CDNS_DPTX_GLOBAL + 0x04)
+
+
+#define to_mhdp_connector(x) container_of(x, struct cdns_mhdp_connector, base)
+#define to_mhdp_bridge(x) container_of(x, struct cdns_mhdp_bridge, base)
+#define mgr_to_mhdp(x) container_of(x, struct cdns_mhdp_device, mst_mgr)
+
+#define CDNS_MHDP_MAX_STREAMS 4
+
+enum pixel_format {
+ PIXEL_FORMAT_RGB = 1,
+ PIXEL_FORMAT_YCBCR_444 = 2,
+ PIXEL_FORMAT_YCBCR_422 = 4,
+ PIXEL_FORMAT_YCBCR_420 = 8,
+ PIXEL_FORMAT_Y_ONLY = 16,
+};
+
+
+int cdns_mhdp_mst_init(struct cdns_mhdp_device *mhdp);
+void cdns_mhdp_mst_deinit(struct cdns_mhdp_device *mhdp);
+bool cdns_mhdp_mst_probe(struct cdns_mhdp_device *mhdp);
+enum pixel_format cdns_mhdp_get_pxlfmt(u32 color_formats);
+u32 cdns_mhdp_get_bpp(u32 bpc, u32 color_formats);
+void cdns_mhdp_configure_video(struct drm_bridge *bridge);
+void cdns_mhdp_mst_enable(struct drm_bridge *bridge);
+void cdns_mhdp_mst_disable(struct drm_bridge *bridge);
+void cdns_mhdp_enable(struct drm_bridge *bridge);
+
+#endif
diff --git a/drivers/gpu/drm/rockchip/cdn-dp-core.c b/drivers/gpu/drm/rockchip/cdn-dp-core.c
index 343f381e3440..a5a668f1912b 100644
--- a/drivers/gpu/drm/rockchip/cdn-dp-core.c
+++ b/drivers/gpu/drm/rockchip/cdn-dp-core.c
@@ -34,7 +34,7 @@
#include "rockchip_drm_vop.h"
#define connector_to_dp(c) \
- container_of(c, struct cdn_dp_device, mhdp.connector)
+ container_of(c, struct cdn_dp_device, mhdp.connector.base)
#define encoder_to_dp(c) \
container_of(c, struct cdn_dp_device, encoder)
@@ -291,7 +291,7 @@ static int cdn_dp_connector_mode_valid(struct drm_connector *connector,
{
struct cdn_dp_device *dp = connector_to_dp(connector);
struct drm_display_info *display_info =
- &dp->mhdp.connector.display_info;
+ &dp->mhdp.connector.base.display_info;
u32 requested, actual, rate, sink_max, source_max = 0;
u8 lanes, bpc;
@@ -387,7 +387,7 @@ static int cdn_dp_get_sink_capability(struct cdn_dp_device *dp)
}
kfree(dp->edid);
- dp->edid = drm_do_get_edid(&dp->mhdp.connector,
+ dp->edid = drm_do_get_edid(&dp->mhdp.connector.base,
cdns_mhdp_get_edid_block, &dp->mhdp);
return 0;
}
@@ -559,7 +559,7 @@ static void cdn_dp_encoder_mode_set(struct drm_encoder *encoder,
{
struct cdn_dp_device *dp = encoder_to_dp(encoder);
struct drm_display_info *display_info =
- &dp->mhdp.connector.display_info;
+ &dp->mhdp.connector.base.display_info;
struct video_info *video = &dp->mhdp.video_info;
switch (display_info->bpc) {
@@ -863,8 +863,8 @@ static int cdn_dp_audio_get_eld(struct device *dev, void *data,
{
struct cdn_dp_device *dp = dev_get_drvdata(dev);
- memcpy(buf, dp->mhdp.connector.eld,
- min(sizeof(dp->mhdp.connector.eld), len));
+ memcpy(buf, dp->mhdp.connector.base.eld,
+ min(sizeof(dp->mhdp.connector.base.eld), len));
return 0;
}
@@ -936,7 +936,7 @@ static void cdn_dp_pd_event_work(struct work_struct *work)
{
struct cdn_dp_device *dp = container_of(work, struct cdn_dp_device,
event_work);
- struct drm_connector *connector = &dp->mhdp.connector;
+ struct drm_connector *connector = &dp->mhdp.connector.base;
enum drm_connector_status old_status;
struct device *dev = dp->mhdp.dev;
@@ -1062,7 +1062,7 @@ static int cdn_dp_bind(struct device *dev, struct device *master, void *data)
drm_encoder_helper_add(encoder, &cdn_dp_encoder_helper_funcs);
- connector = &dp->mhdp.connector;
+ connector = &dp->mhdp.connector.base;
connector->polled = DRM_CONNECTOR_POLL_HPD;
connector->dpms = DRM_MODE_DPMS_OFF;
@@ -1113,7 +1113,7 @@ 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;
- struct drm_connector *connector = &dp->mhdp.connector;
+ struct drm_connector *connector = &dp->mhdp.connector.base;
cancel_work_sync(&dp->event_work);
cdn_dp_encoder_disable(encoder);
diff --git a/include/drm/bridge/cdns-mhdp-cbs.h b/include/drm/bridge/cdns-mhdp-cbs.h
new file mode 100644
index 000000000000..af07cbfcb729
--- /dev/null
+++ b/include/drm/bridge/cdns-mhdp-cbs.h
@@ -0,0 +1,27 @@
+/* SPDX-License-Identifier: GPL v2 */
+/*
+ * Cadence MHDP DP bridge callbacks.
+ *
+ * Copyright: 2018 Cadence Design Systems, Inc.
+ *
+ * Author: Piotr Sroka <piotrs@cadence.com>
+ */
+
+#ifndef CDNS_MHDP_CBS_H
+#define CDNS_MHDP_CBS_H
+
+struct cdns_mhdp_mst_cbs_funcs {
+ struct drm_encoder *(*create_mst_encoder)(void *priv_data,
+ struct drm_bridge *bridge);
+ void (*destroy_mst_encoder)(void *priv_data, struct drm_bridge *bridge);
+};
+
+struct cdns_mhdp_mst_cbs {
+ struct cdns_mhdp_mst_cbs_funcs funcs;
+ void *priv_data;
+};
+
+int mhdp_bridge_attach_mst_cbs(struct drm_bridge *bridge,
+ struct cdns_mhdp_mst_cbs *cbs);
+
+#endif
diff --git a/include/drm/bridge/cdns-mhdp-common.h b/include/drm/bridge/cdns-mhdp-common.h
index c5a5c4fa7fc4..d4711091ff2b 100644
--- a/include/drm/bridge/cdns-mhdp-common.h
+++ b/include/drm/bridge/cdns-mhdp-common.h
@@ -15,10 +15,12 @@
#ifndef CDNS_MHDP_COMMON_H_
#define CDNS_MHDP_COMMON_H_
+#include <drm/drm_dp_mst_helper.h>
#include <linux/bitops.h>
#include <drm/drm_dp_helper.h>
#include <drm/drm_connector.h>
#include <drm/drm_bridge.h>
+#include <drm/bridge/cdns-mhdp-cbs.h>
#define ADDR_IMEM 0x10000
#define ADDR_DMEM 0x20000
@@ -326,11 +328,11 @@
#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 GENERAL_REGISTER_READ 0x07
+#define GENERAL_MAIN_CONTROL 0x01
+#define GENERAL_TEST_ECHO 0x02
+#define GENERAL_BUS_SETTINGS 0x03
+#define GENERAL_TEST_ACCESS 0x04
+#define GENERAL_REGISTER_READ 0x07
#define DPTX_SET_POWER_MNG 0x00
#define DPTX_SET_HOST_CAPABILITIES 0x01
@@ -512,13 +514,34 @@ struct cdns_mhdp_sink {
u8 enhanced;
};
+struct cdns_mhdp_bridge;
+struct cdns_mhdp_connector;
+
+struct cdns_mhdp_bridge {
+ struct cdns_mhdp_device *mhdp;
+ struct drm_bridge base;
+ int pbn;
+ int8_t stream_id;
+ struct cdns_mhdp_connector *connector;
+ bool is_active;
+};
+
+
+struct cdns_mhdp_connector {
+ struct drm_connector base;
+ bool is_mst_connector;
+ struct drm_dp_mst_port *port;
+ struct cdns_mhdp_bridge *bridge;
+};
+
+
struct cdns_mhdp_device {
void __iomem *regs;
struct device *dev;
struct drm_dp_link link;
- struct drm_connector connector;
+ struct cdns_mhdp_connector connector;
struct clk *spdif_clk;
struct reset_control *spdif_rst;
@@ -528,13 +551,22 @@ struct cdns_mhdp_device {
struct drm_dp_aux aux;
struct cdns_mhdp_host host;
struct cdns_mhdp_sink sink;
- struct drm_bridge bridge;
+ struct cdns_mhdp_bridge bridge;
struct phy *phy;
void __iomem *dbg_regs;
struct video_info video_info;
struct drm_display_mode mode;
unsigned int fw_version;
+
+ struct drm_dp_mst_topology_mgr mst_mgr;
+ struct delayed_work hotplug_work;
+
+ struct cdns_mhdp_mst_cbs cbs;
+ bool is_mst;
+ bool can_mst;
+ bool link_up;
+ bool plugged;
};
void cdns_mhdp_clock_reset(struct cdns_mhdp_device *mhdp);
@@ -562,7 +594,7 @@ int cdns_mhdp_audio_config(struct cdns_mhdp_device *mhdp,
int cdns_mhdp_reg_read(struct cdns_mhdp_device *mhdp, u32 addr, u32 *value);
int cdns_mhdp_reg_write(struct cdns_mhdp_device *mhdp, u16 addr, u32 val);
int cdns_mhdp_reg_write_bit(struct cdns_mhdp_device *mhdp, u16 addr,
- u8 start_bit, u8 bits_no, u32 val);
+ u8 start_bit, u8 bits_no, u32 val);
int cdns_mhdp_adjust_lt(struct cdns_mhdp_device *mhdp, u8 nlanes,
u16 udelay, u8 *lanes_data,
u8 *dpcd);
--
2.17.1
^ permalink raw reply related [flat|nested] 45+ messages in thread
* [PATCH v6 5/6] drm/bridge: add support for MST in mhdp8546 driver
@ 2018-10-08 21:42 ` Damian Kos
0 siblings, 0 replies; 45+ messages in thread
From: Damian Kos @ 2018-10-08 21:42 UTC (permalink / raw)
To: linux-arm-kernel
From: Piotr Sroka <piotrs@cadence.com>
- add hot plug support to handle HDP IRQ interrupts in case sideband
message is ready to read.
- there is only one connector created at initialization stage. It is
used as SST connector when controller works in SST mode. If controller
works in MST mode then the SST connector status is disconnected all the
time. MST connectors are created/destroyed in runtime depends on what
devices are connected to the DP controller.
- add callbacks functions to be able to inform module managing encoders
objects to create or destroy an encoder in case new a MST connector is
created/destroyed
Signed-off-by: Piotr Sroka <piotrs@cadence.com>
Signed-off-by: Damian Kos <dkos@cadence.com>
---
drivers/gpu/drm/bridge/Makefile | 2 +-
drivers/gpu/drm/bridge/cdns-mhdp-mst.c | 594 +++++++++++++++++++++++++
drivers/gpu/drm/bridge/cdns-mhdp.c | 560 ++++++++++++-----------
drivers/gpu/drm/bridge/cdns-mhdp.h | 209 +++++++++
drivers/gpu/drm/rockchip/cdn-dp-core.c | 18 +-
include/drm/bridge/cdns-mhdp-cbs.h | 27 ++
include/drm/bridge/cdns-mhdp-common.h | 48 +-
7 files changed, 1189 insertions(+), 269 deletions(-)
create mode 100644 drivers/gpu/drm/bridge/cdns-mhdp-mst.c
create mode 100644 drivers/gpu/drm/bridge/cdns-mhdp.h
create mode 100644 include/drm/bridge/cdns-mhdp-cbs.h
diff --git a/drivers/gpu/drm/bridge/Makefile b/drivers/gpu/drm/bridge/Makefile
index e802fdb85750..b80f3d6ed2a6 100644
--- a/drivers/gpu/drm/bridge/Makefile
+++ b/drivers/gpu/drm/bridge/Makefile
@@ -19,4 +19,4 @@ obj-$(CONFIG_DRM_TI_TFP410) += ti-tfp410.o
obj-$(CONFIG_DRM_CDNS_MHDP) += mhdp8546.o
obj-y += synopsys/
-mhdp8546-objs := cdns-mhdp-common.o cdns-mhdp.o
+mhdp8546-objs := cdns-mhdp-common.o cdns-mhdp.o cdns-mhdp-mst.o
diff --git a/drivers/gpu/drm/bridge/cdns-mhdp-mst.c b/drivers/gpu/drm/bridge/cdns-mhdp-mst.c
new file mode 100644
index 000000000000..782d4bf9b667
--- /dev/null
+++ b/drivers/gpu/drm/bridge/cdns-mhdp-mst.c
@@ -0,0 +1,594 @@
+// SPDX-License-Identifier: GPL v2
+/*
+ * Cadence MHDP DP MST bridge driver.
+ *
+ * Copyright: 2018 Cadence Design Systems, Inc.
+ *
+ * Author: Piotr Sroka <piotrs@cadence.com>
+ */
+#include <drm/drm_print.h>
+#include <drm/drm_crtc_helper.h>
+#include <drm/drm_atomic_helper.h>
+#include <drm/drm_fixed.h>
+#include <drm/drm_connector.h>
+#include <linux/iopoll.h>
+
+#include <drm/bridge/cdns-mhdp-common.h>
+#include "cdns-mhdp.h"
+
+
+static void cdns_mhdp_mst_stream_enable(struct cdns_mhdp_bridge *mhdp_bridge,
+ bool enable)
+{
+ u32 reg;
+ struct cdns_mhdp_device *mhdp = mhdp_bridge->mhdp;
+ u8 stream_id = mhdp_bridge->stream_id;
+
+ cdns_mhdp_reg_read(mhdp, CDNS_DP_MST_STREAM_CONFIG(stream_id), ®);
+
+ if (enable) {
+ reg |= CDNS_DP_MST_STRM_CFG_STREAM_EN;
+ reg &= ~CDNS_DP_MST_STRM_CFG_NO_VIDEO;
+ } else {
+ reg &= ~CDNS_DP_MST_STRM_CFG_STREAM_EN;
+ reg |= CDNS_DP_MST_STRM_CFG_NO_VIDEO;
+ }
+
+ cdns_mhdp_reg_write(mhdp, CDNS_DP_MST_STREAM_CONFIG(stream_id), reg);
+}
+
+static inline s64 calc_fixed_avg_slots(u32 pbn, u32 pbn_div)
+{
+ s64 fixed_pbn, fixed_pbn_div, fixed_targ_avg_slots;
+
+ fixed_pbn = drm_int2fixp(pbn);
+ fixed_pbn_div = drm_int2fixp(pbn_div);
+ fixed_targ_avg_slots = drm_fixp_div(fixed_pbn, fixed_pbn_div);
+
+ return fixed_targ_avg_slots;
+}
+
+static void cdns_mhdp_mst_set_threshold(struct cdns_mhdp_bridge *bridge)
+{
+ u32 threshold;
+ u8 stream_id = bridge->stream_id;
+ struct cdns_mhdp_device *mhdp = bridge->mhdp;
+ s64 fixed_targ_avg_slots, fixed_thresh, fixed_targ_entries;
+
+ fixed_targ_avg_slots = calc_fixed_avg_slots(bridge->pbn,
+ mhdp->mst_mgr.pbn_div);
+
+ fixed_targ_entries = drm_fixp_div(fixed_targ_avg_slots,
+ drm_int2fixp(2));
+ fixed_thresh = drm_fixp_mul(fixed_targ_entries, fixed_targ_entries);
+ fixed_thresh = drm_fixp_div(fixed_thresh, drm_int2fixp(32));
+ fixed_thresh = fixed_targ_entries - fixed_thresh;
+ fixed_thresh = drm_fixp_mul(fixed_thresh,
+ drm_int2fixp(mhdp->link.num_lanes));
+ fixed_thresh = drm_fixp_div(fixed_thresh, drm_int2fixp(4));
+
+ threshold = drm_fixp2int_ceil(fixed_thresh);
+ if (threshold < 2)
+ threshold = 2;
+
+ cdns_mhdp_reg_write(mhdp, CDNS_DP_LINE_THRESH(stream_id),
+ CDNS_DP_ACTIVE_LINE_THRESH(threshold));
+}
+
+static void cdns_mhdp_set_rate_governing(struct cdns_mhdp_bridge *bridge,
+ bool enable)
+{
+ struct cdns_mhdp_device *mhdp = bridge->mhdp;
+ u8 stream_id = bridge->stream_id;
+
+ if (enable) {
+ s64 fixed_targ_avg_slots, fixed_y;
+ u32 x, y;
+
+ fixed_targ_avg_slots =
+ calc_fixed_avg_slots(bridge->pbn,
+ mhdp->mst_mgr.pbn_div);
+
+ x = drm_fixp2int(fixed_targ_avg_slots);
+
+ fixed_y = (fixed_targ_avg_slots - drm_int2fixp(x));
+ fixed_y = drm_fixp_mul(fixed_y, drm_int2fixp(16));
+ y = drm_fixp2int_ceil(fixed_y);
+
+ cdns_mhdp_reg_write(mhdp, CDNS_DP_RATE_GOVERNING(stream_id),
+ CDNS_DP_RG_TARG_AV_SLOTS_Y(y) |
+ CDNS_DP_RG_TARG_AV_SLOTS_X(x) |
+ CDNS_DP_RG_ENABLE);
+ } else
+ cdns_mhdp_reg_write(mhdp, CDNS_DP_RATE_GOVERNING(stream_id), 0);
+}
+
+
+static struct drm_dp_payload *
+cdns_mhdp_get_payload(struct cdns_mhdp_bridge *bridge)
+{
+ int vcpi = bridge->connector->port->vcpi.vcpi, i;
+ struct cdns_mhdp_device *mhdp = bridge->mhdp;
+
+ for (i = 0; i < mhdp->mst_mgr.max_payloads; i++) {
+ struct drm_dp_payload *payload = &mhdp->mst_mgr.payloads[i];
+
+ if (payload->vcpi == vcpi)
+ return payload;
+ }
+
+ return NULL;
+}
+
+
+static int
+cdns_mhdp_set_act_enable(struct cdns_mhdp_device *mhdp)
+{
+ u32 reg;
+ int ret;
+
+ cdns_mhdp_reg_read(mhdp, CDNS_DP_MTPH_CONTROL, ®);
+ cdns_mhdp_reg_write(mhdp, CDNS_DP_MTPH_CONTROL,
+ reg | CDNS_DP_MTPH_ACT_EN);
+
+ ret = readl_poll_timeout(mhdp->regs + CDNS_DP_MTPH_STATUS, reg,
+ ((reg & CDNS_DP_MTPH_ACT_STATUS) == 0), 0,
+ 30);
+ if (ret) {
+ dev_err(mhdp->dev,
+ "ACT sequence cannot complete in 30us\n");
+ return -EIO;
+ }
+
+ return drm_dp_check_act_status(&mhdp->mst_mgr);
+}
+
+
+static int
+cdns_mhdp_apply_slot_allocation(struct cdns_mhdp_bridge *mhdp_bridge)
+{
+ struct drm_dp_payload *payload;
+ struct cdns_mhdp_device *mhdp = mhdp_bridge->mhdp;
+ u8 stream_id = mhdp_bridge->stream_id;
+
+ payload = cdns_mhdp_get_payload(mhdp_bridge);
+
+ if (!payload) {
+ DRM_ERROR("payload is not found\n");
+ return -EIO;
+ }
+
+ cdns_mhdp_reg_write(mhdp, CDNS_DP_MST_SLOT_ALLOCATE(stream_id),
+ CDNS_DP_S_ALLOC_START_SLOT(payload->start_slot) |
+ CDNS_DP_S_ALLOC_END_SLOT(payload->start_slot
+ + payload->num_slots - 1));
+
+ return 0;
+}
+
+static void
+cdns_mhdp_update_slot_allocation(struct cdns_mhdp_bridge *mhdp_bridge)
+{
+ struct drm_device *dev = mhdp_bridge->base.dev;
+ struct drm_connector *connector;
+
+ list_for_each_entry(connector, &dev->mode_config.connector_list, head) {
+ struct cdns_mhdp_connector *mhdp_connector;
+
+ mhdp_connector = to_mhdp_connector(connector);
+ if (!connector->encoder)
+ continue;
+ if (!mhdp_connector->is_mst_connector)
+ continue;
+
+ if (mhdp_connector->bridge->stream_id != -1)
+ cdns_mhdp_apply_slot_allocation(mhdp_connector->bridge);
+ }
+}
+
+static enum drm_connector_status
+cdns_dp_mst_detect(struct drm_connector *connector, bool force)
+{
+ enum drm_connector_status stat;
+ struct cdns_mhdp_connector *mhdp_connector;
+ struct cdns_mhdp_device *mhdp;
+
+ mhdp_connector = to_mhdp_connector(connector);
+ mhdp = mhdp_connector->bridge->mhdp;
+
+ stat = drm_dp_mst_detect_port(connector, &mhdp->mst_mgr,
+ mhdp_connector->port);
+ return stat;
+}
+
+static void
+cdns_dp_mst_connector_destroy(struct drm_connector *connector)
+{
+ struct cdns_mhdp_connector *mhdp_connector;
+ struct cdns_mhdp_bridge *mhdp_bridge;
+
+ mhdp_connector = to_mhdp_connector(connector);
+ mhdp_bridge = mhdp_connector->bridge;
+
+ drm_connector_cleanup(&mhdp_connector->base);
+ drm_bridge_remove(&mhdp_bridge->base);
+ kfree(mhdp_connector);
+ kfree(mhdp_bridge);
+}
+
+static const struct drm_connector_funcs cdns_mhdp_mst_connector_funcs = {
+ .atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state,
+ .atomic_destroy_state = drm_atomic_helper_connector_destroy_state,
+ .reset = drm_atomic_helper_connector_reset,
+ .dpms = drm_helper_connector_dpms,
+ .detect = cdns_dp_mst_detect,
+ .fill_modes = drm_helper_probe_single_connector_modes,
+ .destroy = cdns_dp_mst_connector_destroy,
+};
+
+
+static int cdns_mhdp_mst_get_ddc_modes(struct drm_connector *connector)
+{
+ struct cdns_mhdp_connector *mhdp_connector;
+ struct cdns_mhdp_device *mhdp;
+ struct edid *edid;
+ int ret = 0;
+
+ mhdp_connector = to_mhdp_connector(connector);
+ mhdp = mhdp_connector->bridge->mhdp;
+
+ edid = drm_dp_mst_get_edid(connector, &mhdp->mst_mgr,
+ mhdp_connector->port);
+
+ DRM_DEBUG_KMS("edid retrieved %p\n", edid);
+ if (edid) {
+ drm_connector_update_edid_property(connector, edid);
+ ret = drm_add_edid_modes(connector, edid);
+ return ret;
+ }
+ drm_connector_update_edid_property(connector, NULL);
+
+ return ret;
+}
+
+static int cdns_mhdp_mst_get_modes(struct drm_connector *connector)
+{
+ return cdns_mhdp_mst_get_ddc_modes(connector);
+}
+
+
+static struct
+drm_encoder *cdns_mhdp_mst_best_encoder(struct drm_connector *connector)
+{
+ struct cdns_mhdp_connector *mhdp_connector;
+
+ mhdp_connector = to_mhdp_connector(connector);
+
+ return mhdp_connector->bridge->base.encoder;
+}
+
+static const struct drm_connector_helper_funcs cdns_mhdp_mst_conn_helper_fun = {
+ .get_modes = cdns_mhdp_mst_get_modes,
+ .best_encoder = cdns_mhdp_mst_best_encoder,
+};
+
+void cdns_mhdp_mst_enable(struct drm_bridge *bridge)
+{
+ struct cdns_mhdp_bridge *mhdp_bridge = to_mhdp_bridge(bridge);
+ struct cdns_mhdp_device *mhdp = mhdp_bridge->mhdp;
+ struct drm_display_info *disp_info;
+ struct drm_display_mode *mode;
+ struct cdns_mhdp_connector *mhdp_connector;
+ u32 bpp;
+ enum pixel_format pxlfmt;
+ int ret, slots, stream_id;
+
+ disp_info = &mhdp_bridge->connector->base.display_info;
+
+ pxlfmt = cdns_mhdp_get_pxlfmt(disp_info->color_formats);
+ bpp = cdns_mhdp_get_bpp(disp_info->bpc, pxlfmt);
+
+ mhdp_connector = mhdp_bridge->connector;
+ if (mhdp_bridge->stream_id > -1) {
+ DRM_ERROR("ERROR stream id is attached before bridge is enabled\n");
+ return;
+ }
+
+ stream_id = bridge->encoder->crtc->index;
+
+ mode = &bridge->encoder->crtc->state->adjusted_mode;
+ mhdp_bridge->pbn = drm_dp_calc_pbn_mode(mode->clock, bpp);
+
+ slots = drm_dp_find_vcpi_slots(&mhdp->mst_mgr, mhdp_bridge->pbn);
+ ret = drm_dp_mst_allocate_vcpi(&mhdp->mst_mgr,
+ mhdp_connector->port,
+ mhdp_bridge->pbn, slots);
+ if (ret == false) {
+ DRM_ERROR("failed to allocate vcpi\n");
+ return;
+ }
+ ret = drm_dp_update_payload_part1(&mhdp->mst_mgr);
+ if (ret < 0)
+ DRM_ERROR("failed update_payload_part1\n");
+
+ mhdp_bridge->stream_id = stream_id;
+ mhdp_bridge->is_active = true;
+
+ cdns_mhdp_mst_stream_enable(mhdp_bridge, true);
+ cdns_mhdp_configure_video(bridge);
+
+ ret = cdns_mhdp_apply_slot_allocation(mhdp_bridge);
+ if (ret < 0) {
+ cdns_mhdp_mst_stream_enable(mhdp_bridge, false);
+ mhdp_bridge->stream_id = -1;
+ mhdp_bridge->is_active = false;
+ return;
+ }
+
+ ret = cdns_mhdp_set_act_enable(mhdp);
+ if (ret)
+ DRM_ERROR("failed ACT sequence\n");
+
+ cdns_mhdp_set_rate_governing(mhdp_bridge, true);
+
+ cdns_mhdp_mst_set_threshold(mhdp_bridge);
+
+ drm_dp_update_payload_part2(&mhdp->mst_mgr);
+}
+
+void cdns_mhdp_mst_disable(struct drm_bridge *bridge)
+{
+ struct cdns_mhdp_bridge *mhdp_bridge = to_mhdp_bridge(bridge);
+ struct cdns_mhdp_device *mhdp = mhdp_bridge->mhdp;
+ struct cdns_mhdp_connector *connector = mhdp_bridge->connector;
+
+ drm_dp_mst_reset_vcpi_slots(&mhdp->mst_mgr, connector->port);
+ drm_dp_update_payload_part1(&mhdp->mst_mgr);
+
+ cdns_mhdp_update_slot_allocation(mhdp_bridge);
+
+ drm_dp_check_act_status(&mhdp->mst_mgr);
+
+ drm_dp_update_payload_part2(&mhdp->mst_mgr);
+
+ drm_dp_mst_deallocate_vcpi(&mhdp->mst_mgr, connector->port);
+
+ cdns_mhdp_set_rate_governing(mhdp_bridge, false);
+ cdns_mhdp_mst_stream_enable(mhdp_bridge, false);
+ mhdp_bridge->stream_id = -1;
+ mhdp_bridge->is_active = false;
+}
+
+static const struct drm_bridge_funcs cdns_mhdp_mst_bridge_funcs = {
+ .enable = cdns_mhdp_enable,
+ .disable = cdns_mhdp_mst_disable,
+};
+
+
+static struct cdns_mhdp_bridge*
+cdns_mhpd_create_fake_mst_bridge(struct cdns_mhdp_device *mhdp,
+ struct cdns_mhdp_connector *mhdp_connector)
+{
+ struct cdns_mhdp_bridge *mhdp_bridge;
+ struct drm_encoder *encoder = NULL;
+ struct cdns_mhdp_mst_cbs *cbs = &mhdp->cbs;
+
+ mhdp_bridge = kzalloc(sizeof(*mhdp_bridge), GFP_KERNEL);
+ if (!mhdp_bridge)
+ return NULL;
+
+ mhdp_bridge->mhdp = mhdp;
+ mhdp_bridge->stream_id = -1;
+ mhdp_bridge->connector = mhdp_connector;
+ mhdp_bridge->is_active = false;
+
+ mhdp_bridge->base.funcs = &cdns_mhdp_mst_bridge_funcs;
+
+ drm_bridge_add(&mhdp_bridge->base);
+
+ if (cbs->funcs.create_mst_encoder)
+ encoder = cbs->funcs.create_mst_encoder(cbs->priv_data,
+ &mhdp_bridge->base);
+ if (encoder) {
+ int ret;
+ /* use the same drm device as is in the first encoder */
+ encoder->dev = mhdp->bridge.base.encoder->dev;
+ encoder->possible_crtcs &= ((1 << CDNS_MHDP_MAX_STREAMS) - 1);
+ ret = drm_bridge_attach(encoder, &mhdp_bridge->base, NULL);
+ if (ret) {
+ dev_err(mhdp->dev, "bridge attaching error %d\n", ret);
+ return NULL;
+ }
+
+ ret = drm_connector_attach_encoder(&mhdp_connector->base,
+ encoder);
+ if (ret) {
+ dev_err(mhdp->dev, "failed to attach connector to encoder\n");
+ return NULL;
+ }
+ }
+
+ return mhdp_bridge;
+}
+
+static struct drm_connector *
+cdns_mhdp_mst_cbs_add_connector(struct drm_dp_mst_topology_mgr *mgr,
+ struct drm_dp_mst_port *port,
+ const char *pathprop)
+{
+ struct cdns_mhdp_device *mhdp = mgr_to_mhdp(mgr);
+ struct drm_device *dev = mhdp->bridge.base.dev;
+ struct cdns_mhdp_connector *mhdp_connector;
+ struct drm_connector *connector;
+ struct drm_connector_state *conn_state;
+ int ret;
+
+ mhdp_connector = kzalloc(sizeof(struct cdns_mhdp_connector),
+ GFP_KERNEL);
+ if (!mhdp_connector)
+ return NULL;
+
+ mhdp_connector->is_mst_connector = true;
+ connector = &mhdp_connector->base;
+ mhdp_connector->port = port;
+ DRM_DEBUG_KMS("\n");
+
+ conn_state = kzalloc(sizeof(*conn_state), GFP_KERNEL);
+ if (!conn_state)
+ return NULL;
+
+ __drm_atomic_helper_connector_reset(connector,
+ conn_state);
+
+ drm_connector_init(dev, connector, &cdns_mhdp_mst_connector_funcs,
+ DRM_MODE_CONNECTOR_DisplayPort);
+ drm_connector_helper_add(connector, &cdns_mhdp_mst_conn_helper_fun);
+ mhdp_connector->bridge =
+ cdns_mhpd_create_fake_mst_bridge(mhdp, mhdp_connector);
+
+ drm_object_attach_property(&connector->base,
+ dev->mode_config.path_property, 0);
+ drm_object_attach_property(&connector->base,
+ dev->mode_config.tile_property, 0);
+ ret = drm_connector_set_path_property(connector, pathprop);
+
+ if (ret)
+ DRM_ERROR("ERROR set path propertty failed\n");
+
+ return connector;
+}
+
+static void
+cdns_mhdp_mst_cbs_destroy_connector(struct drm_dp_mst_topology_mgr *mgr,
+ struct drm_connector *connector)
+{
+ struct cdns_mhdp_connector *mhdp_connector;
+ struct cdns_mhdp_device *mhdp;
+ struct cdns_mhdp_bridge *mhdp_bridge;
+
+ mhdp_connector = to_mhdp_connector(connector);
+ mhdp_bridge = mhdp_connector->bridge;
+ mhdp = mhdp_bridge->mhdp;
+
+ drm_connector_unregister(&mhdp_connector->base);
+
+ if (mhdp->cbs.funcs.create_mst_encoder)
+ mhdp->cbs.funcs.destroy_mst_encoder(mhdp->cbs.priv_data,
+ &mhdp_bridge->base);
+ drm_connector_unreference(&mhdp_connector->base);
+}
+
+static void cdns_mhdp_mst_cbs_hotplug(struct drm_dp_mst_topology_mgr *mgr)
+{
+ struct cdns_mhdp_device *mhdp = mgr_to_mhdp(mgr);
+ struct drm_device *dev = mhdp->bridge.base.encoder->dev;
+
+ drm_kms_helper_hotplug_event(dev);
+}
+
+static void
+cdns_mhdp_mst_cbs_register_connector(struct drm_connector *connector)
+{
+ int ret;
+
+ ret = drm_connector_register(connector);
+ if (ret)
+ DRM_ERROR("Register connector failed\n");
+
+}
+
+static const struct drm_dp_mst_topology_cbs mst_cbs = {
+ .add_connector = cdns_mhdp_mst_cbs_add_connector,
+ .register_connector = cdns_mhdp_mst_cbs_register_connector,
+ .destroy_connector = cdns_mhdp_mst_cbs_destroy_connector,
+ .hotplug = cdns_mhdp_mst_cbs_hotplug,
+};
+
+
+static void cdns_mhdp_set_mst_enable(struct cdns_mhdp_device *mhdp, bool enable)
+{
+ u32 reg_val;
+
+ cdns_mhdp_reg_read(mhdp, CDNS_DP_FRAMER_GLOBAL_CONFIG, ®_val);
+
+ if (enable)
+ reg_val |= CDNS_DP_MST_EN;
+ else
+ reg_val &= ~CDNS_DP_MST_EN;
+
+ cdns_mhdp_reg_write(mhdp, CDNS_DP_FRAMER_GLOBAL_CONFIG, reg_val);
+}
+
+bool cdns_mhdp_mst_probe(struct cdns_mhdp_device *mhdp)
+{
+ u8 mstm_cap;
+ u8 dpcd_cap[DP_RECEIVER_CAP_SIZE];
+
+ bool is_mst;
+
+ if (!mhdp->can_mst)
+ return false;
+
+ drm_dp_dpcd_read(&mhdp->aux, DP_DPCD_REV, dpcd_cap,
+ DP_RECEIVER_CAP_SIZE);
+
+ if (dpcd_cap[DP_DPCD_REV] < 0x12)
+ return false;
+
+ if (drm_dp_dpcd_readb(&mhdp->aux, DP_MSTM_CAP, &mstm_cap) != 1)
+ return false;
+
+ if (mstm_cap & DP_MST_CAP) {
+ DRM_DEBUG_KMS("Sink is MST capable\n");
+ is_mst = true;
+ } else {
+ DRM_DEBUG_KMS("Sink is not MST capable\n");
+ is_mst = false;
+ }
+
+ if (is_mst != mhdp->is_mst) {
+ mhdp->is_mst = is_mst;
+ cdns_mhdp_set_mst_enable(mhdp, mhdp->is_mst);
+
+ drm_dp_mst_topology_mgr_set_mst(&mhdp->mst_mgr,
+ mhdp->is_mst);
+ }
+
+ return mhdp->is_mst;
+}
+
+int cdns_mhdp_mst_init(struct cdns_mhdp_device *mhdp)
+{
+ struct cdns_mhdp_bridge *bridge = &mhdp->bridge;
+ struct drm_device *dev = bridge->base.dev;
+ struct cdns_mhdp_connector *connector = bridge->connector;
+ int ret;
+
+ mhdp->mst_mgr.cbs = &mst_cbs;
+ ret = drm_dp_mst_topology_mgr_init(&mhdp->mst_mgr, dev,
+ &mhdp->aux, 16,
+ CDNS_MHDP_MAX_STREAMS,
+ connector->base.base.id);
+ if (ret)
+ mhdp->can_mst = false;
+ else
+ mhdp->can_mst = true;
+
+ mhdp->is_mst = false;
+
+ bridge->stream_id = -1;
+
+ return ret;
+}
+
+void cdns_mhdp_mst_deinit(struct cdns_mhdp_device *mhdp)
+{
+ if (mhdp->is_mst) {
+ mhdp->is_mst = false;
+ drm_dp_mst_topology_mgr_set_mst(&mhdp->mst_mgr,
+ mhdp->is_mst);
+ }
+
+ if (mhdp->can_mst)
+ drm_dp_mst_topology_mgr_destroy(&mhdp->mst_mgr);
+}
diff --git a/drivers/gpu/drm/bridge/cdns-mhdp.c b/drivers/gpu/drm/bridge/cdns-mhdp.c
index a3bbc0e809a5..48ac5cf1e031 100644
--- a/drivers/gpu/drm/bridge/cdns-mhdp.c
+++ b/drivers/gpu/drm/bridge/cdns-mhdp.c
@@ -27,146 +27,15 @@
#include <drm/bridge/cdns-mhdp-common.h>
#include <sound/hdmi-codec.h>
+#include <linux/irq.h>
+#include <linux/of_irq.h>
+#include "cdns-mhdp.h"
#define DEBUG_MSG
#define FW_NAME "cadence/mhdp8546.bin"
-#define CDNS_APB_CFG 0x00000
-#define CDNS_APB_CTRL (CDNS_APB_CFG + 0x00)
-#define CDNS_MAILBOX_FULL (CDNS_APB_CFG + 0x08)
-#define CDNS_MAILBOX_EMPTY (CDNS_APB_CFG + 0x0c)
-#define CDNS_MAILBOX_TX_DATA (CDNS_APB_CFG + 0x10)
-#define CDNS_MAILBOX_RX_DATA (CDNS_APB_CFG + 0x14)
-#define CDNS_KEEP_ALIVE (CDNS_APB_CFG + 0x18)
-#define CDNS_KEEP_ALIVE_MASK GENMASK(7, 0)
-
-#define CDNS_SW_CLK_L (CDNS_APB_CFG + 0x3c)
-#define CDNS_SW_CLK_H (CDNS_APB_CFG + 0x40)
-#define CDNS_SW_EVENT0 (CDNS_APB_CFG + 0x44)
-#define CDNS_DPTX_HPD BIT(0)
-
-#define CDNS_SW_EVENT1 (CDNS_APB_CFG + 0x48)
-#define CDNS_SW_EVENT2 (CDNS_APB_CFG + 0x4c)
-#define CDNS_SW_EVENT3 (CDNS_APB_CFG + 0x50)
-
-#define CDNS_DPTX_CAR (CDNS_APB_CFG + 0x904)
-#define CDNS_VIF_CLK_EN BIT(0)
-#define CDNS_VIF_CLK_RSTN BIT(1)
-
-#define CDNS_SOURCE_VIDEO_INTERFACE 0x00b00
-#define CDNS_BND_HSYNC2VSYNC (CDNS_SOURCE_VIDEO_INTERFACE + \
- 0x00)
-#define CDNS_IP_DTCT_WIN GENMASK(11, 0)
-#define CDNS_IP_DET_INTERLACE_FORMAT BIT(12)
-#define CDNS_IP_BYPASS_V_INTERFACE BIT(13)
-
-#define CDNS_HSYNC2VSYNC_POL_CTRL (CDNS_SOURCE_VIDEO_INTERFACE + \
- 0x10)
-#define CDNS_H2V_HSYNC_POL_ACTIVE_LOW BIT(1)
-#define CDNS_H2V_VSYNC_POL_ACTIVE_LOW BIT(2)
-
-#define CDNS_DPTX_PHY_CONFIG 0x02000
-#define CDNS_PHY_TRAINING_EN BIT(0)
-#define CDNS_PHY_TRAINING_TYPE(x) (((x) & GENMASK(3, 0)) << 1)
-#define CDNS_PHY_SCRAMBLER_BYPASS BIT(5)
-#define CDNS_PHY_ENCODER_BYPASS BIT(6)
-#define CDNS_PHY_SKEW_BYPASS BIT(7)
-#define CDNS_PHY_TRAINING_AUTO BIT(8)
-#define CDNS_PHY_LANE0_SKEW(x) (((x) & GENMASK(2, 0)) << 9)
-#define CDNS_PHY_LANE1_SKEW(x) (((x) & GENMASK(2, 0)) << 12)
-#define CDNS_PHY_LANE2_SKEW(x) (((x) & GENMASK(2, 0)) << 15)
-#define CDNS_PHY_LANE3_SKEW(x) (((x) & GENMASK(2, 0)) << 18)
-#define CDNS_PHY_COMMON_CONFIG (CDNS_PHY_LANE1_SKEW(1) | \
- CDNS_PHY_LANE2_SKEW(2) | \
- CDNS_PHY_LANE3_SKEW(3))
-#define CDNS_PHY_10BIT_EN BIT(21)
-
-#define CDNS_DPTX_FRAMER 0x02200
-#define CDNS_DP_FRAMER_GLOBAL_CONFIG (CDNS_DPTX_FRAMER + 0x00)
-#define CDNS_DP_NUM_LANES(x) (x - 1)
-#define CDNS_DP_FRAMER_EN BIT(3)
-#define CDNS_DP_RATE_GOVERNOR_EN BIT(4)
-#define CDNS_DP_NO_VIDEO_MODE BIT(5)
-#define CDNS_DP_DISABLE_PHY_RST BIT(6)
-#define CDNS_DP_WR_FAILING_EDGE_VSYNC BIT(7)
-
-#define CDNS_DP_SW_RESET (CDNS_DPTX_FRAMER + 0x04)
-#define CDNS_DP_FRAMER_TU (CDNS_DPTX_FRAMER + 0x08)
-#define CDNS_DP_FRAMER_TU_SIZE(x) (((x) & GENMASK(6, 0)) << 8)
-#define CDNS_DP_FRAMER_TU_VS(x) ((x) & GENMASK(5, 0))
-#define CDNS_DP_FRAMER_TU_CNT_RST_EN BIT(15)
-
-#define CDNS_DPTX_STREAM 0x03000
-#define CDNS_DP_MSA_HORIZONTAL_0 (CDNS_DPTX_STREAM + 0x00)
-#define CDNS_DP_MSAH0_H_TOTAL(x) (x)
-#define CDNS_DP_MSAH0_HSYNC_START(x) ((x) << 16)
-
-#define CDNS_DP_MSA_HORIZONTAL_1 (CDNS_DPTX_STREAM + 0x04)
-#define CDNS_DP_MSAH1_HSYNC_WIDTH(x) (x)
-#define CDNS_DP_MSAH1_HSYNC_POL_LOW BIT(15)
-#define CDNS_DP_MSAH1_HDISP_WIDTH(x) ((x) << 16)
-
-#define CDNS_DP_MSA_VERTICAL_0 (CDNS_DPTX_STREAM + 0x08)
-#define CDNS_DP_MSAV0_V_TOTAL(x) (x)
-#define CDNS_DP_MSAV0_VSYNC_START(x) ((x) << 16)
-
-#define CDNS_DP_MSA_VERTICAL_1 (CDNS_DPTX_STREAM + 0x0c)
-#define CDNS_DP_MSAV1_VSYNC_WIDTH(x) (x)
-#define CDNS_DP_MSAV1_VSYNC_POL_LOW BIT(15)
-#define CDNS_DP_MSAV1_VDISP_WIDTH(x) ((x) << 16)
-
-#define CDNS_DP_MSA_MISC (CDNS_DPTX_STREAM + 0x10)
-#define CDNS_DP_STREAM_CONFIG (CDNS_DPTX_STREAM + 0x14)
-#define CDNS_DP_RATE_GOVERNOR_STATUS (CDNS_DPTX_STREAM + 0x2c)
-#define CDNS_DP_RG_TU_VS_DIFF(x) ((x) << 8)
-
-#define CDNS_DP_HORIZONTAL (CDNS_DPTX_STREAM + 0x30)
-#define CDNS_DP_H_HSYNC_WIDTH(x) (x)
-#define CDNS_DP_H_H_TOTAL(x) ((x) << 16)
-
-#define CDNS_DP_VERTICAL_0 (CDNS_DPTX_STREAM + 0x34)
-#define CDNS_DP_V0_VHEIGHT(x) (x)
-#define CDNS_DP_V0_VSTART(x) ((x) << 16)
-
-#define CDNS_DP_VERTICAL_1 (CDNS_DPTX_STREAM + 0x38)
-#define CDNS_DP_V1_VTOTAL(x) (x)
-#define CDNS_DP_V1_VTOTAL_EVEN BIT(16)
-
-#define CDNS_DP_FRAMER_PXL_REPR (CDNS_DPTX_STREAM + 0x4c)
-#define CDNS_DP_FRAMER_6_BPC BIT(0)
-#define CDNS_DP_FRAMER_8_BPC BIT(1)
-#define CDNS_DP_FRAMER_10_BPC BIT(2)
-#define CDNS_DP_FRAMER_12_BPC BIT(3)
-#define CDNS_DP_FRAMER_16_BPC BIT(4)
-#define CDNS_DP_FRAMER_PXL_FORMAT 0x8
-#define CDNS_DP_FRAMER_RGB BIT(0)
-#define CDNS_DP_FRAMER_YCBCR444 BIT(1)
-#define CDNS_DP_FRAMER_YCBCR422 BIT(2)
-#define CDNS_DP_FRAMER_YCBCR420 BIT(3)
-#define CDNS_DP_FRAMER_Y_ONLY BIT(4)
-
-#define CDNS_DP_FRAMER_SP (CDNS_DPTX_STREAM + 0x10)
-#define CDNS_DP_FRAMER_VSYNC_POL_LOW BIT(0)
-#define CDNS_DP_FRAMER_HSYNC_POL_LOW BIT(1)
-#define CDNS_DP_FRAMER_INTERLACE BIT(2)
-
-#define CDNS_DP_LINE_THRESH (CDNS_DPTX_STREAM + 0x64)
-#define CDNS_DP_VB_ID (CDNS_DPTX_STREAM + 0x68)
-#define CDNS_DP_VB_ID_INTERLACED BIT(2)
-
-#define CDNS_DP_FRONT_BACK_PORCH (CDNS_DPTX_STREAM + 0x78)
-#define CDNS_DP_BACK_PORCH(x) (x)
-#define CDNS_DP_FRONT_PORCH(x) ((x) << 16)
-
-#define CDNS_DP_BYTE_COUNT (CDNS_DPTX_STREAM + 0x7c)
-
-#define CDNS_DPTX_GLOBAL 0x02300
-#define CDNS_DP_LANE_EN (CDNS_DPTX_GLOBAL + 0x00)
-#define CDNS_DP_LANE_EN_LANES(x) GENMASK(x - 1, 0)
-#define CDNS_DP_ENHNCD (CDNS_DPTX_GLOBAL + 0x04)
-
#define CDNS_MHDP_IMEM 0x10000
#define CDNS_MHDP_DMEM 0x20000
@@ -216,13 +85,17 @@ MODULE_DEVICE_TABLE(of, mhdp_ids);
static inline struct cdns_mhdp_device *connector_to_mhdp(
struct drm_connector *conn)
{
- return container_of(conn, struct cdns_mhdp_device, connector);
+ struct cdns_mhdp_connector *mhdp_connector = to_mhdp_connector(conn);
+
+ return mhdp_connector->bridge->mhdp;
}
static inline struct cdns_mhdp_device *bridge_to_mhdp(
struct drm_bridge *bridge)
{
- return container_of(bridge, struct cdns_mhdp_device, bridge);
+ struct cdns_mhdp_bridge *mhdp_bridge = to_mhdp_bridge(bridge);
+
+ return mhdp_bridge->mhdp;
}
static unsigned int max_link_rate(struct cdns_mhdp_host host,
@@ -237,6 +110,62 @@ static u8 eq_training_pattern_supported(struct cdns_mhdp_host host,
return fls(host.pattern_supp & sink.pattern_supp);
}
+static void mhdp_hotplug_work_func(struct work_struct *work)
+{
+ struct cdns_mhdp_device *mhdp;
+ int dret, retry;
+ u8 esi[16] = { 0 };
+ bool new_irq_handled;
+ struct drm_connector *connector;
+ bool old_plugged;
+
+
+ mhdp = container_of(work, struct cdns_mhdp_device,
+ hotplug_work.work);
+ connector = &mhdp->connector.base;
+
+ old_plugged = mhdp->plugged;
+ connector->status = connector->funcs->detect(connector, false);
+ if (old_plugged != mhdp->plugged) {
+ drm_kms_helper_hotplug_event(mhdp->bridge.base.dev);
+ return;
+ }
+
+ if (mhdp->plugged) {
+ dret = drm_dp_dpcd_read(&mhdp->aux,
+ DP_SINK_COUNT_ESI, esi, 8);
+
+ if (dret == 8) {
+ drm_dp_mst_hpd_irq(&mhdp->mst_mgr,
+ esi,
+ &new_irq_handled);
+ }
+
+ if (new_irq_handled) {
+ for (retry = 0; retry < 3; retry++) {
+ int wret;
+
+ wret = drm_dp_dpcd_write(&mhdp->aux,
+ DP_SINK_COUNT_ESI+1,
+ &esi[1], 3);
+ if (wret == 3)
+ break;
+ }
+ }
+ }
+
+}
+
+static irqreturn_t mhdp_irq_handler(int irq, void *data)
+{
+ struct cdns_mhdp_device *mhdp = (struct cdns_mhdp_device *)data;
+
+ if (readl(mhdp->regs + CDNS_SW_EVENT0) & CDNS_DPTX_HPD)
+ schedule_delayed_work(&mhdp->hotplug_work, 0);
+
+ return IRQ_HANDLED;
+}
+
static ssize_t mhdp_transfer(struct drm_dp_aux *aux,
struct drm_dp_aux_msg *msg)
{
@@ -300,10 +229,16 @@ static enum drm_connector_status cdns_mhdp_detect(struct drm_connector *conn,
int ret;
ret = cdns_mhdp_get_hpd_status(mhdp);
- if (ret > 0)
- status = connector_status_connected;
- else if (ret < 0)
+ if (ret > 0) {
+ mhdp->plugged = true;
+ cdns_mhdp_mst_probe(mhdp);
+ // for MST mode this connector will be always disconnected
+ if (!mhdp->is_mst)
+ status = connector_status_connected;
+ } else if (ret < 0)
dev_err(mhdp->dev, "Failed to obtain HPD state\n");
+ else
+ mhdp->plugged = false;
return status;
}
@@ -321,11 +256,15 @@ static const struct drm_connector_funcs cdns_mhdp_conn_funcs = {
static int cdns_mhdp_attach(struct drm_bridge *bridge)
{
struct cdns_mhdp_device *mhdp = bridge_to_mhdp(bridge);
- struct drm_connector *conn = &mhdp->connector;
+ struct drm_connector *conn = &mhdp->connector.base;
int ret;
- conn->polled = DRM_CONNECTOR_POLL_CONNECT |
- DRM_CONNECTOR_POLL_DISCONNECT;
+ if (&mhdp->bridge.base != bridge)
+ return -ENODEV;
+
+ cdns_mhdp_mst_init(mhdp);
+
+ conn->polled = DRM_CONNECTOR_POLL_HPD;
ret = drm_connector_init(bridge->dev, conn, &cdns_mhdp_conn_funcs,
DRM_MODE_CONNECTOR_DisplayPort);
@@ -342,17 +281,12 @@ static int cdns_mhdp_attach(struct drm_bridge *bridge)
return ret;
}
+ /* enable interrupts */
+ writel(~CDNS_APB_INT_MASK_SW_EVENT_INT, mhdp->regs + CDNS_APB_INT_MASK);
+
return 0;
}
-enum pixel_format {
- PIXEL_FORMAT_RGB = 1,
- PIXEL_FORMAT_YCBCR_444 = 2,
- PIXEL_FORMAT_YCBCR_422 = 4,
- PIXEL_FORMAT_YCBCR_420 = 8,
- PIXEL_FORMAT_Y_ONLY = 16,
-};
-
static void mhdp_link_training_init(struct cdns_mhdp_device *mhdp)
{
u32 reg32;
@@ -716,13 +650,11 @@ static int mhdp_link_training(struct cdns_mhdp_device *mhdp,
cdns_mhdp_reg_write(mhdp, CDNS_DP_SW_RESET, 1);
cdns_mhdp_reg_write(mhdp, CDNS_DP_SW_RESET, 0);
- /* Enable framer */
- /* FIXME: update when MST supported, BIT(2) */
cdns_mhdp_reg_write(mhdp, CDNS_DP_FRAMER_GLOBAL_CONFIG,
- CDNS_DP_FRAMER_EN |
CDNS_DP_NUM_LANES(mhdp->link.num_lanes) |
CDNS_DP_DISABLE_PHY_RST |
CDNS_DP_WR_FAILING_EDGE_VSYNC |
+ (mhdp->is_mst ? CDNS_DP_MST_EN : 0) |
(!video_mode ? CDNS_DP_NO_VIDEO_MODE : 0));
/* Reset PHY config */
@@ -751,31 +683,20 @@ static void cdns_mhdp_disable(struct drm_bridge *bridge)
cdns_mhdp_set_video_status(mhdp, 0);
+ mhdp->link_up = false;
+
drm_dp_link_power_down(&mhdp->aux, &mhdp->link);
+ if (mhdp->is_mst)
+ cdns_mhdp_mst_disable(bridge);
}
-static void cdns_mhdp_enable(struct drm_bridge *bridge)
+static int cdns_mhdp_link_up(struct cdns_mhdp_device *mhdp)
{
- struct cdns_mhdp_device *mhdp = bridge_to_mhdp(bridge);
- struct drm_display_mode *mode;
- struct drm_display_info *disp_info = &mhdp->connector.display_info;
- enum pixel_format pxlfmt;
- int pxlclock;
- unsigned int rate, tu_size = 30, vs, vs_f, bpp, required_bandwidth,
- available_bandwidth, dp_framer_sp = 0, msa_horizontal_1,
- msa_vertical_1, bnd_hsync2vsync, hsync2vsync_pol_ctrl,
- misc0 = 0, misc1 = 0, line_thresh = 0, pxl_repr,
- front_porch, back_porch, msa_h0, msa_v0, hsync, vsync,
- dp_vertical_1, line_thresh1, line_thresh2;
u32 resp;
-
- unsigned int size = DP_RECEIVER_CAP_SIZE, dp_framer_global_config,
+ u32 size = DP_RECEIVER_CAP_SIZE, dp_framer_global_config,
video_mode, training_interval_us;
u8 reg0[size], reg8, amp[2];
- mode = &bridge->encoder->crtc->state->adjusted_mode;
- pxlclock = mode->crtc_clock;
-
/*
* Upon power-on reset/device disconnection: [2:0] bits should be 0b001
* and [7:5] bits 0b000.
@@ -824,13 +745,17 @@ static void cdns_mhdp_enable(struct drm_bridge *bridge)
default:
dev_err(mhdp->dev,
"wrong training interval returned by DPCD: %d\n", reg8);
- return;
+ return -EIO;
}
cdns_mhdp_reg_read(mhdp, CDNS_DP_FRAMER_GLOBAL_CONFIG, &resp);
dp_framer_global_config = be32_to_cpu(resp);
+ cdns_mhdp_mst_probe(mhdp);
+ if (mhdp->is_mst)
+ dp_framer_global_config |= CDNS_DP_MST_EN;
+
video_mode = !(dp_framer_global_config & CDNS_DP_NO_VIDEO_MODE);
if (dp_framer_global_config & CDNS_DP_FRAMER_EN)
@@ -850,50 +775,168 @@ static void cdns_mhdp_enable(struct drm_bridge *bridge)
if (mhdp_link_training(mhdp, video_mode,
training_interval_us)) {
dev_err(mhdp->dev, "Link training failed. Exiting.\n");
- return;
+ return -EIO;
}
}
+ mhdp->link_up = true;
+
+ return 0;
+}
+
+static int cdns_mhdp_sst_enable(struct drm_bridge *bridge)
+{
+ struct cdns_mhdp_bridge *mhdp_bridge = to_mhdp_bridge(bridge);
+ struct cdns_mhdp_device *mhdp = mhdp_bridge->mhdp;
+ u32 rate, vs, vs_f, required_bandwidth, available_bandwidth;
+ u32 bpp, tu_size = 30, line_thresh1, line_thresh2, line_thresh = 0;
+ struct drm_display_mode *mode;
+ int pxlclock;
+ enum pixel_format pxlfmt;
+ struct drm_display_info *disp_info = &mhdp->connector.base.display_info;
+
+
+ mode = &bridge->encoder->crtc->state->adjusted_mode;
+ pxlclock = mode->crtc_clock;
+
+ mhdp_bridge->stream_id = 0;
+
rate = mhdp->link.rate / 1000;
+ pxlfmt = cdns_mhdp_get_pxlfmt(disp_info->color_formats);
+ bpp = cdns_mhdp_get_bpp(disp_info->bpc, pxlfmt);
+
+ /* find optimal tu_size */
+ required_bandwidth = pxlclock * bpp / 8;
+ available_bandwidth = mhdp->link.num_lanes * rate;
+ do {
+ tu_size += 2;
+
+ vs_f = tu_size * required_bandwidth / available_bandwidth;
+ vs = vs_f / 1000;
+ vs_f = vs_f % 1000;
+ /*
+ * FIXME (CDNS): downspreading?
+ * It's unused is what I've been told.
+ */
+ } while ((vs == 1 || ((vs_f > 850 || vs_f < 100) && vs_f != 0) ||
+ tu_size - vs < 2) && tu_size < 64);
+
+ if (vs > 64)
+ return -EINVAL;
+
+
+ cdns_mhdp_reg_write(mhdp, CDNS_DP_FRAMER_TU,
+ CDNS_DP_FRAMER_TU_VS(vs) |
+ CDNS_DP_FRAMER_TU_SIZE(tu_size) |
+ CDNS_DP_FRAMER_TU_CNT_RST_EN);
+
+ line_thresh1 = ((vs + 1) << 5) * 8 / bpp;
+ line_thresh2 = (pxlclock << 5) / 1000 / rate * (vs + 1) - (1 << 5);
+ line_thresh = line_thresh1 - line_thresh2 / mhdp->link.num_lanes;
+ line_thresh = (line_thresh >> 5) + 2;
+ cdns_mhdp_reg_write(mhdp, CDNS_DP_LINE_THRESH(0),
+ line_thresh & GENMASK(5, 0));
+
+ cdns_mhdp_reg_write(mhdp, CDNS_DP_STREAM_CONFIG_2(0),
+ CDNS_DP_SC2_TU_VS_DIFF((tu_size - vs > 3) ?
+ 0 : tu_size - vs));
+
+ cdns_mhdp_configure_video(bridge);
+
+ cdns_mhdp_set_video_status(mhdp, 1);
+
+ return 0;
+}
+
+enum pixel_format cdns_mhdp_get_pxlfmt(u32 color_formats)
+{
+ enum pixel_format pxlfmt;
+
/* FIXME: what about Y_ONLY? how is it handled in the kernel? */
- if (disp_info->color_formats & DRM_COLOR_FORMAT_YCRCB444)
+ if (color_formats & DRM_COLOR_FORMAT_YCRCB444)
pxlfmt = PIXEL_FORMAT_YCBCR_444;
- else if (disp_info->color_formats & DRM_COLOR_FORMAT_YCRCB422)
+ else if (color_formats & DRM_COLOR_FORMAT_YCRCB422)
pxlfmt = PIXEL_FORMAT_YCBCR_422;
- else if (disp_info->color_formats & DRM_COLOR_FORMAT_YCRCB420)
+ else if (color_formats & DRM_COLOR_FORMAT_YCRCB420)
pxlfmt = PIXEL_FORMAT_YCBCR_420;
else
pxlfmt = PIXEL_FORMAT_RGB;
+ return pxlfmt;
+}
+
+
+u32 cdns_mhdp_get_bpp(u32 bpc, enum pixel_format pxlfmt)
+{
+ u32 bpp;
+
+ switch (pxlfmt) {
+ case PIXEL_FORMAT_RGB:
+ bpp = bpc * 3;
+ break;
+ case PIXEL_FORMAT_YCBCR_444:
+ bpp = bpc * 3;
+ break;
+ case PIXEL_FORMAT_YCBCR_422:
+ bpp = bpc * 2;
+ break;
+ case PIXEL_FORMAT_YCBCR_420:
+ bpp = bpc * 3 / 2;
+ break;
+ default:
+ bpp = bpc;
+ }
+ return bpp;
+}
+
+void cdns_mhdp_configure_video(struct drm_bridge *bridge)
+{
+ struct cdns_mhdp_bridge *mhdp_bridge = to_mhdp_bridge(bridge);
+ struct cdns_mhdp_device *mhdp = mhdp_bridge->mhdp;
+ struct drm_display_info *disp_info;
+ unsigned int bpp, dp_framer_sp = 0, msa_horizontal_1,
+ msa_vertical_1, bnd_hsync2vsync, hsync2vsync_pol_ctrl,
+ misc0 = 0, misc1 = 0, pxl_repr,
+ front_porch, back_porch, msa_h0, msa_v0, hsync, vsync,
+ dp_vertical_1;
+ struct drm_display_mode *mode;
+ enum pixel_format pxlfmt;
+ int pxlclock;
+ u32 tmp;
+ u8 stream_id = mhdp_bridge->stream_id;
+
+ mode = &bridge->encoder->crtc->state->adjusted_mode;
+ pxlclock = mode->crtc_clock;
+
+ disp_info = &mhdp_bridge->connector->base.display_info;
+ pxlfmt = cdns_mhdp_get_pxlfmt(disp_info->color_formats);
+
/* if YCBCR supported and stream not SD, use ITU709 */
/* FIXME: handle ITU version with YCBCR420 when supported */
if ((pxlfmt == PIXEL_FORMAT_YCBCR_444 ||
pxlfmt == PIXEL_FORMAT_YCBCR_422) && mode->crtc_vdisplay >= 720)
misc0 = DP_YCBCR_COEFFICIENTS_ITU709;
+ bpp = cdns_mhdp_get_bpp(disp_info->bpc, pxlfmt);
+
switch (pxlfmt) {
case PIXEL_FORMAT_RGB:
- bpp = disp_info->bpc * 3;
pxl_repr = CDNS_DP_FRAMER_RGB << CDNS_DP_FRAMER_PXL_FORMAT;
misc0 |= DP_COLOR_FORMAT_RGB;
break;
case PIXEL_FORMAT_YCBCR_444:
- bpp = disp_info->bpc * 3;
pxl_repr = CDNS_DP_FRAMER_YCBCR444 << CDNS_DP_FRAMER_PXL_FORMAT;
misc0 |= DP_COLOR_FORMAT_YCbCr444 | DP_TEST_DYNAMIC_RANGE_CEA;
break;
case PIXEL_FORMAT_YCBCR_422:
- bpp = disp_info->bpc * 2;
pxl_repr = CDNS_DP_FRAMER_YCBCR422 << CDNS_DP_FRAMER_PXL_FORMAT;
misc0 |= DP_COLOR_FORMAT_YCbCr422 | DP_TEST_DYNAMIC_RANGE_CEA;
break;
case PIXEL_FORMAT_YCBCR_420:
- bpp = disp_info->bpc * 3 / 2;
pxl_repr = CDNS_DP_FRAMER_YCBCR420 << CDNS_DP_FRAMER_PXL_FORMAT;
break;
default:
- bpp = disp_info->bpc;
pxl_repr = CDNS_DP_FRAMER_Y_ONLY << CDNS_DP_FRAMER_PXL_FORMAT;
}
@@ -920,30 +963,12 @@ static void cdns_mhdp_enable(struct drm_bridge *bridge)
break;
}
- /* find optimal tu_size */
- required_bandwidth = pxlclock * bpp / 8;
- available_bandwidth = mhdp->link.num_lanes * rate;
- do {
- tu_size += 2;
-
- vs_f = tu_size * required_bandwidth / available_bandwidth;
- vs = vs_f / 1000;
- vs_f = vs_f % 1000;
- /*
- * FIXME (CDNS): downspreading?
- * It's unused is what I've been told.
- */
- } while ((vs == 1 || ((vs_f > 850 || vs_f < 100) && vs_f != 0) ||
- tu_size - vs < 2) && tu_size < 64);
-
- if (vs > 64)
- return;
-
bnd_hsync2vsync = CDNS_IP_BYPASS_V_INTERFACE;
if (mode->flags & DRM_MODE_FLAG_INTERLACE)
bnd_hsync2vsync |= CDNS_IP_DET_INTERLACE_FORMAT;
- cdns_mhdp_reg_write(mhdp, CDNS_BND_HSYNC2VSYNC, bnd_hsync2vsync);
+ cdns_mhdp_reg_write(mhdp, CDNS_BND_HSYNC2VSYNC(stream_id),
+ bnd_hsync2vsync);
if (mode->flags & DRM_MODE_FLAG_INTERLACE &&
mode->flags & DRM_MODE_FLAG_PHSYNC)
@@ -952,15 +977,10 @@ static void cdns_mhdp_enable(struct drm_bridge *bridge)
else
hsync2vsync_pol_ctrl = 0;
- cdns_mhdp_reg_write(mhdp, CDNS_HSYNC2VSYNC_POL_CTRL,
+ cdns_mhdp_reg_write(mhdp, CDNS_HSYNC2VSYNC_POL_CTRL(stream_id),
hsync2vsync_pol_ctrl);
- cdns_mhdp_reg_write(mhdp, CDNS_DP_FRAMER_TU,
- CDNS_DP_FRAMER_TU_VS(vs) |
- CDNS_DP_FRAMER_TU_SIZE(tu_size) |
- CDNS_DP_FRAMER_TU_CNT_RST_EN);
-
- cdns_mhdp_reg_write(mhdp, CDNS_DP_FRAMER_PXL_REPR, pxl_repr);
+ cdns_mhdp_reg_write(mhdp, CDNS_DP_FRAMER_PXL_REPR(stream_id), pxl_repr);
if (mode->flags & DRM_MODE_FLAG_INTERLACE)
dp_framer_sp |= CDNS_DP_FRAMER_INTERLACE;
@@ -968,19 +988,19 @@ static void cdns_mhdp_enable(struct drm_bridge *bridge)
dp_framer_sp |= CDNS_DP_FRAMER_HSYNC_POL_LOW;
if (mode->flags & DRM_MODE_FLAG_NVSYNC)
dp_framer_sp |= CDNS_DP_FRAMER_VSYNC_POL_LOW;
- cdns_mhdp_reg_write(mhdp, CDNS_DP_FRAMER_SP, dp_framer_sp);
+ cdns_mhdp_reg_write(mhdp, CDNS_DP_FRAMER_SP(stream_id), dp_framer_sp);
front_porch = mode->crtc_hsync_start - mode->crtc_hdisplay;
back_porch = mode->crtc_htotal - mode->crtc_hsync_end;
- cdns_mhdp_reg_write(mhdp, CDNS_DP_FRONT_BACK_PORCH,
+ cdns_mhdp_reg_write(mhdp, CDNS_DP_FRONT_BACK_PORCH(stream_id),
CDNS_DP_FRONT_PORCH(front_porch) |
CDNS_DP_BACK_PORCH(back_porch));
- cdns_mhdp_reg_write(mhdp, CDNS_DP_BYTE_COUNT,
+ cdns_mhdp_reg_write(mhdp, CDNS_DP_BYTE_COUNT(stream_id),
mode->crtc_hdisplay * bpp / 8);
msa_h0 = mode->crtc_htotal - mode->crtc_hsync_start;
- cdns_mhdp_reg_write(mhdp, CDNS_DP_MSA_HORIZONTAL_0,
+ cdns_mhdp_reg_write(mhdp, CDNS_DP_MSA_HORIZONTAL_0(stream_id),
CDNS_DP_MSAH0_H_TOTAL(mode->crtc_htotal) |
CDNS_DP_MSAH0_HSYNC_START(msa_h0));
@@ -989,11 +1009,11 @@ static void cdns_mhdp_enable(struct drm_bridge *bridge)
CDNS_DP_MSAH1_HDISP_WIDTH(mode->crtc_hdisplay);
if (mode->flags & DRM_MODE_FLAG_NHSYNC)
msa_horizontal_1 |= CDNS_DP_MSAH1_HSYNC_POL_LOW;
- cdns_mhdp_reg_write(mhdp, CDNS_DP_MSA_HORIZONTAL_1,
+ cdns_mhdp_reg_write(mhdp, CDNS_DP_MSA_HORIZONTAL_1(stream_id),
msa_horizontal_1);
msa_v0 = mode->crtc_vtotal - mode->crtc_vsync_start;
- cdns_mhdp_reg_write(mhdp, CDNS_DP_MSA_VERTICAL_0,
+ cdns_mhdp_reg_write(mhdp, CDNS_DP_MSA_VERTICAL_0(stream_id),
CDNS_DP_MSAV0_V_TOTAL(mode->crtc_vtotal) |
CDNS_DP_MSAV0_VSYNC_START(msa_v0));
@@ -1002,7 +1022,8 @@ static void cdns_mhdp_enable(struct drm_bridge *bridge)
CDNS_DP_MSAV1_VDISP_WIDTH(mode->crtc_vdisplay);
if (mode->flags & DRM_MODE_FLAG_NVSYNC)
msa_vertical_1 |= CDNS_DP_MSAV1_VSYNC_POL_LOW;
- cdns_mhdp_reg_write(mhdp, CDNS_DP_MSA_VERTICAL_1, msa_vertical_1);
+ cdns_mhdp_reg_write(mhdp, CDNS_DP_MSA_VERTICAL_1(stream_id),
+ msa_vertical_1);
if ((mode->flags & DRM_MODE_FLAG_INTERLACE) &&
mode->crtc_vtotal % 2 == 0)
@@ -1014,16 +1035,14 @@ static void cdns_mhdp_enable(struct drm_bridge *bridge)
if (pxlfmt == PIXEL_FORMAT_YCBCR_420)
misc1 = CDNS_DP_TEST_VSC_SDP;
- cdns_mhdp_reg_write(mhdp, CDNS_DP_MSA_MISC, misc0 | (misc1 << 8));
+ cdns_mhdp_reg_write(mhdp, CDNS_DP_MSA_MISC(stream_id),
+ misc0 | (misc1 << 8));
- /* FIXME: to be changed if MST mode */
- cdns_mhdp_reg_write(mhdp, CDNS_DP_STREAM_CONFIG, 1);
-
- cdns_mhdp_reg_write(mhdp, CDNS_DP_HORIZONTAL,
+ cdns_mhdp_reg_write(mhdp, CDNS_DP_HORIZONTAL(stream_id),
CDNS_DP_H_HSYNC_WIDTH(hsync) |
CDNS_DP_H_H_TOTAL(mode->crtc_hdisplay));
- cdns_mhdp_reg_write(mhdp, CDNS_DP_VERTICAL_0,
+ cdns_mhdp_reg_write(mhdp, CDNS_DP_VERTICAL_0(stream_id),
CDNS_DP_V0_VHEIGHT(mode->crtc_vdisplay) |
CDNS_DP_V0_VSTART(msa_v0));
@@ -1032,30 +1051,51 @@ static void cdns_mhdp_enable(struct drm_bridge *bridge)
mode->crtc_vtotal % 2 == 0)
dp_vertical_1 |= CDNS_DP_V1_VTOTAL_EVEN;
- cdns_mhdp_reg_write(mhdp, CDNS_DP_VERTICAL_1, dp_vertical_1);
+ cdns_mhdp_reg_write(mhdp, CDNS_DP_VERTICAL_1(stream_id), dp_vertical_1);
- cdns_mhdp_reg_write_bit(mhdp, CDNS_DP_VB_ID, 2, 1,
+ cdns_mhdp_reg_write_bit(mhdp, CDNS_DP_VB_ID(stream_id), 2, 1,
(mode->flags & DRM_MODE_FLAG_INTERLACE) ?
CDNS_DP_VB_ID_INTERLACED : 0);
- line_thresh1 = ((vs + 1) << 5) * 8 / bpp;
- line_thresh2 = (pxlclock << 5) / 1000 / rate * (vs + 1) - (1 << 5);
- line_thresh = line_thresh1 - line_thresh2 / mhdp->link.num_lanes;
- line_thresh = (line_thresh >> 5) + 2;
- cdns_mhdp_reg_write(mhdp, CDNS_DP_LINE_THRESH,
- line_thresh & GENMASK(5, 0));
- cdns_mhdp_reg_write(mhdp, CDNS_DP_RATE_GOVERNOR_STATUS,
- CDNS_DP_RG_TU_VS_DIFF((tu_size - vs > 3) ?
- 0 : tu_size - vs));
+ cdns_mhdp_reg_read(mhdp, CDNS_DP_FRAMER_GLOBAL_CONFIG, &tmp);
+ tmp |= CDNS_DP_FRAMER_EN;
+ cdns_mhdp_reg_write(mhdp, CDNS_DP_FRAMER_GLOBAL_CONFIG, tmp);
+}
- cdns_mhdp_set_video_status(mhdp, 1);
+void cdns_mhdp_enable(struct drm_bridge *bridge)
+{
+ struct cdns_mhdp_bridge *mhdp_bridge = to_mhdp_bridge(bridge);
+ struct cdns_mhdp_device *mhdp = mhdp_bridge->mhdp;
+ int ret = 0;
+
+ bool link_up = mhdp->link_up;
+
+ if (!link_up)
+ cdns_mhdp_link_up(mhdp);
+
+
+ if (!mhdp->is_mst)
+ ret = cdns_mhdp_sst_enable(bridge);
+ else
+ cdns_mhdp_mst_enable(bridge);
+
+}
+
+static void cdns_mhdp_detach(struct drm_bridge *bridge)
+{
+ struct cdns_mhdp_device *mhdp = bridge_to_mhdp(bridge);
+ struct cdns_mhdp_mst_cbs cbs_null = {0};
+
+ cdns_mhdp_mst_deinit(mhdp);
+ mhdp->cbs = cbs_null;
}
static const struct drm_bridge_funcs cdns_mhdp_bridge_funcs = {
.enable = cdns_mhdp_enable,
.disable = cdns_mhdp_disable,
.attach = cdns_mhdp_attach,
+ .detach = cdns_mhdp_detach,
};
static int load_firmware(struct cdns_mhdp_device *mhdp, const char *name,
@@ -1127,8 +1167,8 @@ static int cdns_mhdp_audio_get_eld(struct device *dev, void *data,
{
struct cdns_mhdp_device *mhdp = dev_get_drvdata(dev);
- memcpy(buf, mhdp->connector.eld,
- min(sizeof(mhdp->connector.eld), len));
+ memcpy(buf, mhdp->connector.base.eld,
+ min(sizeof(mhdp->connector.base.eld), len));
return 0;
}
@@ -1149,6 +1189,7 @@ static int mhdp_probe(struct platform_device *pdev)
unsigned int reg;
unsigned long rate;
u32 resp;
+ int irq;
struct hdmi_codec_pdata codec_data = {
.i2s = 1,
@@ -1192,6 +1233,14 @@ static int mhdp_probe(struct platform_device *pdev)
/* Leave debug mode */
writel(0, mhdp->regs + CDNS_APB_CTRL);
+ irq = platform_get_irq(pdev, 0);
+ ret = request_irq(irq, mhdp_irq_handler, 0, "mhdp8546", mhdp);
+ if (ret) {
+ dev_err(&pdev->dev,
+ "cannot install IRQ %d\n", irq);
+ return -EIO;
+ }
+
/*
* Wait for the KEEP_ALIVE "message" on the first 8 bits.
* Updated each sched "tick" (~2ms)
@@ -1222,8 +1271,8 @@ static int mhdp_probe(struct platform_device *pdev)
mhdp->host.lane_mapping = CDNS_LANE_MAPPING_FLIPPED;
mhdp->host.enhanced = true;
- mhdp->bridge.of_node = pdev->dev.of_node;
- mhdp->bridge.funcs = &cdns_mhdp_bridge_funcs;
+ mhdp->bridge.base.of_node = pdev->dev.of_node;
+ mhdp->bridge.base.funcs = &cdns_mhdp_bridge_funcs;
/* Init events to 0 as it's not cleared by FW at boot but on read */
readl(mhdp->regs + CDNS_SW_EVENT0);
@@ -1247,21 +1296,14 @@ static int mhdp_probe(struct platform_device *pdev)
cdns_mhdp_reg_write(mhdp, CDNS_DPTX_CAR,
resp | CDNS_VIF_CLK_EN | CDNS_VIF_CLK_RSTN);
- /* Loop over HDP change */
- /*
- * FIXME: does not work when put in mhdp_bridge_enable.
- * Where should we put it?
- */
- /* Is it still needed with use of mb message HPD STATUS? */
- ret = readl_poll_timeout(mhdp->regs + CDNS_SW_EVENT0, reg,
- reg & CDNS_DPTX_HPD, 500,
- CDNS_SW_EVENT0_TIMEOUT);
- if (ret) {
- dev_err(mhdp->dev, "no HPD received %d\n", reg);
- return -ENODEV;
- }
+ INIT_DELAYED_WORK(&mhdp->hotplug_work, mhdp_hotplug_work_func);
+
+ mhdp->bridge.connector = &mhdp->connector;
+ mhdp->connector.bridge = &mhdp->bridge;
+ mhdp->bridge.mhdp = mhdp;
+ mhdp->bridge.is_active = false;
- drm_bridge_add(&mhdp->bridge);
+ drm_bridge_add(&mhdp->bridge.base);
return 0;
}
@@ -1273,9 +1315,11 @@ static int mhdp_remove(struct platform_device *pdev)
struct cdns_mhdp_device *mhdp = dev_get_drvdata(&pdev->dev);
int ret;
+ flush_delayed_work(&mhdp->hotplug_work);
platform_device_unregister(mhdp->audio_pdev);
- drm_bridge_remove(&mhdp->bridge);
+ cdns_mhdp_mst_deinit(mhdp);
+ drm_bridge_remove(&mhdp->bridge.base);
ret = cdns_mhdp_set_firmware_active(mhdp, false);
if (ret) {
@@ -1288,6 +1332,17 @@ static int mhdp_remove(struct platform_device *pdev)
return 0;
}
+int mhdp_bridge_attach_mst_cbs(struct drm_bridge *bridge,
+ struct cdns_mhdp_mst_cbs *cbs)
+{
+ struct cdns_mhdp_device *mhdp = bridge_to_mhdp(bridge);
+
+ mhdp->cbs = *cbs;
+
+ return 0;
+}
+EXPORT_SYMBOL_GPL(mhdp_bridge_attach_mst_cbs);
+
static struct platform_driver mhdp_driver = {
.driver = {
.name = "cdns-mhdp",
@@ -1299,6 +1354,9 @@ static struct platform_driver mhdp_driver = {
module_platform_driver(mhdp_driver);
MODULE_AUTHOR("Quentin Schulz <quentin.schulz@free-electrons.com>");
+MODULE_AUTHOR("Przemyslaw Gaj <pgaj@cadence.com>");
+MODULE_AUTHOR("Damian Kos <dkos@cadence.com>");
+MODULE_AUTHOR("Piotr Sroka <piotrs@cadence.com>");
MODULE_DESCRIPTION("Cadence MHDP DP bridge driver");
MODULE_LICENSE("GPL");
MODULE_ALIAS("platform:cdns-mhdp");
diff --git a/drivers/gpu/drm/bridge/cdns-mhdp.h b/drivers/gpu/drm/bridge/cdns-mhdp.h
new file mode 100644
index 000000000000..abc1fa3f51a6
--- /dev/null
+++ b/drivers/gpu/drm/bridge/cdns-mhdp.h
@@ -0,0 +1,209 @@
+/* SPDX-License-Identifier: GPL v2 */
+/*
+ * Cadence MHDP DP MST bridge driver.
+ *
+ * Copyright: 2018 Cadence Design Systems, Inc.
+ *
+ * Author: Quentin Schulz <quentin.schulz@free-electrons.com>
+ */
+
+
+#ifndef CDNS_MHDP_H
+#define CDNS_MHDP_H
+
+#include <drm/drm_dp_mst_helper.h>
+
+#define CDNS_APB_CFG 0x00000
+#define CDNS_APB_CTRL (CDNS_APB_CFG + 0x00)
+#define CDNS_MAILBOX_FULL (CDNS_APB_CFG + 0x08)
+#define CDNS_MAILBOX_EMPTY (CDNS_APB_CFG + 0x0c)
+#define CDNS_MAILBOX_TX_DATA (CDNS_APB_CFG + 0x10)
+#define CDNS_MAILBOX_RX_DATA (CDNS_APB_CFG + 0x14)
+#define CDNS_KEEP_ALIVE (CDNS_APB_CFG + 0x18)
+#define CDNS_KEEP_ALIVE_MASK GENMASK(7, 0)
+
+#define CDNS_MB_INT_MASK (CDNS_APB_CFG + 0x34)
+
+#define CDNS_SW_CLK_L (CDNS_APB_CFG + 0x3c)
+#define CDNS_SW_CLK_H (CDNS_APB_CFG + 0x40)
+#define CDNS_SW_EVENT0 (CDNS_APB_CFG + 0x44)
+#define CDNS_DPTX_HPD BIT(0)
+
+#define CDNS_SW_EVENT1 (CDNS_APB_CFG + 0x48)
+#define CDNS_SW_EVENT2 (CDNS_APB_CFG + 0x4c)
+#define CDNS_SW_EVENT3 (CDNS_APB_CFG + 0x50)
+
+#define CDNS_APB_INT_MASK (CDNS_APB_CFG + 0x6C)
+#define CDNS_APB_INT_MASK_MAILBOX_INT BIT(0)
+#define CDNS_APB_INT_MASK_SW_EVENT_INT BIT(1)
+
+#define CDNS_DPTX_CAR (CDNS_APB_CFG + 0x904)
+#define CDNS_VIF_CLK_EN BIT(0)
+#define CDNS_VIF_CLK_RSTN BIT(1)
+
+#define CDNS_SOURCE_VIDEO_IF(s) (0x00b00 + (s * 0x20))
+#define CDNS_BND_HSYNC2VSYNC(s) (CDNS_SOURCE_VIDEO_IF(s) + \
+ 0x00)
+#define CDNS_IP_DTCT_WIN GENMASK(11, 0)
+#define CDNS_IP_DET_INTERLACE_FORMAT BIT(12)
+#define CDNS_IP_BYPASS_V_INTERFACE BIT(13)
+
+#define CDNS_HSYNC2VSYNC_POL_CTRL(s) (CDNS_SOURCE_VIDEO_IF(s) + \
+ 0x10)
+#define CDNS_H2V_HSYNC_POL_ACTIVE_LOW BIT(1)
+#define CDNS_H2V_VSYNC_POL_ACTIVE_LOW BIT(2)
+
+#define CDNS_DPTX_PHY_CONFIG 0x02000
+#define CDNS_PHY_TRAINING_EN BIT(0)
+#define CDNS_PHY_TRAINING_TYPE(x) (((x) & GENMASK(3, 0)) << 1)
+#define CDNS_PHY_SCRAMBLER_BYPASS BIT(5)
+#define CDNS_PHY_ENCODER_BYPASS BIT(6)
+#define CDNS_PHY_SKEW_BYPASS BIT(7)
+#define CDNS_PHY_TRAINING_AUTO BIT(8)
+#define CDNS_PHY_LANE0_SKEW(x) (((x) & GENMASK(2, 0)) << 9)
+#define CDNS_PHY_LANE1_SKEW(x) (((x) & GENMASK(2, 0)) << 12)
+#define CDNS_PHY_LANE2_SKEW(x) (((x) & GENMASK(2, 0)) << 15)
+#define CDNS_PHY_LANE3_SKEW(x) (((x) & GENMASK(2, 0)) << 18)
+#define CDNS_PHY_COMMON_CONFIG (CDNS_PHY_LANE1_SKEW(1) | \
+ CDNS_PHY_LANE2_SKEW(2) | \
+ CDNS_PHY_LANE3_SKEW(3))
+#define CDNS_PHY_10BIT_EN BIT(21)
+
+#define CDNS_DPTX_FRAMER 0x02200
+#define CDNS_DP_FRAMER_GLOBAL_CONFIG (CDNS_DPTX_FRAMER + 0x00)
+#define CDNS_DP_NUM_LANES(x) (x - 1)
+#define CDNS_DP_MST_EN BIT(2)
+#define CDNS_DP_FRAMER_EN BIT(3)
+#define CDNS_DP_RATE_GOVERNOR_EN BIT(4)
+#define CDNS_DP_NO_VIDEO_MODE BIT(5)
+#define CDNS_DP_DISABLE_PHY_RST BIT(6)
+#define CDNS_DP_WR_FAILING_EDGE_VSYNC BIT(7)
+
+#define CDNS_DP_SW_RESET (CDNS_DPTX_FRAMER + 0x04)
+#define CDNS_DP_FRAMER_TU (CDNS_DPTX_FRAMER + 0x08)
+#define CDNS_DP_FRAMER_TU_SIZE(x) (((x) & GENMASK(6, 0)) << 8)
+#define CDNS_DP_FRAMER_TU_VS(x) ((x) & GENMASK(5, 0))
+#define CDNS_DP_FRAMER_TU_CNT_RST_EN BIT(15)
+
+#define CDNS_DPTX_STREAM(s) (0x03000 + s * 0x80)
+#define CDNS_DP_MSA_HORIZONTAL_0(s) (CDNS_DPTX_STREAM(s) + 0x00)
+#define CDNS_DP_MSAH0_H_TOTAL(x) (x)
+#define CDNS_DP_MSAH0_HSYNC_START(x) ((x) << 16)
+
+#define CDNS_DP_MSA_HORIZONTAL_1(s) (CDNS_DPTX_STREAM(s) + 0x04)
+#define CDNS_DP_MSAH1_HSYNC_WIDTH(x) (x)
+#define CDNS_DP_MSAH1_HSYNC_POL_LOW BIT(15)
+#define CDNS_DP_MSAH1_HDISP_WIDTH(x) ((x) << 16)
+
+#define CDNS_DP_MSA_VERTICAL_0(s) (CDNS_DPTX_STREAM(s) + 0x08)
+#define CDNS_DP_MSAV0_V_TOTAL(x) (x)
+#define CDNS_DP_MSAV0_VSYNC_START(x) ((x) << 16)
+
+#define CDNS_DP_MSA_VERTICAL_1(s) (CDNS_DPTX_STREAM(s) + 0x0c)
+#define CDNS_DP_MSAV1_VSYNC_WIDTH(x) (x)
+#define CDNS_DP_MSAV1_VSYNC_POL_LOW BIT(15)
+#define CDNS_DP_MSAV1_VDISP_WIDTH(x) ((x) << 16)
+
+#define CDNS_DP_MSA_MISC(s) (CDNS_DPTX_STREAM(s) + 0x10)
+#define CDNS_DP_STREAM_CONFIGs(s) (CDNS_DPTX_STREAM(s) + 0x14)
+#define CDNS_DP_STREAM_CONFIG_2(s) (CDNS_DPTX_STREAM(s) + 0x2c)
+#define CDNS_DP_SC2_TU_VS_DIFF(x) ((x) << 8)
+
+#define CDNS_DP_HORIZONTAL(s) (CDNS_DPTX_STREAM(s) + 0x30)
+#define CDNS_DP_H_HSYNC_WIDTH(x) (x)
+#define CDNS_DP_H_H_TOTAL(x) ((x) << 16)
+
+#define CDNS_DP_VERTICAL_0(s) (CDNS_DPTX_STREAM(s) + 0x34)
+#define CDNS_DP_V0_VHEIGHT(x) (x)
+#define CDNS_DP_V0_VSTART(x) ((x) << 16)
+
+#define CDNS_DP_VERTICAL_1(s) (CDNS_DPTX_STREAM(s) + 0x38)
+#define CDNS_DP_V1_VTOTAL(x) (x)
+#define CDNS_DP_V1_VTOTAL_EVEN BIT(16)
+
+#define CDNS_DP_FRAMER_PXL_REPR(s) (CDNS_DPTX_STREAM(s) + 0x4c)
+#define CDNS_DP_FRAMER_6_BPC BIT(0)
+#define CDNS_DP_FRAMER_8_BPC BIT(1)
+#define CDNS_DP_FRAMER_10_BPC BIT(2)
+#define CDNS_DP_FRAMER_12_BPC BIT(3)
+#define CDNS_DP_FRAMER_16_BPC BIT(4)
+#define CDNS_DP_FRAMER_PXL_FORMAT 0x8
+#define CDNS_DP_FRAMER_RGB BIT(0)
+#define CDNS_DP_FRAMER_YCBCR444 BIT(1)
+#define CDNS_DP_FRAMER_YCBCR422 BIT(2)
+#define CDNS_DP_FRAMER_YCBCR420 BIT(3)
+#define CDNS_DP_FRAMER_Y_ONLY BIT(4)
+
+#define CDNS_DP_FRAMER_SP(s) (CDNS_DPTX_STREAM(s) + 0x10)
+#define CDNS_DP_FRAMER_VSYNC_POL_LOW BIT(0)
+#define CDNS_DP_FRAMER_HSYNC_POL_LOW BIT(1)
+#define CDNS_DP_FRAMER_INTERLACE BIT(2)
+
+#define CDNS_DP_LINE_THRESH(s) (CDNS_DPTX_STREAM(s) + 0x64)
+#define CDNS_DP_ACTIVE_LINE_THRESH(x) (x)
+
+#define CDNS_DP_VB_ID(s) (CDNS_DPTX_STREAM(s) + 0x68)
+#define CDNS_DP_VB_ID_INTERLACED BIT(2)
+#define CDNS_DP_VB_ID_COMPRESSED BIT(6)
+
+#define CDNS_DP_FRONT_BACK_PORCH(s) (CDNS_DPTX_STREAM(s) + 0x78)
+#define CDNS_DP_BACK_PORCH(x) (x)
+#define CDNS_DP_FRONT_PORCH(x) ((x) << 16)
+
+#define CDNS_DP_BYTE_COUNT(s) (CDNS_DPTX_STREAM(s) + 0x7c)
+#define CDNS_DP_BYTE_COUNT_BYTES_IN_CHUNK_SHIFT 16
+
+#define CDNS_DP_MST_STREAM_CONFIG(s) (CDNS_DPTX_STREAM(s) + 0x14)
+#define CDNS_DP_MST_STRM_CFG_STREAM_EN BIT(0)
+#define CDNS_DP_MST_STRM_CFG_NO_VIDEO BIT(1)
+
+#define CDNS_DP_MST_SLOT_ALLOCATE(s) (CDNS_DPTX_STREAM(s) + 0x44)
+#define CDNS_DP_S_ALLOC_START_SLOT(x) (x)
+#define CDNS_DP_S_ALLOC_END_SLOT(x) ((x) << 8)
+
+#define CDNS_DP_RATE_GOVERNING(s) (CDNS_DPTX_STREAM(s) + 0x48)
+#define CDNS_DP_RG_TARG_AV_SLOTS_Y(x) (x)
+#define CDNS_DP_RG_TARG_AV_SLOTS_X(x) (x << 4)
+#define CDNS_DP_RG_ENABLE BIT(10)
+
+#define CDNS_DP_MTPH_CONTROL 0x2264
+#define CDNS_DP_MTPH_ECF_EN BIT(0)
+#define CDNS_DP_MTPH_ACT_EN BIT(1)
+#define CDNS_DP_MTPH_LVP_EN BIT(2)
+
+#define CDNS_DP_MTPH_STATUS 0x226C
+#define CDNS_DP_MTPH_ACT_STATUS BIT(0)
+
+
+#define CDNS_DPTX_GLOBAL 0x02300
+#define CDNS_DP_LANE_EN (CDNS_DPTX_GLOBAL + 0x00)
+#define CDNS_DP_LANE_EN_LANES(x) GENMASK(x - 1, 0)
+#define CDNS_DP_ENHNCD (CDNS_DPTX_GLOBAL + 0x04)
+
+
+#define to_mhdp_connector(x) container_of(x, struct cdns_mhdp_connector, base)
+#define to_mhdp_bridge(x) container_of(x, struct cdns_mhdp_bridge, base)
+#define mgr_to_mhdp(x) container_of(x, struct cdns_mhdp_device, mst_mgr)
+
+#define CDNS_MHDP_MAX_STREAMS 4
+
+enum pixel_format {
+ PIXEL_FORMAT_RGB = 1,
+ PIXEL_FORMAT_YCBCR_444 = 2,
+ PIXEL_FORMAT_YCBCR_422 = 4,
+ PIXEL_FORMAT_YCBCR_420 = 8,
+ PIXEL_FORMAT_Y_ONLY = 16,
+};
+
+
+int cdns_mhdp_mst_init(struct cdns_mhdp_device *mhdp);
+void cdns_mhdp_mst_deinit(struct cdns_mhdp_device *mhdp);
+bool cdns_mhdp_mst_probe(struct cdns_mhdp_device *mhdp);
+enum pixel_format cdns_mhdp_get_pxlfmt(u32 color_formats);
+u32 cdns_mhdp_get_bpp(u32 bpc, u32 color_formats);
+void cdns_mhdp_configure_video(struct drm_bridge *bridge);
+void cdns_mhdp_mst_enable(struct drm_bridge *bridge);
+void cdns_mhdp_mst_disable(struct drm_bridge *bridge);
+void cdns_mhdp_enable(struct drm_bridge *bridge);
+
+#endif
diff --git a/drivers/gpu/drm/rockchip/cdn-dp-core.c b/drivers/gpu/drm/rockchip/cdn-dp-core.c
index 343f381e3440..a5a668f1912b 100644
--- a/drivers/gpu/drm/rockchip/cdn-dp-core.c
+++ b/drivers/gpu/drm/rockchip/cdn-dp-core.c
@@ -34,7 +34,7 @@
#include "rockchip_drm_vop.h"
#define connector_to_dp(c) \
- container_of(c, struct cdn_dp_device, mhdp.connector)
+ container_of(c, struct cdn_dp_device, mhdp.connector.base)
#define encoder_to_dp(c) \
container_of(c, struct cdn_dp_device, encoder)
@@ -291,7 +291,7 @@ static int cdn_dp_connector_mode_valid(struct drm_connector *connector,
{
struct cdn_dp_device *dp = connector_to_dp(connector);
struct drm_display_info *display_info =
- &dp->mhdp.connector.display_info;
+ &dp->mhdp.connector.base.display_info;
u32 requested, actual, rate, sink_max, source_max = 0;
u8 lanes, bpc;
@@ -387,7 +387,7 @@ static int cdn_dp_get_sink_capability(struct cdn_dp_device *dp)
}
kfree(dp->edid);
- dp->edid = drm_do_get_edid(&dp->mhdp.connector,
+ dp->edid = drm_do_get_edid(&dp->mhdp.connector.base,
cdns_mhdp_get_edid_block, &dp->mhdp);
return 0;
}
@@ -559,7 +559,7 @@ static void cdn_dp_encoder_mode_set(struct drm_encoder *encoder,
{
struct cdn_dp_device *dp = encoder_to_dp(encoder);
struct drm_display_info *display_info =
- &dp->mhdp.connector.display_info;
+ &dp->mhdp.connector.base.display_info;
struct video_info *video = &dp->mhdp.video_info;
switch (display_info->bpc) {
@@ -863,8 +863,8 @@ static int cdn_dp_audio_get_eld(struct device *dev, void *data,
{
struct cdn_dp_device *dp = dev_get_drvdata(dev);
- memcpy(buf, dp->mhdp.connector.eld,
- min(sizeof(dp->mhdp.connector.eld), len));
+ memcpy(buf, dp->mhdp.connector.base.eld,
+ min(sizeof(dp->mhdp.connector.base.eld), len));
return 0;
}
@@ -936,7 +936,7 @@ static void cdn_dp_pd_event_work(struct work_struct *work)
{
struct cdn_dp_device *dp = container_of(work, struct cdn_dp_device,
event_work);
- struct drm_connector *connector = &dp->mhdp.connector;
+ struct drm_connector *connector = &dp->mhdp.connector.base;
enum drm_connector_status old_status;
struct device *dev = dp->mhdp.dev;
@@ -1062,7 +1062,7 @@ static int cdn_dp_bind(struct device *dev, struct device *master, void *data)
drm_encoder_helper_add(encoder, &cdn_dp_encoder_helper_funcs);
- connector = &dp->mhdp.connector;
+ connector = &dp->mhdp.connector.base;
connector->polled = DRM_CONNECTOR_POLL_HPD;
connector->dpms = DRM_MODE_DPMS_OFF;
@@ -1113,7 +1113,7 @@ 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;
- struct drm_connector *connector = &dp->mhdp.connector;
+ struct drm_connector *connector = &dp->mhdp.connector.base;
cancel_work_sync(&dp->event_work);
cdn_dp_encoder_disable(encoder);
diff --git a/include/drm/bridge/cdns-mhdp-cbs.h b/include/drm/bridge/cdns-mhdp-cbs.h
new file mode 100644
index 000000000000..af07cbfcb729
--- /dev/null
+++ b/include/drm/bridge/cdns-mhdp-cbs.h
@@ -0,0 +1,27 @@
+/* SPDX-License-Identifier: GPL v2 */
+/*
+ * Cadence MHDP DP bridge callbacks.
+ *
+ * Copyright: 2018 Cadence Design Systems, Inc.
+ *
+ * Author: Piotr Sroka <piotrs@cadence.com>
+ */
+
+#ifndef CDNS_MHDP_CBS_H
+#define CDNS_MHDP_CBS_H
+
+struct cdns_mhdp_mst_cbs_funcs {
+ struct drm_encoder *(*create_mst_encoder)(void *priv_data,
+ struct drm_bridge *bridge);
+ void (*destroy_mst_encoder)(void *priv_data, struct drm_bridge *bridge);
+};
+
+struct cdns_mhdp_mst_cbs {
+ struct cdns_mhdp_mst_cbs_funcs funcs;
+ void *priv_data;
+};
+
+int mhdp_bridge_attach_mst_cbs(struct drm_bridge *bridge,
+ struct cdns_mhdp_mst_cbs *cbs);
+
+#endif
diff --git a/include/drm/bridge/cdns-mhdp-common.h b/include/drm/bridge/cdns-mhdp-common.h
index c5a5c4fa7fc4..d4711091ff2b 100644
--- a/include/drm/bridge/cdns-mhdp-common.h
+++ b/include/drm/bridge/cdns-mhdp-common.h
@@ -15,10 +15,12 @@
#ifndef CDNS_MHDP_COMMON_H_
#define CDNS_MHDP_COMMON_H_
+#include <drm/drm_dp_mst_helper.h>
#include <linux/bitops.h>
#include <drm/drm_dp_helper.h>
#include <drm/drm_connector.h>
#include <drm/drm_bridge.h>
+#include <drm/bridge/cdns-mhdp-cbs.h>
#define ADDR_IMEM 0x10000
#define ADDR_DMEM 0x20000
@@ -326,11 +328,11 @@
#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 GENERAL_REGISTER_READ 0x07
+#define GENERAL_MAIN_CONTROL 0x01
+#define GENERAL_TEST_ECHO 0x02
+#define GENERAL_BUS_SETTINGS 0x03
+#define GENERAL_TEST_ACCESS 0x04
+#define GENERAL_REGISTER_READ 0x07
#define DPTX_SET_POWER_MNG 0x00
#define DPTX_SET_HOST_CAPABILITIES 0x01
@@ -512,13 +514,34 @@ struct cdns_mhdp_sink {
u8 enhanced;
};
+struct cdns_mhdp_bridge;
+struct cdns_mhdp_connector;
+
+struct cdns_mhdp_bridge {
+ struct cdns_mhdp_device *mhdp;
+ struct drm_bridge base;
+ int pbn;
+ int8_t stream_id;
+ struct cdns_mhdp_connector *connector;
+ bool is_active;
+};
+
+
+struct cdns_mhdp_connector {
+ struct drm_connector base;
+ bool is_mst_connector;
+ struct drm_dp_mst_port *port;
+ struct cdns_mhdp_bridge *bridge;
+};
+
+
struct cdns_mhdp_device {
void __iomem *regs;
struct device *dev;
struct drm_dp_link link;
- struct drm_connector connector;
+ struct cdns_mhdp_connector connector;
struct clk *spdif_clk;
struct reset_control *spdif_rst;
@@ -528,13 +551,22 @@ struct cdns_mhdp_device {
struct drm_dp_aux aux;
struct cdns_mhdp_host host;
struct cdns_mhdp_sink sink;
- struct drm_bridge bridge;
+ struct cdns_mhdp_bridge bridge;
struct phy *phy;
void __iomem *dbg_regs;
struct video_info video_info;
struct drm_display_mode mode;
unsigned int fw_version;
+
+ struct drm_dp_mst_topology_mgr mst_mgr;
+ struct delayed_work hotplug_work;
+
+ struct cdns_mhdp_mst_cbs cbs;
+ bool is_mst;
+ bool can_mst;
+ bool link_up;
+ bool plugged;
};
void cdns_mhdp_clock_reset(struct cdns_mhdp_device *mhdp);
@@ -562,7 +594,7 @@ int cdns_mhdp_audio_config(struct cdns_mhdp_device *mhdp,
int cdns_mhdp_reg_read(struct cdns_mhdp_device *mhdp, u32 addr, u32 *value);
int cdns_mhdp_reg_write(struct cdns_mhdp_device *mhdp, u16 addr, u32 val);
int cdns_mhdp_reg_write_bit(struct cdns_mhdp_device *mhdp, u16 addr,
- u8 start_bit, u8 bits_no, u32 val);
+ u8 start_bit, u8 bits_no, u32 val);
int cdns_mhdp_adjust_lt(struct cdns_mhdp_device *mhdp, u8 nlanes,
u16 udelay, u8 *lanes_data,
u8 *dpcd);
--
2.17.1
^ permalink raw reply related [flat|nested] 45+ messages in thread
* [PATCH v6 6/6] drm/bridge: add PHY initialization in mhdp8546 driver.
2018-10-08 21:42 ` Damian Kos
(?)
@ 2018-10-08 21:42 ` Damian Kos
-1 siblings, 0 replies; 45+ messages in thread
From: Damian Kos @ 2018-10-08 21:42 UTC (permalink / raw)
To: David Airlie, Rob Herring, Mark Rutland, Archit Taneja,
Andrzej Hajda, Laurent Pinchart, Gustavo Padovan,
Maarten Lankhorst, Sean Paul, Sandy Huang, Heiko Stübner,
Quentin Schulz, Damian Kos, Piotr Sroka, dri-devel, devicetree,
linux-kernel, linux-arm-kernel, linux-rockchip
Cc: rafalc, quentin.schulz, jbergsagel
This patch modifies the mhdp8546 driver to initialize sd0801 "Torrent" PHY.
And removes the dbg_regs field from cdns_mhdp_device structure.
Signed-off-by: Damian Kos <dkos@cadence.com>
---
drivers/gpu/drm/bridge/cdns-mhdp.c | 9 +++++++++
include/drm/bridge/cdns-mhdp-common.h | 1 -
2 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/bridge/cdns-mhdp.c b/drivers/gpu/drm/bridge/cdns-mhdp.c
index 48ac5cf1e031..caaf3c17d74f 100644
--- a/drivers/gpu/drm/bridge/cdns-mhdp.c
+++ b/drivers/gpu/drm/bridge/cdns-mhdp.c
@@ -17,6 +17,7 @@
#include <linux/of.h>
#include <linux/platform_device.h>
#include <linux/slab.h>
+#include <linux/phy/phy.h>
#include <drm/drm_atomic_helper.h>
#include <drm/drm_bridge.h>
@@ -1220,6 +1221,12 @@ static int mhdp_probe(struct platform_device *pdev)
if (IS_ERR(mhdp->regs))
return PTR_ERR(mhdp->regs);
+ mhdp->phy = devm_phy_get(&pdev->dev, "dpphy");
+ if (IS_ERR(mhdp->phy)) {
+ dev_err(&pdev->dev, "no PHY configured\n");
+ return PTR_ERR(mhdp->phy);
+ }
+
platform_set_drvdata(pdev, mhdp);
ret = load_firmware(mhdp, FW_NAME, CDNS_MHDP_IMEM);
@@ -1291,6 +1298,8 @@ static int mhdp_probe(struct platform_device *pdev)
mhdp->dev, HDMI_CODEC_DRV_NAME, PLATFORM_DEVID_AUTO,
&codec_data, sizeof(codec_data));
+ phy_init(mhdp->phy);
+
/* Enable VIF clock for stream 0 */
cdns_mhdp_reg_read(mhdp, CDNS_DPTX_CAR, &resp);
cdns_mhdp_reg_write(mhdp, CDNS_DPTX_CAR,
diff --git a/include/drm/bridge/cdns-mhdp-common.h b/include/drm/bridge/cdns-mhdp-common.h
index d4711091ff2b..1e8a44138ce2 100644
--- a/include/drm/bridge/cdns-mhdp-common.h
+++ b/include/drm/bridge/cdns-mhdp-common.h
@@ -553,7 +553,6 @@ struct cdns_mhdp_device {
struct cdns_mhdp_sink sink;
struct cdns_mhdp_bridge bridge;
struct phy *phy;
- void __iomem *dbg_regs;
struct video_info video_info;
struct drm_display_mode mode;
--
2.17.1
^ permalink raw reply related [flat|nested] 45+ messages in thread
* [PATCH v6 6/6] drm/bridge: add PHY initialization in mhdp8546 driver.
@ 2018-10-08 21:42 ` Damian Kos
0 siblings, 0 replies; 45+ messages in thread
From: Damian Kos @ 2018-10-08 21:42 UTC (permalink / raw)
To: David Airlie, Rob Herring, Mark Rutland, Archit Taneja,
Andrzej Hajda, Laurent Pinchart, Gustavo Padovan,
Maarten Lankhorst, Sean Paul, Sandy Huang, Heiko Stübner,
Quentin Schulz, Damian Kos, Piotr Sroka, dri-devel, devicetree,
linux-kernel, linux-arm-kernel, linux-rockchip
Cc: rafalc, quentin.schulz, jbergsagel
This patch modifies the mhdp8546 driver to initialize sd0801 "Torrent" PHY.
And removes the dbg_regs field from cdns_mhdp_device structure.
Signed-off-by: Damian Kos <dkos@cadence.com>
---
drivers/gpu/drm/bridge/cdns-mhdp.c | 9 +++++++++
include/drm/bridge/cdns-mhdp-common.h | 1 -
2 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/bridge/cdns-mhdp.c b/drivers/gpu/drm/bridge/cdns-mhdp.c
index 48ac5cf1e031..caaf3c17d74f 100644
--- a/drivers/gpu/drm/bridge/cdns-mhdp.c
+++ b/drivers/gpu/drm/bridge/cdns-mhdp.c
@@ -17,6 +17,7 @@
#include <linux/of.h>
#include <linux/platform_device.h>
#include <linux/slab.h>
+#include <linux/phy/phy.h>
#include <drm/drm_atomic_helper.h>
#include <drm/drm_bridge.h>
@@ -1220,6 +1221,12 @@ static int mhdp_probe(struct platform_device *pdev)
if (IS_ERR(mhdp->regs))
return PTR_ERR(mhdp->regs);
+ mhdp->phy = devm_phy_get(&pdev->dev, "dpphy");
+ if (IS_ERR(mhdp->phy)) {
+ dev_err(&pdev->dev, "no PHY configured\n");
+ return PTR_ERR(mhdp->phy);
+ }
+
platform_set_drvdata(pdev, mhdp);
ret = load_firmware(mhdp, FW_NAME, CDNS_MHDP_IMEM);
@@ -1291,6 +1298,8 @@ static int mhdp_probe(struct platform_device *pdev)
mhdp->dev, HDMI_CODEC_DRV_NAME, PLATFORM_DEVID_AUTO,
&codec_data, sizeof(codec_data));
+ phy_init(mhdp->phy);
+
/* Enable VIF clock for stream 0 */
cdns_mhdp_reg_read(mhdp, CDNS_DPTX_CAR, &resp);
cdns_mhdp_reg_write(mhdp, CDNS_DPTX_CAR,
diff --git a/include/drm/bridge/cdns-mhdp-common.h b/include/drm/bridge/cdns-mhdp-common.h
index d4711091ff2b..1e8a44138ce2 100644
--- a/include/drm/bridge/cdns-mhdp-common.h
+++ b/include/drm/bridge/cdns-mhdp-common.h
@@ -553,7 +553,6 @@ struct cdns_mhdp_device {
struct cdns_mhdp_sink sink;
struct cdns_mhdp_bridge bridge;
struct phy *phy;
- void __iomem *dbg_regs;
struct video_info video_info;
struct drm_display_mode mode;
--
2.17.1
^ permalink raw reply related [flat|nested] 45+ messages in thread
* [PATCH v6 6/6] drm/bridge: add PHY initialization in mhdp8546 driver.
@ 2018-10-08 21:42 ` Damian Kos
0 siblings, 0 replies; 45+ messages in thread
From: Damian Kos @ 2018-10-08 21:42 UTC (permalink / raw)
To: linux-arm-kernel
This patch modifies the mhdp8546 driver to initialize sd0801 "Torrent" PHY.
And removes the dbg_regs field from cdns_mhdp_device structure.
Signed-off-by: Damian Kos <dkos@cadence.com>
---
drivers/gpu/drm/bridge/cdns-mhdp.c | 9 +++++++++
include/drm/bridge/cdns-mhdp-common.h | 1 -
2 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/bridge/cdns-mhdp.c b/drivers/gpu/drm/bridge/cdns-mhdp.c
index 48ac5cf1e031..caaf3c17d74f 100644
--- a/drivers/gpu/drm/bridge/cdns-mhdp.c
+++ b/drivers/gpu/drm/bridge/cdns-mhdp.c
@@ -17,6 +17,7 @@
#include <linux/of.h>
#include <linux/platform_device.h>
#include <linux/slab.h>
+#include <linux/phy/phy.h>
#include <drm/drm_atomic_helper.h>
#include <drm/drm_bridge.h>
@@ -1220,6 +1221,12 @@ static int mhdp_probe(struct platform_device *pdev)
if (IS_ERR(mhdp->regs))
return PTR_ERR(mhdp->regs);
+ mhdp->phy = devm_phy_get(&pdev->dev, "dpphy");
+ if (IS_ERR(mhdp->phy)) {
+ dev_err(&pdev->dev, "no PHY configured\n");
+ return PTR_ERR(mhdp->phy);
+ }
+
platform_set_drvdata(pdev, mhdp);
ret = load_firmware(mhdp, FW_NAME, CDNS_MHDP_IMEM);
@@ -1291,6 +1298,8 @@ static int mhdp_probe(struct platform_device *pdev)
mhdp->dev, HDMI_CODEC_DRV_NAME, PLATFORM_DEVID_AUTO,
&codec_data, sizeof(codec_data));
+ phy_init(mhdp->phy);
+
/* Enable VIF clock for stream 0 */
cdns_mhdp_reg_read(mhdp, CDNS_DPTX_CAR, &resp);
cdns_mhdp_reg_write(mhdp, CDNS_DPTX_CAR,
diff --git a/include/drm/bridge/cdns-mhdp-common.h b/include/drm/bridge/cdns-mhdp-common.h
index d4711091ff2b..1e8a44138ce2 100644
--- a/include/drm/bridge/cdns-mhdp-common.h
+++ b/include/drm/bridge/cdns-mhdp-common.h
@@ -553,7 +553,6 @@ struct cdns_mhdp_device {
struct cdns_mhdp_sink sink;
struct cdns_mhdp_bridge bridge;
struct phy *phy;
- void __iomem *dbg_regs;
struct video_info video_info;
struct drm_display_mode mode;
--
2.17.1
^ permalink raw reply related [flat|nested] 45+ messages in thread
* RE: [PATCH v6 0/6] drm: add support for Cadence MHDP DPI/DP bridge.
@ 2018-11-05 9:44 ` Damian Kos
0 siblings, 0 replies; 45+ messages in thread
From: Damian Kos @ 2018-11-05 9:44 UTC (permalink / raw)
To: David Airlie, Rob Herring, Mark Rutland, Archit Taneja,
Andrzej Hajda, Laurent Pinchart, Gustavo Padovan,
Maarten Lankhorst, Sean Paul, Sandy Huang, Heiko Stübner,
Quentin Schulz, Piotr Sroka, dri-devel, devicetree, linux-kernel,
linux-arm-kernel, linux-rockchip
Cc: Rafal Ciepiela, quentin.schulz, jbergsagel, Damian Kos
Hi Guys,
I'm wondering if this time patch is so good that there're no change requests, or is it so bad that it was rejected without a comment : )
Please let me know if this patch is being in review or was rejected and, if so, what needs to be changed.
Regards,
Damian
-----Original Message-----
From: Damian Kos <dkos@cadence.com>
Sent: Monday, October 8, 2018 23:42
To: David Airlie <airlied@linux.ie>; Rob Herring <robh+dt@kernel.org>; Mark Rutland <mark.rutland@arm.com>; Archit Taneja <architt@codeaurora.org>; Andrzej Hajda <a.hajda@samsung.com>; Laurent Pinchart <Laurent.pinchart@ideasonboard.com>; Gustavo Padovan <gustavo@padovan.org>; Maarten Lankhorst <maarten.lankhorst@linux.intel.com>; Sean Paul <sean@poorly.run>; Sandy Huang <hjc@rock-chips.com>; Heiko Stübner <heiko@sntech.de>; Quentin Schulz <quentin.schulz@free-electrons.com>; Damian Kos <dkos@cadence.com>; Piotr Sroka <piotrs@cadence.com>; dri-devel@lists.freedesktop.org; devicetree@vger.kernel.org; linux-kernel@vger.kernel.org; linux-arm-kernel@lists.infradead.org; linux-rockchip@lists.infradead.org
Cc: Rafal Ciepiela <rafalc@cadence.com>; quentin.schulz@bootlin.com; jbergsagel@ti.com
Subject: [PATCH v6 0/6] drm: add support for Cadence MHDP DPI/DP bridge.
Hello!
This is the series of patches that will add support for the Cadence's DPI/DP bridge. Please note that this is a preliminary version of the driver and there will be more patches in the future with updates, fixes and improvements.
Please keep that in mind when looking at FIXME/TODO/XXX comments.
Initially, MHDP driver was developed as a DRM bridge driver and was planed to be placed in drivers/gpu/drm/bridge/mhdp.c. However, there was already a driver for Cadence's DP controller developed by RockChip, but that driver uses the different DRM framework and looks like a part of a bigger system.
Both controllers (including firmware) are quite different internally (MST/FEC/DSC support, link training done by driver, additional commands, IRQ's
etc.) but they have similar register map, except for Framer/Streamer (which is noticeably different), so they appear similar.
The following patches contain:
- Moving common code to drivers/gpu/drm/bridge/cdns-mhdp-common.* and
modifying it a bit (mostly new prefixes for functions and data types) so it
can be used by two, higher level, drivers.
- Modifying existing RockChip's DP driver to use the common code after changes
made to it (use the new cdns_mhdp_device structure and new function names).
- Modifying DRM helpers a bit. Some are required for new driver, some are
updates from DP 1.2 to 1.3 or 1.4.
- Adding documentation for device tree bindings.
- Adding preliminary Cadence DPI/DP bridge driver.
Some of the things that will be added later on include (but are not limited
to):
- DSC support
- FEC support
- HDCP support
Changes in v2:
- Added actual description of what the patch contains, what is it for and
what's going on here in general.
- New structure. Now we have one common low level driver + two high level
drivers - one for RockChip with minimum changes and one, more general, for
Cadence.
- Dropped some changes made to DRM helpers.
- Updated the device tree bindings document.
Changes in v3:
- Corrected dt-bindings document
- Enabled some clocks at startup (since FW doesn't do that anymore).
- Changed Firmware file name to match the file on Linux Firmware repo.
- Added SST audio support
- Made common functions (in cdns-mhdp-common.*) public.
Changes in v4:
- Fixed Kconfig in drm/rockchip
- Fixed Signed-offs
- dp_link_status() is no longer public since it's used only in drm_dp_helper.c
- Replaced EXTRA_CFLAGS with ccflags-y in drm/rockchip Makefile
Changes in v5:
- Fixed Kconfig in drm/rockchip again
- Moved cdn-dp-reg.h (cdns-mhdp-common.h) to include/drm/bridge instead of
drivers/gpu/drm/bridge/
- Updated the mhdp_validate_cr function
Changes in v6:
- Added Reviewed-bys for already reviewed patches
- Dropped patch v5-0003 (that made dp_get_lane_status helper public)
- Added patch with MST support
- Added patch with Cadence SD0801 PHY init
Damian Kos (2):
drm/rockchip: prepare common code for cdns and rk dpi/dp driver
drm/bridge: add PHY initialization in mhdp8546 driver.
Piotr Sroka (1):
drm/bridge: add support for MST in mhdp8546 driver
Quentin Schulz (3):
drm/dp: fix link probing for devices supporting DP 1.4+
dt-bindings: drm/bridge: Document Cadence MHDP bridge bindings
drm: bridge: add support for Cadence MHDP DPI/DP bridge
.../bindings/display/bridge/cdns,mhdp.txt | 43 +
drivers/gpu/drm/bridge/Kconfig | 9 +
drivers/gpu/drm/bridge/Makefile | 3 +
drivers/gpu/drm/bridge/cdns-mhdp-common.c | 1107 +++++++++++++
drivers/gpu/drm/bridge/cdns-mhdp-mst.c | 594 +++++++
drivers/gpu/drm/bridge/cdns-mhdp.c | 1371 +++++++++++++++++
drivers/gpu/drm/bridge/cdns-mhdp.h | 209 +++
drivers/gpu/drm/drm_dp_helper.c | 30 +-
drivers/gpu/drm/rockchip/Kconfig | 4 +-
drivers/gpu/drm/rockchip/Makefile | 2 +-
drivers/gpu/drm/rockchip/cdn-dp-core.c | 234 +--
drivers/gpu/drm/rockchip/cdn-dp-core.h | 43 +-
drivers/gpu/drm/rockchip/cdn-dp-reg.c | 969 ------------
include/drm/bridge/cdns-mhdp-cbs.h | 27 +
.../drm/bridge/cdns-mhdp-common.h | 174 ++-
15 files changed, 3669 insertions(+), 1150 deletions(-) create mode 100644 Documentation/devicetree/bindings/display/bridge/cdns,mhdp.txt
create mode 100644 drivers/gpu/drm/bridge/cdns-mhdp-common.c
create mode 100644 drivers/gpu/drm/bridge/cdns-mhdp-mst.c
create mode 100644 drivers/gpu/drm/bridge/cdns-mhdp.c
create mode 100644 drivers/gpu/drm/bridge/cdns-mhdp.h
delete mode 100644 drivers/gpu/drm/rockchip/cdn-dp-reg.c
create mode 100644 include/drm/bridge/cdns-mhdp-cbs.h
rename drivers/gpu/drm/rockchip/cdn-dp-reg.h => include/drm/bridge/cdns-mhdp-common.h (77%)
--
2.17.1
^ permalink raw reply [flat|nested] 45+ messages in thread
* RE: [PATCH v6 0/6] drm: add support for Cadence MHDP DPI/DP bridge.
@ 2018-11-05 9:44 ` Damian Kos
0 siblings, 0 replies; 45+ messages in thread
From: Damian Kos @ 2018-11-05 9:44 UTC (permalink / raw)
To: David Airlie, Rob Herring, Mark Rutland, Archit Taneja,
Andrzej Hajda, Laurent Pinchart, Gustavo Padovan,
Maarten Lankhorst, Sean Paul, Sandy Huang, Heiko Stübner,
Quentin Schulz, Piotr Sroka,
dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW,
devicetree-u79uwXL29TY76Z2rM5mHXA,
linux-kernel-u79uwXL29TY76Z2rM5mHXA,
linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
linux-rockchip-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r
Cc: jbergsagel-l0cyMroinI0, Rafal Ciepiela, Damian Kos,
quentin.schulz-LDxbnhwyfcJBDgjK7y7TUQ
Hi Guys,
I'm wondering if this time patch is so good that there're no change requests, or is it so bad that it was rejected without a comment : )
Please let me know if this patch is being in review or was rejected and, if so, what needs to be changed.
Regards,
Damian
-----Original Message-----
From: Damian Kos <dkos@cadence.com>
Sent: Monday, October 8, 2018 23:42
To: David Airlie <airlied@linux.ie>; Rob Herring <robh+dt@kernel.org>; Mark Rutland <mark.rutland@arm.com>; Archit Taneja <architt@codeaurora.org>; Andrzej Hajda <a.hajda@samsung.com>; Laurent Pinchart <Laurent.pinchart@ideasonboard.com>; Gustavo Padovan <gustavo@padovan.org>; Maarten Lankhorst <maarten.lankhorst@linux.intel.com>; Sean Paul <sean@poorly.run>; Sandy Huang <hjc@rock-chips.com>; Heiko Stübner <heiko@sntech.de>; Quentin Schulz <quentin.schulz@free-electrons.com>; Damian Kos <dkos@cadence.com>; Piotr Sroka <piotrs@cadence.com>; dri-devel@lists.freedesktop.org; devicetree@vger.kernel.org; linux-kernel@vger.kernel.org; linux-arm-kernel@lists.infradead.org; linux-rockchip@lists.infradead.org
Cc: Rafal Ciepiela <rafalc@cadence.com>; quentin.schulz@bootlin.com; jbergsagel@ti.com
Subject: [PATCH v6 0/6] drm: add support for Cadence MHDP DPI/DP bridge.
Hello!
This is the series of patches that will add support for the Cadence's DPI/DP bridge. Please note that this is a preliminary version of the driver and there will be more patches in the future with updates, fixes and improvements.
Please keep that in mind when looking at FIXME/TODO/XXX comments.
Initially, MHDP driver was developed as a DRM bridge driver and was planed to be placed in drivers/gpu/drm/bridge/mhdp.c. However, there was already a driver for Cadence's DP controller developed by RockChip, but that driver uses the different DRM framework and looks like a part of a bigger system.
Both controllers (including firmware) are quite different internally (MST/FEC/DSC support, link training done by driver, additional commands, IRQ's
etc.) but they have similar register map, except for Framer/Streamer (which is noticeably different), so they appear similar.
The following patches contain:
- Moving common code to drivers/gpu/drm/bridge/cdns-mhdp-common.* and
modifying it a bit (mostly new prefixes for functions and data types) so it
can be used by two, higher level, drivers.
- Modifying existing RockChip's DP driver to use the common code after changes
made to it (use the new cdns_mhdp_device structure and new function names).
- Modifying DRM helpers a bit. Some are required for new driver, some are
updates from DP 1.2 to 1.3 or 1.4.
- Adding documentation for device tree bindings.
- Adding preliminary Cadence DPI/DP bridge driver.
Some of the things that will be added later on include (but are not limited
to):
- DSC support
- FEC support
- HDCP support
Changes in v2:
- Added actual description of what the patch contains, what is it for and
what's going on here in general.
- New structure. Now we have one common low level driver + two high level
drivers - one for RockChip with minimum changes and one, more general, for
Cadence.
- Dropped some changes made to DRM helpers.
- Updated the device tree bindings document.
Changes in v3:
- Corrected dt-bindings document
- Enabled some clocks at startup (since FW doesn't do that anymore).
- Changed Firmware file name to match the file on Linux Firmware repo.
- Added SST audio support
- Made common functions (in cdns-mhdp-common.*) public.
Changes in v4:
- Fixed Kconfig in drm/rockchip
- Fixed Signed-offs
- dp_link_status() is no longer public since it's used only in drm_dp_helper.c
- Replaced EXTRA_CFLAGS with ccflags-y in drm/rockchip Makefile
Changes in v5:
- Fixed Kconfig in drm/rockchip again
- Moved cdn-dp-reg.h (cdns-mhdp-common.h) to include/drm/bridge instead of
drivers/gpu/drm/bridge/
- Updated the mhdp_validate_cr function
Changes in v6:
- Added Reviewed-bys for already reviewed patches
- Dropped patch v5-0003 (that made dp_get_lane_status helper public)
- Added patch with MST support
- Added patch with Cadence SD0801 PHY init
Damian Kos (2):
drm/rockchip: prepare common code for cdns and rk dpi/dp driver
drm/bridge: add PHY initialization in mhdp8546 driver.
Piotr Sroka (1):
drm/bridge: add support for MST in mhdp8546 driver
Quentin Schulz (3):
drm/dp: fix link probing for devices supporting DP 1.4+
dt-bindings: drm/bridge: Document Cadence MHDP bridge bindings
drm: bridge: add support for Cadence MHDP DPI/DP bridge
.../bindings/display/bridge/cdns,mhdp.txt | 43 +
drivers/gpu/drm/bridge/Kconfig | 9 +
drivers/gpu/drm/bridge/Makefile | 3 +
drivers/gpu/drm/bridge/cdns-mhdp-common.c | 1107 +++++++++++++
drivers/gpu/drm/bridge/cdns-mhdp-mst.c | 594 +++++++
drivers/gpu/drm/bridge/cdns-mhdp.c | 1371 +++++++++++++++++
drivers/gpu/drm/bridge/cdns-mhdp.h | 209 +++
drivers/gpu/drm/drm_dp_helper.c | 30 +-
drivers/gpu/drm/rockchip/Kconfig | 4 +-
drivers/gpu/drm/rockchip/Makefile | 2 +-
drivers/gpu/drm/rockchip/cdn-dp-core.c | 234 +--
drivers/gpu/drm/rockchip/cdn-dp-core.h | 43 +-
drivers/gpu/drm/rockchip/cdn-dp-reg.c | 969 ------------
include/drm/bridge/cdns-mhdp-cbs.h | 27 +
.../drm/bridge/cdns-mhdp-common.h | 174 ++-
15 files changed, 3669 insertions(+), 1150 deletions(-) create mode 100644 Documentation/devicetree/bindings/display/bridge/cdns,mhdp.txt
create mode 100644 drivers/gpu/drm/bridge/cdns-mhdp-common.c
create mode 100644 drivers/gpu/drm/bridge/cdns-mhdp-mst.c
create mode 100644 drivers/gpu/drm/bridge/cdns-mhdp.c
create mode 100644 drivers/gpu/drm/bridge/cdns-mhdp.h
delete mode 100644 drivers/gpu/drm/rockchip/cdn-dp-reg.c
create mode 100644 include/drm/bridge/cdns-mhdp-cbs.h
rename drivers/gpu/drm/rockchip/cdn-dp-reg.h => include/drm/bridge/cdns-mhdp-common.h (77%)
--
2.17.1
_______________________________________________
Linux-rockchip mailing list
Linux-rockchip@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-rockchip
^ permalink raw reply [flat|nested] 45+ messages in thread
* [PATCH v6 0/6] drm: add support for Cadence MHDP DPI/DP bridge.
@ 2018-11-05 9:44 ` Damian Kos
0 siblings, 0 replies; 45+ messages in thread
From: Damian Kos @ 2018-11-05 9:44 UTC (permalink / raw)
To: linux-arm-kernel
Hi Guys,
I'm wondering if this time patch is so good that there're no change requests, or is it so bad that it was rejected without a comment : )
Please let me know if this patch is being in review or was rejected and, if so, what needs to be changed.
Regards,
Damian
-----Original Message-----
From: Damian Kos <dkos@cadence.com>
Sent: Monday, October 8, 2018 23:42
To: David Airlie <airlied@linux.ie>; Rob Herring <robh+dt@kernel.org>; Mark Rutland <mark.rutland@arm.com>; Archit Taneja <architt@codeaurora.org>; Andrzej Hajda <a.hajda@samsung.com>; Laurent Pinchart <Laurent.pinchart@ideasonboard.com>; Gustavo Padovan <gustavo@padovan.org>; Maarten Lankhorst <maarten.lankhorst@linux.intel.com>; Sean Paul <sean@poorly.run>; Sandy Huang <hjc@rock-chips.com>; Heiko St?bner <heiko@sntech.de>; Quentin Schulz <quentin.schulz@free-electrons.com>; Damian Kos <dkos@cadence.com>; Piotr Sroka <piotrs@cadence.com>; dri-devel at lists.freedesktop.org; devicetree at vger.kernel.org; linux-kernel at vger.kernel.org; linux-arm-kernel at lists.infradead.org; linux-rockchip at lists.infradead.org
Cc: Rafal Ciepiela <rafalc@cadence.com>; quentin.schulz at bootlin.com; jbergsagel at ti.com
Subject: [PATCH v6 0/6] drm: add support for Cadence MHDP DPI/DP bridge.
Hello!
This is the series of patches that will add support for the Cadence's DPI/DP bridge. Please note that this is a preliminary version of the driver and there will be more patches in the future with updates, fixes and improvements.
Please keep that in mind when looking at FIXME/TODO/XXX comments.
Initially, MHDP driver was developed as a DRM bridge driver and was planed to be placed in drivers/gpu/drm/bridge/mhdp.c. However, there was already a driver for Cadence's DP controller developed by RockChip, but that driver uses the different DRM framework and looks like a part of a bigger system.
Both controllers (including firmware) are quite different internally (MST/FEC/DSC support, link training done by driver, additional commands, IRQ's
etc.) but they have similar register map, except for Framer/Streamer (which is noticeably different), so they appear similar.
The following patches contain:
- Moving common code to drivers/gpu/drm/bridge/cdns-mhdp-common.* and
modifying it a bit (mostly new prefixes for functions and data types) so it
can be used by two, higher level, drivers.
- Modifying existing RockChip's DP driver to use the common code after changes
made to it (use the new cdns_mhdp_device structure and new function names).
- Modifying DRM helpers a bit. Some are required for new driver, some are
updates from DP 1.2 to 1.3 or 1.4.
- Adding documentation for device tree bindings.
- Adding preliminary Cadence DPI/DP bridge driver.
Some of the things that will be added later on include (but are not limited
to):
- DSC support
- FEC support
- HDCP support
Changes in v2:
- Added actual description of what the patch contains, what is it for and
what's going on here in general.
- New structure. Now we have one common low level driver + two high level
drivers - one for RockChip with minimum changes and one, more general, for
Cadence.
- Dropped some changes made to DRM helpers.
- Updated the device tree bindings document.
Changes in v3:
- Corrected dt-bindings document
- Enabled some clocks at startup (since FW doesn't do that anymore).
- Changed Firmware file name to match the file on Linux Firmware repo.
- Added SST audio support
- Made common functions (in cdns-mhdp-common.*) public.
Changes in v4:
- Fixed Kconfig in drm/rockchip
- Fixed Signed-offs
- dp_link_status() is no longer public since it's used only in drm_dp_helper.c
- Replaced EXTRA_CFLAGS with ccflags-y in drm/rockchip Makefile
Changes in v5:
- Fixed Kconfig in drm/rockchip again
- Moved cdn-dp-reg.h (cdns-mhdp-common.h) to include/drm/bridge instead of
drivers/gpu/drm/bridge/
- Updated the mhdp_validate_cr function
Changes in v6:
- Added Reviewed-bys for already reviewed patches
- Dropped patch v5-0003 (that made dp_get_lane_status helper public)
- Added patch with MST support
- Added patch with Cadence SD0801 PHY init
Damian Kos (2):
drm/rockchip: prepare common code for cdns and rk dpi/dp driver
drm/bridge: add PHY initialization in mhdp8546 driver.
Piotr Sroka (1):
drm/bridge: add support for MST in mhdp8546 driver
Quentin Schulz (3):
drm/dp: fix link probing for devices supporting DP 1.4+
dt-bindings: drm/bridge: Document Cadence MHDP bridge bindings
drm: bridge: add support for Cadence MHDP DPI/DP bridge
.../bindings/display/bridge/cdns,mhdp.txt | 43 +
drivers/gpu/drm/bridge/Kconfig | 9 +
drivers/gpu/drm/bridge/Makefile | 3 +
drivers/gpu/drm/bridge/cdns-mhdp-common.c | 1107 +++++++++++++
drivers/gpu/drm/bridge/cdns-mhdp-mst.c | 594 +++++++
drivers/gpu/drm/bridge/cdns-mhdp.c | 1371 +++++++++++++++++
drivers/gpu/drm/bridge/cdns-mhdp.h | 209 +++
drivers/gpu/drm/drm_dp_helper.c | 30 +-
drivers/gpu/drm/rockchip/Kconfig | 4 +-
drivers/gpu/drm/rockchip/Makefile | 2 +-
drivers/gpu/drm/rockchip/cdn-dp-core.c | 234 +--
drivers/gpu/drm/rockchip/cdn-dp-core.h | 43 +-
drivers/gpu/drm/rockchip/cdn-dp-reg.c | 969 ------------
include/drm/bridge/cdns-mhdp-cbs.h | 27 +
.../drm/bridge/cdns-mhdp-common.h | 174 ++-
15 files changed, 3669 insertions(+), 1150 deletions(-) create mode 100644 Documentation/devicetree/bindings/display/bridge/cdns,mhdp.txt
create mode 100644 drivers/gpu/drm/bridge/cdns-mhdp-common.c
create mode 100644 drivers/gpu/drm/bridge/cdns-mhdp-mst.c
create mode 100644 drivers/gpu/drm/bridge/cdns-mhdp.c
create mode 100644 drivers/gpu/drm/bridge/cdns-mhdp.h
delete mode 100644 drivers/gpu/drm/rockchip/cdn-dp-reg.c
create mode 100644 include/drm/bridge/cdns-mhdp-cbs.h
rename drivers/gpu/drm/rockchip/cdn-dp-reg.h => include/drm/bridge/cdns-mhdp-common.h (77%)
--
2.17.1
^ permalink raw reply [flat|nested] 45+ messages in thread
* Re: [PATCH v6 0/6] drm: add support for Cadence MHDP DPI/DP bridge.
2018-11-05 9:44 ` Damian Kos
(?)
@ 2018-11-05 10:30 ` Laurent Pinchart
-1 siblings, 0 replies; 45+ messages in thread
From: Laurent Pinchart @ 2018-11-05 10:30 UTC (permalink / raw)
To: Damian Kos
Cc: David Airlie, Rob Herring, Mark Rutland, Archit Taneja,
Andrzej Hajda, Gustavo Padovan, Maarten Lankhorst, Sean Paul,
Sandy Huang, Heiko Stübner, Quentin Schulz, Piotr Sroka,
dri-devel, devicetree, linux-kernel, linux-arm-kernel,
linux-rockchip, Rafal Ciepiela, quentin.schulz, jbergsagel
Hi Damian,
On Monday, 5 November 2018 11:44:53 EET Damian Kos wrote:
> Hi Guys,
>
> I'm wondering if this time patch is so good that there're no change
> requests, or is it so bad that it was rejected without a comment : )
> Please let me know if this patch is being in review or was rejected and, if
> so, what needs to be changed.
I unfortunately don't have time to review your series for the time being.
Hopefully someone else will have a better review bandwidth :-) Sorry about
that.
--
Regards,
Laurent Pinchart
^ permalink raw reply [flat|nested] 45+ messages in thread
* Re: [PATCH v6 0/6] drm: add support for Cadence MHDP DPI/DP bridge.
@ 2018-11-05 10:30 ` Laurent Pinchart
0 siblings, 0 replies; 45+ messages in thread
From: Laurent Pinchart @ 2018-11-05 10:30 UTC (permalink / raw)
To: Damian Kos
Cc: Mark Rutland, devicetree, quentin.schulz, Quentin Schulz,
David Airlie, dri-devel, linux-kernel, Rafal Ciepiela,
Rob Herring, jbergsagel, linux-rockchip, Sean Paul,
linux-arm-kernel, Piotr Sroka
Hi Damian,
On Monday, 5 November 2018 11:44:53 EET Damian Kos wrote:
> Hi Guys,
>
> I'm wondering if this time patch is so good that there're no change
> requests, or is it so bad that it was rejected without a comment : )
> Please let me know if this patch is being in review or was rejected and, if
> so, what needs to be changed.
I unfortunately don't have time to review your series for the time being.
Hopefully someone else will have a better review bandwidth :-) Sorry about
that.
--
Regards,
Laurent Pinchart
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 45+ messages in thread
* [PATCH v6 0/6] drm: add support for Cadence MHDP DPI/DP bridge.
@ 2018-11-05 10:30 ` Laurent Pinchart
0 siblings, 0 replies; 45+ messages in thread
From: Laurent Pinchart @ 2018-11-05 10:30 UTC (permalink / raw)
To: linux-arm-kernel
Hi Damian,
On Monday, 5 November 2018 11:44:53 EET Damian Kos wrote:
> Hi Guys,
>
> I'm wondering if this time patch is so good that there're no change
> requests, or is it so bad that it was rejected without a comment : )
> Please let me know if this patch is being in review or was rejected and, if
> so, what needs to be changed.
I unfortunately don't have time to review your series for the time being.
Hopefully someone else will have a better review bandwidth :-) Sorry about
that.
--
Regards,
Laurent Pinchart
^ permalink raw reply [flat|nested] 45+ messages in thread
* RE: [PATCH v6 0/6] drm: add support for Cadence MHDP DPI/DP bridge.
2018-11-05 10:30 ` Laurent Pinchart
(?)
@ 2018-11-05 10:33 ` Damian Kos
-1 siblings, 0 replies; 45+ messages in thread
From: Damian Kos @ 2018-11-05 10:33 UTC (permalink / raw)
To: Laurent Pinchart
Cc: David Airlie, Rob Herring, Mark Rutland, Archit Taneja,
Andrzej Hajda, Gustavo Padovan, Maarten Lankhorst, Sean Paul,
Sandy Huang, Heiko Stübner, Quentin Schulz, Piotr Sroka,
dri-devel, devicetree, linux-kernel, linux-arm-kernel,
linux-rockchip, Rafal Ciepiela, quentin.schulz, jbergsagel
Hi Laurent,
Understood. Thanks.
Damian
-----Original Message-----
From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Sent: Monday, November 5, 2018 11:30
To: Damian Kos <dkos@cadence.com>
Cc: David Airlie <airlied@linux.ie>; Rob Herring <robh+dt@kernel.org>; Mark Rutland <mark.rutland@arm.com>; Archit Taneja <architt@codeaurora.org>; Andrzej Hajda <a.hajda@samsung.com>; Gustavo Padovan <gustavo@padovan.org>; Maarten Lankhorst <maarten.lankhorst@linux.intel.com>; Sean Paul <sean@poorly.run>; Sandy Huang <hjc@rock-chips.com>; Heiko Stübner <heiko@sntech.de>; Quentin Schulz <quentin.schulz@free-electrons.com>; Piotr Sroka <piotrs@cadence.com>; dri-devel@lists.freedesktop.org; devicetree@vger.kernel.org; linux-kernel@vger.kernel.org; linux-arm-kernel@lists.infradead.org; linux-rockchip@lists.infradead.org; Rafal Ciepiela <rafalc@cadence.com>; quentin.schulz@bootlin.com; jbergsagel@ti.com
Subject: Re: [PATCH v6 0/6] drm: add support for Cadence MHDP DPI/DP bridge.
EXTERNAL MAIL
Hi Damian,
On Monday, 5 November 2018 11:44:53 EET Damian Kos wrote:
> Hi Guys,
>
> I'm wondering if this time patch is so good that there're no change
> requests, or is it so bad that it was rejected without a comment : )
> Please let me know if this patch is being in review or was rejected
> and, if so, what needs to be changed.
I unfortunately don't have time to review your series for the time being.
Hopefully someone else will have a better review bandwidth :-) Sorry about that.
--
Regards,
Laurent Pinchart
^ permalink raw reply [flat|nested] 45+ messages in thread
* RE: [PATCH v6 0/6] drm: add support for Cadence MHDP DPI/DP bridge.
@ 2018-11-05 10:33 ` Damian Kos
0 siblings, 0 replies; 45+ messages in thread
From: Damian Kos @ 2018-11-05 10:33 UTC (permalink / raw)
To: Laurent Pinchart
Cc: Mark Rutland, devicetree-u79uwXL29TY76Z2rM5mHXA, Archit Taneja,
quentin.schulz-LDxbnhwyfcJBDgjK7y7TUQ, Heiko Stübner,
Quentin Schulz, David Airlie, Gustavo Padovan, Maarten Lankhorst,
Sandy Huang, dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW,
linux-kernel-u79uwXL29TY76Z2rM5mHXA, Andrzej Hajda,
Rafal Ciepiela, Rob Herring, jbergsagel-l0cyMroinI0,
linux-rockchip-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r, Sean Paul,
linux-arm-kernel-IAPFreCvJWM7uuMidbF8XcXa4x6EXUF0
Hi Laurent,
Understood. Thanks.
Damian
-----Original Message-----
From: Laurent Pinchart <laurent.pinchart-ryLnwIuWjnjg/C1BVhZhaw@public.gmane.org>
Sent: Monday, November 5, 2018 11:30
To: Damian Kos <dkos-vna1KIf7WgpBDgjK7y7TUQ@public.gmane.org>
Cc: David Airlie <airlied-cv59FeDIM0c@public.gmane.org>; Rob Herring <robh+dt-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>; Mark Rutland <mark.rutland-5wv7dgnIgG8@public.gmane.org>; Archit Taneja <architt-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org>; Andrzej Hajda <a.hajda-Sze3O3UU22JBDgjK7y7TUQ@public.gmane.org>; Gustavo Padovan <gustavo-THi1TnShQwVAfugRpC6u6w@public.gmane.org>; Maarten Lankhorst <maarten.lankhorst-VuQAYsv1563Yd54FQh9/CA@public.gmane.org>; Sean Paul <sean@poorly.run>; Sandy Huang <hjc-TNX95d0MmH7DzftRWevZcw@public.gmane.org>; Heiko Stübner <heiko-4mtYJXux2i+zQB+pC5nmwQ@public.gmane.org>; Quentin Schulz <quentin.schulz-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org>; Piotr Sroka <piotrs@cadence.com>; dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org; devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org; linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org; linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org; linux-rockchip-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org; Rafal Ciepiela <rafalc-vna1KIf7WgpBDgjK7y7TUQ@public.gmane.org>; quentin.schulz-LDxbnhwyfcJBDgjK7y7TUQ@public.gmane.org; jbergsagel-l0cyMroinI0@public.gmane.org
Subject: Re: [PATCH v6 0/6] drm: add support for Cadence MHDP DPI/DP bridge.
EXTERNAL MAIL
Hi Damian,
On Monday, 5 November 2018 11:44:53 EET Damian Kos wrote:
> Hi Guys,
>
> I'm wondering if this time patch is so good that there're no change
> requests, or is it so bad that it was rejected without a comment : )
> Please let me know if this patch is being in review or was rejected
> and, if so, what needs to be changed.
I unfortunately don't have time to review your series for the time being.
Hopefully someone else will have a better review bandwidth :-) Sorry about that.
--
Regards,
Laurent Pinchart
^ permalink raw reply [flat|nested] 45+ messages in thread
* [PATCH v6 0/6] drm: add support for Cadence MHDP DPI/DP bridge.
@ 2018-11-05 10:33 ` Damian Kos
0 siblings, 0 replies; 45+ messages in thread
From: Damian Kos @ 2018-11-05 10:33 UTC (permalink / raw)
To: linux-arm-kernel
Hi Laurent,
Understood. Thanks.
Damian
-----Original Message-----
From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Sent: Monday, November 5, 2018 11:30
To: Damian Kos <dkos@cadence.com>
Cc: David Airlie <airlied@linux.ie>; Rob Herring <robh+dt@kernel.org>; Mark Rutland <mark.rutland@arm.com>; Archit Taneja <architt@codeaurora.org>; Andrzej Hajda <a.hajda@samsung.com>; Gustavo Padovan <gustavo@padovan.org>; Maarten Lankhorst <maarten.lankhorst@linux.intel.com>; Sean Paul <sean@poorly.run>; Sandy Huang <hjc@rock-chips.com>; Heiko St?bner <heiko@sntech.de>; Quentin Schulz <quentin.schulz@free-electrons.com>; Piotr Sroka <piotrs@cadence.com>; dri-devel at lists.freedesktop.org; devicetree at vger.kernel.org; linux-kernel at vger.kernel.org; linux-arm-kernel at lists.infradead.org; linux-rockchip at lists.infradead.org; Rafal Ciepiela <rafalc@cadence.com>; quentin.schulz at bootlin.com; jbergsagel at ti.com
Subject: Re: [PATCH v6 0/6] drm: add support for Cadence MHDP DPI/DP bridge.
EXTERNAL MAIL
Hi Damian,
On Monday, 5 November 2018 11:44:53 EET Damian Kos wrote:
> Hi Guys,
>
> I'm wondering if this time patch is so good that there're no change
> requests, or is it so bad that it was rejected without a comment : )
> Please let me know if this patch is being in review or was rejected
> and, if so, what needs to be changed.
I unfortunately don't have time to review your series for the time being.
Hopefully someone else will have a better review bandwidth :-) Sorry about that.
--
Regards,
Laurent Pinchart
^ permalink raw reply [flat|nested] 45+ messages in thread
* Re: [PATCH v6 0/6] drm: add support for Cadence MHDP DPI/DP bridge.
2018-11-05 10:33 ` Damian Kos
(?)
@ 2018-11-05 11:09 ` Andrzej Hajda
-1 siblings, 0 replies; 45+ messages in thread
From: Andrzej Hajda @ 2018-11-05 11:09 UTC (permalink / raw)
To: Damian Kos, Laurent Pinchart
Cc: David Airlie, Rob Herring, Mark Rutland, Archit Taneja,
Gustavo Padovan, Maarten Lankhorst, Sean Paul, Sandy Huang,
Heiko Stübner, Quentin Schulz, Piotr Sroka, dri-devel,
devicetree, linux-kernel, linux-arm-kernel, linux-rockchip,
Rafal Ciepiela, quentin.schulz, jbergsagel
On 05.11.2018 11:33, Damian Kos wrote:
> Hi Laurent,
>
> Understood. Thanks.
I will look at it today or tomorrow.
Regards
Andrzej
>
> Damian
>
> -----Original Message-----
> From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> Sent: Monday, November 5, 2018 11:30
> To: Damian Kos <dkos@cadence.com>
> Cc: David Airlie <airlied@linux.ie>; Rob Herring <robh+dt@kernel.org>; Mark Rutland <mark.rutland@arm.com>; Archit Taneja <architt@codeaurora.org>; Andrzej Hajda <a.hajda@samsung.com>; Gustavo Padovan <gustavo@padovan.org>; Maarten Lankhorst <maarten.lankhorst@linux.intel.com>; Sean Paul <sean@poorly.run>; Sandy Huang <hjc@rock-chips.com>; Heiko Stübner <heiko@sntech.de>; Quentin Schulz <quentin.schulz@free-electrons.com>; Piotr Sroka <piotrs@cadence.com>; dri-devel@lists.freedesktop.org; devicetree@vger.kernel.org; linux-kernel@vger.kernel.org; linux-arm-kernel@lists.infradead.org; linux-rockchip@lists.infradead.org; Rafal Ciepiela <rafalc@cadence.com>; quentin.schulz@bootlin.com; jbergsagel@ti.com
> Subject: Re: [PATCH v6 0/6] drm: add support for Cadence MHDP DPI/DP bridge.
>
> EXTERNAL MAIL
>
>
> Hi Damian,
>
> On Monday, 5 November 2018 11:44:53 EET Damian Kos wrote:
>> Hi Guys,
>>
>> I'm wondering if this time patch is so good that there're no change
>> requests, or is it so bad that it was rejected without a comment : )
>> Please let me know if this patch is being in review or was rejected
>> and, if so, what needs to be changed.
> I unfortunately don't have time to review your series for the time being.
> Hopefully someone else will have a better review bandwidth :-) Sorry about that.
>
> --
> Regards,
>
> Laurent Pinchart
>
>
>
>
>
^ permalink raw reply [flat|nested] 45+ messages in thread
* Re: [PATCH v6 0/6] drm: add support for Cadence MHDP DPI/DP bridge.
@ 2018-11-05 11:09 ` Andrzej Hajda
0 siblings, 0 replies; 45+ messages in thread
From: Andrzej Hajda @ 2018-11-05 11:09 UTC (permalink / raw)
To: Damian Kos, Laurent Pinchart
Cc: Mark Rutland, devicetree, quentin.schulz, linux-rockchip,
David Airlie, dri-devel, linux-kernel, Quentin Schulz,
Rafal Ciepiela, Rob Herring, jbergsagel, Sean Paul,
linux-arm-kernel, Piotr Sroka
On 05.11.2018 11:33, Damian Kos wrote:
> Hi Laurent,
>
> Understood. Thanks.
I will look at it today or tomorrow.
Regards
Andrzej
>
> Damian
>
> -----Original Message-----
> From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> Sent: Monday, November 5, 2018 11:30
> To: Damian Kos <dkos@cadence.com>
> Cc: David Airlie <airlied@linux.ie>; Rob Herring <robh+dt@kernel.org>; Mark Rutland <mark.rutland@arm.com>; Archit Taneja <architt@codeaurora.org>; Andrzej Hajda <a.hajda@samsung.com>; Gustavo Padovan <gustavo@padovan.org>; Maarten Lankhorst <maarten.lankhorst@linux.intel.com>; Sean Paul <sean@poorly.run>; Sandy Huang <hjc@rock-chips.com>; Heiko Stübner <heiko@sntech.de>; Quentin Schulz <quentin.schulz@free-electrons.com>; Piotr Sroka <piotrs@cadence.com>; dri-devel@lists.freedesktop.org; devicetree@vger.kernel.org; linux-kernel@vger.kernel.org; linux-arm-kernel@lists.infradead.org; linux-rockchip@lists.infradead.org; Rafal Ciepiela <rafalc@cadence.com>; quentin.schulz@bootlin.com; jbergsagel@ti.com
> Subject: Re: [PATCH v6 0/6] drm: add support for Cadence MHDP DPI/DP bridge.
>
> EXTERNAL MAIL
>
>
> Hi Damian,
>
> On Monday, 5 November 2018 11:44:53 EET Damian Kos wrote:
>> Hi Guys,
>>
>> I'm wondering if this time patch is so good that there're no change
>> requests, or is it so bad that it was rejected without a comment : )
>> Please let me know if this patch is being in review or was rejected
>> and, if so, what needs to be changed.
> I unfortunately don't have time to review your series for the time being.
> Hopefully someone else will have a better review bandwidth :-) Sorry about that.
>
> --
> Regards,
>
> Laurent Pinchart
>
>
>
>
>
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 45+ messages in thread
* [PATCH v6 0/6] drm: add support for Cadence MHDP DPI/DP bridge.
@ 2018-11-05 11:09 ` Andrzej Hajda
0 siblings, 0 replies; 45+ messages in thread
From: Andrzej Hajda @ 2018-11-05 11:09 UTC (permalink / raw)
To: linux-arm-kernel
On 05.11.2018 11:33, Damian Kos wrote:
> Hi Laurent,
>
> Understood. Thanks.
I will look at it today or tomorrow.
Regards
Andrzej
>
> Damian
>
> -----Original Message-----
> From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> Sent: Monday, November 5, 2018 11:30
> To: Damian Kos <dkos@cadence.com>
> Cc: David Airlie <airlied@linux.ie>; Rob Herring <robh+dt@kernel.org>; Mark Rutland <mark.rutland@arm.com>; Archit Taneja <architt@codeaurora.org>; Andrzej Hajda <a.hajda@samsung.com>; Gustavo Padovan <gustavo@padovan.org>; Maarten Lankhorst <maarten.lankhorst@linux.intel.com>; Sean Paul <sean@poorly.run>; Sandy Huang <hjc@rock-chips.com>; Heiko St?bner <heiko@sntech.de>; Quentin Schulz <quentin.schulz@free-electrons.com>; Piotr Sroka <piotrs@cadence.com>; dri-devel at lists.freedesktop.org; devicetree at vger.kernel.org; linux-kernel at vger.kernel.org; linux-arm-kernel at lists.infradead.org; linux-rockchip at lists.infradead.org; Rafal Ciepiela <rafalc@cadence.com>; quentin.schulz at bootlin.com; jbergsagel at ti.com
> Subject: Re: [PATCH v6 0/6] drm: add support for Cadence MHDP DPI/DP bridge.
>
> EXTERNAL MAIL
>
>
> Hi Damian,
>
> On Monday, 5 November 2018 11:44:53 EET Damian Kos wrote:
>> Hi Guys,
>>
>> I'm wondering if this time patch is so good that there're no change
>> requests, or is it so bad that it was rejected without a comment : )
>> Please let me know if this patch is being in review or was rejected
>> and, if so, what needs to be changed.
> I unfortunately don't have time to review your series for the time being.
> Hopefully someone else will have a better review bandwidth :-) Sorry about that.
>
> --
> Regards,
>
> Laurent Pinchart
>
>
>
>
>
^ permalink raw reply [flat|nested] 45+ messages in thread
* RE: [PATCH v6 0/6] drm: add support for Cadence MHDP DPI/DP bridge.
@ 2018-11-05 11:34 ` Damian Kos
0 siblings, 0 replies; 45+ messages in thread
From: Damian Kos @ 2018-11-05 11:34 UTC (permalink / raw)
To: Andrzej Hajda
Cc: David Airlie, Rob Herring, Mark Rutland, Laurent Pinchart,
Archit Taneja, Gustavo Padovan, Maarten Lankhorst, Sean Paul,
Sandy Huang, Heiko Stübner, Quentin Schulz, Piotr Sroka,
dri-devel, devicetree, linux-kernel, linux-arm-kernel,
linux-rockchip, Rafal Ciepiela, quentin.schulz, jbergsagel
Hi Andrzej,
Thanks!
Damian
-----Original Message-----
From: Andrzej Hajda <a.hajda@samsung.com>
Sent: Monday, November 5, 2018 12:10
To: Damian Kos <dkos@cadence.com>; Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Cc: David Airlie <airlied@linux.ie>; Rob Herring <robh+dt@kernel.org>; Mark Rutland <mark.rutland@arm.com>; Archit Taneja <architt@codeaurora.org>; Gustavo Padovan <gustavo@padovan.org>; Maarten Lankhorst <maarten.lankhorst@linux.intel.com>; Sean Paul <sean@poorly.run>; Sandy Huang <hjc@rock-chips.com>; Heiko Stübner <heiko@sntech.de>; Quentin Schulz <quentin.schulz@free-electrons.com>; Piotr Sroka <piotrs@cadence.com>; dri-devel@lists.freedesktop.org; devicetree@vger.kernel.org; linux-kernel@vger.kernel.org; linux-arm-kernel@lists.infradead.org; linux-rockchip@lists.infradead.org; Rafal Ciepiela <rafalc@cadence.com>; quentin.schulz@bootlin.com; jbergsagel@ti.com
Subject: Re: [PATCH v6 0/6] drm: add support for Cadence MHDP DPI/DP bridge.
EXTERNAL MAIL
On 05.11.2018 11:33, Damian Kos wrote:
> Hi Laurent,
>
> Understood. Thanks.
I will look at it today or tomorrow.
Regards
Andrzej
>
> Damian
>
> -----Original Message-----
> From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> Sent: Monday, November 5, 2018 11:30
> To: Damian Kos <dkos@cadence.com>
> Cc: David Airlie <airlied@linux.ie>; Rob Herring <robh+dt@kernel.org>;
> Mark Rutland <mark.rutland@arm.com>; Archit Taneja
> <architt@codeaurora.org>; Andrzej Hajda <a.hajda@samsung.com>; Gustavo
> Padovan <gustavo@padovan.org>; Maarten Lankhorst
> <maarten.lankhorst@linux.intel.com>; Sean Paul <sean@poorly.run>;
> Sandy Huang <hjc@rock-chips.com>; Heiko Stübner <heiko@sntech.de>;
> Quentin Schulz <quentin.schulz@free-electrons.com>; Piotr Sroka
> <piotrs@cadence.com>; dri-devel@lists.freedesktop.org;
> devicetree@vger.kernel.org; linux-kernel@vger.kernel.org;
> linux-arm-kernel@lists.infradead.org;
> linux-rockchip@lists.infradead.org; Rafal Ciepiela
> <rafalc@cadence.com>; quentin.schulz@bootlin.com; jbergsagel@ti.com
> Subject: Re: [PATCH v6 0/6] drm: add support for Cadence MHDP DPI/DP bridge.
>
> EXTERNAL MAIL
>
>
> Hi Damian,
>
> On Monday, 5 November 2018 11:44:53 EET Damian Kos wrote:
>> Hi Guys,
>>
>> I'm wondering if this time patch is so good that there're no change
>> requests, or is it so bad that it was rejected without a comment : )
>> Please let me know if this patch is being in review or was rejected
>> and, if so, what needs to be changed.
> I unfortunately don't have time to review your series for the time being.
> Hopefully someone else will have a better review bandwidth :-) Sorry about that.
>
> --
> Regards,
>
> Laurent Pinchart
>
>
>
>
>
^ permalink raw reply [flat|nested] 45+ messages in thread
* RE: [PATCH v6 0/6] drm: add support for Cadence MHDP DPI/DP bridge.
@ 2018-11-05 11:34 ` Damian Kos
0 siblings, 0 replies; 45+ messages in thread
From: Damian Kos @ 2018-11-05 11:34 UTC (permalink / raw)
To: Andrzej Hajda
Cc: Mark Rutland, devicetree-u79uwXL29TY76Z2rM5mHXA, Archit Taneja,
quentin.schulz-LDxbnhwyfcJBDgjK7y7TUQ, Heiko Stübner,
linux-rockchip-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r, David Airlie,
Gustavo Padovan, Maarten Lankhorst, Sandy Huang,
dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW,
linux-kernel-u79uwXL29TY76Z2rM5mHXA, Quentin Schulz,
Rafal Ciepiela, Rob Herring, Laurent Pinchart,
jbergsagel-l0cyMroinI0, Sean Paul, linux-arm-kernel
Hi Andrzej,
Thanks!
Damian
-----Original Message-----
From: Andrzej Hajda <a.hajda@samsung.com>
Sent: Monday, November 5, 2018 12:10
To: Damian Kos <dkos@cadence.com>; Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Cc: David Airlie <airlied@linux.ie>; Rob Herring <robh+dt@kernel.org>; Mark Rutland <mark.rutland@arm.com>; Archit Taneja <architt@codeaurora.org>; Gustavo Padovan <gustavo@padovan.org>; Maarten Lankhorst <maarten.lankhorst@linux.intel.com>; Sean Paul <sean@poorly.run>; Sandy Huang <hjc@rock-chips.com>; Heiko Stübner <heiko@sntech.de>; Quentin Schulz <quentin.schulz@free-electrons.com>; Piotr Sroka <piotrs@cadence.com>; dri-devel@lists.freedesktop.org; devicetree@vger.kernel.org; linux-kernel@vger.kernel.org; linux-arm-kernel@lists.infradead.org; linux-rockchip@lists.infradead.org; Rafal Ciepiela <rafalc@cadence.com>; quentin.schulz@bootlin.com; jbergsagel@ti.com
Subject: Re: [PATCH v6 0/6] drm: add support for Cadence MHDP DPI/DP bridge.
EXTERNAL MAIL
On 05.11.2018 11:33, Damian Kos wrote:
> Hi Laurent,
>
> Understood. Thanks.
I will look at it today or tomorrow.
Regards
Andrzej
>
> Damian
>
> -----Original Message-----
> From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> Sent: Monday, November 5, 2018 11:30
> To: Damian Kos <dkos@cadence.com>
> Cc: David Airlie <airlied@linux.ie>; Rob Herring <robh+dt@kernel.org>;
> Mark Rutland <mark.rutland@arm.com>; Archit Taneja
> <architt@codeaurora.org>; Andrzej Hajda <a.hajda@samsung.com>; Gustavo
> Padovan <gustavo@padovan.org>; Maarten Lankhorst
> <maarten.lankhorst@linux.intel.com>; Sean Paul <sean@poorly.run>;
> Sandy Huang <hjc@rock-chips.com>; Heiko Stübner <heiko@sntech.de>;
> Quentin Schulz <quentin.schulz@free-electrons.com>; Piotr Sroka
> <piotrs@cadence.com>; dri-devel@lists.freedesktop.org;
> devicetree@vger.kernel.org; linux-kernel@vger.kernel.org;
> linux-arm-kernel@lists.infradead.org;
> linux-rockchip@lists.infradead.org; Rafal Ciepiela
> <rafalc@cadence.com>; quentin.schulz@bootlin.com; jbergsagel@ti.com
> Subject: Re: [PATCH v6 0/6] drm: add support for Cadence MHDP DPI/DP bridge.
>
> EXTERNAL MAIL
>
>
> Hi Damian,
>
> On Monday, 5 November 2018 11:44:53 EET Damian Kos wrote:
>> Hi Guys,
>>
>> I'm wondering if this time patch is so good that there're no change
>> requests, or is it so bad that it was rejected without a comment : )
>> Please let me know if this patch is being in review or was rejected
>> and, if so, what needs to be changed.
> I unfortunately don't have time to review your series for the time being.
> Hopefully someone else will have a better review bandwidth :-) Sorry about that.
>
> --
> Regards,
>
> Laurent Pinchart
>
>
>
>
>
_______________________________________________
Linux-rockchip mailing list
Linux-rockchip@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-rockchip
^ permalink raw reply [flat|nested] 45+ messages in thread
* [PATCH v6 0/6] drm: add support for Cadence MHDP DPI/DP bridge.
@ 2018-11-05 11:34 ` Damian Kos
0 siblings, 0 replies; 45+ messages in thread
From: Damian Kos @ 2018-11-05 11:34 UTC (permalink / raw)
To: linux-arm-kernel
Hi Andrzej,
Thanks!
Damian
-----Original Message-----
From: Andrzej Hajda <a.hajda@samsung.com>
Sent: Monday, November 5, 2018 12:10
To: Damian Kos <dkos@cadence.com>; Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Cc: David Airlie <airlied@linux.ie>; Rob Herring <robh+dt@kernel.org>; Mark Rutland <mark.rutland@arm.com>; Archit Taneja <architt@codeaurora.org>; Gustavo Padovan <gustavo@padovan.org>; Maarten Lankhorst <maarten.lankhorst@linux.intel.com>; Sean Paul <sean@poorly.run>; Sandy Huang <hjc@rock-chips.com>; Heiko St?bner <heiko@sntech.de>; Quentin Schulz <quentin.schulz@free-electrons.com>; Piotr Sroka <piotrs@cadence.com>; dri-devel at lists.freedesktop.org; devicetree at vger.kernel.org; linux-kernel at vger.kernel.org; linux-arm-kernel at lists.infradead.org; linux-rockchip at lists.infradead.org; Rafal Ciepiela <rafalc@cadence.com>; quentin.schulz at bootlin.com; jbergsagel at ti.com
Subject: Re: [PATCH v6 0/6] drm: add support for Cadence MHDP DPI/DP bridge.
EXTERNAL MAIL
On 05.11.2018 11:33, Damian Kos wrote:
> Hi Laurent,
>
> Understood. Thanks.
I will look at it today or tomorrow.
Regards
Andrzej
>
> Damian
>
> -----Original Message-----
> From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> Sent: Monday, November 5, 2018 11:30
> To: Damian Kos <dkos@cadence.com>
> Cc: David Airlie <airlied@linux.ie>; Rob Herring <robh+dt@kernel.org>;
> Mark Rutland <mark.rutland@arm.com>; Archit Taneja
> <architt@codeaurora.org>; Andrzej Hajda <a.hajda@samsung.com>; Gustavo
> Padovan <gustavo@padovan.org>; Maarten Lankhorst
> <maarten.lankhorst@linux.intel.com>; Sean Paul <sean@poorly.run>;
> Sandy Huang <hjc@rock-chips.com>; Heiko St?bner <heiko@sntech.de>;
> Quentin Schulz <quentin.schulz@free-electrons.com>; Piotr Sroka
> <piotrs@cadence.com>; dri-devel at lists.freedesktop.org;
> devicetree at vger.kernel.org; linux-kernel at vger.kernel.org;
> linux-arm-kernel at lists.infradead.org;
> linux-rockchip at lists.infradead.org; Rafal Ciepiela
> <rafalc@cadence.com>; quentin.schulz at bootlin.com; jbergsagel at ti.com
> Subject: Re: [PATCH v6 0/6] drm: add support for Cadence MHDP DPI/DP bridge.
>
> EXTERNAL MAIL
>
>
> Hi Damian,
>
> On Monday, 5 November 2018 11:44:53 EET Damian Kos wrote:
>> Hi Guys,
>>
>> I'm wondering if this time patch is so good that there're no change
>> requests, or is it so bad that it was rejected without a comment : )
>> Please let me know if this patch is being in review or was rejected
>> and, if so, what needs to be changed.
> I unfortunately don't have time to review your series for the time being.
> Hopefully someone else will have a better review bandwidth :-) Sorry about that.
>
> --
> Regards,
>
> Laurent Pinchart
>
>
>
>
>
^ permalink raw reply [flat|nested] 45+ messages in thread
* Re: [PATCH v6 4/6] drm: bridge: add support for Cadence MHDP DPI/DP bridge
2018-10-08 21:42 ` Damian Kos
@ 2018-11-05 13:10 ` Andrzej Hajda
-1 siblings, 0 replies; 45+ messages in thread
From: Andrzej Hajda @ 2018-11-05 13:10 UTC (permalink / raw)
To: Damian Kos, David Airlie, Rob Herring, Mark Rutland,
Archit Taneja, Laurent Pinchart, Gustavo Padovan,
Maarten Lankhorst, Sean Paul, Sandy Huang, Heiko Stübner,
Quentin Schulz, Piotr Sroka, dri-devel, devicetree, linux-kernel,
linux-arm-kernel, linux-rockchip
Cc: rafalc, quentin.schulz, jbergsagel
On 08.10.2018 23:42, Damian Kos wrote:
> From: Quentin Schulz <quentin.schulz@free-electrons.com>
>
> This adds basic support for Cadence MHDP DPI to DP bridge.
>
> Basically, it takes a DPI stream as input and output it encoded in DP
> format. It's missing proper HPD, HDCP and currently supports only
> SST mode.
>
> Changes made in the low level driver (cdn-dp-reg.*):
> - moved it to from drivers/gpu/drm/rockchip to
> drivers/gpu/drm/bridge/cdns-mhdp-common.c and
> include/drm/bridge/cdns-mhdp-common.h
> - functions for sending/receiving commands are now public
> - added functions for reading registers and link training
> adjustment
>
> Changes made in RK's driver (cdn-dp-core.*):
> - Moved audio_info and audio_pdev fields from cdn_dp_device to
> cdns_mhdp_device structure.
>
> Signed-off-by: Quentin Schulz <quentin.schulz@free-electrons.com>
> Signed-off-by: Damian Kos <dkos@cadence.com>
> ---
> drivers/gpu/drm/bridge/Kconfig | 9 +
> drivers/gpu/drm/bridge/Makefile | 3 +
> .../cdns-mhdp-common.c} | 136 +-
> drivers/gpu/drm/bridge/cdns-mhdp.c | 1304 +++++++++++++++++
> drivers/gpu/drm/rockchip/Kconfig | 4 +-
> drivers/gpu/drm/rockchip/Makefile | 2 +-
> drivers/gpu/drm/rockchip/cdn-dp-core.c | 16 +-
> drivers/gpu/drm/rockchip/cdn-dp-core.h | 5 +-
> .../drm/bridge/cdns-mhdp-common.h | 21 +-
> 9 files changed, 1480 insertions(+), 20 deletions(-)
> rename drivers/gpu/drm/{rockchip/cdn-dp-reg.c => bridge/cdns-mhdp-common.c} (87%)
> create mode 100644 drivers/gpu/drm/bridge/cdns-mhdp.c
> rename drivers/gpu/drm/rockchip/cdn-dp-reg.h => include/drm/bridge/cdns-mhdp-common.h (95%)
>
> diff --git a/drivers/gpu/drm/bridge/Kconfig b/drivers/gpu/drm/bridge/Kconfig
> index 9eeb8ef0b174..90a4810a8c96 100644
> --- a/drivers/gpu/drm/bridge/Kconfig
> +++ b/drivers/gpu/drm/bridge/Kconfig
> @@ -35,6 +35,15 @@ config DRM_CDNS_DSI
> Support Cadence DPI to DSI bridge. This is an internal
> bridge and is meant to be directly embedded in a SoC.
>
> +config DRM_CDNS_MHDP
> + tristate "Cadence DPI/DP bridge"
> + select DRM_KMS_HELPER
> + select DRM_PANEL_BRIDGE
> + depends on OF
> + help
> + Support Cadence DPI to DP bridge. This is an internal
> + bridge and is meant to be directly embedded in a SoC.
> +
> config DRM_DUMB_VGA_DAC
> tristate "Dumb VGA DAC Bridge support"
> depends on OF
> diff --git a/drivers/gpu/drm/bridge/Makefile b/drivers/gpu/drm/bridge/Makefile
> index 4934fcf5a6f8..e802fdb85750 100644
> --- a/drivers/gpu/drm/bridge/Makefile
> +++ b/drivers/gpu/drm/bridge/Makefile
> @@ -16,4 +16,7 @@ obj-$(CONFIG_DRM_ANALOGIX_DP) += analogix/
> obj-$(CONFIG_DRM_I2C_ADV7511) += adv7511/
> obj-$(CONFIG_DRM_TI_SN65DSI86) += ti-sn65dsi86.o
> obj-$(CONFIG_DRM_TI_TFP410) += ti-tfp410.o
> +obj-$(CONFIG_DRM_CDNS_MHDP) += mhdp8546.o
Alphabetic order?
> obj-y += synopsys/
> +
> +mhdp8546-objs := cdns-mhdp-common.o cdns-mhdp.o
> diff --git a/drivers/gpu/drm/rockchip/cdn-dp-reg.c b/drivers/gpu/drm/bridge/cdns-mhdp-common.c
> similarity index 87%
> rename from drivers/gpu/drm/rockchip/cdn-dp-reg.c
> rename to drivers/gpu/drm/bridge/cdns-mhdp-common.c
> index c1a76e6fff88..fda1bee7adb5 100644
> --- a/drivers/gpu/drm/rockchip/cdn-dp-reg.c
> +++ b/drivers/gpu/drm/bridge/cdns-mhdp-common.c
> @@ -19,8 +19,9 @@
> #include <linux/iopoll.h>
> #include <linux/reset.h>
>
> -#include "cdn-dp-core.h"
> -#include "cdn-dp-reg.h"
> +#include <drm/drm_print.h>
> +#include <drm/drm_modes.h>
> +#include <drm/bridge/cdns-mhdp-common.h>
>
> #define CDNS_DP_SPDIF_CLK 200000000
> #define FW_ALIVE_TIMEOUT_US 1000000
> @@ -33,6 +34,7 @@ void cdns_mhdp_set_fw_clk(struct cdns_mhdp_device *mhdp, unsigned long clk)
> {
> writel(clk / 1000000, mhdp->regs + SW_CLK_H);
> }
> +EXPORT_SYMBOL(cdns_mhdp_set_fw_clk);
>
> void cdns_mhdp_clock_reset(struct cdns_mhdp_device *mhdp)
> {
> @@ -82,6 +84,7 @@ void cdns_mhdp_clock_reset(struct cdns_mhdp_device *mhdp)
> /* enable Mailbox and PIF interrupt */
> writel(0, mhdp->regs + APB_INT_MASK);
> }
> +EXPORT_SYMBOL(cdns_mhdp_clock_reset);
>
> static int cdns_mhdp_mailbox_read(struct cdns_mhdp_device *mhdp)
> {
> @@ -189,7 +192,56 @@ static int cdns_mhdp_mailbox_send(struct cdns_mhdp_device *mhdp, u8 module_id,
> return 0;
> }
>
> -static int cdns_mhdp_reg_write(struct cdns_mhdp_device *mhdp, u16 addr, u32 val)
> +int cdns_mhdp_reg_read(struct cdns_mhdp_device *mhdp, u32 addr, u32 *value)
> +{
> + u8 msg[4], resp[8];
> + int ret;
> +
> + if (addr == 0) {
> + ret = -EINVAL;
> + goto err_reg_read;
> + }
> +
> + msg[0] = (u8)(addr >> 24);
> + msg[1] = (u8)(addr >> 16);
> + msg[2] = (u8)(addr >> 8);
> + msg[3] = (u8)addr;
addr is u16, so addr >> 16 is always 0, the core question what type of
addr we should use?
To avoid byte shifts you can use put_unaligned_le32 - little more generic.
> +
> + ret = cdns_mhdp_mailbox_send(mhdp, MB_MODULE_ID_GENERAL,
> + GENERAL_REGISTER_READ,
> + sizeof(msg), msg);
> + if (ret)
> + goto err_reg_read;
> +
> + ret = cdns_mhdp_mailbox_validate_receive(mhdp, MB_MODULE_ID_GENERAL,
> + GENERAL_REGISTER_READ,
> + sizeof(resp));
> + if (ret)
> + goto err_reg_read;
> +
> + ret = cdns_mhdp_mailbox_read_receive(mhdp, resp, sizeof(resp));
> + if (ret)
> + goto err_reg_read;
> +
> + /* Returned address value should be the same as requested */
> + if (memcmp(msg, resp, sizeof(msg))) {
> + ret = -EINVAL;
> + goto err_reg_read;
> + }
> +
> + *value = (resp[4] << 24) | (resp[5] << 16) | (resp[6] << 8) | resp[7];
*value = get_unaligned_be32(resp + 4);
and it can be put after if clause below.
> +
> +err_reg_read:
> + if (ret) {
> + DRM_DEV_ERROR(mhdp->dev, "Failed to read register.\n");
> + *value = 0;
> + }
> +
> + return ret;
> +}
> +EXPORT_SYMBOL(cdns_mhdp_reg_read);
> +
> +int cdns_mhdp_reg_write(struct cdns_mhdp_device *mhdp, u16 addr, u32 val)
> {
> u8 msg[6];
>
> @@ -202,8 +254,9 @@ static int cdns_mhdp_reg_write(struct cdns_mhdp_device *mhdp, u16 addr, u32 val)
> return cdns_mhdp_mailbox_send(mhdp, MB_MODULE_ID_DP_TX,
> DPTX_WRITE_REGISTER, sizeof(msg), msg);
> }
> +EXPORT_SYMBOL(cdns_mhdp_reg_write);
>
> -static int cdns_mhdp_reg_write_bit(struct cdns_mhdp_device *mhdp, u16 addr,
> +int cdns_mhdp_reg_write_bit(struct cdns_mhdp_device *mhdp, u16 addr,
> u8 start_bit, u8 bits_no, u32 val)
> {
> u8 field[8];
> @@ -220,6 +273,7 @@ static int cdns_mhdp_reg_write_bit(struct cdns_mhdp_device *mhdp, u16 addr,
> return cdns_mhdp_mailbox_send(mhdp, MB_MODULE_ID_DP_TX,
> DPTX_WRITE_FIELD, sizeof(field), field);
> }
> +EXPORT_SYMBOL(cdns_mhdp_reg_write_bit);
>
> int cdns_mhdp_dpcd_read(struct cdns_mhdp_device *mhdp,
> u32 addr, u8 *data, u16 len)
> @@ -252,6 +306,7 @@ int cdns_mhdp_dpcd_read(struct cdns_mhdp_device *mhdp,
> err_dpcd_read:
> return ret;
> }
> +EXPORT_SYMBOL(cdns_mhdp_dpcd_read);
>
> int cdns_mhdp_dpcd_write(struct cdns_mhdp_device *mhdp, u32 addr, u8 value)
> {
> @@ -286,6 +341,7 @@ int cdns_mhdp_dpcd_write(struct cdns_mhdp_device *mhdp, u32 addr, u8 value)
> DRM_DEV_ERROR(mhdp->dev, "dpcd write failed: %d\n", ret);
> return ret;
> }
> +EXPORT_SYMBOL(cdns_mhdp_dpcd_write);
>
> int cdns_mhdp_load_firmware(struct cdns_mhdp_device *mhdp, const u32 *i_mem,
> u32 i_size, const u32 *d_mem, u32 d_size)
> @@ -328,6 +384,7 @@ int cdns_mhdp_load_firmware(struct cdns_mhdp_device *mhdp, const u32 *i_mem,
>
> return 0;
> }
> +EXPORT_SYMBOL(cdns_mhdp_load_firmware);
>
> int cdns_mhdp_set_firmware_active(struct cdns_mhdp_device *mhdp, bool enable)
> {
> @@ -362,6 +419,7 @@ int cdns_mhdp_set_firmware_active(struct cdns_mhdp_device *mhdp, bool enable)
> DRM_DEV_ERROR(mhdp->dev, "set firmware active failed\n");
> return ret;
> }
> +EXPORT_SYMBOL(cdns_mhdp_set_firmware_active);
>
> int cdns_mhdp_set_host_cap(struct cdns_mhdp_device *mhdp, u8 lanes, bool flip)
> {
> @@ -391,6 +449,7 @@ int cdns_mhdp_set_host_cap(struct cdns_mhdp_device *mhdp, u8 lanes, bool flip)
> DRM_DEV_ERROR(mhdp->dev, "set host cap failed: %d\n", ret);
> return ret;
> }
> +EXPORT_SYMBOL(cdns_mhdp_set_host_cap);
>
> int cdns_mhdp_event_config(struct cdns_mhdp_device *mhdp)
> {
> @@ -408,11 +467,13 @@ int cdns_mhdp_event_config(struct cdns_mhdp_device *mhdp)
>
> return ret;
> }
> +EXPORT_SYMBOL(cdns_mhdp_event_config);
>
> u32 cdns_mhdp_get_event(struct cdns_mhdp_device *mhdp)
> {
> return readl(mhdp->regs + SW_EVENTS0);
> }
> +EXPORT_SYMBOL(cdns_mhdp_get_event);
>
> int cdns_mhdp_get_hpd_status(struct cdns_mhdp_device *mhdp)
> {
> @@ -440,6 +501,7 @@ int cdns_mhdp_get_hpd_status(struct cdns_mhdp_device *mhdp)
> DRM_DEV_ERROR(mhdp->dev, "get hpd status failed: %d\n", ret);
> return ret;
> }
> +EXPORT_SYMBOL(cdns_mhdp_get_hpd_status);
>
> int cdns_mhdp_get_edid_block(void *data, u8 *edid,
> unsigned int block, size_t length)
> @@ -482,6 +544,7 @@ int cdns_mhdp_get_edid_block(void *data, u8 *edid,
>
> return ret;
> }
> +EXPORT_SYMBOL(cdns_mhdp_get_edid_block);
>
> static int cdns_mhdp_training_start(struct cdns_mhdp_device *mhdp)
> {
> @@ -580,6 +643,7 @@ int cdns_mhdp_train_link(struct cdns_mhdp_device *mhdp)
> mhdp->link.num_lanes);
> return ret;
> }
> +EXPORT_SYMBOL(cdns_mhdp_train_link);
>
> int cdns_mhdp_set_video_status(struct cdns_mhdp_device *mhdp, int active)
> {
> @@ -595,6 +659,7 @@ int cdns_mhdp_set_video_status(struct cdns_mhdp_device *mhdp, int active)
>
> return ret;
> }
> +EXPORT_SYMBOL(cdns_mhdp_set_video_status);
>
> static int cdns_mhdp_get_msa_misc(struct video_info *video,
> struct drm_display_mode *mode)
> @@ -797,6 +862,7 @@ int cdns_mhdp_config_video(struct cdns_mhdp_device *mhdp)
> DRM_DEV_ERROR(mhdp->dev, "config video failed: %d\n", ret);
> return ret;
> }
> +EXPORT_SYMBOL(cdns_mhdp_config_video);
>
> int cdns_mhdp_audio_stop(struct cdns_mhdp_device *mhdp,
> struct audio_info *audio)
> @@ -831,6 +897,7 @@ int cdns_mhdp_audio_stop(struct cdns_mhdp_device *mhdp,
>
> return 0;
> }
> +EXPORT_SYMBOL(cdns_mhdp_audio_stop);
>
> int cdns_mhdp_audio_mute(struct cdns_mhdp_device *mhdp, bool enable)
> {
> @@ -842,6 +909,7 @@ int cdns_mhdp_audio_mute(struct cdns_mhdp_device *mhdp, bool enable)
>
> return ret;
> }
> +EXPORT_SYMBOL(cdns_mhdp_audio_mute);
>
> static void cdns_mhdp_audio_config_i2s(struct cdns_mhdp_device *mhdp,
> struct audio_info *audio)
> @@ -977,3 +1045,63 @@ int cdns_mhdp_audio_config(struct cdns_mhdp_device *mhdp,
> DRM_DEV_ERROR(mhdp->dev, "audio config failed: %d\n", ret);
> return ret;
> }
> +EXPORT_SYMBOL(cdns_mhdp_audio_config);
> +
> +int cdns_mhdp_adjust_lt(struct cdns_mhdp_device *mhdp,
> + u8 nlanes, u16 udelay, u8 *lanes_data, u8 *dpcd)
> +{
> + u8 payload[7];
> + u8 hdr[5]; /* For DPCD read response header */
> + u32 addr;
> + u8 const nregs = 6; /* Registers 0x202-0x207 */
> + int ret;
> +
> + if (nlanes != 4 && nlanes != 2 && nlanes != 1) {
> + DRM_DEV_ERROR(mhdp->dev, "invalid number of lanes: %d\n",
> + nlanes);
> + ret = -EINVAL;
> + goto err_adjust_lt;
> + }
> +
> + payload[0] = nlanes;
> + payload[1] = (u8)(udelay >> 8);
> + payload[2] = (u8)udelay;
> +
> + payload[3] = lanes_data[0];
> + if (nlanes > 1)
> + payload[4] = lanes_data[1];
> + if (nlanes > 2) {
> + payload[5] = lanes_data[2];
> + payload[6] = lanes_data[3];
> + }
memcpy(payload+3, lanes_data, nlanes); ?
> +
> + ret = cdns_mhdp_mailbox_send(mhdp, MB_MODULE_ID_DP_TX,
> + DPTX_ADJUST_LT,
> + sizeof(payload), payload);
> + if (ret)
> + goto err_adjust_lt;
> +
> + /* Yes, read the DPCD read command response */
> + ret = cdns_mhdp_mailbox_validate_receive(mhdp, MB_MODULE_ID_DP_TX,
> + DPTX_READ_DPCD,
> + sizeof(hdr) + nregs);
> + if (ret)
> + goto err_adjust_lt;
> +
> + ret = cdns_mhdp_mailbox_read_receive(mhdp, hdr, sizeof(hdr));
> + if (ret)
> + goto err_adjust_lt;
> +
> + addr = (hdr[2] << 24) | (hdr[3] << 8) | hdr[4];
again get_unaligned_*
> + if (addr != DP_LANE0_1_STATUS)
> + goto err_adjust_lt;
> +
> + ret = cdns_mhdp_mailbox_read_receive(mhdp, dpcd, nregs);
> +
> +err_adjust_lt:
> + if (ret)
> + DRM_DEV_ERROR(mhdp->dev, "Failed to adjust Link Training.\n");
> +
> + return ret;
> +}
> +EXPORT_SYMBOL(cdns_mhdp_adjust_lt);
Lot of exports here, do we really need them all?
> diff --git a/drivers/gpu/drm/bridge/cdns-mhdp.c b/drivers/gpu/drm/bridge/cdns-mhdp.c
> new file mode 100644
> index 000000000000..a3bbc0e809a5
> --- /dev/null
> +++ b/drivers/gpu/drm/bridge/cdns-mhdp.c
> @@ -0,0 +1,1304 @@
> +// SPDX-License-Identifier: GPL v2
> +/*
> + * Cadence MHDP DP bridge driver.
> + *
> + * Copyright: 2018 Cadence Design Systems, Inc.
> + *
> + * Author: Quentin Schulz <quentin.schulz@free-electrons.com>
> + */
> +
> +#include <linux/clk.h>
> +#include <linux/delay.h>
> +#include <linux/err.h>
> +#include <linux/firmware.h>
> +#include <linux/io.h>
> +#include <linux/iopoll.h>
> +#include <linux/module.h>
> +#include <linux/of.h>
> +#include <linux/platform_device.h>
> +#include <linux/slab.h>
> +
> +#include <drm/drm_atomic_helper.h>
> +#include <drm/drm_bridge.h>
> +#include <drm/drm_connector.h>
> +#include <drm/drm_crtc_helper.h>
> +#include <drm/drm_dp_helper.h>
> +#include <drm/drm_modeset_helper_vtables.h>
> +#include <drm/bridge/cdns-mhdp-common.h>
> +
> +#include <sound/hdmi-codec.h>
> +
> +
> +#define DEBUG_MSG
> +
> +#define FW_NAME "cadence/mhdp8546.bin"
> +
> +#define CDNS_APB_CFG 0x00000
> +#define CDNS_APB_CTRL (CDNS_APB_CFG + 0x00)
> +#define CDNS_MAILBOX_FULL (CDNS_APB_CFG + 0x08)
> +#define CDNS_MAILBOX_EMPTY (CDNS_APB_CFG + 0x0c)
> +#define CDNS_MAILBOX_TX_DATA (CDNS_APB_CFG + 0x10)
> +#define CDNS_MAILBOX_RX_DATA (CDNS_APB_CFG + 0x14)
> +#define CDNS_KEEP_ALIVE (CDNS_APB_CFG + 0x18)
> +#define CDNS_KEEP_ALIVE_MASK GENMASK(7, 0)
> +
> +#define CDNS_SW_CLK_L (CDNS_APB_CFG + 0x3c)
> +#define CDNS_SW_CLK_H (CDNS_APB_CFG + 0x40)
> +#define CDNS_SW_EVENT0 (CDNS_APB_CFG + 0x44)
> +#define CDNS_DPTX_HPD BIT(0)
> +
> +#define CDNS_SW_EVENT1 (CDNS_APB_CFG + 0x48)
> +#define CDNS_SW_EVENT2 (CDNS_APB_CFG + 0x4c)
> +#define CDNS_SW_EVENT3 (CDNS_APB_CFG + 0x50)
> +
> +#define CDNS_DPTX_CAR (CDNS_APB_CFG + 0x904)
> +#define CDNS_VIF_CLK_EN BIT(0)
> +#define CDNS_VIF_CLK_RSTN BIT(1)
> +
> +#define CDNS_SOURCE_VIDEO_INTERFACE 0x00b00
> +#define CDNS_BND_HSYNC2VSYNC (CDNS_SOURCE_VIDEO_INTERFACE + \
> + 0x00)
> +#define CDNS_IP_DTCT_WIN GENMASK(11, 0)
> +#define CDNS_IP_DET_INTERLACE_FORMAT BIT(12)
> +#define CDNS_IP_BYPASS_V_INTERFACE BIT(13)
> +
> +#define CDNS_HSYNC2VSYNC_POL_CTRL (CDNS_SOURCE_VIDEO_INTERFACE + \
> + 0x10)
> +#define CDNS_H2V_HSYNC_POL_ACTIVE_LOW BIT(1)
> +#define CDNS_H2V_VSYNC_POL_ACTIVE_LOW BIT(2)
> +
> +#define CDNS_DPTX_PHY_CONFIG 0x02000
> +#define CDNS_PHY_TRAINING_EN BIT(0)
> +#define CDNS_PHY_TRAINING_TYPE(x) (((x) & GENMASK(3, 0)) << 1)
> +#define CDNS_PHY_SCRAMBLER_BYPASS BIT(5)
> +#define CDNS_PHY_ENCODER_BYPASS BIT(6)
> +#define CDNS_PHY_SKEW_BYPASS BIT(7)
> +#define CDNS_PHY_TRAINING_AUTO BIT(8)
> +#define CDNS_PHY_LANE0_SKEW(x) (((x) & GENMASK(2, 0)) << 9)
> +#define CDNS_PHY_LANE1_SKEW(x) (((x) & GENMASK(2, 0)) << 12)
> +#define CDNS_PHY_LANE2_SKEW(x) (((x) & GENMASK(2, 0)) << 15)
> +#define CDNS_PHY_LANE3_SKEW(x) (((x) & GENMASK(2, 0)) << 18)
> +#define CDNS_PHY_COMMON_CONFIG (CDNS_PHY_LANE1_SKEW(1) | \
> + CDNS_PHY_LANE2_SKEW(2) | \
> + CDNS_PHY_LANE3_SKEW(3))
> +#define CDNS_PHY_10BIT_EN BIT(21)
> +
> +#define CDNS_DPTX_FRAMER 0x02200
> +#define CDNS_DP_FRAMER_GLOBAL_CONFIG (CDNS_DPTX_FRAMER + 0x00)
> +#define CDNS_DP_NUM_LANES(x) (x - 1)
> +#define CDNS_DP_FRAMER_EN BIT(3)
> +#define CDNS_DP_RATE_GOVERNOR_EN BIT(4)
> +#define CDNS_DP_NO_VIDEO_MODE BIT(5)
> +#define CDNS_DP_DISABLE_PHY_RST BIT(6)
> +#define CDNS_DP_WR_FAILING_EDGE_VSYNC BIT(7)
> +
> +#define CDNS_DP_SW_RESET (CDNS_DPTX_FRAMER + 0x04)
> +#define CDNS_DP_FRAMER_TU (CDNS_DPTX_FRAMER + 0x08)
> +#define CDNS_DP_FRAMER_TU_SIZE(x) (((x) & GENMASK(6, 0)) << 8)
> +#define CDNS_DP_FRAMER_TU_VS(x) ((x) & GENMASK(5, 0))
> +#define CDNS_DP_FRAMER_TU_CNT_RST_EN BIT(15)
> +
> +#define CDNS_DPTX_STREAM 0x03000
> +#define CDNS_DP_MSA_HORIZONTAL_0 (CDNS_DPTX_STREAM + 0x00)
> +#define CDNS_DP_MSAH0_H_TOTAL(x) (x)
> +#define CDNS_DP_MSAH0_HSYNC_START(x) ((x) << 16)
> +
> +#define CDNS_DP_MSA_HORIZONTAL_1 (CDNS_DPTX_STREAM + 0x04)
> +#define CDNS_DP_MSAH1_HSYNC_WIDTH(x) (x)
> +#define CDNS_DP_MSAH1_HSYNC_POL_LOW BIT(15)
> +#define CDNS_DP_MSAH1_HDISP_WIDTH(x) ((x) << 16)
> +
> +#define CDNS_DP_MSA_VERTICAL_0 (CDNS_DPTX_STREAM + 0x08)
> +#define CDNS_DP_MSAV0_V_TOTAL(x) (x)
> +#define CDNS_DP_MSAV0_VSYNC_START(x) ((x) << 16)
> +
> +#define CDNS_DP_MSA_VERTICAL_1 (CDNS_DPTX_STREAM + 0x0c)
> +#define CDNS_DP_MSAV1_VSYNC_WIDTH(x) (x)
> +#define CDNS_DP_MSAV1_VSYNC_POL_LOW BIT(15)
> +#define CDNS_DP_MSAV1_VDISP_WIDTH(x) ((x) << 16)
> +
> +#define CDNS_DP_MSA_MISC (CDNS_DPTX_STREAM + 0x10)
> +#define CDNS_DP_STREAM_CONFIG (CDNS_DPTX_STREAM + 0x14)
> +#define CDNS_DP_RATE_GOVERNOR_STATUS (CDNS_DPTX_STREAM + 0x2c)
> +#define CDNS_DP_RG_TU_VS_DIFF(x) ((x) << 8)
> +
> +#define CDNS_DP_HORIZONTAL (CDNS_DPTX_STREAM + 0x30)
> +#define CDNS_DP_H_HSYNC_WIDTH(x) (x)
> +#define CDNS_DP_H_H_TOTAL(x) ((x) << 16)
> +
> +#define CDNS_DP_VERTICAL_0 (CDNS_DPTX_STREAM + 0x34)
> +#define CDNS_DP_V0_VHEIGHT(x) (x)
> +#define CDNS_DP_V0_VSTART(x) ((x) << 16)
> +
> +#define CDNS_DP_VERTICAL_1 (CDNS_DPTX_STREAM + 0x38)
> +#define CDNS_DP_V1_VTOTAL(x) (x)
> +#define CDNS_DP_V1_VTOTAL_EVEN BIT(16)
> +
> +#define CDNS_DP_FRAMER_PXL_REPR (CDNS_DPTX_STREAM + 0x4c)
> +#define CDNS_DP_FRAMER_6_BPC BIT(0)
> +#define CDNS_DP_FRAMER_8_BPC BIT(1)
> +#define CDNS_DP_FRAMER_10_BPC BIT(2)
> +#define CDNS_DP_FRAMER_12_BPC BIT(3)
> +#define CDNS_DP_FRAMER_16_BPC BIT(4)
> +#define CDNS_DP_FRAMER_PXL_FORMAT 0x8
> +#define CDNS_DP_FRAMER_RGB BIT(0)
> +#define CDNS_DP_FRAMER_YCBCR444 BIT(1)
> +#define CDNS_DP_FRAMER_YCBCR422 BIT(2)
> +#define CDNS_DP_FRAMER_YCBCR420 BIT(3)
> +#define CDNS_DP_FRAMER_Y_ONLY BIT(4)
> +
> +#define CDNS_DP_FRAMER_SP (CDNS_DPTX_STREAM + 0x10)
> +#define CDNS_DP_FRAMER_VSYNC_POL_LOW BIT(0)
> +#define CDNS_DP_FRAMER_HSYNC_POL_LOW BIT(1)
> +#define CDNS_DP_FRAMER_INTERLACE BIT(2)
> +
> +#define CDNS_DP_LINE_THRESH (CDNS_DPTX_STREAM + 0x64)
> +#define CDNS_DP_VB_ID (CDNS_DPTX_STREAM + 0x68)
> +#define CDNS_DP_VB_ID_INTERLACED BIT(2)
> +
> +#define CDNS_DP_FRONT_BACK_PORCH (CDNS_DPTX_STREAM + 0x78)
> +#define CDNS_DP_BACK_PORCH(x) (x)
> +#define CDNS_DP_FRONT_PORCH(x) ((x) << 16)
> +
> +#define CDNS_DP_BYTE_COUNT (CDNS_DPTX_STREAM + 0x7c)
> +
> +#define CDNS_DPTX_GLOBAL 0x02300
> +#define CDNS_DP_LANE_EN (CDNS_DPTX_GLOBAL + 0x00)
> +#define CDNS_DP_LANE_EN_LANES(x) GENMASK(x - 1, 0)
> +#define CDNS_DP_ENHNCD (CDNS_DPTX_GLOBAL + 0x04)
> +
> +#define CDNS_MHDP_IMEM 0x10000
> +#define CDNS_MHDP_DMEM 0x20000
> +
> +#define CDNS_DP_TRAINING_PATTERN_4 0x7
> +
> +/* 3min delay because of EDID mb being VERY slow */
> +/* FIXME: should be >615000 when upstreaming */
> +#define CDNS_TIMEOUT_MAILBOX (1000 * 1000 * 60 * 3)
> +
> +/* FIXME: Should be 2000 */
> +#define CDNS_KEEP_ALIVE_TIMEOUT 40000
> +#define CDNS_SW_EVENT0_TIMEOUT 40000
> +
> +static const struct of_device_id mhdp_ids[] = {
> + { .compatible = "cdns,mhdp8546", },
> + { /* sentinel */ }
> +};
> +MODULE_DEVICE_TABLE(of, mhdp_ids);
> +
> +#define CDNS_LANE_1 BIT(0)
> +#define CDNS_LANE_2 BIT(1)
> +#define CDNS_LANE_4 BIT(2)
> +#define CDNS_SSC BIT(3)
> +#define CDNS_SCRAMBLER BIT(4)
> +
> +#define CDNS_VOLT_SWING(x) ((x) & GENMASK(1, 0))
> +#define CDNS_FORCE_VOLT_SWING BIT(2)
> +
> +#define CDNS_PRE_EMPHASIS(x) ((x) & GENMASK(1, 0))
> +#define CDNS_FORCE_PRE_EMPHASIS BIT(2)
> +
> +#define CDNS_SUPPORT_TPS(x) BIT((x) - 1)
> +
> +#define CDNS_FAST_LINK_TRAINING BIT(0)
> +
> +#define CDNS_LANE_MAPPING_TYPE_C_LANE_0(x) ((x) & GENMASK(1, 0))
> +#define CDNS_LANE_MAPPING_TYPE_C_LANE_1(x) ((x) & GENMASK(3, 2))
> +#define CDNS_LANE_MAPPING_TYPE_C_LANE_2(x) ((x) & GENMASK(5, 4))
> +#define CDNS_LANE_MAPPING_TYPE_C_LANE_3(x) ((x) & GENMASK(7, 6))
> +#define CDNS_LANE_MAPPING_NORMAL 0xe4
> +#define CDNS_LANE_MAPPING_FLIPPED 0x1b
> +
> +#define CDNS_DP_MAX_NUM_LANES 4
> +#define CDNS_DP_TEST_VSC_SDP (1 << 6) /* 1.3+ */
> +#define CDNS_DP_TEST_COLOR_FORMAT_RAW_Y_ONLY (1 << 7)
> +
> +static inline struct cdns_mhdp_device *connector_to_mhdp(
> + struct drm_connector *conn)
> +{
> + return container_of(conn, struct cdns_mhdp_device, connector);
> +}
> +
> +static inline struct cdns_mhdp_device *bridge_to_mhdp(
> + struct drm_bridge *bridge)
> +{
> + return container_of(bridge, struct cdns_mhdp_device, bridge);
> +}
> +
> +static unsigned int max_link_rate(struct cdns_mhdp_host host,
> + struct cdns_mhdp_sink sink)
> +{
> + return min(host.link_rate, sink.link_rate);
> +}
> +
> +static u8 eq_training_pattern_supported(struct cdns_mhdp_host host,
> + struct cdns_mhdp_sink sink)
> +{
> + return fls(host.pattern_supp & sink.pattern_supp);
> +}
> +
> +static ssize_t mhdp_transfer(struct drm_dp_aux *aux,
> + struct drm_dp_aux_msg *msg)
> +{
> + struct cdns_mhdp_device *mhdp = dev_get_drvdata(aux->dev);
> + int ret;
> +
> + if (msg->request != DP_AUX_NATIVE_WRITE &&
> + msg->request != DP_AUX_NATIVE_READ)
> + return -ENOTSUPP;
> +
> + if (msg->request == DP_AUX_NATIVE_WRITE) {
> + int i;
> +
> + for (i = 0; i < msg->size; ++i) {
> + ret = cdns_mhdp_dpcd_write(mhdp,
> + msg->address + i,
> + *((u8 *)msg->buffer + i));
Maybe alias would be more readable:
const u8 *buf = msg->buffer;
...
ret = cdns_mhdp_dpcd_write(mhdp, msg->address + i, buf[i]);
> + if (!ret)
> + continue;
> +
> + DRM_DEV_ERROR(mhdp->dev, "Failed to write DPCD\n");
> +
> + return i;
Here you return number of bytes transfered, and drops error code. It
would be good if somebody confirms it is correctly implemented
aux.transfer error handling. Docs says:
"Upon success, the implementation should return the number of payload
bytes that were transferred, or a negative error-code on failure." - I
would not call this situation success, but maybe I am wrong.
> + }
> + } else {
> + ret = cdns_mhdp_dpcd_read(mhdp, msg->address,
> + msg->buffer, msg->size);
> + if (ret) {
> + DRM_DEV_ERROR(mhdp->dev, "Failed to read DPCD\n");
> + return 0;
> + }
> + }
> +
> + return msg->size;
> +}
> +
> +static int cdns_mhdp_get_modes(struct drm_connector *connector)
> +{
> + struct cdns_mhdp_device *mhdp = connector_to_mhdp(connector);
> + struct edid *edid;
> + int num_modes;
> +
> + edid = drm_do_get_edid(connector, cdns_mhdp_get_edid_block, mhdp);
> +
> + drm_connector_update_edid_property(connector, edid);
> +
> + num_modes = drm_add_edid_modes(connector, edid);
Shouldn't edid be released?
> +
> + return num_modes;
> +}
> +
> +static const struct drm_connector_helper_funcs cdns_mhdp_conn_helper_funcs = {
> + .get_modes = cdns_mhdp_get_modes,
> +};
> +
> +static enum drm_connector_status cdns_mhdp_detect(struct drm_connector *conn,
> + bool force)
> +{
> + struct cdns_mhdp_device *mhdp = connector_to_mhdp(conn);
> + enum drm_connector_status status = connector_status_disconnected;
> + int ret;
> +
> + ret = cdns_mhdp_get_hpd_status(mhdp);
> + if (ret > 0)
> + status = connector_status_connected;
> + else if (ret < 0)
> + dev_err(mhdp->dev, "Failed to obtain HPD state\n");
> +
> + return status;
if (ret > 0)
return connector_status_connected;
if (ret < 0)
dev_err(mhdp->dev, "Failed to obtain HPD state\n");
return connector_status_disconnected;
> +}
> +
> +static const struct drm_connector_funcs cdns_mhdp_conn_funcs = {
> + .fill_modes = drm_helper_probe_single_connector_modes,
> + .atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state,
> + .atomic_destroy_state = drm_atomic_helper_connector_destroy_state,
> + .reset = drm_atomic_helper_connector_reset,
> + .destroy = drm_connector_cleanup,
> + .dpms = drm_helper_connector_dpms,
> + .detect = cdns_mhdp_detect,
> +};
> +
> +static int cdns_mhdp_attach(struct drm_bridge *bridge)
> +{
> + struct cdns_mhdp_device *mhdp = bridge_to_mhdp(bridge);
> + struct drm_connector *conn = &mhdp->connector;
> + int ret;
> +
> + conn->polled = DRM_CONNECTOR_POLL_CONNECT |
> + DRM_CONNECTOR_POLL_DISCONNECT;
> +
> + ret = drm_connector_init(bridge->dev, conn, &cdns_mhdp_conn_funcs,
> + DRM_MODE_CONNECTOR_DisplayPort);
> + if (ret) {
> + dev_err(mhdp->dev, "failed to init connector\n");
> + return ret;
> + }
> +
> + drm_connector_helper_add(conn, &cdns_mhdp_conn_helper_funcs);
> +
> + ret = drm_connector_attach_encoder(conn, bridge->encoder);
> + if (ret) {
> + dev_err(mhdp->dev, "failed to attach connector to encoder\n");
> + return ret;
> + }
> +
> + return 0;
> +}
> +
> +enum pixel_format {
> + PIXEL_FORMAT_RGB = 1,
> + PIXEL_FORMAT_YCBCR_444 = 2,
> + PIXEL_FORMAT_YCBCR_422 = 4,
> + PIXEL_FORMAT_YCBCR_420 = 8,
> + PIXEL_FORMAT_Y_ONLY = 16,
> +};
> +
> +static void mhdp_link_training_init(struct cdns_mhdp_device *mhdp)
> +{
> + u32 reg32;
> +
> + drm_dp_dpcd_writeb(&mhdp->aux, DP_TRAINING_PATTERN_SET,
> + DP_TRAINING_PATTERN_DISABLE);
> +
> + /* Reset PHY configuration */
> + reg32 = CDNS_PHY_COMMON_CONFIG | CDNS_PHY_TRAINING_TYPE(1);
> + if (!(mhdp->host.lanes_cnt & CDNS_SCRAMBLER))
> + reg32 |= CDNS_PHY_SCRAMBLER_BYPASS;
> +
> + cdns_mhdp_reg_write(mhdp, CDNS_DPTX_PHY_CONFIG, reg32);
> +
> + cdns_mhdp_reg_write(mhdp, CDNS_DP_ENHNCD,
> + mhdp->sink.enhanced & mhdp->host.enhanced);
> +
> + cdns_mhdp_reg_write(mhdp, CDNS_DP_LANE_EN,
> + CDNS_DP_LANE_EN_LANES(mhdp->link.num_lanes));
> +
> + drm_dp_link_configure(&mhdp->aux, &mhdp->link);
> +
> + cdns_mhdp_reg_write(mhdp, CDNS_DPTX_PHY_CONFIG,
> + CDNS_PHY_COMMON_CONFIG |
> + CDNS_PHY_TRAINING_EN |
> + CDNS_PHY_TRAINING_TYPE(1) |
> + CDNS_PHY_SCRAMBLER_BYPASS);
> +
> + drm_dp_dpcd_writeb(&mhdp->aux, DP_TRAINING_PATTERN_SET,
> + DP_TRAINING_PATTERN_1 | DP_LINK_SCRAMBLING_DISABLE);
> +}
> +
> +static void mhdp_get_adjust_train(struct cdns_mhdp_device *mhdp,
> + u8 link_status[DP_LINK_STATUS_SIZE],
> + u8 lanes_data[CDNS_DP_MAX_NUM_LANES])
> +{
> + unsigned int i;
> + u8 adjust, max_pre_emphasis, max_volt_swing;
> +
> + max_pre_emphasis = CDNS_PRE_EMPHASIS(mhdp->host.pre_emphasis)
> + << DP_TRAIN_PRE_EMPHASIS_SHIFT;
> + max_volt_swing = CDNS_VOLT_SWING(mhdp->host.volt_swing);
> +
> + for (i = 0; i < mhdp->link.num_lanes; i++) {
> + adjust = drm_dp_get_adjust_request_voltage(link_status, i);
> + lanes_data[i] = min_t(u8, adjust, max_volt_swing);
> + if (lanes_data[i] != adjust)
> + lanes_data[i] |= DP_TRAIN_MAX_SWING_REACHED;
> +
> + adjust = drm_dp_get_adjust_request_pre_emphasis(link_status, i);
> + lanes_data[i] |= min_t(u8, adjust, max_pre_emphasis);
> + if ((lanes_data[i] >> DP_TRAIN_PRE_EMPHASIS_SHIFT) != adjust)
> + lanes_data[i] |= DP_TRAIN_MAX_PRE_EMPHASIS_REACHED;
> + }
> +}
> +
> +static void mhdp_set_adjust_request_voltage(
> + u8 link_status[DP_LINK_STATUS_SIZE], int lane, u8 volt)
> +{
> + int i = DP_ADJUST_REQUEST_LANE0_1 + (lane >> 1);
> + int s = ((lane & 1) ?
> + DP_ADJUST_VOLTAGE_SWING_LANE1_SHIFT :
> + DP_ADJUST_VOLTAGE_SWING_LANE0_SHIFT);
> + int idx = i - DP_LANE0_1_STATUS;
> +
> + link_status[idx] &= ~(DP_ADJUST_VOLTAGE_SWING_LANE0_MASK << s);
> + link_status[idx] |= volt << s;
> +}
> +
> +static void mhdp_set_adjust_request_pre_emphasis(
> + u8 link_status[DP_LINK_STATUS_SIZE], int lane, u8 pre_emphasis)
> +{
> + int i = DP_ADJUST_REQUEST_LANE0_1 + (lane >> 1);
> + int s = ((lane & 1) ?
> + DP_ADJUST_PRE_EMPHASIS_LANE1_SHIFT :
> + DP_ADJUST_PRE_EMPHASIS_LANE0_SHIFT);
> + int idx = i - DP_LANE0_1_STATUS;
> +
> + link_status[idx] &= ~(DP_ADJUST_PRE_EMPHASIS_LANE0_MASK << s);
> + link_status[idx] |= pre_emphasis << s;
> +}
> +
> +static void mhdp_adjust_requested_eq(struct cdns_mhdp_device *mhdp,
> + u8 link_status[DP_LINK_STATUS_SIZE])
> +{
> + unsigned int i;
> + u8 pre, volt, max_pre = CDNS_VOLT_SWING(mhdp->host.volt_swing),
> + max_volt = CDNS_PRE_EMPHASIS(mhdp->host.pre_emphasis);
> +
> + for (i = 0; i < mhdp->link.num_lanes; i++) {
> + volt = drm_dp_get_adjust_request_voltage(link_status, i);
> + pre = drm_dp_get_adjust_request_pre_emphasis(link_status, i);
> + if (volt + pre > 3)
> + mhdp_set_adjust_request_voltage(link_status, i,
> + 3 - pre);
> + if (mhdp->host.volt_swing & CDNS_FORCE_VOLT_SWING)
> + mhdp_set_adjust_request_voltage(link_status, i,
> + max_volt);
> + if (mhdp->host.pre_emphasis & CDNS_FORCE_PRE_EMPHASIS)
> + mhdp_set_adjust_request_pre_emphasis(link_status, i,
> + max_pre);
> + }
> +}
> +
> +static bool mhdp_link_training_channel_eq(struct cdns_mhdp_device *mhdp,
> + u8 eq_tps,
> + unsigned int training_interval)
> +{
> + u8 lanes_data[CDNS_DP_MAX_NUM_LANES], fail_counter_short = 0;
> + u8 dpcd[DP_LINK_STATUS_SIZE];
> + u32 reg32;
> +
> + dev_dbg(mhdp->dev, "Link training - Starting EQ phase\n");
> +
> + /* Enable link training TPS[eq_tps] in PHY */
> + reg32 = CDNS_PHY_COMMON_CONFIG | CDNS_PHY_TRAINING_EN |
> + CDNS_PHY_TRAINING_TYPE(eq_tps);
> + if (eq_tps != 4)
> + reg32 |= CDNS_PHY_SCRAMBLER_BYPASS;
> + cdns_mhdp_reg_write(mhdp, CDNS_DPTX_PHY_CONFIG, reg32);
> +
> + drm_dp_dpcd_writeb(&mhdp->aux, DP_TRAINING_PATTERN_SET,
> + (eq_tps != 4) ? eq_tps | DP_LINK_SCRAMBLING_DISABLE :
> + CDNS_DP_TRAINING_PATTERN_4);
> +
> + drm_dp_dpcd_read_link_status(&mhdp->aux, dpcd);
> +
> + do {
> + mhdp_get_adjust_train(mhdp, dpcd, lanes_data);
> +
> + cdns_mhdp_adjust_lt(mhdp, mhdp->link.num_lanes,
> + training_interval, lanes_data, dpcd);
> +
> + if (!drm_dp_clock_recovery_ok(dpcd, mhdp->link.num_lanes))
> + goto err;
> +
> + if (drm_dp_channel_eq_ok(dpcd, mhdp->link.num_lanes)) {
> + dev_dbg(mhdp->dev,
> + "Link training: EQ phase succeeded\n");
> + return true;
> + }
> +
> + fail_counter_short++;
> +
> + mhdp_adjust_requested_eq(mhdp, dpcd);
> + } while (fail_counter_short < 5);
> +
> +err:
> + dev_dbg(mhdp->dev,
> + "Link training - EQ phase failed for %d lanes and %d rate\n",
> + mhdp->link.num_lanes, mhdp->link.rate);
> +
> + return false;
> +}
> +
> +static void mhdp_adjust_requested_cr(struct cdns_mhdp_device *mhdp,
> + u8 link_status[DP_LINK_STATUS_SIZE],
> + u8 *req_volt, u8 *req_pre)
> +{
> + unsigned int i, max_volt = CDNS_VOLT_SWING(mhdp->host.volt_swing),
> + max_pre = CDNS_PRE_EMPHASIS(mhdp->host.pre_emphasis);
> +
> + for (i = 0; i < mhdp->link.num_lanes; i++) {
> + if (mhdp->host.volt_swing & CDNS_FORCE_VOLT_SWING)
> + mhdp_set_adjust_request_voltage(link_status, i,
> + max_volt);
> + else
> + mhdp_set_adjust_request_voltage(link_status, i,
> + req_volt[i]);
> +
> + if (mhdp->host.pre_emphasis & CDNS_FORCE_PRE_EMPHASIS)
> + mhdp_set_adjust_request_pre_emphasis(link_status, i,
> + max_pre);
> + else
> + mhdp_set_adjust_request_pre_emphasis(link_status, i,
> + req_pre[i]);
> + }
> +}
> +
> +static void mhdp_validate_cr(struct cdns_mhdp_device *mhdp, bool *cr_done,
> + bool *same_before_adjust, bool *max_swing_reached,
> + u8 before_cr[DP_LINK_STATUS_SIZE],
> + u8 after_cr[DP_LINK_STATUS_SIZE], u8 *req_volt,
> + u8 *req_pre)
> +{
> + unsigned int i;
> + u8 tmp, max_volt = CDNS_VOLT_SWING(mhdp->host.volt_swing),
> + max_pre = CDNS_PRE_EMPHASIS(mhdp->host.pre_emphasis);
> + bool same_pre, same_volt;
> +
> + *same_before_adjust = false;
> + *max_swing_reached = false;
> + *cr_done = drm_dp_clock_recovery_ok(after_cr, mhdp->link.num_lanes);
> +
> + for (i = 0; i < mhdp->link.num_lanes; i++) {
> + tmp = drm_dp_get_adjust_request_voltage(after_cr, i);
> + req_volt[i] = min_t(u8, tmp, max_volt);
> +
> + tmp = drm_dp_get_adjust_request_pre_emphasis(after_cr, i) >>
> + DP_TRAIN_PRE_EMPHASIS_SHIFT;
> + req_pre[i] = min_t(u8, tmp, max_pre);
> +
> + same_pre = (before_cr[i] & DP_TRAIN_PRE_EMPHASIS_MASK) ==
> + (req_pre[i] << DP_TRAIN_PRE_EMPHASIS_SHIFT);
> + same_volt = (before_cr[i] & DP_TRAIN_VOLTAGE_SWING_MASK) ==
> + req_volt[i];
> + if (same_pre && same_volt)
> + *same_before_adjust = true;
> +
> + /* 3.1.5.2 in DP Standard v1.4. Table 3-1 */
> + if (!*cr_done && req_volt[i] + req_pre[i] >= 3) {
> + *max_swing_reached = true;
> + return;
> + }
> + }
> +}
> +
> +static bool mhdp_link_training_clock_recovery(struct cdns_mhdp_device *mhdp)
> +{
> + u8 lanes_data[CDNS_DP_MAX_NUM_LANES], fail_counter_short = 0,
> + fail_counter_cr_long = 0;
> + u8 dpcd[DP_LINK_STATUS_SIZE];
> + bool cr_done;
> +
> + dev_dbg(mhdp->dev, "Link training starting CR phase\n");
> +
> + mhdp_link_training_init(mhdp);
> +
> + drm_dp_dpcd_read_link_status(&mhdp->aux, dpcd);
> +
> + do {
> + u8 requested_adjust_volt_swing[CDNS_DP_MAX_NUM_LANES] = {},
> + requested_adjust_pre_emphasis[CDNS_DP_MAX_NUM_LANES] = {};
> + bool same_before_adjust, max_swing_reached;
> +
> + mhdp_get_adjust_train(mhdp, dpcd, lanes_data);
> +
> + cdns_mhdp_adjust_lt(mhdp, mhdp->link.num_lanes, 100,
> + lanes_data, dpcd);
> +
> + mhdp_validate_cr(mhdp, &cr_done, &same_before_adjust,
> + &max_swing_reached, lanes_data, dpcd,
> + requested_adjust_volt_swing,
> + requested_adjust_pre_emphasis);
> +
> + if (max_swing_reached)
> + goto err;
> +
> + if (cr_done) {
> + dev_dbg(mhdp->dev,
> + "Link training: CR phase succeeded\n");
> + return true;
> + }
> +
> + /* Not all CR_DONE bits set */
> + fail_counter_cr_long++;
> +
> + if (same_before_adjust) {
> + fail_counter_short++;
> + continue;
> + }
> +
> + fail_counter_short = 0;
> + /*
> + * Voltage swing/pre-emphasis adjust requested
> + * during CR phase
> + */
> + mhdp_adjust_requested_cr(mhdp, dpcd,
> + requested_adjust_volt_swing,
> + requested_adjust_pre_emphasis);
> + } while (fail_counter_short < 5 && fail_counter_cr_long < 10);
> +
> +err:
> + dev_dbg(mhdp->dev,
> + "Link training: CR phase failed for %d lanes and %d rate\n",
> + mhdp->link.num_lanes, mhdp->link.rate);
> +
> + return false;
> +}
> +
> +static void lower_link_rate(struct drm_dp_link *link)
> +{
> + switch (drm_dp_link_rate_to_bw_code(link->rate)) {
> + case DP_LINK_BW_2_7:
> + link->rate = drm_dp_bw_code_to_link_rate(DP_LINK_BW_1_62);
> + break;
> + case DP_LINK_BW_5_4:
> + link->rate = drm_dp_bw_code_to_link_rate(DP_LINK_BW_2_7);
> + break;
> + case DP_LINK_BW_8_1:
> + link->rate = drm_dp_bw_code_to_link_rate(DP_LINK_BW_5_4);
> + break;
> + }
> +}
Quite subotpimal code conversion from rates to bw_code and then back.
I suspect the link training code across whole drms is waiting for
generic helpers and refactoring.
> +
> +static int mhdp_link_training(struct cdns_mhdp_device *mhdp,
> + unsigned int video_mode,
> + unsigned int training_interval)
> +{
> + u32 reg32;
> + u8 eq_tps = eq_training_pattern_supported(mhdp->host, mhdp->sink);
> +
> + while (1) {
> + if (!mhdp_link_training_clock_recovery(mhdp)) {
> + if (drm_dp_link_rate_to_bw_code(mhdp->link.rate) !=
> + DP_LINK_BW_1_62) {
> + dev_dbg(mhdp->dev,
> + "Reducing link rate during CR phase\n");
> + lower_link_rate(&mhdp->link);
> + drm_dp_link_configure(&mhdp->aux, &mhdp->link);
> +
> + continue;
> + } else if (mhdp->link.num_lanes > 1) {
> + dev_dbg(mhdp->dev,
> + "Reducing lanes number during CR phase\n");
> + mhdp->link.num_lanes >>= 1;
> + mhdp->link.rate = max_link_rate(mhdp->host,
> + mhdp->sink);
> + drm_dp_link_configure(&mhdp->aux, &mhdp->link);
> +
> + continue;
> + }
> +
> + dev_dbg(mhdp->dev,
> + "Link training failed during CR phase\n");
> + goto err;
> + }
> +
> + if (mhdp_link_training_channel_eq(mhdp, eq_tps,
> + training_interval))
> + break;
> +
> + if (mhdp->link.num_lanes > 1) {
> + dev_dbg(mhdp->dev,
> + "Reducing lanes number during EQ phase\n");
> + mhdp->link.num_lanes >>= 1;
> + drm_dp_link_configure(&mhdp->aux, &mhdp->link);
> +
> + continue;
> + } else if (drm_dp_link_rate_to_bw_code(mhdp->link.rate) !=
> + DP_LINK_BW_1_62) {
> + dev_dbg(mhdp->dev,
> + "Reducing link rate during EQ phase\n");
> + lower_link_rate(&mhdp->link);
> + drm_dp_link_configure(&mhdp->aux, &mhdp->link);
> +
> + continue;
> + }
> +
> + dev_dbg(mhdp->dev, "Link training failed during EQ phase\n");
> + goto err;
> + }
> +
> + dev_dbg(mhdp->dev, "Link training successful\n");
> +
> + drm_dp_dpcd_writeb(&mhdp->aux, DP_TRAINING_PATTERN_SET,
> + (mhdp->host.lanes_cnt & CDNS_SCRAMBLER) ? 0 :
> + DP_LINK_SCRAMBLING_DISABLE);
> +
> + /* SW reset DPTX framer */
> + cdns_mhdp_reg_write(mhdp, CDNS_DP_SW_RESET, 1);
> + cdns_mhdp_reg_write(mhdp, CDNS_DP_SW_RESET, 0);
> +
> + /* Enable framer */
> + /* FIXME: update when MST supported, BIT(2) */
> + cdns_mhdp_reg_write(mhdp, CDNS_DP_FRAMER_GLOBAL_CONFIG,
> + CDNS_DP_FRAMER_EN |
> + CDNS_DP_NUM_LANES(mhdp->link.num_lanes) |
> + CDNS_DP_DISABLE_PHY_RST |
> + CDNS_DP_WR_FAILING_EDGE_VSYNC |
> + (!video_mode ? CDNS_DP_NO_VIDEO_MODE : 0));
> +
> + /* Reset PHY config */
> + reg32 = CDNS_PHY_COMMON_CONFIG | CDNS_PHY_TRAINING_TYPE(1);
> + if (!(mhdp->host.lanes_cnt & CDNS_SCRAMBLER))
> + reg32 |= CDNS_PHY_SCRAMBLER_BYPASS;
> + cdns_mhdp_reg_write(mhdp, CDNS_DPTX_PHY_CONFIG, reg32);
> +
> + return 0;
> +err:
> + /* Reset PHY config */
> + reg32 = CDNS_PHY_COMMON_CONFIG | CDNS_PHY_TRAINING_TYPE(1);
> + if (!(mhdp->host.lanes_cnt & CDNS_SCRAMBLER))
> + reg32 |= CDNS_PHY_SCRAMBLER_BYPASS;
> + cdns_mhdp_reg_write(mhdp, CDNS_DPTX_PHY_CONFIG, reg32);
> +
> + drm_dp_dpcd_writeb(&mhdp->aux, DP_TRAINING_PATTERN_SET,
> + DP_TRAINING_PATTERN_DISABLE);
> +
> + return -EIO;
> +}
> +
> +static void cdns_mhdp_disable(struct drm_bridge *bridge)
> +{
> + struct cdns_mhdp_device *mhdp = bridge_to_mhdp(bridge);
> +
> + cdns_mhdp_set_video_status(mhdp, 0);
> +
> + drm_dp_link_power_down(&mhdp->aux, &mhdp->link);
> +}
> +
> +static void cdns_mhdp_enable(struct drm_bridge *bridge)
> +{
> + struct cdns_mhdp_device *mhdp = bridge_to_mhdp(bridge);
> + struct drm_display_mode *mode;
> + struct drm_display_info *disp_info = &mhdp->connector.display_info;
> + enum pixel_format pxlfmt;
> + int pxlclock;
> + unsigned int rate, tu_size = 30, vs, vs_f, bpp, required_bandwidth,
> + available_bandwidth, dp_framer_sp = 0, msa_horizontal_1,
> + msa_vertical_1, bnd_hsync2vsync, hsync2vsync_pol_ctrl,
> + misc0 = 0, misc1 = 0, line_thresh = 0, pxl_repr,
> + front_porch, back_porch, msa_h0, msa_v0, hsync, vsync,
> + dp_vertical_1, line_thresh1, line_thresh2;
> + u32 resp;
Number of variables and number of lines in the function suggests it
should be split.
> +
> + unsigned int size = DP_RECEIVER_CAP_SIZE, dp_framer_global_config,
> + video_mode, training_interval_us;
> + u8 reg0[size], reg8, amp[2];
> +
> + mode = &bridge->encoder->crtc->state->adjusted_mode;
> + pxlclock = mode->crtc_clock;
> +
> + /*
> + * Upon power-on reset/device disconnection: [2:0] bits should be 0b001
> + * and [7:5] bits 0b000.
> + */
> + drm_dp_dpcd_writeb(&mhdp->aux, DP_SET_POWER, 1);
> +
> + drm_dp_link_probe(&mhdp->aux, &mhdp->link);
> +
> + dev_dbg(mhdp->dev, "Set sink device power state via DPCD\n");
> + drm_dp_link_power_up(&mhdp->aux, &mhdp->link);
> + /* FIXME (CDNS): do we have to wait for 100ms before going on? */
> + mdelay(100);
> +
> + mhdp->sink.link_rate = mhdp->link.rate;
> + mhdp->sink.lanes_cnt = mhdp->link.num_lanes;
> + mhdp->sink.enhanced = !!(mhdp->link.capabilities &
> + DP_LINK_CAP_ENHANCED_FRAMING);
> +
> + drm_dp_dpcd_read(&mhdp->aux, DP_DPCD_REV, reg0, size);
> +
> + mhdp->sink.pattern_supp = CDNS_SUPPORT_TPS(1) | CDNS_SUPPORT_TPS(2);
> + if (drm_dp_tps3_supported(reg0))
> + mhdp->sink.pattern_supp |= CDNS_SUPPORT_TPS(3);
> + if (drm_dp_tps4_supported(reg0))
> + mhdp->sink.pattern_supp |= CDNS_SUPPORT_TPS(4);
> +
> + mhdp->sink.fast_link = !!(reg0[DP_MAX_DOWNSPREAD] &
> + DP_NO_AUX_HANDSHAKE_LINK_TRAINING);
> +
> + mhdp->link.rate = max_link_rate(mhdp->host, mhdp->sink);
> + mhdp->link.num_lanes = min_t(u8, mhdp->sink.lanes_cnt,
> + mhdp->host.lanes_cnt & GENMASK(2, 0));
> +
> + reg8 = reg0[DP_TRAINING_AUX_RD_INTERVAL] &
> + DP_TRAINING_AUX_RD_MASK;
> + switch (reg8) {
> + case 0:
> + training_interval_us = 400;
> + break;
> + case 1:
> + case 2:
> + case 3:
> + case 4:
> + training_interval_us = 4000 << (reg8 - 1);
> + break;
> + default:
> + dev_err(mhdp->dev,
> + "wrong training interval returned by DPCD: %d\n", reg8);
> + return;
> + }
> +
> + cdns_mhdp_reg_read(mhdp, CDNS_DP_FRAMER_GLOBAL_CONFIG, &resp);
> +
> + dp_framer_global_config = be32_to_cpu(resp);
> +
> + video_mode = !(dp_framer_global_config & CDNS_DP_NO_VIDEO_MODE);
> +
> + if (dp_framer_global_config & CDNS_DP_FRAMER_EN)
> + cdns_mhdp_reg_write(mhdp, CDNS_DP_FRAMER_GLOBAL_CONFIG,
> + dp_framer_global_config &
> + ~CDNS_DP_FRAMER_EN);
> +
> + /* Spread AMP if required, enable 8b/10b coding */
> + amp[0] = (mhdp->host.lanes_cnt & CDNS_SSC) ? DP_SPREAD_AMP_0_5 : 0;
> + amp[1] = DP_SET_ANSI_8B10B;
> + drm_dp_dpcd_write(&mhdp->aux, DP_DOWNSPREAD_CTRL, amp, 2);
> +
> + if (mhdp->host.fast_link & mhdp->sink.fast_link) {
> + /* FIXME: implement fastlink */
> + dev_dbg(mhdp->dev, "fastlink\n");
> + } else {
> + if (mhdp_link_training(mhdp, video_mode,
> + training_interval_us)) {
> + dev_err(mhdp->dev, "Link training failed. Exiting.\n");
> + return;
> + }
> + }
> +
> + rate = mhdp->link.rate / 1000;
> +
> + /* FIXME: what about Y_ONLY? how is it handled in the kernel? */
> + if (disp_info->color_formats & DRM_COLOR_FORMAT_YCRCB444)
> + pxlfmt = PIXEL_FORMAT_YCBCR_444;
> + else if (disp_info->color_formats & DRM_COLOR_FORMAT_YCRCB422)
> + pxlfmt = PIXEL_FORMAT_YCBCR_422;
> + else if (disp_info->color_formats & DRM_COLOR_FORMAT_YCRCB420)
> + pxlfmt = PIXEL_FORMAT_YCBCR_420;
> + else
> + pxlfmt = PIXEL_FORMAT_RGB;
> +
> + /* if YCBCR supported and stream not SD, use ITU709 */
> + /* FIXME: handle ITU version with YCBCR420 when supported */
> + if ((pxlfmt == PIXEL_FORMAT_YCBCR_444 ||
> + pxlfmt == PIXEL_FORMAT_YCBCR_422) && mode->crtc_vdisplay >= 720)
> + misc0 = DP_YCBCR_COEFFICIENTS_ITU709;
> +
> + switch (pxlfmt) {
> + case PIXEL_FORMAT_RGB:
> + bpp = disp_info->bpc * 3;
> + pxl_repr = CDNS_DP_FRAMER_RGB << CDNS_DP_FRAMER_PXL_FORMAT;
> + misc0 |= DP_COLOR_FORMAT_RGB;
> + break;
> + case PIXEL_FORMAT_YCBCR_444:
> + bpp = disp_info->bpc * 3;
> + pxl_repr = CDNS_DP_FRAMER_YCBCR444 << CDNS_DP_FRAMER_PXL_FORMAT;
> + misc0 |= DP_COLOR_FORMAT_YCbCr444 | DP_TEST_DYNAMIC_RANGE_CEA;
> + break;
> + case PIXEL_FORMAT_YCBCR_422:
> + bpp = disp_info->bpc * 2;
> + pxl_repr = CDNS_DP_FRAMER_YCBCR422 << CDNS_DP_FRAMER_PXL_FORMAT;
> + misc0 |= DP_COLOR_FORMAT_YCbCr422 | DP_TEST_DYNAMIC_RANGE_CEA;
> + break;
> + case PIXEL_FORMAT_YCBCR_420:
> + bpp = disp_info->bpc * 3 / 2;
> + pxl_repr = CDNS_DP_FRAMER_YCBCR420 << CDNS_DP_FRAMER_PXL_FORMAT;
> + break;
> + default:
> + bpp = disp_info->bpc;
> + pxl_repr = CDNS_DP_FRAMER_Y_ONLY << CDNS_DP_FRAMER_PXL_FORMAT;
> + }
> +
> + switch (disp_info->bpc) {
> + case 6:
> + misc0 |= DP_TEST_BIT_DEPTH_6;
> + pxl_repr |= CDNS_DP_FRAMER_6_BPC;
> + break;
> + case 8:
> + misc0 |= DP_TEST_BIT_DEPTH_8;
> + pxl_repr |= CDNS_DP_FRAMER_8_BPC;
> + break;
> + case 10:
> + misc0 |= DP_TEST_BIT_DEPTH_10;
> + pxl_repr |= CDNS_DP_FRAMER_10_BPC;
> + break;
> + case 12:
> + misc0 |= DP_TEST_BIT_DEPTH_12;
> + pxl_repr |= CDNS_DP_FRAMER_12_BPC;
> + break;
> + case 16:
> + misc0 |= DP_TEST_BIT_DEPTH_16;
> + pxl_repr |= CDNS_DP_FRAMER_16_BPC;
> + break;
> + }
> +
> + /* find optimal tu_size */
> + required_bandwidth = pxlclock * bpp / 8;
> + available_bandwidth = mhdp->link.num_lanes * rate;
> + do {
> + tu_size += 2;
> +
> + vs_f = tu_size * required_bandwidth / available_bandwidth;
> + vs = vs_f / 1000;
> + vs_f = vs_f % 1000;
> + /*
> + * FIXME (CDNS): downspreading?
> + * It's unused is what I've been told.
> + */
> + } while ((vs == 1 || ((vs_f > 850 || vs_f < 100) && vs_f != 0) ||
> + tu_size - vs < 2) && tu_size < 64);
> +
> + if (vs > 64)
> + return;
> +
> + bnd_hsync2vsync = CDNS_IP_BYPASS_V_INTERFACE;
> + if (mode->flags & DRM_MODE_FLAG_INTERLACE)
> + bnd_hsync2vsync |= CDNS_IP_DET_INTERLACE_FORMAT;
> +
> + cdns_mhdp_reg_write(mhdp, CDNS_BND_HSYNC2VSYNC, bnd_hsync2vsync);
> +
> + if (mode->flags & DRM_MODE_FLAG_INTERLACE &&
> + mode->flags & DRM_MODE_FLAG_PHSYNC)
> + hsync2vsync_pol_ctrl = CDNS_H2V_HSYNC_POL_ACTIVE_LOW |
> + CDNS_H2V_VSYNC_POL_ACTIVE_LOW;
> + else
> + hsync2vsync_pol_ctrl = 0;
> +
> + cdns_mhdp_reg_write(mhdp, CDNS_HSYNC2VSYNC_POL_CTRL,
> + hsync2vsync_pol_ctrl);
> +
> + cdns_mhdp_reg_write(mhdp, CDNS_DP_FRAMER_TU,
> + CDNS_DP_FRAMER_TU_VS(vs) |
> + CDNS_DP_FRAMER_TU_SIZE(tu_size) |
> + CDNS_DP_FRAMER_TU_CNT_RST_EN);
> +
> + cdns_mhdp_reg_write(mhdp, CDNS_DP_FRAMER_PXL_REPR, pxl_repr);
> +
> + if (mode->flags & DRM_MODE_FLAG_INTERLACE)
> + dp_framer_sp |= CDNS_DP_FRAMER_INTERLACE;
> + if (mode->flags & DRM_MODE_FLAG_NHSYNC)
> + dp_framer_sp |= CDNS_DP_FRAMER_HSYNC_POL_LOW;
> + if (mode->flags & DRM_MODE_FLAG_NVSYNC)
> + dp_framer_sp |= CDNS_DP_FRAMER_VSYNC_POL_LOW;
> + cdns_mhdp_reg_write(mhdp, CDNS_DP_FRAMER_SP, dp_framer_sp);
> +
> + front_porch = mode->crtc_hsync_start - mode->crtc_hdisplay;
> + back_porch = mode->crtc_htotal - mode->crtc_hsync_end;
> + cdns_mhdp_reg_write(mhdp, CDNS_DP_FRONT_BACK_PORCH,
> + CDNS_DP_FRONT_PORCH(front_porch) |
> + CDNS_DP_BACK_PORCH(back_porch));
> +
> + cdns_mhdp_reg_write(mhdp, CDNS_DP_BYTE_COUNT,
> + mode->crtc_hdisplay * bpp / 8);
> +
> + msa_h0 = mode->crtc_htotal - mode->crtc_hsync_start;
> + cdns_mhdp_reg_write(mhdp, CDNS_DP_MSA_HORIZONTAL_0,
> + CDNS_DP_MSAH0_H_TOTAL(mode->crtc_htotal) |
> + CDNS_DP_MSAH0_HSYNC_START(msa_h0));
> +
> + hsync = mode->crtc_hsync_end - mode->crtc_hsync_start;
> + msa_horizontal_1 = CDNS_DP_MSAH1_HSYNC_WIDTH(hsync) |
> + CDNS_DP_MSAH1_HDISP_WIDTH(mode->crtc_hdisplay);
> + if (mode->flags & DRM_MODE_FLAG_NHSYNC)
> + msa_horizontal_1 |= CDNS_DP_MSAH1_HSYNC_POL_LOW;
> + cdns_mhdp_reg_write(mhdp, CDNS_DP_MSA_HORIZONTAL_1,
> + msa_horizontal_1);
> +
> + msa_v0 = mode->crtc_vtotal - mode->crtc_vsync_start;
> + cdns_mhdp_reg_write(mhdp, CDNS_DP_MSA_VERTICAL_0,
> + CDNS_DP_MSAV0_V_TOTAL(mode->crtc_vtotal) |
> + CDNS_DP_MSAV0_VSYNC_START(msa_v0));
> +
> + vsync = mode->crtc_vsync_end - mode->crtc_vsync_start;
> + msa_vertical_1 = CDNS_DP_MSAV1_VSYNC_WIDTH(vsync) |
> + CDNS_DP_MSAV1_VDISP_WIDTH(mode->crtc_vdisplay);
> + if (mode->flags & DRM_MODE_FLAG_NVSYNC)
> + msa_vertical_1 |= CDNS_DP_MSAV1_VSYNC_POL_LOW;
> + cdns_mhdp_reg_write(mhdp, CDNS_DP_MSA_VERTICAL_1, msa_vertical_1);
> +
> + if ((mode->flags & DRM_MODE_FLAG_INTERLACE) &&
> + mode->crtc_vtotal % 2 == 0)
> + misc1 = DP_TEST_INTERLACED;
> + if (pxlfmt == PIXEL_FORMAT_Y_ONLY)
> + misc1 |= CDNS_DP_TEST_COLOR_FORMAT_RAW_Y_ONLY;
> + /* FIXME: use VSC SDP for Y420 */
> + /* FIXME: (CDNS) no code for Y420 in bare metal test */
> + if (pxlfmt == PIXEL_FORMAT_YCBCR_420)
> + misc1 = CDNS_DP_TEST_VSC_SDP;
> +
> + cdns_mhdp_reg_write(mhdp, CDNS_DP_MSA_MISC, misc0 | (misc1 << 8));
> +
> + /* FIXME: to be changed if MST mode */
> + cdns_mhdp_reg_write(mhdp, CDNS_DP_STREAM_CONFIG, 1);
> +
> + cdns_mhdp_reg_write(mhdp, CDNS_DP_HORIZONTAL,
> + CDNS_DP_H_HSYNC_WIDTH(hsync) |
> + CDNS_DP_H_H_TOTAL(mode->crtc_hdisplay));
> +
> + cdns_mhdp_reg_write(mhdp, CDNS_DP_VERTICAL_0,
> + CDNS_DP_V0_VHEIGHT(mode->crtc_vdisplay) |
> + CDNS_DP_V0_VSTART(msa_v0));
> +
> + dp_vertical_1 = CDNS_DP_V1_VTOTAL(mode->crtc_vtotal);
> + if ((mode->flags & DRM_MODE_FLAG_INTERLACE) &&
> + mode->crtc_vtotal % 2 == 0)
> + dp_vertical_1 |= CDNS_DP_V1_VTOTAL_EVEN;
> +
> + cdns_mhdp_reg_write(mhdp, CDNS_DP_VERTICAL_1, dp_vertical_1);
> +
> + cdns_mhdp_reg_write_bit(mhdp, CDNS_DP_VB_ID, 2, 1,
> + (mode->flags & DRM_MODE_FLAG_INTERLACE) ?
> + CDNS_DP_VB_ID_INTERLACED : 0);
> +
> + line_thresh1 = ((vs + 1) << 5) * 8 / bpp;
> + line_thresh2 = (pxlclock << 5) / 1000 / rate * (vs + 1) - (1 << 5);
> + line_thresh = line_thresh1 - line_thresh2 / mhdp->link.num_lanes;
> + line_thresh = (line_thresh >> 5) + 2;
> + cdns_mhdp_reg_write(mhdp, CDNS_DP_LINE_THRESH,
> + line_thresh & GENMASK(5, 0));
> +
> + cdns_mhdp_reg_write(mhdp, CDNS_DP_RATE_GOVERNOR_STATUS,
> + CDNS_DP_RG_TU_VS_DIFF((tu_size - vs > 3) ?
> + 0 : tu_size - vs));
> +
> + cdns_mhdp_set_video_status(mhdp, 1);
> +}
> +
> +static const struct drm_bridge_funcs cdns_mhdp_bridge_funcs = {
> + .enable = cdns_mhdp_enable,
> + .disable = cdns_mhdp_disable,
> + .attach = cdns_mhdp_attach,
> +};
> +
> +static int load_firmware(struct cdns_mhdp_device *mhdp, const char *name,
> + unsigned int addr)
> +{
> + const struct firmware *fw;
> + int ret;
> +
> + ret = request_firmware(&fw, name, mhdp->dev);
> + if (ret) {
> + dev_err(mhdp->dev, "failed to load firmware (%s), ret: %d\n",
> + name, ret);
> + return ret;
> + }
> +
> + memcpy_toio(mhdp->regs + addr, fw->data, fw->size);
> +
> + release_firmware(fw);
> +
> + return 0;
> +}
> +
> +static int cdns_mhdp_audio_hw_params(struct device *dev, void *data,
> + struct hdmi_codec_daifmt *daifmt,
> + struct hdmi_codec_params *params)
> +{
> + struct cdns_mhdp_device *mhdp = dev_get_drvdata(dev);
> + struct audio_info audio = {
> + .sample_width = params->sample_width,
> + .sample_rate = params->sample_rate,
> + .channels = params->channels,
> + };
> + int ret;
> +
> + if (daifmt->fmt != HDMI_I2S) {
> + DRM_DEV_ERROR(dev, "Invalid format %d\n", daifmt->fmt);
> + return -EINVAL;
> + }
> +
> + audio.format = AFMT_I2S;
> +
> + ret = cdns_mhdp_audio_config(mhdp, &audio);
> + if (!ret)
> + mhdp->audio_info = audio;
> +
> + return 0;
> +}
> +
> +static void cdns_mhdp_audio_shutdown(struct device *dev, void *data)
> +{
> + struct cdns_mhdp_device *mhdp = dev_get_drvdata(dev);
> + int ret;
> +
> + ret = cdns_mhdp_audio_stop(mhdp, &mhdp->audio_info);
> + if (!ret)
> + mhdp->audio_info.format = AFMT_UNUSED;
> +}
> +
> +static int cdns_mhdp_audio_digital_mute(struct device *dev, void *data,
> + bool enable)
> +{
> + struct cdns_mhdp_device *mhdp = dev_get_drvdata(dev);
> +
> + return cdns_mhdp_audio_mute(mhdp, enable);
> +}
> +
> +static int cdns_mhdp_audio_get_eld(struct device *dev, void *data,
> + u8 *buf, size_t len)
> +{
> + struct cdns_mhdp_device *mhdp = dev_get_drvdata(dev);
> +
> + memcpy(buf, mhdp->connector.eld,
> + min(sizeof(mhdp->connector.eld), len));
> +
> + return 0;
> +}
> +
> +static const struct hdmi_codec_ops audio_codec_ops = {
> + .hw_params = cdns_mhdp_audio_hw_params,
> + .audio_shutdown = cdns_mhdp_audio_shutdown,
> + .digital_mute = cdns_mhdp_audio_digital_mute,
> + .get_eld = cdns_mhdp_audio_get_eld,
> +};
> +
> +static int mhdp_probe(struct platform_device *pdev)
> +{
> + struct resource *regs;
> + struct cdns_mhdp_device *mhdp;
> + struct clk *clk;
> + int ret;
> + unsigned int reg;
> + unsigned long rate;
> + u32 resp;
> +
> + struct hdmi_codec_pdata codec_data = {
> + .i2s = 1,
> + .max_i2s_channels = 8,
> + .ops = &audio_codec_ops,
> + };
> +
> + mhdp = devm_kzalloc(&pdev->dev, sizeof(struct cdns_mhdp_device),
> + GFP_KERNEL);
> + if (!mhdp)
> + return -ENOMEM;
> +
> + clk = devm_clk_get(&pdev->dev, NULL);
> + if (IS_ERR(clk)) {
> + dev_err(&pdev->dev, "couldn't get clk: %ld\n", PTR_ERR(clk));
> + return PTR_ERR(clk);
> + }
> +
> + mhdp->dev = &pdev->dev;
> + dev_set_drvdata(&pdev->dev, mhdp);
> +
> + drm_dp_aux_init(&mhdp->aux);
> + mhdp->aux.dev = &pdev->dev;
> + mhdp->aux.transfer = mhdp_transfer;
> +
> + regs = platform_get_resource(pdev, IORESOURCE_MEM, 0);
> + mhdp->regs = devm_ioremap_resource(&pdev->dev, regs);
> + if (IS_ERR(mhdp->regs))
> + return PTR_ERR(mhdp->regs);
> +
> + platform_set_drvdata(pdev, mhdp);
> +
> + ret = load_firmware(mhdp, FW_NAME, CDNS_MHDP_IMEM);
> + if (ret)
> + return ret;
> +
> + rate = clk_get_rate(clk);
> + writel(rate % 1000000, mhdp->regs + CDNS_SW_CLK_L);
> + writel(rate / 1000000, mhdp->regs + CDNS_SW_CLK_H);
> +
> + /* Leave debug mode */
> + writel(0, mhdp->regs + CDNS_APB_CTRL);
> +
> + /*
> + * Wait for the KEEP_ALIVE "message" on the first 8 bits.
> + * Updated each sched "tick" (~2ms)
> + */
> + ret = readl_poll_timeout(mhdp->regs + CDNS_KEEP_ALIVE, reg,
> + reg & CDNS_KEEP_ALIVE_MASK, 500,
> + CDNS_KEEP_ALIVE_TIMEOUT);
> + if (ret) {
> + dev_err(&pdev->dev,
> + "device didn't give any life sign: reg %d\n", reg);
> + return -EIO;
> + }
> +
> + /*
> + * FIXME (CDNS): how are the characteristics/features of the host
> + * defined? Will they be always hardcoded?
At the begining they can be hardcoded, unless there is already
infrastructure to get them from.
> + */
> + /* FIXME: link rate 2.7; num_lanes = 2, */
What does it mean?
> + /* FIXME: read capabilities from PHY */
> + mhdp->host.link_rate = drm_dp_bw_code_to_link_rate(DP_LINK_BW_5_4);
> + mhdp->host.lanes_cnt = CDNS_LANE_4 | CDNS_SCRAMBLER;
> + mhdp->host.volt_swing = CDNS_VOLT_SWING(3);
> + mhdp->host.pre_emphasis = CDNS_PRE_EMPHASIS(2);
> + mhdp->host.pattern_supp = CDNS_SUPPORT_TPS(1) |
> + CDNS_SUPPORT_TPS(2) | CDNS_SUPPORT_TPS(3) |
> + CDNS_SUPPORT_TPS(4);
> + mhdp->host.fast_link = 0;
> + mhdp->host.lane_mapping = CDNS_LANE_MAPPING_FLIPPED;
> + mhdp->host.enhanced = true;
> +
> + mhdp->bridge.of_node = pdev->dev.of_node;
> + mhdp->bridge.funcs = &cdns_mhdp_bridge_funcs;
> +
> + /* Init events to 0 as it's not cleared by FW at boot but on read */
> + readl(mhdp->regs + CDNS_SW_EVENT0);
> + readl(mhdp->regs + CDNS_SW_EVENT1);
> + readl(mhdp->regs + CDNS_SW_EVENT2);
> + readl(mhdp->regs + CDNS_SW_EVENT3);
> +
> + /* Activate uCPU */
> + ret = cdns_mhdp_set_firmware_active(mhdp, true);
> + if (ret) {
> + dev_err(mhdp->dev, "Failed to activate DP\n");
> + return ret;
> + }
> +
> + mhdp->audio_pdev = platform_device_register_data(
> + mhdp->dev, HDMI_CODEC_DRV_NAME, PLATFORM_DEVID_AUTO,
> + &codec_data, sizeof(codec_data));
> +
> + /* Enable VIF clock for stream 0 */
> + cdns_mhdp_reg_read(mhdp, CDNS_DPTX_CAR, &resp);
> + cdns_mhdp_reg_write(mhdp, CDNS_DPTX_CAR,
> + resp | CDNS_VIF_CLK_EN | CDNS_VIF_CLK_RSTN);
> +
> + /* Loop over HDP change */
> + /*
> + * FIXME: does not work when put in mhdp_bridge_enable.
> + * Where should we put it?
It would be good to get rid of these fixmes before final version.
It would be also good to have review from displayport developers - I do
not know DP too much, but I suspect all this link training could be
improved.
Regards
Andrzej
> + */
> + /* Is it still needed with use of mb message HPD STATUS? */
> + ret = readl_poll_timeout(mhdp->regs + CDNS_SW_EVENT0, reg,
> + reg & CDNS_DPTX_HPD, 500,
> + CDNS_SW_EVENT0_TIMEOUT);
> + if (ret) {
> + dev_err(mhdp->dev, "no HPD received %d\n", reg);
> + return -ENODEV;
> + }
> +
> + drm_bridge_add(&mhdp->bridge);
> +
> + return 0;
> +}
> +
> +MODULE_FIRMWARE(FW_NAME);
> +
> +static int mhdp_remove(struct platform_device *pdev)
> +{
> + struct cdns_mhdp_device *mhdp = dev_get_drvdata(&pdev->dev);
> + int ret;
> +
> + platform_device_unregister(mhdp->audio_pdev);
> +
> + drm_bridge_remove(&mhdp->bridge);
> +
> + ret = cdns_mhdp_set_firmware_active(mhdp, false);
> + if (ret) {
> + dev_err(mhdp->dev, "Failed to de-activate DP\n");
> + return ret;
> + }
> +
> + /* FIXME: check for missing functions */
> +
> + return 0;
> +}
> +
> +static struct platform_driver mhdp_driver = {
> + .driver = {
> + .name = "cdns-mhdp",
> + .of_match_table = of_match_ptr(mhdp_ids),
> + },
> + .probe = mhdp_probe,
> + .remove = mhdp_remove,
> +};
> +module_platform_driver(mhdp_driver);
> +
> +MODULE_AUTHOR("Quentin Schulz <quentin.schulz@free-electrons.com>");
> +MODULE_DESCRIPTION("Cadence MHDP DP bridge driver");
> +MODULE_LICENSE("GPL");
> +MODULE_ALIAS("platform:cdns-mhdp");
> diff --git a/drivers/gpu/drm/rockchip/Kconfig b/drivers/gpu/drm/rockchip/Kconfig
> index 26438d45732b..bd6454b590a2 100644
> --- a/drivers/gpu/drm/rockchip/Kconfig
> +++ b/drivers/gpu/drm/rockchip/Kconfig
> @@ -28,7 +28,9 @@ config ROCKCHIP_ANALOGIX_DP
>
> config ROCKCHIP_CDN_DP
> bool "Rockchip cdn DP"
> - depends on EXTCON=y || (EXTCON=m && DRM_ROCKCHIP=m)
> + depends on DRM_ROCKCHIP
> + select EXTCON
> + select DRM_CDNS_MHDP
> help
> This selects support for Rockchip SoC specific extensions
> for the cdn DP driver. If you want to enable Dp on
> diff --git a/drivers/gpu/drm/rockchip/Makefile b/drivers/gpu/drm/rockchip/Makefile
> index 868263ff0302..c908a4fb8a47 100644
> --- a/drivers/gpu/drm/rockchip/Makefile
> +++ b/drivers/gpu/drm/rockchip/Makefile
> @@ -9,7 +9,7 @@ rockchipdrm-y := rockchip_drm_drv.o rockchip_drm_fb.o \
> rockchipdrm-$(CONFIG_DRM_FBDEV_EMULATION) += rockchip_drm_fbdev.o
>
> rockchipdrm-$(CONFIG_ROCKCHIP_ANALOGIX_DP) += analogix_dp-rockchip.o
> -rockchipdrm-$(CONFIG_ROCKCHIP_CDN_DP) += cdn-dp-core.o cdn-dp-reg.o
> +rockchipdrm-$(CONFIG_ROCKCHIP_CDN_DP) += cdn-dp-core.o
> rockchipdrm-$(CONFIG_ROCKCHIP_DW_HDMI) += dw_hdmi-rockchip.o
> rockchipdrm-$(CONFIG_ROCKCHIP_DW_MIPI_DSI) += dw-mipi-dsi.o
> rockchipdrm-$(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
> index bf7e206326f0..343f381e3440 100644
> --- a/drivers/gpu/drm/rockchip/cdn-dp-core.c
> +++ b/drivers/gpu/drm/rockchip/cdn-dp-core.c
> @@ -816,7 +816,7 @@ static int cdn_dp_audio_hw_params(struct device *dev, void *data,
>
> ret = cdns_mhdp_audio_config(&dp->mhdp, &audio);
> if (!ret)
> - dp->audio_info = audio;
> + dp->mhdp.audio_info = audio;
>
> out:
> mutex_unlock(&dp->lock);
> @@ -832,9 +832,9 @@ static void cdn_dp_audio_shutdown(struct device *dev, void *data)
> if (!dp->active)
> goto out;
>
> - ret = cdns_mhdp_audio_stop(&dp->mhdp, &dp->audio_info);
> + ret = cdns_mhdp_audio_stop(&dp->mhdp, &dp->mhdp.audio_info);
> if (!ret)
> - dp->audio_info.format = AFMT_UNUSED;
> + dp->mhdp.audio_info.format = AFMT_UNUSED;
> out:
> mutex_unlock(&dp->lock);
> }
> @@ -886,11 +886,11 @@ static int cdn_dp_audio_codec_init(struct cdn_dp_device *dp,
> .max_i2s_channels = 8,
> };
>
> - dp->audio_pdev = platform_device_register_data(
> - dev, HDMI_CODEC_DRV_NAME, PLATFORM_DEVID_AUTO,
> - &codec_data, sizeof(codec_data));
> + dp->mhdp.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);
> + return PTR_ERR_OR_ZERO(dp->mhdp.audio_pdev);
> }
>
> static int cdn_dp_request_firmware(struct cdn_dp_device *dp)
> @@ -1217,7 +1217,7 @@ static int cdn_dp_remove(struct platform_device *pdev)
> {
> struct cdn_dp_device *dp = platform_get_drvdata(pdev);
>
> - platform_device_unregister(dp->audio_pdev);
> + platform_device_unregister(dp->mhdp.audio_pdev);
> cdn_dp_suspend(dp->mhdp.dev);
> component_del(&pdev->dev, &cdn_dp_component_ops);
>
> diff --git a/drivers/gpu/drm/rockchip/cdn-dp-core.h b/drivers/gpu/drm/rockchip/cdn-dp-core.h
> index bad65c2fe610..a086dad31287 100644
> --- a/drivers/gpu/drm/rockchip/cdn-dp-core.h
> +++ b/drivers/gpu/drm/rockchip/cdn-dp-core.h
> @@ -19,8 +19,9 @@
> #include <drm/drm_crtc_helper.h>
> #include <drm/drm_dp_helper.h>
> #include <drm/drm_panel.h>
> +#include <drm/bridge/cdns-mhdp-common.h>
> +
> #include "rockchip_drm_drv.h"
> -#include "cdn-dp-reg.h"
>
> #define MAX_PHY 2
>
> @@ -45,7 +46,6 @@ struct cdn_dp_device {
> struct cdns_mhdp_device mhdp;
> struct drm_device *drm_dev;
> struct drm_encoder encoder;
> - struct platform_device *audio_pdev;
> struct work_struct event_work;
> struct edid *edid;
>
> @@ -64,7 +64,6 @@ struct cdn_dp_device {
> struct reset_control *dptx_rst;
> struct reset_control *apb_rst;
> struct reset_control *core_rst;
> - struct audio_info audio_info;
> struct cdn_dp_port *port[MAX_PHY];
> u8 ports;
> u8 lanes;
> diff --git a/drivers/gpu/drm/rockchip/cdn-dp-reg.h b/include/drm/bridge/cdns-mhdp-common.h
> similarity index 95%
> rename from drivers/gpu/drm/rockchip/cdn-dp-reg.h
> rename to include/drm/bridge/cdns-mhdp-common.h
> index 3cb40d719515..c5a5c4fa7fc4 100644
> --- a/drivers/gpu/drm/rockchip/cdn-dp-reg.h
> +++ b/include/drm/bridge/cdns-mhdp-common.h
> @@ -12,10 +12,13 @@
> * GNU General Public License for more details.
> */
>
> -#ifndef _CDN_DP_REG_H
> -#define _CDN_DP_REG_H
> +#ifndef CDNS_MHDP_COMMON_H_
> +#define CDNS_MHDP_COMMON_H_
>
> #include <linux/bitops.h>
> +#include <drm/drm_dp_helper.h>
> +#include <drm/drm_connector.h>
> +#include <drm/drm_bridge.h>
>
> #define ADDR_IMEM 0x10000
> #define ADDR_DMEM 0x20000
> @@ -327,6 +330,7 @@
> #define GENERAL_TEST_ECHO 0x02
> #define GENERAL_BUS_SETTINGS 0x03
> #define GENERAL_TEST_ACCESS 0x04
> +#define GENERAL_REGISTER_READ 0x07
>
> #define DPTX_SET_POWER_MNG 0x00
> #define DPTX_SET_HOST_CAPABILITIES 0x01
> @@ -346,6 +350,7 @@
> #define DPTX_SET_LINK_BREAK_POINT 0x0f
> #define DPTX_FORCE_LANES 0x10
> #define DPTX_HPD_STATE 0x11
> +#define DPTX_ADJUST_LT 0x12
>
> #define FW_STANDBY 0
> #define FW_ACTIVE 1
> @@ -517,6 +522,9 @@ struct cdns_mhdp_device {
> struct clk *spdif_clk;
> struct reset_control *spdif_rst;
>
> + struct platform_device *audio_pdev;
> + struct audio_info audio_info;
> +
> struct drm_dp_aux aux;
> struct cdns_mhdp_host host;
> struct cdns_mhdp_sink sink;
> @@ -551,4 +559,11 @@ int cdns_mhdp_audio_stop(struct cdns_mhdp_device *mhdp,
> int cdns_mhdp_audio_mute(struct cdns_mhdp_device *mhdp, bool enable);
> int cdns_mhdp_audio_config(struct cdns_mhdp_device *mhdp,
> struct audio_info *audio);
> -#endif /* _CDN_DP_REG_H */
> +int cdns_mhdp_reg_read(struct cdns_mhdp_device *mhdp, u32 addr, u32 *value);
> +int cdns_mhdp_reg_write(struct cdns_mhdp_device *mhdp, u16 addr, u32 val);
> +int cdns_mhdp_reg_write_bit(struct cdns_mhdp_device *mhdp, u16 addr,
> + u8 start_bit, u8 bits_no, u32 val);
> +int cdns_mhdp_adjust_lt(struct cdns_mhdp_device *mhdp, u8 nlanes,
> + u16 udelay, u8 *lanes_data,
> + u8 *dpcd);
> +#endif /* CDNS_MHDP_COMMON_H_ */
^ permalink raw reply [flat|nested] 45+ messages in thread
* [PATCH v6 4/6] drm: bridge: add support for Cadence MHDP DPI/DP bridge
@ 2018-11-05 13:10 ` Andrzej Hajda
0 siblings, 0 replies; 45+ messages in thread
From: Andrzej Hajda @ 2018-11-05 13:10 UTC (permalink / raw)
To: linux-arm-kernel
On 08.10.2018 23:42, Damian Kos wrote:
> From: Quentin Schulz <quentin.schulz@free-electrons.com>
>
> This adds basic support for Cadence MHDP DPI to DP bridge.
>
> Basically, it takes a DPI stream as input and output it encoded in DP
> format. It's missing proper HPD, HDCP and currently supports only
> SST mode.
>
> Changes made in the low level driver (cdn-dp-reg.*):
> - moved it to from drivers/gpu/drm/rockchip to
> drivers/gpu/drm/bridge/cdns-mhdp-common.c and
> include/drm/bridge/cdns-mhdp-common.h
> - functions for sending/receiving commands are now public
> - added functions for reading registers and link training
> adjustment
>
> Changes made in RK's driver (cdn-dp-core.*):
> - Moved audio_info and audio_pdev fields from cdn_dp_device to
> cdns_mhdp_device structure.
>
> Signed-off-by: Quentin Schulz <quentin.schulz@free-electrons.com>
> Signed-off-by: Damian Kos <dkos@cadence.com>
> ---
> drivers/gpu/drm/bridge/Kconfig | 9 +
> drivers/gpu/drm/bridge/Makefile | 3 +
> .../cdns-mhdp-common.c} | 136 +-
> drivers/gpu/drm/bridge/cdns-mhdp.c | 1304 +++++++++++++++++
> drivers/gpu/drm/rockchip/Kconfig | 4 +-
> drivers/gpu/drm/rockchip/Makefile | 2 +-
> drivers/gpu/drm/rockchip/cdn-dp-core.c | 16 +-
> drivers/gpu/drm/rockchip/cdn-dp-core.h | 5 +-
> .../drm/bridge/cdns-mhdp-common.h | 21 +-
> 9 files changed, 1480 insertions(+), 20 deletions(-)
> rename drivers/gpu/drm/{rockchip/cdn-dp-reg.c => bridge/cdns-mhdp-common.c} (87%)
> create mode 100644 drivers/gpu/drm/bridge/cdns-mhdp.c
> rename drivers/gpu/drm/rockchip/cdn-dp-reg.h => include/drm/bridge/cdns-mhdp-common.h (95%)
>
> diff --git a/drivers/gpu/drm/bridge/Kconfig b/drivers/gpu/drm/bridge/Kconfig
> index 9eeb8ef0b174..90a4810a8c96 100644
> --- a/drivers/gpu/drm/bridge/Kconfig
> +++ b/drivers/gpu/drm/bridge/Kconfig
> @@ -35,6 +35,15 @@ config DRM_CDNS_DSI
> Support Cadence DPI to DSI bridge. This is an internal
> bridge and is meant to be directly embedded in a SoC.
>
> +config DRM_CDNS_MHDP
> + tristate "Cadence DPI/DP bridge"
> + select DRM_KMS_HELPER
> + select DRM_PANEL_BRIDGE
> + depends on OF
> + help
> + Support Cadence DPI to DP bridge. This is an internal
> + bridge and is meant to be directly embedded in a SoC.
> +
> config DRM_DUMB_VGA_DAC
> tristate "Dumb VGA DAC Bridge support"
> depends on OF
> diff --git a/drivers/gpu/drm/bridge/Makefile b/drivers/gpu/drm/bridge/Makefile
> index 4934fcf5a6f8..e802fdb85750 100644
> --- a/drivers/gpu/drm/bridge/Makefile
> +++ b/drivers/gpu/drm/bridge/Makefile
> @@ -16,4 +16,7 @@ obj-$(CONFIG_DRM_ANALOGIX_DP) += analogix/
> obj-$(CONFIG_DRM_I2C_ADV7511) += adv7511/
> obj-$(CONFIG_DRM_TI_SN65DSI86) += ti-sn65dsi86.o
> obj-$(CONFIG_DRM_TI_TFP410) += ti-tfp410.o
> +obj-$(CONFIG_DRM_CDNS_MHDP) += mhdp8546.o
Alphabetic order?
> obj-y += synopsys/
> +
> +mhdp8546-objs := cdns-mhdp-common.o cdns-mhdp.o
> diff --git a/drivers/gpu/drm/rockchip/cdn-dp-reg.c b/drivers/gpu/drm/bridge/cdns-mhdp-common.c
> similarity index 87%
> rename from drivers/gpu/drm/rockchip/cdn-dp-reg.c
> rename to drivers/gpu/drm/bridge/cdns-mhdp-common.c
> index c1a76e6fff88..fda1bee7adb5 100644
> --- a/drivers/gpu/drm/rockchip/cdn-dp-reg.c
> +++ b/drivers/gpu/drm/bridge/cdns-mhdp-common.c
> @@ -19,8 +19,9 @@
> #include <linux/iopoll.h>
> #include <linux/reset.h>
>
> -#include "cdn-dp-core.h"
> -#include "cdn-dp-reg.h"
> +#include <drm/drm_print.h>
> +#include <drm/drm_modes.h>
> +#include <drm/bridge/cdns-mhdp-common.h>
>
> #define CDNS_DP_SPDIF_CLK 200000000
> #define FW_ALIVE_TIMEOUT_US 1000000
> @@ -33,6 +34,7 @@ void cdns_mhdp_set_fw_clk(struct cdns_mhdp_device *mhdp, unsigned long clk)
> {
> writel(clk / 1000000, mhdp->regs + SW_CLK_H);
> }
> +EXPORT_SYMBOL(cdns_mhdp_set_fw_clk);
>
> void cdns_mhdp_clock_reset(struct cdns_mhdp_device *mhdp)
> {
> @@ -82,6 +84,7 @@ void cdns_mhdp_clock_reset(struct cdns_mhdp_device *mhdp)
> /* enable Mailbox and PIF interrupt */
> writel(0, mhdp->regs + APB_INT_MASK);
> }
> +EXPORT_SYMBOL(cdns_mhdp_clock_reset);
>
> static int cdns_mhdp_mailbox_read(struct cdns_mhdp_device *mhdp)
> {
> @@ -189,7 +192,56 @@ static int cdns_mhdp_mailbox_send(struct cdns_mhdp_device *mhdp, u8 module_id,
> return 0;
> }
>
> -static int cdns_mhdp_reg_write(struct cdns_mhdp_device *mhdp, u16 addr, u32 val)
> +int cdns_mhdp_reg_read(struct cdns_mhdp_device *mhdp, u32 addr, u32 *value)
> +{
> + u8 msg[4], resp[8];
> + int ret;
> +
> + if (addr == 0) {
> + ret = -EINVAL;
> + goto err_reg_read;
> + }
> +
> + msg[0] = (u8)(addr >> 24);
> + msg[1] = (u8)(addr >> 16);
> + msg[2] = (u8)(addr >> 8);
> + msg[3] = (u8)addr;
addr is u16, so? addr >> 16 is always 0, the core question what type of
addr we should use?
To avoid byte shifts you can use put_unaligned_le32 - little more generic.
> +
> + ret = cdns_mhdp_mailbox_send(mhdp, MB_MODULE_ID_GENERAL,
> + GENERAL_REGISTER_READ,
> + sizeof(msg), msg);
> + if (ret)
> + goto err_reg_read;
> +
> + ret = cdns_mhdp_mailbox_validate_receive(mhdp, MB_MODULE_ID_GENERAL,
> + GENERAL_REGISTER_READ,
> + sizeof(resp));
> + if (ret)
> + goto err_reg_read;
> +
> + ret = cdns_mhdp_mailbox_read_receive(mhdp, resp, sizeof(resp));
> + if (ret)
> + goto err_reg_read;
> +
> + /* Returned address value should be the same as requested */
> + if (memcmp(msg, resp, sizeof(msg))) {
> + ret = -EINVAL;
> + goto err_reg_read;
> + }
> +
> + *value = (resp[4] << 24) | (resp[5] << 16) | (resp[6] << 8) | resp[7];
*value = get_unaligned_be32(resp + 4);
and it can be put after if clause below.
> +
> +err_reg_read:
> + if (ret) {
> + DRM_DEV_ERROR(mhdp->dev, "Failed to read register.\n");
> + *value = 0;
> + }
> +
> + return ret;
> +}
> +EXPORT_SYMBOL(cdns_mhdp_reg_read);
> +
> +int cdns_mhdp_reg_write(struct cdns_mhdp_device *mhdp, u16 addr, u32 val)
> {
> u8 msg[6];
>
> @@ -202,8 +254,9 @@ static int cdns_mhdp_reg_write(struct cdns_mhdp_device *mhdp, u16 addr, u32 val)
> return cdns_mhdp_mailbox_send(mhdp, MB_MODULE_ID_DP_TX,
> DPTX_WRITE_REGISTER, sizeof(msg), msg);
> }
> +EXPORT_SYMBOL(cdns_mhdp_reg_write);
>
> -static int cdns_mhdp_reg_write_bit(struct cdns_mhdp_device *mhdp, u16 addr,
> +int cdns_mhdp_reg_write_bit(struct cdns_mhdp_device *mhdp, u16 addr,
> u8 start_bit, u8 bits_no, u32 val)
> {
> u8 field[8];
> @@ -220,6 +273,7 @@ static int cdns_mhdp_reg_write_bit(struct cdns_mhdp_device *mhdp, u16 addr,
> return cdns_mhdp_mailbox_send(mhdp, MB_MODULE_ID_DP_TX,
> DPTX_WRITE_FIELD, sizeof(field), field);
> }
> +EXPORT_SYMBOL(cdns_mhdp_reg_write_bit);
>
> int cdns_mhdp_dpcd_read(struct cdns_mhdp_device *mhdp,
> u32 addr, u8 *data, u16 len)
> @@ -252,6 +306,7 @@ int cdns_mhdp_dpcd_read(struct cdns_mhdp_device *mhdp,
> err_dpcd_read:
> return ret;
> }
> +EXPORT_SYMBOL(cdns_mhdp_dpcd_read);
>
> int cdns_mhdp_dpcd_write(struct cdns_mhdp_device *mhdp, u32 addr, u8 value)
> {
> @@ -286,6 +341,7 @@ int cdns_mhdp_dpcd_write(struct cdns_mhdp_device *mhdp, u32 addr, u8 value)
> DRM_DEV_ERROR(mhdp->dev, "dpcd write failed: %d\n", ret);
> return ret;
> }
> +EXPORT_SYMBOL(cdns_mhdp_dpcd_write);
>
> int cdns_mhdp_load_firmware(struct cdns_mhdp_device *mhdp, const u32 *i_mem,
> u32 i_size, const u32 *d_mem, u32 d_size)
> @@ -328,6 +384,7 @@ int cdns_mhdp_load_firmware(struct cdns_mhdp_device *mhdp, const u32 *i_mem,
>
> return 0;
> }
> +EXPORT_SYMBOL(cdns_mhdp_load_firmware);
>
> int cdns_mhdp_set_firmware_active(struct cdns_mhdp_device *mhdp, bool enable)
> {
> @@ -362,6 +419,7 @@ int cdns_mhdp_set_firmware_active(struct cdns_mhdp_device *mhdp, bool enable)
> DRM_DEV_ERROR(mhdp->dev, "set firmware active failed\n");
> return ret;
> }
> +EXPORT_SYMBOL(cdns_mhdp_set_firmware_active);
>
> int cdns_mhdp_set_host_cap(struct cdns_mhdp_device *mhdp, u8 lanes, bool flip)
> {
> @@ -391,6 +449,7 @@ int cdns_mhdp_set_host_cap(struct cdns_mhdp_device *mhdp, u8 lanes, bool flip)
> DRM_DEV_ERROR(mhdp->dev, "set host cap failed: %d\n", ret);
> return ret;
> }
> +EXPORT_SYMBOL(cdns_mhdp_set_host_cap);
>
> int cdns_mhdp_event_config(struct cdns_mhdp_device *mhdp)
> {
> @@ -408,11 +467,13 @@ int cdns_mhdp_event_config(struct cdns_mhdp_device *mhdp)
>
> return ret;
> }
> +EXPORT_SYMBOL(cdns_mhdp_event_config);
>
> u32 cdns_mhdp_get_event(struct cdns_mhdp_device *mhdp)
> {
> return readl(mhdp->regs + SW_EVENTS0);
> }
> +EXPORT_SYMBOL(cdns_mhdp_get_event);
>
> int cdns_mhdp_get_hpd_status(struct cdns_mhdp_device *mhdp)
> {
> @@ -440,6 +501,7 @@ int cdns_mhdp_get_hpd_status(struct cdns_mhdp_device *mhdp)
> DRM_DEV_ERROR(mhdp->dev, "get hpd status failed: %d\n", ret);
> return ret;
> }
> +EXPORT_SYMBOL(cdns_mhdp_get_hpd_status);
>
> int cdns_mhdp_get_edid_block(void *data, u8 *edid,
> unsigned int block, size_t length)
> @@ -482,6 +544,7 @@ int cdns_mhdp_get_edid_block(void *data, u8 *edid,
>
> return ret;
> }
> +EXPORT_SYMBOL(cdns_mhdp_get_edid_block);
>
> static int cdns_mhdp_training_start(struct cdns_mhdp_device *mhdp)
> {
> @@ -580,6 +643,7 @@ int cdns_mhdp_train_link(struct cdns_mhdp_device *mhdp)
> mhdp->link.num_lanes);
> return ret;
> }
> +EXPORT_SYMBOL(cdns_mhdp_train_link);
>
> int cdns_mhdp_set_video_status(struct cdns_mhdp_device *mhdp, int active)
> {
> @@ -595,6 +659,7 @@ int cdns_mhdp_set_video_status(struct cdns_mhdp_device *mhdp, int active)
>
> return ret;
> }
> +EXPORT_SYMBOL(cdns_mhdp_set_video_status);
>
> static int cdns_mhdp_get_msa_misc(struct video_info *video,
> struct drm_display_mode *mode)
> @@ -797,6 +862,7 @@ int cdns_mhdp_config_video(struct cdns_mhdp_device *mhdp)
> DRM_DEV_ERROR(mhdp->dev, "config video failed: %d\n", ret);
> return ret;
> }
> +EXPORT_SYMBOL(cdns_mhdp_config_video);
>
> int cdns_mhdp_audio_stop(struct cdns_mhdp_device *mhdp,
> struct audio_info *audio)
> @@ -831,6 +897,7 @@ int cdns_mhdp_audio_stop(struct cdns_mhdp_device *mhdp,
>
> return 0;
> }
> +EXPORT_SYMBOL(cdns_mhdp_audio_stop);
>
> int cdns_mhdp_audio_mute(struct cdns_mhdp_device *mhdp, bool enable)
> {
> @@ -842,6 +909,7 @@ int cdns_mhdp_audio_mute(struct cdns_mhdp_device *mhdp, bool enable)
>
> return ret;
> }
> +EXPORT_SYMBOL(cdns_mhdp_audio_mute);
>
> static void cdns_mhdp_audio_config_i2s(struct cdns_mhdp_device *mhdp,
> struct audio_info *audio)
> @@ -977,3 +1045,63 @@ int cdns_mhdp_audio_config(struct cdns_mhdp_device *mhdp,
> DRM_DEV_ERROR(mhdp->dev, "audio config failed: %d\n", ret);
> return ret;
> }
> +EXPORT_SYMBOL(cdns_mhdp_audio_config);
> +
> +int cdns_mhdp_adjust_lt(struct cdns_mhdp_device *mhdp,
> + u8 nlanes, u16 udelay, u8 *lanes_data, u8 *dpcd)
> +{
> + u8 payload[7];
> + u8 hdr[5]; /* For DPCD read response header */
> + u32 addr;
> + u8 const nregs = 6; /* Registers 0x202-0x207 */
> + int ret;
> +
> + if (nlanes != 4 && nlanes != 2 && nlanes != 1) {
> + DRM_DEV_ERROR(mhdp->dev, "invalid number of lanes: %d\n",
> + nlanes);
> + ret = -EINVAL;
> + goto err_adjust_lt;
> + }
> +
> + payload[0] = nlanes;
> + payload[1] = (u8)(udelay >> 8);
> + payload[2] = (u8)udelay;
> +
> + payload[3] = lanes_data[0];
> + if (nlanes > 1)
> + payload[4] = lanes_data[1];
> + if (nlanes > 2) {
> + payload[5] = lanes_data[2];
> + payload[6] = lanes_data[3];
> + }
??? memcpy(payload+3, lanes_data, nlanes); ?
> +
> + ret = cdns_mhdp_mailbox_send(mhdp, MB_MODULE_ID_DP_TX,
> + DPTX_ADJUST_LT,
> + sizeof(payload), payload);
> + if (ret)
> + goto err_adjust_lt;
> +
> + /* Yes, read the DPCD read command response */
> + ret = cdns_mhdp_mailbox_validate_receive(mhdp, MB_MODULE_ID_DP_TX,
> + DPTX_READ_DPCD,
> + sizeof(hdr) + nregs);
> + if (ret)
> + goto err_adjust_lt;
> +
> + ret = cdns_mhdp_mailbox_read_receive(mhdp, hdr, sizeof(hdr));
> + if (ret)
> + goto err_adjust_lt;
> +
> + addr = (hdr[2] << 24) | (hdr[3] << 8) | hdr[4];
again get_unaligned_*
> + if (addr != DP_LANE0_1_STATUS)
> + goto err_adjust_lt;
> +
> + ret = cdns_mhdp_mailbox_read_receive(mhdp, dpcd, nregs);
> +
> +err_adjust_lt:
> + if (ret)
> + DRM_DEV_ERROR(mhdp->dev, "Failed to adjust Link Training.\n");
> +
> + return ret;
> +}
> +EXPORT_SYMBOL(cdns_mhdp_adjust_lt);
Lot of exports here, do we really need them all?
> diff --git a/drivers/gpu/drm/bridge/cdns-mhdp.c b/drivers/gpu/drm/bridge/cdns-mhdp.c
> new file mode 100644
> index 000000000000..a3bbc0e809a5
> --- /dev/null
> +++ b/drivers/gpu/drm/bridge/cdns-mhdp.c
> @@ -0,0 +1,1304 @@
> +// SPDX-License-Identifier: GPL v2
> +/*
> + * Cadence MHDP DP bridge driver.
> + *
> + * Copyright: 2018 Cadence Design Systems, Inc.
> + *
> + * Author: Quentin Schulz <quentin.schulz@free-electrons.com>
> + */
> +
> +#include <linux/clk.h>
> +#include <linux/delay.h>
> +#include <linux/err.h>
> +#include <linux/firmware.h>
> +#include <linux/io.h>
> +#include <linux/iopoll.h>
> +#include <linux/module.h>
> +#include <linux/of.h>
> +#include <linux/platform_device.h>
> +#include <linux/slab.h>
> +
> +#include <drm/drm_atomic_helper.h>
> +#include <drm/drm_bridge.h>
> +#include <drm/drm_connector.h>
> +#include <drm/drm_crtc_helper.h>
> +#include <drm/drm_dp_helper.h>
> +#include <drm/drm_modeset_helper_vtables.h>
> +#include <drm/bridge/cdns-mhdp-common.h>
> +
> +#include <sound/hdmi-codec.h>
> +
> +
> +#define DEBUG_MSG
> +
> +#define FW_NAME "cadence/mhdp8546.bin"
> +
> +#define CDNS_APB_CFG 0x00000
> +#define CDNS_APB_CTRL (CDNS_APB_CFG + 0x00)
> +#define CDNS_MAILBOX_FULL (CDNS_APB_CFG + 0x08)
> +#define CDNS_MAILBOX_EMPTY (CDNS_APB_CFG + 0x0c)
> +#define CDNS_MAILBOX_TX_DATA (CDNS_APB_CFG + 0x10)
> +#define CDNS_MAILBOX_RX_DATA (CDNS_APB_CFG + 0x14)
> +#define CDNS_KEEP_ALIVE (CDNS_APB_CFG + 0x18)
> +#define CDNS_KEEP_ALIVE_MASK GENMASK(7, 0)
> +
> +#define CDNS_SW_CLK_L (CDNS_APB_CFG + 0x3c)
> +#define CDNS_SW_CLK_H (CDNS_APB_CFG + 0x40)
> +#define CDNS_SW_EVENT0 (CDNS_APB_CFG + 0x44)
> +#define CDNS_DPTX_HPD BIT(0)
> +
> +#define CDNS_SW_EVENT1 (CDNS_APB_CFG + 0x48)
> +#define CDNS_SW_EVENT2 (CDNS_APB_CFG + 0x4c)
> +#define CDNS_SW_EVENT3 (CDNS_APB_CFG + 0x50)
> +
> +#define CDNS_DPTX_CAR (CDNS_APB_CFG + 0x904)
> +#define CDNS_VIF_CLK_EN BIT(0)
> +#define CDNS_VIF_CLK_RSTN BIT(1)
> +
> +#define CDNS_SOURCE_VIDEO_INTERFACE 0x00b00
> +#define CDNS_BND_HSYNC2VSYNC (CDNS_SOURCE_VIDEO_INTERFACE + \
> + 0x00)
> +#define CDNS_IP_DTCT_WIN GENMASK(11, 0)
> +#define CDNS_IP_DET_INTERLACE_FORMAT BIT(12)
> +#define CDNS_IP_BYPASS_V_INTERFACE BIT(13)
> +
> +#define CDNS_HSYNC2VSYNC_POL_CTRL (CDNS_SOURCE_VIDEO_INTERFACE + \
> + 0x10)
> +#define CDNS_H2V_HSYNC_POL_ACTIVE_LOW BIT(1)
> +#define CDNS_H2V_VSYNC_POL_ACTIVE_LOW BIT(2)
> +
> +#define CDNS_DPTX_PHY_CONFIG 0x02000
> +#define CDNS_PHY_TRAINING_EN BIT(0)
> +#define CDNS_PHY_TRAINING_TYPE(x) (((x) & GENMASK(3, 0)) << 1)
> +#define CDNS_PHY_SCRAMBLER_BYPASS BIT(5)
> +#define CDNS_PHY_ENCODER_BYPASS BIT(6)
> +#define CDNS_PHY_SKEW_BYPASS BIT(7)
> +#define CDNS_PHY_TRAINING_AUTO BIT(8)
> +#define CDNS_PHY_LANE0_SKEW(x) (((x) & GENMASK(2, 0)) << 9)
> +#define CDNS_PHY_LANE1_SKEW(x) (((x) & GENMASK(2, 0)) << 12)
> +#define CDNS_PHY_LANE2_SKEW(x) (((x) & GENMASK(2, 0)) << 15)
> +#define CDNS_PHY_LANE3_SKEW(x) (((x) & GENMASK(2, 0)) << 18)
> +#define CDNS_PHY_COMMON_CONFIG (CDNS_PHY_LANE1_SKEW(1) | \
> + CDNS_PHY_LANE2_SKEW(2) | \
> + CDNS_PHY_LANE3_SKEW(3))
> +#define CDNS_PHY_10BIT_EN BIT(21)
> +
> +#define CDNS_DPTX_FRAMER 0x02200
> +#define CDNS_DP_FRAMER_GLOBAL_CONFIG (CDNS_DPTX_FRAMER + 0x00)
> +#define CDNS_DP_NUM_LANES(x) (x - 1)
> +#define CDNS_DP_FRAMER_EN BIT(3)
> +#define CDNS_DP_RATE_GOVERNOR_EN BIT(4)
> +#define CDNS_DP_NO_VIDEO_MODE BIT(5)
> +#define CDNS_DP_DISABLE_PHY_RST BIT(6)
> +#define CDNS_DP_WR_FAILING_EDGE_VSYNC BIT(7)
> +
> +#define CDNS_DP_SW_RESET (CDNS_DPTX_FRAMER + 0x04)
> +#define CDNS_DP_FRAMER_TU (CDNS_DPTX_FRAMER + 0x08)
> +#define CDNS_DP_FRAMER_TU_SIZE(x) (((x) & GENMASK(6, 0)) << 8)
> +#define CDNS_DP_FRAMER_TU_VS(x) ((x) & GENMASK(5, 0))
> +#define CDNS_DP_FRAMER_TU_CNT_RST_EN BIT(15)
> +
> +#define CDNS_DPTX_STREAM 0x03000
> +#define CDNS_DP_MSA_HORIZONTAL_0 (CDNS_DPTX_STREAM + 0x00)
> +#define CDNS_DP_MSAH0_H_TOTAL(x) (x)
> +#define CDNS_DP_MSAH0_HSYNC_START(x) ((x) << 16)
> +
> +#define CDNS_DP_MSA_HORIZONTAL_1 (CDNS_DPTX_STREAM + 0x04)
> +#define CDNS_DP_MSAH1_HSYNC_WIDTH(x) (x)
> +#define CDNS_DP_MSAH1_HSYNC_POL_LOW BIT(15)
> +#define CDNS_DP_MSAH1_HDISP_WIDTH(x) ((x) << 16)
> +
> +#define CDNS_DP_MSA_VERTICAL_0 (CDNS_DPTX_STREAM + 0x08)
> +#define CDNS_DP_MSAV0_V_TOTAL(x) (x)
> +#define CDNS_DP_MSAV0_VSYNC_START(x) ((x) << 16)
> +
> +#define CDNS_DP_MSA_VERTICAL_1 (CDNS_DPTX_STREAM + 0x0c)
> +#define CDNS_DP_MSAV1_VSYNC_WIDTH(x) (x)
> +#define CDNS_DP_MSAV1_VSYNC_POL_LOW BIT(15)
> +#define CDNS_DP_MSAV1_VDISP_WIDTH(x) ((x) << 16)
> +
> +#define CDNS_DP_MSA_MISC (CDNS_DPTX_STREAM + 0x10)
> +#define CDNS_DP_STREAM_CONFIG (CDNS_DPTX_STREAM + 0x14)
> +#define CDNS_DP_RATE_GOVERNOR_STATUS (CDNS_DPTX_STREAM + 0x2c)
> +#define CDNS_DP_RG_TU_VS_DIFF(x) ((x) << 8)
> +
> +#define CDNS_DP_HORIZONTAL (CDNS_DPTX_STREAM + 0x30)
> +#define CDNS_DP_H_HSYNC_WIDTH(x) (x)
> +#define CDNS_DP_H_H_TOTAL(x) ((x) << 16)
> +
> +#define CDNS_DP_VERTICAL_0 (CDNS_DPTX_STREAM + 0x34)
> +#define CDNS_DP_V0_VHEIGHT(x) (x)
> +#define CDNS_DP_V0_VSTART(x) ((x) << 16)
> +
> +#define CDNS_DP_VERTICAL_1 (CDNS_DPTX_STREAM + 0x38)
> +#define CDNS_DP_V1_VTOTAL(x) (x)
> +#define CDNS_DP_V1_VTOTAL_EVEN BIT(16)
> +
> +#define CDNS_DP_FRAMER_PXL_REPR (CDNS_DPTX_STREAM + 0x4c)
> +#define CDNS_DP_FRAMER_6_BPC BIT(0)
> +#define CDNS_DP_FRAMER_8_BPC BIT(1)
> +#define CDNS_DP_FRAMER_10_BPC BIT(2)
> +#define CDNS_DP_FRAMER_12_BPC BIT(3)
> +#define CDNS_DP_FRAMER_16_BPC BIT(4)
> +#define CDNS_DP_FRAMER_PXL_FORMAT 0x8
> +#define CDNS_DP_FRAMER_RGB BIT(0)
> +#define CDNS_DP_FRAMER_YCBCR444 BIT(1)
> +#define CDNS_DP_FRAMER_YCBCR422 BIT(2)
> +#define CDNS_DP_FRAMER_YCBCR420 BIT(3)
> +#define CDNS_DP_FRAMER_Y_ONLY BIT(4)
> +
> +#define CDNS_DP_FRAMER_SP (CDNS_DPTX_STREAM + 0x10)
> +#define CDNS_DP_FRAMER_VSYNC_POL_LOW BIT(0)
> +#define CDNS_DP_FRAMER_HSYNC_POL_LOW BIT(1)
> +#define CDNS_DP_FRAMER_INTERLACE BIT(2)
> +
> +#define CDNS_DP_LINE_THRESH (CDNS_DPTX_STREAM + 0x64)
> +#define CDNS_DP_VB_ID (CDNS_DPTX_STREAM + 0x68)
> +#define CDNS_DP_VB_ID_INTERLACED BIT(2)
> +
> +#define CDNS_DP_FRONT_BACK_PORCH (CDNS_DPTX_STREAM + 0x78)
> +#define CDNS_DP_BACK_PORCH(x) (x)
> +#define CDNS_DP_FRONT_PORCH(x) ((x) << 16)
> +
> +#define CDNS_DP_BYTE_COUNT (CDNS_DPTX_STREAM + 0x7c)
> +
> +#define CDNS_DPTX_GLOBAL 0x02300
> +#define CDNS_DP_LANE_EN (CDNS_DPTX_GLOBAL + 0x00)
> +#define CDNS_DP_LANE_EN_LANES(x) GENMASK(x - 1, 0)
> +#define CDNS_DP_ENHNCD (CDNS_DPTX_GLOBAL + 0x04)
> +
> +#define CDNS_MHDP_IMEM 0x10000
> +#define CDNS_MHDP_DMEM 0x20000
> +
> +#define CDNS_DP_TRAINING_PATTERN_4 0x7
> +
> +/* 3min delay because of EDID mb being VERY slow */
> +/* FIXME: should be >615000 when upstreaming */
> +#define CDNS_TIMEOUT_MAILBOX (1000 * 1000 * 60 * 3)
> +
> +/* FIXME: Should be 2000 */
> +#define CDNS_KEEP_ALIVE_TIMEOUT 40000
> +#define CDNS_SW_EVENT0_TIMEOUT 40000
> +
> +static const struct of_device_id mhdp_ids[] = {
> + { .compatible = "cdns,mhdp8546", },
> + { /* sentinel */ }
> +};
> +MODULE_DEVICE_TABLE(of, mhdp_ids);
> +
> +#define CDNS_LANE_1 BIT(0)
> +#define CDNS_LANE_2 BIT(1)
> +#define CDNS_LANE_4 BIT(2)
> +#define CDNS_SSC BIT(3)
> +#define CDNS_SCRAMBLER BIT(4)
> +
> +#define CDNS_VOLT_SWING(x) ((x) & GENMASK(1, 0))
> +#define CDNS_FORCE_VOLT_SWING BIT(2)
> +
> +#define CDNS_PRE_EMPHASIS(x) ((x) & GENMASK(1, 0))
> +#define CDNS_FORCE_PRE_EMPHASIS BIT(2)
> +
> +#define CDNS_SUPPORT_TPS(x) BIT((x) - 1)
> +
> +#define CDNS_FAST_LINK_TRAINING BIT(0)
> +
> +#define CDNS_LANE_MAPPING_TYPE_C_LANE_0(x) ((x) & GENMASK(1, 0))
> +#define CDNS_LANE_MAPPING_TYPE_C_LANE_1(x) ((x) & GENMASK(3, 2))
> +#define CDNS_LANE_MAPPING_TYPE_C_LANE_2(x) ((x) & GENMASK(5, 4))
> +#define CDNS_LANE_MAPPING_TYPE_C_LANE_3(x) ((x) & GENMASK(7, 6))
> +#define CDNS_LANE_MAPPING_NORMAL 0xe4
> +#define CDNS_LANE_MAPPING_FLIPPED 0x1b
> +
> +#define CDNS_DP_MAX_NUM_LANES 4
> +#define CDNS_DP_TEST_VSC_SDP (1 << 6) /* 1.3+ */
> +#define CDNS_DP_TEST_COLOR_FORMAT_RAW_Y_ONLY (1 << 7)
> +
> +static inline struct cdns_mhdp_device *connector_to_mhdp(
> + struct drm_connector *conn)
> +{
> + return container_of(conn, struct cdns_mhdp_device, connector);
> +}
> +
> +static inline struct cdns_mhdp_device *bridge_to_mhdp(
> + struct drm_bridge *bridge)
> +{
> + return container_of(bridge, struct cdns_mhdp_device, bridge);
> +}
> +
> +static unsigned int max_link_rate(struct cdns_mhdp_host host,
> + struct cdns_mhdp_sink sink)
> +{
> + return min(host.link_rate, sink.link_rate);
> +}
> +
> +static u8 eq_training_pattern_supported(struct cdns_mhdp_host host,
> + struct cdns_mhdp_sink sink)
> +{
> + return fls(host.pattern_supp & sink.pattern_supp);
> +}
> +
> +static ssize_t mhdp_transfer(struct drm_dp_aux *aux,
> + struct drm_dp_aux_msg *msg)
> +{
> + struct cdns_mhdp_device *mhdp = dev_get_drvdata(aux->dev);
> + int ret;
> +
> + if (msg->request != DP_AUX_NATIVE_WRITE &&
> + msg->request != DP_AUX_NATIVE_READ)
> + return -ENOTSUPP;
> +
> + if (msg->request == DP_AUX_NATIVE_WRITE) {
> + int i;
> +
> + for (i = 0; i < msg->size; ++i) {
> + ret = cdns_mhdp_dpcd_write(mhdp,
> + msg->address + i,
> + *((u8 *)msg->buffer + i));
Maybe alias would be more readable:
const u8 *buf = msg->buffer;
...
ret = cdns_mhdp_dpcd_write(mhdp, msg->address + i, buf[i]);
> + if (!ret)
> + continue;
> +
> + DRM_DEV_ERROR(mhdp->dev, "Failed to write DPCD\n");
> +
> + return i;
Here you return number of bytes transfered, and drops error code. It
would be good if somebody confirms it is correctly implemented
aux.transfer error handling. Docs says:
"Upon success, the implementation should return the number of payload
bytes that were transferred, or a negative error-code on failure." - I
would not call this situation success, but maybe I am wrong.
> + }
> + } else {
> + ret = cdns_mhdp_dpcd_read(mhdp, msg->address,
> + msg->buffer, msg->size);
> + if (ret) {
> + DRM_DEV_ERROR(mhdp->dev, "Failed to read DPCD\n");
> + return 0;
> + }
> + }
> +
> + return msg->size;
> +}
> +
> +static int cdns_mhdp_get_modes(struct drm_connector *connector)
> +{
> + struct cdns_mhdp_device *mhdp = connector_to_mhdp(connector);
> + struct edid *edid;
> + int num_modes;
> +
> + edid = drm_do_get_edid(connector, cdns_mhdp_get_edid_block, mhdp);
> +
> + drm_connector_update_edid_property(connector, edid);
> +
> + num_modes = drm_add_edid_modes(connector, edid);
Shouldn't edid be released?
> +
> + return num_modes;
> +}
> +
> +static const struct drm_connector_helper_funcs cdns_mhdp_conn_helper_funcs = {
> + .get_modes = cdns_mhdp_get_modes,
> +};
> +
> +static enum drm_connector_status cdns_mhdp_detect(struct drm_connector *conn,
> + bool force)
> +{
> + struct cdns_mhdp_device *mhdp = connector_to_mhdp(conn);
> + enum drm_connector_status status = connector_status_disconnected;
> + int ret;
> +
> + ret = cdns_mhdp_get_hpd_status(mhdp);
> + if (ret > 0)
> + status = connector_status_connected;
> + else if (ret < 0)
> + dev_err(mhdp->dev, "Failed to obtain HPD state\n");
> +
> + return status;
??? ??? ??? if (ret > 0)
??? ??? ??? ??? return connector_status_connected;
??? ??? ??? if (ret < 0)
??? ??? ??? ??? dev_err(mhdp->dev, "Failed to obtain HPD state\n");
??? ??? ??? return connector_status_disconnected;
> +}
> +
> +static const struct drm_connector_funcs cdns_mhdp_conn_funcs = {
> + .fill_modes = drm_helper_probe_single_connector_modes,
> + .atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state,
> + .atomic_destroy_state = drm_atomic_helper_connector_destroy_state,
> + .reset = drm_atomic_helper_connector_reset,
> + .destroy = drm_connector_cleanup,
> + .dpms = drm_helper_connector_dpms,
> + .detect = cdns_mhdp_detect,
> +};
> +
> +static int cdns_mhdp_attach(struct drm_bridge *bridge)
> +{
> + struct cdns_mhdp_device *mhdp = bridge_to_mhdp(bridge);
> + struct drm_connector *conn = &mhdp->connector;
> + int ret;
> +
> + conn->polled = DRM_CONNECTOR_POLL_CONNECT |
> + DRM_CONNECTOR_POLL_DISCONNECT;
> +
> + ret = drm_connector_init(bridge->dev, conn, &cdns_mhdp_conn_funcs,
> + DRM_MODE_CONNECTOR_DisplayPort);
> + if (ret) {
> + dev_err(mhdp->dev, "failed to init connector\n");
> + return ret;
> + }
> +
> + drm_connector_helper_add(conn, &cdns_mhdp_conn_helper_funcs);
> +
> + ret = drm_connector_attach_encoder(conn, bridge->encoder);
> + if (ret) {
> + dev_err(mhdp->dev, "failed to attach connector to encoder\n");
> + return ret;
> + }
> +
> + return 0;
> +}
> +
> +enum pixel_format {
> + PIXEL_FORMAT_RGB = 1,
> + PIXEL_FORMAT_YCBCR_444 = 2,
> + PIXEL_FORMAT_YCBCR_422 = 4,
> + PIXEL_FORMAT_YCBCR_420 = 8,
> + PIXEL_FORMAT_Y_ONLY = 16,
> +};
> +
> +static void mhdp_link_training_init(struct cdns_mhdp_device *mhdp)
> +{
> + u32 reg32;
> +
> + drm_dp_dpcd_writeb(&mhdp->aux, DP_TRAINING_PATTERN_SET,
> + DP_TRAINING_PATTERN_DISABLE);
> +
> + /* Reset PHY configuration */
> + reg32 = CDNS_PHY_COMMON_CONFIG | CDNS_PHY_TRAINING_TYPE(1);
> + if (!(mhdp->host.lanes_cnt & CDNS_SCRAMBLER))
> + reg32 |= CDNS_PHY_SCRAMBLER_BYPASS;
> +
> + cdns_mhdp_reg_write(mhdp, CDNS_DPTX_PHY_CONFIG, reg32);
> +
> + cdns_mhdp_reg_write(mhdp, CDNS_DP_ENHNCD,
> + mhdp->sink.enhanced & mhdp->host.enhanced);
> +
> + cdns_mhdp_reg_write(mhdp, CDNS_DP_LANE_EN,
> + CDNS_DP_LANE_EN_LANES(mhdp->link.num_lanes));
> +
> + drm_dp_link_configure(&mhdp->aux, &mhdp->link);
> +
> + cdns_mhdp_reg_write(mhdp, CDNS_DPTX_PHY_CONFIG,
> + CDNS_PHY_COMMON_CONFIG |
> + CDNS_PHY_TRAINING_EN |
> + CDNS_PHY_TRAINING_TYPE(1) |
> + CDNS_PHY_SCRAMBLER_BYPASS);
> +
> + drm_dp_dpcd_writeb(&mhdp->aux, DP_TRAINING_PATTERN_SET,
> + DP_TRAINING_PATTERN_1 | DP_LINK_SCRAMBLING_DISABLE);
> +}
> +
> +static void mhdp_get_adjust_train(struct cdns_mhdp_device *mhdp,
> + u8 link_status[DP_LINK_STATUS_SIZE],
> + u8 lanes_data[CDNS_DP_MAX_NUM_LANES])
> +{
> + unsigned int i;
> + u8 adjust, max_pre_emphasis, max_volt_swing;
> +
> + max_pre_emphasis = CDNS_PRE_EMPHASIS(mhdp->host.pre_emphasis)
> + << DP_TRAIN_PRE_EMPHASIS_SHIFT;
> + max_volt_swing = CDNS_VOLT_SWING(mhdp->host.volt_swing);
> +
> + for (i = 0; i < mhdp->link.num_lanes; i++) {
> + adjust = drm_dp_get_adjust_request_voltage(link_status, i);
> + lanes_data[i] = min_t(u8, adjust, max_volt_swing);
> + if (lanes_data[i] != adjust)
> + lanes_data[i] |= DP_TRAIN_MAX_SWING_REACHED;
> +
> + adjust = drm_dp_get_adjust_request_pre_emphasis(link_status, i);
> + lanes_data[i] |= min_t(u8, adjust, max_pre_emphasis);
> + if ((lanes_data[i] >> DP_TRAIN_PRE_EMPHASIS_SHIFT) != adjust)
> + lanes_data[i] |= DP_TRAIN_MAX_PRE_EMPHASIS_REACHED;
> + }
> +}
> +
> +static void mhdp_set_adjust_request_voltage(
> + u8 link_status[DP_LINK_STATUS_SIZE], int lane, u8 volt)
> +{
> + int i = DP_ADJUST_REQUEST_LANE0_1 + (lane >> 1);
> + int s = ((lane & 1) ?
> + DP_ADJUST_VOLTAGE_SWING_LANE1_SHIFT :
> + DP_ADJUST_VOLTAGE_SWING_LANE0_SHIFT);
> + int idx = i - DP_LANE0_1_STATUS;
> +
> + link_status[idx] &= ~(DP_ADJUST_VOLTAGE_SWING_LANE0_MASK << s);
> + link_status[idx] |= volt << s;
> +}
> +
> +static void mhdp_set_adjust_request_pre_emphasis(
> + u8 link_status[DP_LINK_STATUS_SIZE], int lane, u8 pre_emphasis)
> +{
> + int i = DP_ADJUST_REQUEST_LANE0_1 + (lane >> 1);
> + int s = ((lane & 1) ?
> + DP_ADJUST_PRE_EMPHASIS_LANE1_SHIFT :
> + DP_ADJUST_PRE_EMPHASIS_LANE0_SHIFT);
> + int idx = i - DP_LANE0_1_STATUS;
> +
> + link_status[idx] &= ~(DP_ADJUST_PRE_EMPHASIS_LANE0_MASK << s);
> + link_status[idx] |= pre_emphasis << s;
> +}
> +
> +static void mhdp_adjust_requested_eq(struct cdns_mhdp_device *mhdp,
> + u8 link_status[DP_LINK_STATUS_SIZE])
> +{
> + unsigned int i;
> + u8 pre, volt, max_pre = CDNS_VOLT_SWING(mhdp->host.volt_swing),
> + max_volt = CDNS_PRE_EMPHASIS(mhdp->host.pre_emphasis);
> +
> + for (i = 0; i < mhdp->link.num_lanes; i++) {
> + volt = drm_dp_get_adjust_request_voltage(link_status, i);
> + pre = drm_dp_get_adjust_request_pre_emphasis(link_status, i);
> + if (volt + pre > 3)
> + mhdp_set_adjust_request_voltage(link_status, i,
> + 3 - pre);
> + if (mhdp->host.volt_swing & CDNS_FORCE_VOLT_SWING)
> + mhdp_set_adjust_request_voltage(link_status, i,
> + max_volt);
> + if (mhdp->host.pre_emphasis & CDNS_FORCE_PRE_EMPHASIS)
> + mhdp_set_adjust_request_pre_emphasis(link_status, i,
> + max_pre);
> + }
> +}
> +
> +static bool mhdp_link_training_channel_eq(struct cdns_mhdp_device *mhdp,
> + u8 eq_tps,
> + unsigned int training_interval)
> +{
> + u8 lanes_data[CDNS_DP_MAX_NUM_LANES], fail_counter_short = 0;
> + u8 dpcd[DP_LINK_STATUS_SIZE];
> + u32 reg32;
> +
> + dev_dbg(mhdp->dev, "Link training - Starting EQ phase\n");
> +
> + /* Enable link training TPS[eq_tps] in PHY */
> + reg32 = CDNS_PHY_COMMON_CONFIG | CDNS_PHY_TRAINING_EN |
> + CDNS_PHY_TRAINING_TYPE(eq_tps);
> + if (eq_tps != 4)
> + reg32 |= CDNS_PHY_SCRAMBLER_BYPASS;
> + cdns_mhdp_reg_write(mhdp, CDNS_DPTX_PHY_CONFIG, reg32);
> +
> + drm_dp_dpcd_writeb(&mhdp->aux, DP_TRAINING_PATTERN_SET,
> + (eq_tps != 4) ? eq_tps | DP_LINK_SCRAMBLING_DISABLE :
> + CDNS_DP_TRAINING_PATTERN_4);
> +
> + drm_dp_dpcd_read_link_status(&mhdp->aux, dpcd);
> +
> + do {
> + mhdp_get_adjust_train(mhdp, dpcd, lanes_data);
> +
> + cdns_mhdp_adjust_lt(mhdp, mhdp->link.num_lanes,
> + training_interval, lanes_data, dpcd);
> +
> + if (!drm_dp_clock_recovery_ok(dpcd, mhdp->link.num_lanes))
> + goto err;
> +
> + if (drm_dp_channel_eq_ok(dpcd, mhdp->link.num_lanes)) {
> + dev_dbg(mhdp->dev,
> + "Link training: EQ phase succeeded\n");
> + return true;
> + }
> +
> + fail_counter_short++;
> +
> + mhdp_adjust_requested_eq(mhdp, dpcd);
> + } while (fail_counter_short < 5);
> +
> +err:
> + dev_dbg(mhdp->dev,
> + "Link training - EQ phase failed for %d lanes and %d rate\n",
> + mhdp->link.num_lanes, mhdp->link.rate);
> +
> + return false;
> +}
> +
> +static void mhdp_adjust_requested_cr(struct cdns_mhdp_device *mhdp,
> + u8 link_status[DP_LINK_STATUS_SIZE],
> + u8 *req_volt, u8 *req_pre)
> +{
> + unsigned int i, max_volt = CDNS_VOLT_SWING(mhdp->host.volt_swing),
> + max_pre = CDNS_PRE_EMPHASIS(mhdp->host.pre_emphasis);
> +
> + for (i = 0; i < mhdp->link.num_lanes; i++) {
> + if (mhdp->host.volt_swing & CDNS_FORCE_VOLT_SWING)
> + mhdp_set_adjust_request_voltage(link_status, i,
> + max_volt);
> + else
> + mhdp_set_adjust_request_voltage(link_status, i,
> + req_volt[i]);
> +
> + if (mhdp->host.pre_emphasis & CDNS_FORCE_PRE_EMPHASIS)
> + mhdp_set_adjust_request_pre_emphasis(link_status, i,
> + max_pre);
> + else
> + mhdp_set_adjust_request_pre_emphasis(link_status, i,
> + req_pre[i]);
> + }
> +}
> +
> +static void mhdp_validate_cr(struct cdns_mhdp_device *mhdp, bool *cr_done,
> + bool *same_before_adjust, bool *max_swing_reached,
> + u8 before_cr[DP_LINK_STATUS_SIZE],
> + u8 after_cr[DP_LINK_STATUS_SIZE], u8 *req_volt,
> + u8 *req_pre)
> +{
> + unsigned int i;
> + u8 tmp, max_volt = CDNS_VOLT_SWING(mhdp->host.volt_swing),
> + max_pre = CDNS_PRE_EMPHASIS(mhdp->host.pre_emphasis);
> + bool same_pre, same_volt;
> +
> + *same_before_adjust = false;
> + *max_swing_reached = false;
> + *cr_done = drm_dp_clock_recovery_ok(after_cr, mhdp->link.num_lanes);
> +
> + for (i = 0; i < mhdp->link.num_lanes; i++) {
> + tmp = drm_dp_get_adjust_request_voltage(after_cr, i);
> + req_volt[i] = min_t(u8, tmp, max_volt);
> +
> + tmp = drm_dp_get_adjust_request_pre_emphasis(after_cr, i) >>
> + DP_TRAIN_PRE_EMPHASIS_SHIFT;
> + req_pre[i] = min_t(u8, tmp, max_pre);
> +
> + same_pre = (before_cr[i] & DP_TRAIN_PRE_EMPHASIS_MASK) ==
> + (req_pre[i] << DP_TRAIN_PRE_EMPHASIS_SHIFT);
> + same_volt = (before_cr[i] & DP_TRAIN_VOLTAGE_SWING_MASK) ==
> + req_volt[i];
> + if (same_pre && same_volt)
> + *same_before_adjust = true;
> +
> + /* 3.1.5.2 in DP Standard v1.4. Table 3-1 */
> + if (!*cr_done && req_volt[i] + req_pre[i] >= 3) {
> + *max_swing_reached = true;
> + return;
> + }
> + }
> +}
> +
> +static bool mhdp_link_training_clock_recovery(struct cdns_mhdp_device *mhdp)
> +{
> + u8 lanes_data[CDNS_DP_MAX_NUM_LANES], fail_counter_short = 0,
> + fail_counter_cr_long = 0;
> + u8 dpcd[DP_LINK_STATUS_SIZE];
> + bool cr_done;
> +
> + dev_dbg(mhdp->dev, "Link training starting CR phase\n");
> +
> + mhdp_link_training_init(mhdp);
> +
> + drm_dp_dpcd_read_link_status(&mhdp->aux, dpcd);
> +
> + do {
> + u8 requested_adjust_volt_swing[CDNS_DP_MAX_NUM_LANES] = {},
> + requested_adjust_pre_emphasis[CDNS_DP_MAX_NUM_LANES] = {};
> + bool same_before_adjust, max_swing_reached;
> +
> + mhdp_get_adjust_train(mhdp, dpcd, lanes_data);
> +
> + cdns_mhdp_adjust_lt(mhdp, mhdp->link.num_lanes, 100,
> + lanes_data, dpcd);
> +
> + mhdp_validate_cr(mhdp, &cr_done, &same_before_adjust,
> + &max_swing_reached, lanes_data, dpcd,
> + requested_adjust_volt_swing,
> + requested_adjust_pre_emphasis);
> +
> + if (max_swing_reached)
> + goto err;
> +
> + if (cr_done) {
> + dev_dbg(mhdp->dev,
> + "Link training: CR phase succeeded\n");
> + return true;
> + }
> +
> + /* Not all CR_DONE bits set */
> + fail_counter_cr_long++;
> +
> + if (same_before_adjust) {
> + fail_counter_short++;
> + continue;
> + }
> +
> + fail_counter_short = 0;
> + /*
> + * Voltage swing/pre-emphasis adjust requested
> + * during CR phase
> + */
> + mhdp_adjust_requested_cr(mhdp, dpcd,
> + requested_adjust_volt_swing,
> + requested_adjust_pre_emphasis);
> + } while (fail_counter_short < 5 && fail_counter_cr_long < 10);
> +
> +err:
> + dev_dbg(mhdp->dev,
> + "Link training: CR phase failed for %d lanes and %d rate\n",
> + mhdp->link.num_lanes, mhdp->link.rate);
> +
> + return false;
> +}
> +
> +static void lower_link_rate(struct drm_dp_link *link)
> +{
> + switch (drm_dp_link_rate_to_bw_code(link->rate)) {
> + case DP_LINK_BW_2_7:
> + link->rate = drm_dp_bw_code_to_link_rate(DP_LINK_BW_1_62);
> + break;
> + case DP_LINK_BW_5_4:
> + link->rate = drm_dp_bw_code_to_link_rate(DP_LINK_BW_2_7);
> + break;
> + case DP_LINK_BW_8_1:
> + link->rate = drm_dp_bw_code_to_link_rate(DP_LINK_BW_5_4);
> + break;
> + }
> +}
Quite subotpimal code conversion from rates to bw_code and then back.
I suspect the link training code across whole drms is waiting for
generic helpers and refactoring.
> +
> +static int mhdp_link_training(struct cdns_mhdp_device *mhdp,
> + unsigned int video_mode,
> + unsigned int training_interval)
> +{
> + u32 reg32;
> + u8 eq_tps = eq_training_pattern_supported(mhdp->host, mhdp->sink);
> +
> + while (1) {
> + if (!mhdp_link_training_clock_recovery(mhdp)) {
> + if (drm_dp_link_rate_to_bw_code(mhdp->link.rate) !=
> + DP_LINK_BW_1_62) {
> + dev_dbg(mhdp->dev,
> + "Reducing link rate during CR phase\n");
> + lower_link_rate(&mhdp->link);
> + drm_dp_link_configure(&mhdp->aux, &mhdp->link);
> +
> + continue;
> + } else if (mhdp->link.num_lanes > 1) {
> + dev_dbg(mhdp->dev,
> + "Reducing lanes number during CR phase\n");
> + mhdp->link.num_lanes >>= 1;
> + mhdp->link.rate = max_link_rate(mhdp->host,
> + mhdp->sink);
> + drm_dp_link_configure(&mhdp->aux, &mhdp->link);
> +
> + continue;
> + }
> +
> + dev_dbg(mhdp->dev,
> + "Link training failed during CR phase\n");
> + goto err;
> + }
> +
> + if (mhdp_link_training_channel_eq(mhdp, eq_tps,
> + training_interval))
> + break;
> +
> + if (mhdp->link.num_lanes > 1) {
> + dev_dbg(mhdp->dev,
> + "Reducing lanes number during EQ phase\n");
> + mhdp->link.num_lanes >>= 1;
> + drm_dp_link_configure(&mhdp->aux, &mhdp->link);
> +
> + continue;
> + } else if (drm_dp_link_rate_to_bw_code(mhdp->link.rate) !=
> + DP_LINK_BW_1_62) {
> + dev_dbg(mhdp->dev,
> + "Reducing link rate during EQ phase\n");
> + lower_link_rate(&mhdp->link);
> + drm_dp_link_configure(&mhdp->aux, &mhdp->link);
> +
> + continue;
> + }
> +
> + dev_dbg(mhdp->dev, "Link training failed during EQ phase\n");
> + goto err;
> + }
> +
> + dev_dbg(mhdp->dev, "Link training successful\n");
> +
> + drm_dp_dpcd_writeb(&mhdp->aux, DP_TRAINING_PATTERN_SET,
> + (mhdp->host.lanes_cnt & CDNS_SCRAMBLER) ? 0 :
> + DP_LINK_SCRAMBLING_DISABLE);
> +
> + /* SW reset DPTX framer */
> + cdns_mhdp_reg_write(mhdp, CDNS_DP_SW_RESET, 1);
> + cdns_mhdp_reg_write(mhdp, CDNS_DP_SW_RESET, 0);
> +
> + /* Enable framer */
> + /* FIXME: update when MST supported, BIT(2) */
> + cdns_mhdp_reg_write(mhdp, CDNS_DP_FRAMER_GLOBAL_CONFIG,
> + CDNS_DP_FRAMER_EN |
> + CDNS_DP_NUM_LANES(mhdp->link.num_lanes) |
> + CDNS_DP_DISABLE_PHY_RST |
> + CDNS_DP_WR_FAILING_EDGE_VSYNC |
> + (!video_mode ? CDNS_DP_NO_VIDEO_MODE : 0));
> +
> + /* Reset PHY config */
> + reg32 = CDNS_PHY_COMMON_CONFIG | CDNS_PHY_TRAINING_TYPE(1);
> + if (!(mhdp->host.lanes_cnt & CDNS_SCRAMBLER))
> + reg32 |= CDNS_PHY_SCRAMBLER_BYPASS;
> + cdns_mhdp_reg_write(mhdp, CDNS_DPTX_PHY_CONFIG, reg32);
> +
> + return 0;
> +err:
> + /* Reset PHY config */
> + reg32 = CDNS_PHY_COMMON_CONFIG | CDNS_PHY_TRAINING_TYPE(1);
> + if (!(mhdp->host.lanes_cnt & CDNS_SCRAMBLER))
> + reg32 |= CDNS_PHY_SCRAMBLER_BYPASS;
> + cdns_mhdp_reg_write(mhdp, CDNS_DPTX_PHY_CONFIG, reg32);
> +
> + drm_dp_dpcd_writeb(&mhdp->aux, DP_TRAINING_PATTERN_SET,
> + DP_TRAINING_PATTERN_DISABLE);
> +
> + return -EIO;
> +}
> +
> +static void cdns_mhdp_disable(struct drm_bridge *bridge)
> +{
> + struct cdns_mhdp_device *mhdp = bridge_to_mhdp(bridge);
> +
> + cdns_mhdp_set_video_status(mhdp, 0);
> +
> + drm_dp_link_power_down(&mhdp->aux, &mhdp->link);
> +}
> +
> +static void cdns_mhdp_enable(struct drm_bridge *bridge)
> +{
> + struct cdns_mhdp_device *mhdp = bridge_to_mhdp(bridge);
> + struct drm_display_mode *mode;
> + struct drm_display_info *disp_info = &mhdp->connector.display_info;
> + enum pixel_format pxlfmt;
> + int pxlclock;
> + unsigned int rate, tu_size = 30, vs, vs_f, bpp, required_bandwidth,
> + available_bandwidth, dp_framer_sp = 0, msa_horizontal_1,
> + msa_vertical_1, bnd_hsync2vsync, hsync2vsync_pol_ctrl,
> + misc0 = 0, misc1 = 0, line_thresh = 0, pxl_repr,
> + front_porch, back_porch, msa_h0, msa_v0, hsync, vsync,
> + dp_vertical_1, line_thresh1, line_thresh2;
> + u32 resp;
Number of variables and number of lines in the function suggests it
should be split.
> +
> + unsigned int size = DP_RECEIVER_CAP_SIZE, dp_framer_global_config,
> + video_mode, training_interval_us;
> + u8 reg0[size], reg8, amp[2];
> +
> + mode = &bridge->encoder->crtc->state->adjusted_mode;
> + pxlclock = mode->crtc_clock;
> +
> + /*
> + * Upon power-on reset/device disconnection: [2:0] bits should be 0b001
> + * and [7:5] bits 0b000.
> + */
> + drm_dp_dpcd_writeb(&mhdp->aux, DP_SET_POWER, 1);
> +
> + drm_dp_link_probe(&mhdp->aux, &mhdp->link);
> +
> + dev_dbg(mhdp->dev, "Set sink device power state via DPCD\n");
> + drm_dp_link_power_up(&mhdp->aux, &mhdp->link);
> + /* FIXME (CDNS): do we have to wait for 100ms before going on? */
> + mdelay(100);
> +
> + mhdp->sink.link_rate = mhdp->link.rate;
> + mhdp->sink.lanes_cnt = mhdp->link.num_lanes;
> + mhdp->sink.enhanced = !!(mhdp->link.capabilities &
> + DP_LINK_CAP_ENHANCED_FRAMING);
> +
> + drm_dp_dpcd_read(&mhdp->aux, DP_DPCD_REV, reg0, size);
> +
> + mhdp->sink.pattern_supp = CDNS_SUPPORT_TPS(1) | CDNS_SUPPORT_TPS(2);
> + if (drm_dp_tps3_supported(reg0))
> + mhdp->sink.pattern_supp |= CDNS_SUPPORT_TPS(3);
> + if (drm_dp_tps4_supported(reg0))
> + mhdp->sink.pattern_supp |= CDNS_SUPPORT_TPS(4);
> +
> + mhdp->sink.fast_link = !!(reg0[DP_MAX_DOWNSPREAD] &
> + DP_NO_AUX_HANDSHAKE_LINK_TRAINING);
> +
> + mhdp->link.rate = max_link_rate(mhdp->host, mhdp->sink);
> + mhdp->link.num_lanes = min_t(u8, mhdp->sink.lanes_cnt,
> + mhdp->host.lanes_cnt & GENMASK(2, 0));
> +
> + reg8 = reg0[DP_TRAINING_AUX_RD_INTERVAL] &
> + DP_TRAINING_AUX_RD_MASK;
> + switch (reg8) {
> + case 0:
> + training_interval_us = 400;
> + break;
> + case 1:
> + case 2:
> + case 3:
> + case 4:
> + training_interval_us = 4000 << (reg8 - 1);
> + break;
> + default:
> + dev_err(mhdp->dev,
> + "wrong training interval returned by DPCD: %d\n", reg8);
> + return;
> + }
> +
> + cdns_mhdp_reg_read(mhdp, CDNS_DP_FRAMER_GLOBAL_CONFIG, &resp);
> +
> + dp_framer_global_config = be32_to_cpu(resp);
> +
> + video_mode = !(dp_framer_global_config & CDNS_DP_NO_VIDEO_MODE);
> +
> + if (dp_framer_global_config & CDNS_DP_FRAMER_EN)
> + cdns_mhdp_reg_write(mhdp, CDNS_DP_FRAMER_GLOBAL_CONFIG,
> + dp_framer_global_config &
> + ~CDNS_DP_FRAMER_EN);
> +
> + /* Spread AMP if required, enable 8b/10b coding */
> + amp[0] = (mhdp->host.lanes_cnt & CDNS_SSC) ? DP_SPREAD_AMP_0_5 : 0;
> + amp[1] = DP_SET_ANSI_8B10B;
> + drm_dp_dpcd_write(&mhdp->aux, DP_DOWNSPREAD_CTRL, amp, 2);
> +
> + if (mhdp->host.fast_link & mhdp->sink.fast_link) {
> + /* FIXME: implement fastlink */
> + dev_dbg(mhdp->dev, "fastlink\n");
> + } else {
> + if (mhdp_link_training(mhdp, video_mode,
> + training_interval_us)) {
> + dev_err(mhdp->dev, "Link training failed. Exiting.\n");
> + return;
> + }
> + }
> +
> + rate = mhdp->link.rate / 1000;
> +
> + /* FIXME: what about Y_ONLY? how is it handled in the kernel? */
> + if (disp_info->color_formats & DRM_COLOR_FORMAT_YCRCB444)
> + pxlfmt = PIXEL_FORMAT_YCBCR_444;
> + else if (disp_info->color_formats & DRM_COLOR_FORMAT_YCRCB422)
> + pxlfmt = PIXEL_FORMAT_YCBCR_422;
> + else if (disp_info->color_formats & DRM_COLOR_FORMAT_YCRCB420)
> + pxlfmt = PIXEL_FORMAT_YCBCR_420;
> + else
> + pxlfmt = PIXEL_FORMAT_RGB;
> +
> + /* if YCBCR supported and stream not SD, use ITU709 */
> + /* FIXME: handle ITU version with YCBCR420 when supported */
> + if ((pxlfmt == PIXEL_FORMAT_YCBCR_444 ||
> + pxlfmt == PIXEL_FORMAT_YCBCR_422) && mode->crtc_vdisplay >= 720)
> + misc0 = DP_YCBCR_COEFFICIENTS_ITU709;
> +
> + switch (pxlfmt) {
> + case PIXEL_FORMAT_RGB:
> + bpp = disp_info->bpc * 3;
> + pxl_repr = CDNS_DP_FRAMER_RGB << CDNS_DP_FRAMER_PXL_FORMAT;
> + misc0 |= DP_COLOR_FORMAT_RGB;
> + break;
> + case PIXEL_FORMAT_YCBCR_444:
> + bpp = disp_info->bpc * 3;
> + pxl_repr = CDNS_DP_FRAMER_YCBCR444 << CDNS_DP_FRAMER_PXL_FORMAT;
> + misc0 |= DP_COLOR_FORMAT_YCbCr444 | DP_TEST_DYNAMIC_RANGE_CEA;
> + break;
> + case PIXEL_FORMAT_YCBCR_422:
> + bpp = disp_info->bpc * 2;
> + pxl_repr = CDNS_DP_FRAMER_YCBCR422 << CDNS_DP_FRAMER_PXL_FORMAT;
> + misc0 |= DP_COLOR_FORMAT_YCbCr422 | DP_TEST_DYNAMIC_RANGE_CEA;
> + break;
> + case PIXEL_FORMAT_YCBCR_420:
> + bpp = disp_info->bpc * 3 / 2;
> + pxl_repr = CDNS_DP_FRAMER_YCBCR420 << CDNS_DP_FRAMER_PXL_FORMAT;
> + break;
> + default:
> + bpp = disp_info->bpc;
> + pxl_repr = CDNS_DP_FRAMER_Y_ONLY << CDNS_DP_FRAMER_PXL_FORMAT;
> + }
> +
> + switch (disp_info->bpc) {
> + case 6:
> + misc0 |= DP_TEST_BIT_DEPTH_6;
> + pxl_repr |= CDNS_DP_FRAMER_6_BPC;
> + break;
> + case 8:
> + misc0 |= DP_TEST_BIT_DEPTH_8;
> + pxl_repr |= CDNS_DP_FRAMER_8_BPC;
> + break;
> + case 10:
> + misc0 |= DP_TEST_BIT_DEPTH_10;
> + pxl_repr |= CDNS_DP_FRAMER_10_BPC;
> + break;
> + case 12:
> + misc0 |= DP_TEST_BIT_DEPTH_12;
> + pxl_repr |= CDNS_DP_FRAMER_12_BPC;
> + break;
> + case 16:
> + misc0 |= DP_TEST_BIT_DEPTH_16;
> + pxl_repr |= CDNS_DP_FRAMER_16_BPC;
> + break;
> + }
> +
> + /* find optimal tu_size */
> + required_bandwidth = pxlclock * bpp / 8;
> + available_bandwidth = mhdp->link.num_lanes * rate;
> + do {
> + tu_size += 2;
> +
> + vs_f = tu_size * required_bandwidth / available_bandwidth;
> + vs = vs_f / 1000;
> + vs_f = vs_f % 1000;
> + /*
> + * FIXME (CDNS): downspreading?
> + * It's unused is what I've been told.
> + */
> + } while ((vs == 1 || ((vs_f > 850 || vs_f < 100) && vs_f != 0) ||
> + tu_size - vs < 2) && tu_size < 64);
> +
> + if (vs > 64)
> + return;
> +
> + bnd_hsync2vsync = CDNS_IP_BYPASS_V_INTERFACE;
> + if (mode->flags & DRM_MODE_FLAG_INTERLACE)
> + bnd_hsync2vsync |= CDNS_IP_DET_INTERLACE_FORMAT;
> +
> + cdns_mhdp_reg_write(mhdp, CDNS_BND_HSYNC2VSYNC, bnd_hsync2vsync);
> +
> + if (mode->flags & DRM_MODE_FLAG_INTERLACE &&
> + mode->flags & DRM_MODE_FLAG_PHSYNC)
> + hsync2vsync_pol_ctrl = CDNS_H2V_HSYNC_POL_ACTIVE_LOW |
> + CDNS_H2V_VSYNC_POL_ACTIVE_LOW;
> + else
> + hsync2vsync_pol_ctrl = 0;
> +
> + cdns_mhdp_reg_write(mhdp, CDNS_HSYNC2VSYNC_POL_CTRL,
> + hsync2vsync_pol_ctrl);
> +
> + cdns_mhdp_reg_write(mhdp, CDNS_DP_FRAMER_TU,
> + CDNS_DP_FRAMER_TU_VS(vs) |
> + CDNS_DP_FRAMER_TU_SIZE(tu_size) |
> + CDNS_DP_FRAMER_TU_CNT_RST_EN);
> +
> + cdns_mhdp_reg_write(mhdp, CDNS_DP_FRAMER_PXL_REPR, pxl_repr);
> +
> + if (mode->flags & DRM_MODE_FLAG_INTERLACE)
> + dp_framer_sp |= CDNS_DP_FRAMER_INTERLACE;
> + if (mode->flags & DRM_MODE_FLAG_NHSYNC)
> + dp_framer_sp |= CDNS_DP_FRAMER_HSYNC_POL_LOW;
> + if (mode->flags & DRM_MODE_FLAG_NVSYNC)
> + dp_framer_sp |= CDNS_DP_FRAMER_VSYNC_POL_LOW;
> + cdns_mhdp_reg_write(mhdp, CDNS_DP_FRAMER_SP, dp_framer_sp);
> +
> + front_porch = mode->crtc_hsync_start - mode->crtc_hdisplay;
> + back_porch = mode->crtc_htotal - mode->crtc_hsync_end;
> + cdns_mhdp_reg_write(mhdp, CDNS_DP_FRONT_BACK_PORCH,
> + CDNS_DP_FRONT_PORCH(front_porch) |
> + CDNS_DP_BACK_PORCH(back_porch));
> +
> + cdns_mhdp_reg_write(mhdp, CDNS_DP_BYTE_COUNT,
> + mode->crtc_hdisplay * bpp / 8);
> +
> + msa_h0 = mode->crtc_htotal - mode->crtc_hsync_start;
> + cdns_mhdp_reg_write(mhdp, CDNS_DP_MSA_HORIZONTAL_0,
> + CDNS_DP_MSAH0_H_TOTAL(mode->crtc_htotal) |
> + CDNS_DP_MSAH0_HSYNC_START(msa_h0));
> +
> + hsync = mode->crtc_hsync_end - mode->crtc_hsync_start;
> + msa_horizontal_1 = CDNS_DP_MSAH1_HSYNC_WIDTH(hsync) |
> + CDNS_DP_MSAH1_HDISP_WIDTH(mode->crtc_hdisplay);
> + if (mode->flags & DRM_MODE_FLAG_NHSYNC)
> + msa_horizontal_1 |= CDNS_DP_MSAH1_HSYNC_POL_LOW;
> + cdns_mhdp_reg_write(mhdp, CDNS_DP_MSA_HORIZONTAL_1,
> + msa_horizontal_1);
> +
> + msa_v0 = mode->crtc_vtotal - mode->crtc_vsync_start;
> + cdns_mhdp_reg_write(mhdp, CDNS_DP_MSA_VERTICAL_0,
> + CDNS_DP_MSAV0_V_TOTAL(mode->crtc_vtotal) |
> + CDNS_DP_MSAV0_VSYNC_START(msa_v0));
> +
> + vsync = mode->crtc_vsync_end - mode->crtc_vsync_start;
> + msa_vertical_1 = CDNS_DP_MSAV1_VSYNC_WIDTH(vsync) |
> + CDNS_DP_MSAV1_VDISP_WIDTH(mode->crtc_vdisplay);
> + if (mode->flags & DRM_MODE_FLAG_NVSYNC)
> + msa_vertical_1 |= CDNS_DP_MSAV1_VSYNC_POL_LOW;
> + cdns_mhdp_reg_write(mhdp, CDNS_DP_MSA_VERTICAL_1, msa_vertical_1);
> +
> + if ((mode->flags & DRM_MODE_FLAG_INTERLACE) &&
> + mode->crtc_vtotal % 2 == 0)
> + misc1 = DP_TEST_INTERLACED;
> + if (pxlfmt == PIXEL_FORMAT_Y_ONLY)
> + misc1 |= CDNS_DP_TEST_COLOR_FORMAT_RAW_Y_ONLY;
> + /* FIXME: use VSC SDP for Y420 */
> + /* FIXME: (CDNS) no code for Y420 in bare metal test */
> + if (pxlfmt == PIXEL_FORMAT_YCBCR_420)
> + misc1 = CDNS_DP_TEST_VSC_SDP;
> +
> + cdns_mhdp_reg_write(mhdp, CDNS_DP_MSA_MISC, misc0 | (misc1 << 8));
> +
> + /* FIXME: to be changed if MST mode */
> + cdns_mhdp_reg_write(mhdp, CDNS_DP_STREAM_CONFIG, 1);
> +
> + cdns_mhdp_reg_write(mhdp, CDNS_DP_HORIZONTAL,
> + CDNS_DP_H_HSYNC_WIDTH(hsync) |
> + CDNS_DP_H_H_TOTAL(mode->crtc_hdisplay));
> +
> + cdns_mhdp_reg_write(mhdp, CDNS_DP_VERTICAL_0,
> + CDNS_DP_V0_VHEIGHT(mode->crtc_vdisplay) |
> + CDNS_DP_V0_VSTART(msa_v0));
> +
> + dp_vertical_1 = CDNS_DP_V1_VTOTAL(mode->crtc_vtotal);
> + if ((mode->flags & DRM_MODE_FLAG_INTERLACE) &&
> + mode->crtc_vtotal % 2 == 0)
> + dp_vertical_1 |= CDNS_DP_V1_VTOTAL_EVEN;
> +
> + cdns_mhdp_reg_write(mhdp, CDNS_DP_VERTICAL_1, dp_vertical_1);
> +
> + cdns_mhdp_reg_write_bit(mhdp, CDNS_DP_VB_ID, 2, 1,
> + (mode->flags & DRM_MODE_FLAG_INTERLACE) ?
> + CDNS_DP_VB_ID_INTERLACED : 0);
> +
> + line_thresh1 = ((vs + 1) << 5) * 8 / bpp;
> + line_thresh2 = (pxlclock << 5) / 1000 / rate * (vs + 1) - (1 << 5);
> + line_thresh = line_thresh1 - line_thresh2 / mhdp->link.num_lanes;
> + line_thresh = (line_thresh >> 5) + 2;
> + cdns_mhdp_reg_write(mhdp, CDNS_DP_LINE_THRESH,
> + line_thresh & GENMASK(5, 0));
> +
> + cdns_mhdp_reg_write(mhdp, CDNS_DP_RATE_GOVERNOR_STATUS,
> + CDNS_DP_RG_TU_VS_DIFF((tu_size - vs > 3) ?
> + 0 : tu_size - vs));
> +
> + cdns_mhdp_set_video_status(mhdp, 1);
> +}
> +
> +static const struct drm_bridge_funcs cdns_mhdp_bridge_funcs = {
> + .enable = cdns_mhdp_enable,
> + .disable = cdns_mhdp_disable,
> + .attach = cdns_mhdp_attach,
> +};
> +
> +static int load_firmware(struct cdns_mhdp_device *mhdp, const char *name,
> + unsigned int addr)
> +{
> + const struct firmware *fw;
> + int ret;
> +
> + ret = request_firmware(&fw, name, mhdp->dev);
> + if (ret) {
> + dev_err(mhdp->dev, "failed to load firmware (%s), ret: %d\n",
> + name, ret);
> + return ret;
> + }
> +
> + memcpy_toio(mhdp->regs + addr, fw->data, fw->size);
> +
> + release_firmware(fw);
> +
> + return 0;
> +}
> +
> +static int cdns_mhdp_audio_hw_params(struct device *dev, void *data,
> + struct hdmi_codec_daifmt *daifmt,
> + struct hdmi_codec_params *params)
> +{
> + struct cdns_mhdp_device *mhdp = dev_get_drvdata(dev);
> + struct audio_info audio = {
> + .sample_width = params->sample_width,
> + .sample_rate = params->sample_rate,
> + .channels = params->channels,
> + };
> + int ret;
> +
> + if (daifmt->fmt != HDMI_I2S) {
> + DRM_DEV_ERROR(dev, "Invalid format %d\n", daifmt->fmt);
> + return -EINVAL;
> + }
> +
> + audio.format = AFMT_I2S;
> +
> + ret = cdns_mhdp_audio_config(mhdp, &audio);
> + if (!ret)
> + mhdp->audio_info = audio;
> +
> + return 0;
> +}
> +
> +static void cdns_mhdp_audio_shutdown(struct device *dev, void *data)
> +{
> + struct cdns_mhdp_device *mhdp = dev_get_drvdata(dev);
> + int ret;
> +
> + ret = cdns_mhdp_audio_stop(mhdp, &mhdp->audio_info);
> + if (!ret)
> + mhdp->audio_info.format = AFMT_UNUSED;
> +}
> +
> +static int cdns_mhdp_audio_digital_mute(struct device *dev, void *data,
> + bool enable)
> +{
> + struct cdns_mhdp_device *mhdp = dev_get_drvdata(dev);
> +
> + return cdns_mhdp_audio_mute(mhdp, enable);
> +}
> +
> +static int cdns_mhdp_audio_get_eld(struct device *dev, void *data,
> + u8 *buf, size_t len)
> +{
> + struct cdns_mhdp_device *mhdp = dev_get_drvdata(dev);
> +
> + memcpy(buf, mhdp->connector.eld,
> + min(sizeof(mhdp->connector.eld), len));
> +
> + return 0;
> +}
> +
> +static const struct hdmi_codec_ops audio_codec_ops = {
> + .hw_params = cdns_mhdp_audio_hw_params,
> + .audio_shutdown = cdns_mhdp_audio_shutdown,
> + .digital_mute = cdns_mhdp_audio_digital_mute,
> + .get_eld = cdns_mhdp_audio_get_eld,
> +};
> +
> +static int mhdp_probe(struct platform_device *pdev)
> +{
> + struct resource *regs;
> + struct cdns_mhdp_device *mhdp;
> + struct clk *clk;
> + int ret;
> + unsigned int reg;
> + unsigned long rate;
> + u32 resp;
> +
> + struct hdmi_codec_pdata codec_data = {
> + .i2s = 1,
> + .max_i2s_channels = 8,
> + .ops = &audio_codec_ops,
> + };
> +
> + mhdp = devm_kzalloc(&pdev->dev, sizeof(struct cdns_mhdp_device),
> + GFP_KERNEL);
> + if (!mhdp)
> + return -ENOMEM;
> +
> + clk = devm_clk_get(&pdev->dev, NULL);
> + if (IS_ERR(clk)) {
> + dev_err(&pdev->dev, "couldn't get clk: %ld\n", PTR_ERR(clk));
> + return PTR_ERR(clk);
> + }
> +
> + mhdp->dev = &pdev->dev;
> + dev_set_drvdata(&pdev->dev, mhdp);
> +
> + drm_dp_aux_init(&mhdp->aux);
> + mhdp->aux.dev = &pdev->dev;
> + mhdp->aux.transfer = mhdp_transfer;
> +
> + regs = platform_get_resource(pdev, IORESOURCE_MEM, 0);
> + mhdp->regs = devm_ioremap_resource(&pdev->dev, regs);
> + if (IS_ERR(mhdp->regs))
> + return PTR_ERR(mhdp->regs);
> +
> + platform_set_drvdata(pdev, mhdp);
> +
> + ret = load_firmware(mhdp, FW_NAME, CDNS_MHDP_IMEM);
> + if (ret)
> + return ret;
> +
> + rate = clk_get_rate(clk);
> + writel(rate % 1000000, mhdp->regs + CDNS_SW_CLK_L);
> + writel(rate / 1000000, mhdp->regs + CDNS_SW_CLK_H);
> +
> + /* Leave debug mode */
> + writel(0, mhdp->regs + CDNS_APB_CTRL);
> +
> + /*
> + * Wait for the KEEP_ALIVE "message" on the first 8 bits.
> + * Updated each sched "tick" (~2ms)
> + */
> + ret = readl_poll_timeout(mhdp->regs + CDNS_KEEP_ALIVE, reg,
> + reg & CDNS_KEEP_ALIVE_MASK, 500,
> + CDNS_KEEP_ALIVE_TIMEOUT);
> + if (ret) {
> + dev_err(&pdev->dev,
> + "device didn't give any life sign: reg %d\n", reg);
> + return -EIO;
> + }
> +
> + /*
> + * FIXME (CDNS): how are the characteristics/features of the host
> + * defined? Will they be always hardcoded?
At the begining they can be hardcoded, unless there is already
infrastructure to get them from.
> + */
> + /* FIXME: link rate 2.7; num_lanes = 2, */
What does it mean?
> + /* FIXME: read capabilities from PHY */
> + mhdp->host.link_rate = drm_dp_bw_code_to_link_rate(DP_LINK_BW_5_4);
> + mhdp->host.lanes_cnt = CDNS_LANE_4 | CDNS_SCRAMBLER;
> + mhdp->host.volt_swing = CDNS_VOLT_SWING(3);
> + mhdp->host.pre_emphasis = CDNS_PRE_EMPHASIS(2);
> + mhdp->host.pattern_supp = CDNS_SUPPORT_TPS(1) |
> + CDNS_SUPPORT_TPS(2) | CDNS_SUPPORT_TPS(3) |
> + CDNS_SUPPORT_TPS(4);
> + mhdp->host.fast_link = 0;
> + mhdp->host.lane_mapping = CDNS_LANE_MAPPING_FLIPPED;
> + mhdp->host.enhanced = true;
> +
> + mhdp->bridge.of_node = pdev->dev.of_node;
> + mhdp->bridge.funcs = &cdns_mhdp_bridge_funcs;
> +
> + /* Init events to 0 as it's not cleared by FW at boot but on read */
> + readl(mhdp->regs + CDNS_SW_EVENT0);
> + readl(mhdp->regs + CDNS_SW_EVENT1);
> + readl(mhdp->regs + CDNS_SW_EVENT2);
> + readl(mhdp->regs + CDNS_SW_EVENT3);
> +
> + /* Activate uCPU */
> + ret = cdns_mhdp_set_firmware_active(mhdp, true);
> + if (ret) {
> + dev_err(mhdp->dev, "Failed to activate DP\n");
> + return ret;
> + }
> +
> + mhdp->audio_pdev = platform_device_register_data(
> + mhdp->dev, HDMI_CODEC_DRV_NAME, PLATFORM_DEVID_AUTO,
> + &codec_data, sizeof(codec_data));
> +
> + /* Enable VIF clock for stream 0 */
> + cdns_mhdp_reg_read(mhdp, CDNS_DPTX_CAR, &resp);
> + cdns_mhdp_reg_write(mhdp, CDNS_DPTX_CAR,
> + resp | CDNS_VIF_CLK_EN | CDNS_VIF_CLK_RSTN);
> +
> + /* Loop over HDP change */
> + /*
> + * FIXME: does not work when put in mhdp_bridge_enable.
> + * Where should we put it?
It would be good to get rid of these fixmes before final version.
It would be also good to have review from displayport developers - I do
not know DP too much, but I suspect all this link training could be
improved.
Regards
Andrzej
> + */
> + /* Is it still needed with use of mb message HPD STATUS? */
> + ret = readl_poll_timeout(mhdp->regs + CDNS_SW_EVENT0, reg,
> + reg & CDNS_DPTX_HPD, 500,
> + CDNS_SW_EVENT0_TIMEOUT);
> + if (ret) {
> + dev_err(mhdp->dev, "no HPD received %d\n", reg);
> + return -ENODEV;
> + }
> +
> + drm_bridge_add(&mhdp->bridge);
> +
> + return 0;
> +}
> +
> +MODULE_FIRMWARE(FW_NAME);
> +
> +static int mhdp_remove(struct platform_device *pdev)
> +{
> + struct cdns_mhdp_device *mhdp = dev_get_drvdata(&pdev->dev);
> + int ret;
> +
> + platform_device_unregister(mhdp->audio_pdev);
> +
> + drm_bridge_remove(&mhdp->bridge);
> +
> + ret = cdns_mhdp_set_firmware_active(mhdp, false);
> + if (ret) {
> + dev_err(mhdp->dev, "Failed to de-activate DP\n");
> + return ret;
> + }
> +
> + /* FIXME: check for missing functions */
> +
> + return 0;
> +}
> +
> +static struct platform_driver mhdp_driver = {
> + .driver = {
> + .name = "cdns-mhdp",
> + .of_match_table = of_match_ptr(mhdp_ids),
> + },
> + .probe = mhdp_probe,
> + .remove = mhdp_remove,
> +};
> +module_platform_driver(mhdp_driver);
> +
> +MODULE_AUTHOR("Quentin Schulz <quentin.schulz@free-electrons.com>");
> +MODULE_DESCRIPTION("Cadence MHDP DP bridge driver");
> +MODULE_LICENSE("GPL");
> +MODULE_ALIAS("platform:cdns-mhdp");
> diff --git a/drivers/gpu/drm/rockchip/Kconfig b/drivers/gpu/drm/rockchip/Kconfig
> index 26438d45732b..bd6454b590a2 100644
> --- a/drivers/gpu/drm/rockchip/Kconfig
> +++ b/drivers/gpu/drm/rockchip/Kconfig
> @@ -28,7 +28,9 @@ config ROCKCHIP_ANALOGIX_DP
>
> config ROCKCHIP_CDN_DP
> bool "Rockchip cdn DP"
> - depends on EXTCON=y || (EXTCON=m && DRM_ROCKCHIP=m)
> + depends on DRM_ROCKCHIP
> + select EXTCON
> + select DRM_CDNS_MHDP
> help
> This selects support for Rockchip SoC specific extensions
> for the cdn DP driver. If you want to enable Dp on
> diff --git a/drivers/gpu/drm/rockchip/Makefile b/drivers/gpu/drm/rockchip/Makefile
> index 868263ff0302..c908a4fb8a47 100644
> --- a/drivers/gpu/drm/rockchip/Makefile
> +++ b/drivers/gpu/drm/rockchip/Makefile
> @@ -9,7 +9,7 @@ rockchipdrm-y := rockchip_drm_drv.o rockchip_drm_fb.o \
> rockchipdrm-$(CONFIG_DRM_FBDEV_EMULATION) += rockchip_drm_fbdev.o
>
> rockchipdrm-$(CONFIG_ROCKCHIP_ANALOGIX_DP) += analogix_dp-rockchip.o
> -rockchipdrm-$(CONFIG_ROCKCHIP_CDN_DP) += cdn-dp-core.o cdn-dp-reg.o
> +rockchipdrm-$(CONFIG_ROCKCHIP_CDN_DP) += cdn-dp-core.o
> rockchipdrm-$(CONFIG_ROCKCHIP_DW_HDMI) += dw_hdmi-rockchip.o
> rockchipdrm-$(CONFIG_ROCKCHIP_DW_MIPI_DSI) += dw-mipi-dsi.o
> rockchipdrm-$(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
> index bf7e206326f0..343f381e3440 100644
> --- a/drivers/gpu/drm/rockchip/cdn-dp-core.c
> +++ b/drivers/gpu/drm/rockchip/cdn-dp-core.c
> @@ -816,7 +816,7 @@ static int cdn_dp_audio_hw_params(struct device *dev, void *data,
>
> ret = cdns_mhdp_audio_config(&dp->mhdp, &audio);
> if (!ret)
> - dp->audio_info = audio;
> + dp->mhdp.audio_info = audio;
>
> out:
> mutex_unlock(&dp->lock);
> @@ -832,9 +832,9 @@ static void cdn_dp_audio_shutdown(struct device *dev, void *data)
> if (!dp->active)
> goto out;
>
> - ret = cdns_mhdp_audio_stop(&dp->mhdp, &dp->audio_info);
> + ret = cdns_mhdp_audio_stop(&dp->mhdp, &dp->mhdp.audio_info);
> if (!ret)
> - dp->audio_info.format = AFMT_UNUSED;
> + dp->mhdp.audio_info.format = AFMT_UNUSED;
> out:
> mutex_unlock(&dp->lock);
> }
> @@ -886,11 +886,11 @@ static int cdn_dp_audio_codec_init(struct cdn_dp_device *dp,
> .max_i2s_channels = 8,
> };
>
> - dp->audio_pdev = platform_device_register_data(
> - dev, HDMI_CODEC_DRV_NAME, PLATFORM_DEVID_AUTO,
> - &codec_data, sizeof(codec_data));
> + dp->mhdp.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);
> + return PTR_ERR_OR_ZERO(dp->mhdp.audio_pdev);
> }
>
> static int cdn_dp_request_firmware(struct cdn_dp_device *dp)
> @@ -1217,7 +1217,7 @@ static int cdn_dp_remove(struct platform_device *pdev)
> {
> struct cdn_dp_device *dp = platform_get_drvdata(pdev);
>
> - platform_device_unregister(dp->audio_pdev);
> + platform_device_unregister(dp->mhdp.audio_pdev);
> cdn_dp_suspend(dp->mhdp.dev);
> component_del(&pdev->dev, &cdn_dp_component_ops);
>
> diff --git a/drivers/gpu/drm/rockchip/cdn-dp-core.h b/drivers/gpu/drm/rockchip/cdn-dp-core.h
> index bad65c2fe610..a086dad31287 100644
> --- a/drivers/gpu/drm/rockchip/cdn-dp-core.h
> +++ b/drivers/gpu/drm/rockchip/cdn-dp-core.h
> @@ -19,8 +19,9 @@
> #include <drm/drm_crtc_helper.h>
> #include <drm/drm_dp_helper.h>
> #include <drm/drm_panel.h>
> +#include <drm/bridge/cdns-mhdp-common.h>
> +
> #include "rockchip_drm_drv.h"
> -#include "cdn-dp-reg.h"
>
> #define MAX_PHY 2
>
> @@ -45,7 +46,6 @@ struct cdn_dp_device {
> struct cdns_mhdp_device mhdp;
> struct drm_device *drm_dev;
> struct drm_encoder encoder;
> - struct platform_device *audio_pdev;
> struct work_struct event_work;
> struct edid *edid;
>
> @@ -64,7 +64,6 @@ struct cdn_dp_device {
> struct reset_control *dptx_rst;
> struct reset_control *apb_rst;
> struct reset_control *core_rst;
> - struct audio_info audio_info;
> struct cdn_dp_port *port[MAX_PHY];
> u8 ports;
> u8 lanes;
> diff --git a/drivers/gpu/drm/rockchip/cdn-dp-reg.h b/include/drm/bridge/cdns-mhdp-common.h
> similarity index 95%
> rename from drivers/gpu/drm/rockchip/cdn-dp-reg.h
> rename to include/drm/bridge/cdns-mhdp-common.h
> index 3cb40d719515..c5a5c4fa7fc4 100644
> --- a/drivers/gpu/drm/rockchip/cdn-dp-reg.h
> +++ b/include/drm/bridge/cdns-mhdp-common.h
> @@ -12,10 +12,13 @@
> * GNU General Public License for more details.
> */
>
> -#ifndef _CDN_DP_REG_H
> -#define _CDN_DP_REG_H
> +#ifndef CDNS_MHDP_COMMON_H_
> +#define CDNS_MHDP_COMMON_H_
>
> #include <linux/bitops.h>
> +#include <drm/drm_dp_helper.h>
> +#include <drm/drm_connector.h>
> +#include <drm/drm_bridge.h>
>
> #define ADDR_IMEM 0x10000
> #define ADDR_DMEM 0x20000
> @@ -327,6 +330,7 @@
> #define GENERAL_TEST_ECHO 0x02
> #define GENERAL_BUS_SETTINGS 0x03
> #define GENERAL_TEST_ACCESS 0x04
> +#define GENERAL_REGISTER_READ 0x07
>
> #define DPTX_SET_POWER_MNG 0x00
> #define DPTX_SET_HOST_CAPABILITIES 0x01
> @@ -346,6 +350,7 @@
> #define DPTX_SET_LINK_BREAK_POINT 0x0f
> #define DPTX_FORCE_LANES 0x10
> #define DPTX_HPD_STATE 0x11
> +#define DPTX_ADJUST_LT 0x12
>
> #define FW_STANDBY 0
> #define FW_ACTIVE 1
> @@ -517,6 +522,9 @@ struct cdns_mhdp_device {
> struct clk *spdif_clk;
> struct reset_control *spdif_rst;
>
> + struct platform_device *audio_pdev;
> + struct audio_info audio_info;
> +
> struct drm_dp_aux aux;
> struct cdns_mhdp_host host;
> struct cdns_mhdp_sink sink;
> @@ -551,4 +559,11 @@ int cdns_mhdp_audio_stop(struct cdns_mhdp_device *mhdp,
> int cdns_mhdp_audio_mute(struct cdns_mhdp_device *mhdp, bool enable);
> int cdns_mhdp_audio_config(struct cdns_mhdp_device *mhdp,
> struct audio_info *audio);
> -#endif /* _CDN_DP_REG_H */
> +int cdns_mhdp_reg_read(struct cdns_mhdp_device *mhdp, u32 addr, u32 *value);
> +int cdns_mhdp_reg_write(struct cdns_mhdp_device *mhdp, u16 addr, u32 val);
> +int cdns_mhdp_reg_write_bit(struct cdns_mhdp_device *mhdp, u16 addr,
> + u8 start_bit, u8 bits_no, u32 val);
> +int cdns_mhdp_adjust_lt(struct cdns_mhdp_device *mhdp, u8 nlanes,
> + u16 udelay, u8 *lanes_data,
> + u8 *dpcd);
> +#endif /* CDNS_MHDP_COMMON_H_ */
^ permalink raw reply [flat|nested] 45+ messages in thread
* Re: [PATCH v6 5/6] drm/bridge: add support for MST in mhdp8546 driver
2018-10-08 21:42 ` Damian Kos
@ 2018-11-07 11:40 ` Andrzej Hajda
-1 siblings, 0 replies; 45+ messages in thread
From: Andrzej Hajda @ 2018-11-07 11:40 UTC (permalink / raw)
To: Damian Kos, David Airlie, Rob Herring, Mark Rutland,
Archit Taneja, Laurent Pinchart, Gustavo Padovan,
Maarten Lankhorst, Sean Paul, Sandy Huang, Heiko Stübner,
Quentin Schulz, Piotr Sroka, dri-devel, devicetree, linux-kernel,
linux-arm-kernel, linux-rockchip
Cc: rafalc, quentin.schulz, jbergsagel
On 08.10.2018 23:42, Damian Kos wrote:
> From: Piotr Sroka <piotrs@cadence.com>
>
> - add hot plug support to handle HDP IRQ interrupts in case sideband
> message is ready to read.
> - there is only one connector created at initialization stage. It is
> used as SST connector when controller works in SST mode. If controller
> works in MST mode then the SST connector status is disconnected all the
> time. MST connectors are created/destroyed in runtime depends on what
> devices are connected to the DP controller.
> - add callbacks functions to be able to inform module managing encoders
> objects to create or destroy an encoder in case new a MST connector is
> created/destroyed
I am not familiar with MST so I will stick to bike-shedding :) Reviewer
with MST experience needed.
>
> Signed-off-by: Piotr Sroka <piotrs@cadence.com>
> Signed-off-by: Damian Kos <dkos@cadence.com>
> ---
> drivers/gpu/drm/bridge/Makefile | 2 +-
> drivers/gpu/drm/bridge/cdns-mhdp-mst.c | 594 +++++++++++++++++++++++++
> drivers/gpu/drm/bridge/cdns-mhdp.c | 560 ++++++++++++-----------
> drivers/gpu/drm/bridge/cdns-mhdp.h | 209 +++++++++
> drivers/gpu/drm/rockchip/cdn-dp-core.c | 18 +-
> include/drm/bridge/cdns-mhdp-cbs.h | 27 ++
> include/drm/bridge/cdns-mhdp-common.h | 48 +-
> 7 files changed, 1189 insertions(+), 269 deletions(-)
> create mode 100644 drivers/gpu/drm/bridge/cdns-mhdp-mst.c
> create mode 100644 drivers/gpu/drm/bridge/cdns-mhdp.h
> create mode 100644 include/drm/bridge/cdns-mhdp-cbs.h
>
> diff --git a/drivers/gpu/drm/bridge/Makefile b/drivers/gpu/drm/bridge/Makefile
> index e802fdb85750..b80f3d6ed2a6 100644
> --- a/drivers/gpu/drm/bridge/Makefile
> +++ b/drivers/gpu/drm/bridge/Makefile
> @@ -19,4 +19,4 @@ obj-$(CONFIG_DRM_TI_TFP410) += ti-tfp410.o
> obj-$(CONFIG_DRM_CDNS_MHDP) += mhdp8546.o
> obj-y += synopsys/
>
> -mhdp8546-objs := cdns-mhdp-common.o cdns-mhdp.o
> +mhdp8546-objs := cdns-mhdp-common.o cdns-mhdp.o cdns-mhdp-mst.o
> diff --git a/drivers/gpu/drm/bridge/cdns-mhdp-mst.c b/drivers/gpu/drm/bridge/cdns-mhdp-mst.c
> new file mode 100644
> index 000000000000..782d4bf9b667
> --- /dev/null
> +++ b/drivers/gpu/drm/bridge/cdns-mhdp-mst.c
> @@ -0,0 +1,594 @@
> +// SPDX-License-Identifier: GPL v2
> +/*
> + * Cadence MHDP DP MST bridge driver.
> + *
> + * Copyright: 2018 Cadence Design Systems, Inc.
> + *
> + * Author: Piotr Sroka <piotrs@cadence.com>
> + */
> +#include <drm/drm_print.h>
> +#include <drm/drm_crtc_helper.h>
> +#include <drm/drm_atomic_helper.h>
> +#include <drm/drm_fixed.h>
> +#include <drm/drm_connector.h>
> +#include <linux/iopoll.h>
> +
> +#include <drm/bridge/cdns-mhdp-common.h>
Alphabetic order.
> +#include "cdns-mhdp.h"
> +
> +
> +static void cdns_mhdp_mst_stream_enable(struct cdns_mhdp_bridge *mhdp_bridge,
> + bool enable)
> +{
> + u32 reg;
> + struct cdns_mhdp_device *mhdp = mhdp_bridge->mhdp;
> + u8 stream_id = mhdp_bridge->stream_id;
> +
> + cdns_mhdp_reg_read(mhdp, CDNS_DP_MST_STREAM_CONFIG(stream_id), ®);
> +
> + if (enable) {
> + reg |= CDNS_DP_MST_STRM_CFG_STREAM_EN;
> + reg &= ~CDNS_DP_MST_STRM_CFG_NO_VIDEO;
> + } else {
> + reg &= ~CDNS_DP_MST_STRM_CFG_STREAM_EN;
> + reg |= CDNS_DP_MST_STRM_CFG_NO_VIDEO;
> + }
> +
> + cdns_mhdp_reg_write(mhdp, CDNS_DP_MST_STREAM_CONFIG(stream_id), reg);
> +}
> +
> +static inline s64 calc_fixed_avg_slots(u32 pbn, u32 pbn_div)
> +{
> + s64 fixed_pbn, fixed_pbn_div, fixed_targ_avg_slots;
> +
> + fixed_pbn = drm_int2fixp(pbn);
> + fixed_pbn_div = drm_int2fixp(pbn_div);
> + fixed_targ_avg_slots = drm_fixp_div(fixed_pbn, fixed_pbn_div);
> +
> + return fixed_targ_avg_slots;
> +}
> +
> +static void cdns_mhdp_mst_set_threshold(struct cdns_mhdp_bridge *bridge)
> +{
> + u32 threshold;
> + u8 stream_id = bridge->stream_id;
> + struct cdns_mhdp_device *mhdp = bridge->mhdp;
> + s64 fixed_targ_avg_slots, fixed_thresh, fixed_targ_entries;
> +
> + fixed_targ_avg_slots = calc_fixed_avg_slots(bridge->pbn,
> + mhdp->mst_mgr.pbn_div);
> +
> + fixed_targ_entries = drm_fixp_div(fixed_targ_avg_slots,
> + drm_int2fixp(2));
> + fixed_thresh = drm_fixp_mul(fixed_targ_entries, fixed_targ_entries);
> + fixed_thresh = drm_fixp_div(fixed_thresh, drm_int2fixp(32));
> + fixed_thresh = fixed_targ_entries - fixed_thresh;
> + fixed_thresh = drm_fixp_mul(fixed_thresh,
> + drm_int2fixp(mhdp->link.num_lanes));
> + fixed_thresh = drm_fixp_div(fixed_thresh, drm_int2fixp(4));
> +
> + threshold = drm_fixp2int_ceil(fixed_thresh);
> + if (threshold < 2)
> + threshold = 2;
> +
> + cdns_mhdp_reg_write(mhdp, CDNS_DP_LINE_THRESH(stream_id),
> + CDNS_DP_ACTIVE_LINE_THRESH(threshold));
All this magic makes me think I am not a right person to review this
code, or the code is overcomplicated. Lets try layman approach.
Formula is as below:
threshold = (pbn/pbn_div/2 - (pbn/pbn_div/2)^2 / 32)*num_lanes / 4
plus round_up, and cap by 2.
Please describe the formula in comment to increase readability and use
some temporary variables instead of overusing fixed_thresh.
Where this formula comes from? Document it.
Moreover if there is no difference between drm_fixp_div(x,
drm_int2fixp(const)) and div_s64(x, const) I guess the latter is better.
> +}
> +
> +static void cdns_mhdp_set_rate_governing(struct cdns_mhdp_bridge *bridge,
> + bool enable)
> +{
> + struct cdns_mhdp_device *mhdp = bridge->mhdp;
> + u8 stream_id = bridge->stream_id;
> +
> + if (enable) {
> + s64 fixed_targ_avg_slots, fixed_y;
> + u32 x, y;
> +
> + fixed_targ_avg_slots =
> + calc_fixed_avg_slots(bridge->pbn,
> + mhdp->mst_mgr.pbn_div);
> +
> + x = drm_fixp2int(fixed_targ_avg_slots);
> +
> + fixed_y = (fixed_targ_avg_slots - drm_int2fixp(x));
> + fixed_y = drm_fixp_mul(fixed_y, drm_int2fixp(16));
Again, maybe fixed_y *= 16;
> + y = drm_fixp2int_ceil(fixed_y);
Ok, at this point x is integer part of fixed_targ_avg_slots and y is
fractional part of fixed_targ_avg_slots * 16.
Looking at calc_fixed_avg_slots it means, that:
x = bridge->pbn / mhdp->mst_mgr.pbn_div;
y = bridge->pbn % mhdp->mst_mgr.pbn_div * 16 / mhdp->mst_mgr.pbn_div;
Without using fixed arithmetic, more direct?
> +
> + cdns_mhdp_reg_write(mhdp, CDNS_DP_RATE_GOVERNING(stream_id),
> + CDNS_DP_RG_TARG_AV_SLOTS_Y(y) |
> + CDNS_DP_RG_TARG_AV_SLOTS_X(x) |
> + CDNS_DP_RG_ENABLE);
> + } else
> + cdns_mhdp_reg_write(mhdp, CDNS_DP_RATE_GOVERNING(stream_id), 0);
> +}
> +
> +
> +static struct drm_dp_payload *
> +cdns_mhdp_get_payload(struct cdns_mhdp_bridge *bridge)
> +{
> + int vcpi = bridge->connector->port->vcpi.vcpi, i;
> + struct cdns_mhdp_device *mhdp = bridge->mhdp;
> +
> + for (i = 0; i < mhdp->mst_mgr.max_payloads; i++) {
> + struct drm_dp_payload *payload = &mhdp->mst_mgr.payloads[i];
> +
> + if (payload->vcpi == vcpi)
> + return payload;
> + }
> +
> + return NULL;
> +}
> +
> +
> +static int
> +cdns_mhdp_set_act_enable(struct cdns_mhdp_device *mhdp)
> +{
> + u32 reg;
> + int ret;
> +
> + cdns_mhdp_reg_read(mhdp, CDNS_DP_MTPH_CONTROL, ®);
> + cdns_mhdp_reg_write(mhdp, CDNS_DP_MTPH_CONTROL,
> + reg | CDNS_DP_MTPH_ACT_EN);
> +
> + ret = readl_poll_timeout(mhdp->regs + CDNS_DP_MTPH_STATUS, reg,
> + ((reg & CDNS_DP_MTPH_ACT_STATUS) == 0), 0,
> + 30);
> + if (ret) {
> + dev_err(mhdp->dev,
> + "ACT sequence cannot complete in 30us\n");
> + return -EIO;
> + }
> +
> + return drm_dp_check_act_status(&mhdp->mst_mgr);
> +}
> +
> +
> +static int
> +cdns_mhdp_apply_slot_allocation(struct cdns_mhdp_bridge *mhdp_bridge)
> +{
> + struct drm_dp_payload *payload;
> + struct cdns_mhdp_device *mhdp = mhdp_bridge->mhdp;
> + u8 stream_id = mhdp_bridge->stream_id;
> +
> + payload = cdns_mhdp_get_payload(mhdp_bridge);
> +
> + if (!payload) {
> + DRM_ERROR("payload is not found\n");
> + return -EIO;
> + }
> +
> + cdns_mhdp_reg_write(mhdp, CDNS_DP_MST_SLOT_ALLOCATE(stream_id),
> + CDNS_DP_S_ALLOC_START_SLOT(payload->start_slot) |
> + CDNS_DP_S_ALLOC_END_SLOT(payload->start_slot
> + + payload->num_slots - 1));
> +
> + return 0;
> +}
> +
> +static void
> +cdns_mhdp_update_slot_allocation(struct cdns_mhdp_bridge *mhdp_bridge)
> +{
> + struct drm_device *dev = mhdp_bridge->base.dev;
> + struct drm_connector *connector;
> +
> + list_for_each_entry(connector, &dev->mode_config.connector_list, head) {
> + struct cdns_mhdp_connector *mhdp_connector;
> +
> + mhdp_connector = to_mhdp_connector(connector);
> + if (!connector->encoder)
> + continue;
> + if (!mhdp_connector->is_mst_connector)
> + continue;
> +
> + if (mhdp_connector->bridge->stream_id != -1)
> + cdns_mhdp_apply_slot_allocation(mhdp_connector->bridge);
> + }
> +}
> +
> +static enum drm_connector_status
> +cdns_dp_mst_detect(struct drm_connector *connector, bool force)
> +{
> + enum drm_connector_status stat;
> + struct cdns_mhdp_connector *mhdp_connector;
> + struct cdns_mhdp_device *mhdp;
> +
> + mhdp_connector = to_mhdp_connector(connector);
> + mhdp = mhdp_connector->bridge->mhdp;
> +
> + stat = drm_dp_mst_detect_port(connector, &mhdp->mst_mgr,
> + mhdp_connector->port);
> + return stat;
> +}
> +
> +static void
> +cdns_dp_mst_connector_destroy(struct drm_connector *connector)
> +{
> + struct cdns_mhdp_connector *mhdp_connector;
> + struct cdns_mhdp_bridge *mhdp_bridge;
> +
> + mhdp_connector = to_mhdp_connector(connector);
> + mhdp_bridge = mhdp_connector->bridge;
> +
> + drm_connector_cleanup(&mhdp_connector->base);
> + drm_bridge_remove(&mhdp_bridge->base);
> + kfree(mhdp_connector);
> + kfree(mhdp_bridge);
> +}
> +
> +static const struct drm_connector_funcs cdns_mhdp_mst_connector_funcs = {
> + .atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state,
> + .atomic_destroy_state = drm_atomic_helper_connector_destroy_state,
> + .reset = drm_atomic_helper_connector_reset,
> + .dpms = drm_helper_connector_dpms,
> + .detect = cdns_dp_mst_detect,
> + .fill_modes = drm_helper_probe_single_connector_modes,
> + .destroy = cdns_dp_mst_connector_destroy,
> +};
> +
> +
> +static int cdns_mhdp_mst_get_ddc_modes(struct drm_connector *connector)
> +{
> + struct cdns_mhdp_connector *mhdp_connector;
> + struct cdns_mhdp_device *mhdp;
> + struct edid *edid;
> + int ret = 0;
> +
> + mhdp_connector = to_mhdp_connector(connector);
> + mhdp = mhdp_connector->bridge->mhdp;
> +
> + edid = drm_dp_mst_get_edid(connector, &mhdp->mst_mgr,
> + mhdp_connector->port);
> +
> + DRM_DEBUG_KMS("edid retrieved %p\n", edid);
> + if (edid) {
> + drm_connector_update_edid_property(connector, edid);
> + ret = drm_add_edid_modes(connector, edid);
> + return ret;
> + }
> + drm_connector_update_edid_property(connector, NULL);
> +
> + return ret;
I suspect edid should be freed, but looking at other users of
drm_dp_mst_get_edid it is not so obvious (only intel frees it) - memory
leaks?
> +}
> +
> +static int cdns_mhdp_mst_get_modes(struct drm_connector *connector)
> +{
> + return cdns_mhdp_mst_get_ddc_modes(connector);
> +}
> +
> +
> +static struct
> +drm_encoder *cdns_mhdp_mst_best_encoder(struct drm_connector *connector)
> +{
> + struct cdns_mhdp_connector *mhdp_connector;
> +
> + mhdp_connector = to_mhdp_connector(connector);
> +
> + return mhdp_connector->bridge->base.encoder;
> +}+
> +static const struct drm_connector_helper_funcs cdns_mhdp_mst_conn_helper_fun = {
> + .get_modes = cdns_mhdp_mst_get_modes,
> + .best_encoder = cdns_mhdp_mst_best_encoder,
> +};
> +
> +void cdns_mhdp_mst_enable(struct drm_bridge *bridge)
> +{
> + struct cdns_mhdp_bridge *mhdp_bridge = to_mhdp_bridge(bridge);
> + struct cdns_mhdp_device *mhdp = mhdp_bridge->mhdp;
> + struct drm_display_info *disp_info;
> + struct drm_display_mode *mode;
> + struct cdns_mhdp_connector *mhdp_connector;
> + u32 bpp;
> + enum pixel_format pxlfmt;
> + int ret, slots, stream_id;
> +
> + disp_info = &mhdp_bridge->connector->base.display_info;
> +
> + pxlfmt = cdns_mhdp_get_pxlfmt(disp_info->color_formats);
> + bpp = cdns_mhdp_get_bpp(disp_info->bpc, pxlfmt);
> +
> + mhdp_connector = mhdp_bridge->connector;
> + if (mhdp_bridge->stream_id > -1) {
> + DRM_ERROR("ERROR stream id is attached before bridge is enabled\n");
> + return;
> + }
> +
> + stream_id = bridge->encoder->crtc->index;
> +
> + mode = &bridge->encoder->crtc->state->adjusted_mode;
> + mhdp_bridge->pbn = drm_dp_calc_pbn_mode(mode->clock, bpp);
> +
> + slots = drm_dp_find_vcpi_slots(&mhdp->mst_mgr, mhdp_bridge->pbn);
> + ret = drm_dp_mst_allocate_vcpi(&mhdp->mst_mgr,
> + mhdp_connector->port,
> + mhdp_bridge->pbn, slots);
> + if (ret == false) {
> + DRM_ERROR("failed to allocate vcpi\n");
> + return;
> + }
> + ret = drm_dp_update_payload_part1(&mhdp->mst_mgr);
> + if (ret < 0)
> + DRM_ERROR("failed update_payload_part1\n");
> +
> + mhdp_bridge->stream_id = stream_id;
> + mhdp_bridge->is_active = true;
> +
> + cdns_mhdp_mst_stream_enable(mhdp_bridge, true);
> + cdns_mhdp_configure_video(bridge);
> +
> + ret = cdns_mhdp_apply_slot_allocation(mhdp_bridge);
> + if (ret < 0) {
> + cdns_mhdp_mst_stream_enable(mhdp_bridge, false);
> + mhdp_bridge->stream_id = -1;
> + mhdp_bridge->is_active = false;
> + return;
> + }
> +
> + ret = cdns_mhdp_set_act_enable(mhdp);
> + if (ret)
> + DRM_ERROR("failed ACT sequence\n");
> +
> + cdns_mhdp_set_rate_governing(mhdp_bridge, true);
> +
> + cdns_mhdp_mst_set_threshold(mhdp_bridge);
> +
> + drm_dp_update_payload_part2(&mhdp->mst_mgr);
> +}
> +
> +void cdns_mhdp_mst_disable(struct drm_bridge *bridge)
> +{
> + struct cdns_mhdp_bridge *mhdp_bridge = to_mhdp_bridge(bridge);
> + struct cdns_mhdp_device *mhdp = mhdp_bridge->mhdp;
> + struct cdns_mhdp_connector *connector = mhdp_bridge->connector;
> +
> + drm_dp_mst_reset_vcpi_slots(&mhdp->mst_mgr, connector->port);
> + drm_dp_update_payload_part1(&mhdp->mst_mgr);
> +
> + cdns_mhdp_update_slot_allocation(mhdp_bridge);
> +
> + drm_dp_check_act_status(&mhdp->mst_mgr);
> +
> + drm_dp_update_payload_part2(&mhdp->mst_mgr);
> +
> + drm_dp_mst_deallocate_vcpi(&mhdp->mst_mgr, connector->port);
> +
> + cdns_mhdp_set_rate_governing(mhdp_bridge, false);
> + cdns_mhdp_mst_stream_enable(mhdp_bridge, false);
> + mhdp_bridge->stream_id = -1;
> + mhdp_bridge->is_active = false;
> +}
> +
> +static const struct drm_bridge_funcs cdns_mhdp_mst_bridge_funcs = {
> + .enable = cdns_mhdp_enable,
> + .disable = cdns_mhdp_mst_disable,
> +};
> +
> +
> +static struct cdns_mhdp_bridge*
> +cdns_mhpd_create_fake_mst_bridge(struct cdns_mhdp_device *mhdp,
> + struct cdns_mhdp_connector *mhdp_connector)
> +{
> + struct cdns_mhdp_bridge *mhdp_bridge;
> + struct drm_encoder *encoder = NULL;
> + struct cdns_mhdp_mst_cbs *cbs = &mhdp->cbs;
> +
> + mhdp_bridge = kzalloc(sizeof(*mhdp_bridge), GFP_KERNEL);
> + if (!mhdp_bridge)
> + return NULL;
> +
> + mhdp_bridge->mhdp = mhdp;
> + mhdp_bridge->stream_id = -1;
> + mhdp_bridge->connector = mhdp_connector;
> + mhdp_bridge->is_active = false;
> +
> + mhdp_bridge->base.funcs = &cdns_mhdp_mst_bridge_funcs;
> +
> + drm_bridge_add(&mhdp_bridge->base);
> +
> + if (cbs->funcs.create_mst_encoder)
> + encoder = cbs->funcs.create_mst_encoder(cbs->priv_data,
> + &mhdp_bridge->base);
> + if (encoder) {
> + int ret;
> + /* use the same drm device as is in the first encoder */
> + encoder->dev = mhdp->bridge.base.encoder->dev;
> + encoder->possible_crtcs &= ((1 << CDNS_MHDP_MAX_STREAMS) - 1);
> + ret = drm_bridge_attach(encoder, &mhdp_bridge->base, NULL);
> + if (ret) {
> + dev_err(mhdp->dev, "bridge attaching error %d\n", ret);
> + return NULL;
> + }
> +
> + ret = drm_connector_attach_encoder(&mhdp_connector->base,
> + encoder);
> + if (ret) {
> + dev_err(mhdp->dev, "failed to attach connector to encoder\n");
> + return NULL;
> + }
> + }
> +
> + return mhdp_bridge;
> +}
> +
> +static struct drm_connector *
> +cdns_mhdp_mst_cbs_add_connector(struct drm_dp_mst_topology_mgr *mgr,
> + struct drm_dp_mst_port *port,
> + const char *pathprop)
> +{
> + struct cdns_mhdp_device *mhdp = mgr_to_mhdp(mgr);
> + struct drm_device *dev = mhdp->bridge.base.dev;
> + struct cdns_mhdp_connector *mhdp_connector;
> + struct drm_connector *connector;
> + struct drm_connector_state *conn_state;
> + int ret;
> +
> + mhdp_connector = kzalloc(sizeof(struct cdns_mhdp_connector),
> + GFP_KERNEL);
> + if (!mhdp_connector)
> + return NULL;
> +
> + mhdp_connector->is_mst_connector = true;
> + connector = &mhdp_connector->base;
> + mhdp_connector->port = port;
> + DRM_DEBUG_KMS("\n");
> +
> + conn_state = kzalloc(sizeof(*conn_state), GFP_KERNEL);
> + if (!conn_state)
> + return NULL;
> +
> + __drm_atomic_helper_connector_reset(connector,
> + conn_state);
> +
> + drm_connector_init(dev, connector, &cdns_mhdp_mst_connector_funcs,
> + DRM_MODE_CONNECTOR_DisplayPort);
> + drm_connector_helper_add(connector, &cdns_mhdp_mst_conn_helper_fun);
> + mhdp_connector->bridge =
> + cdns_mhpd_create_fake_mst_bridge(mhdp, mhdp_connector);
> +
> + drm_object_attach_property(&connector->base,
> + dev->mode_config.path_property, 0);
> + drm_object_attach_property(&connector->base,
> + dev->mode_config.tile_property, 0);
> + ret = drm_connector_set_path_property(connector, pathprop);
> +
> + if (ret)
> + DRM_ERROR("ERROR set path propertty failed\n");
> +
> + return connector;
> +}
> +
> +static void
> +cdns_mhdp_mst_cbs_destroy_connector(struct drm_dp_mst_topology_mgr *mgr,
> + struct drm_connector *connector)
> +{
> + struct cdns_mhdp_connector *mhdp_connector;
> + struct cdns_mhdp_device *mhdp;
> + struct cdns_mhdp_bridge *mhdp_bridge;
> +
> + mhdp_connector = to_mhdp_connector(connector);
> + mhdp_bridge = mhdp_connector->bridge;
> + mhdp = mhdp_bridge->mhdp;
> +
> + drm_connector_unregister(&mhdp_connector->base);
> +
> + if (mhdp->cbs.funcs.create_mst_encoder)
> + mhdp->cbs.funcs.destroy_mst_encoder(mhdp->cbs.priv_data,
> + &mhdp_bridge->base);
> + drm_connector_unreference(&mhdp_connector->base);
> +}
> +
> +static void cdns_mhdp_mst_cbs_hotplug(struct drm_dp_mst_topology_mgr *mgr)
> +{
> + struct cdns_mhdp_device *mhdp = mgr_to_mhdp(mgr);
> + struct drm_device *dev = mhdp->bridge.base.encoder->dev;
> +
> + drm_kms_helper_hotplug_event(dev);
> +}
> +
> +static void
> +cdns_mhdp_mst_cbs_register_connector(struct drm_connector *connector)
> +{
> + int ret;
> +
> + ret = drm_connector_register(connector);
> + if (ret)
> + DRM_ERROR("Register connector failed\n");
> +
> +}
> +
> +static const struct drm_dp_mst_topology_cbs mst_cbs = {
> + .add_connector = cdns_mhdp_mst_cbs_add_connector,
> + .register_connector = cdns_mhdp_mst_cbs_register_connector,
> + .destroy_connector = cdns_mhdp_mst_cbs_destroy_connector,
> + .hotplug = cdns_mhdp_mst_cbs_hotplug,
> +};
> +
> +
> +static void cdns_mhdp_set_mst_enable(struct cdns_mhdp_device *mhdp, bool enable)
> +{
> + u32 reg_val;
> +
> + cdns_mhdp_reg_read(mhdp, CDNS_DP_FRAMER_GLOBAL_CONFIG, ®_val);
> +
> + if (enable)
> + reg_val |= CDNS_DP_MST_EN;
> + else
> + reg_val &= ~CDNS_DP_MST_EN;
> +
> + cdns_mhdp_reg_write(mhdp, CDNS_DP_FRAMER_GLOBAL_CONFIG, reg_val);
> +}
> +
> +bool cdns_mhdp_mst_probe(struct cdns_mhdp_device *mhdp)
> +{
> + u8 mstm_cap;
> + u8 dpcd_cap[DP_RECEIVER_CAP_SIZE];
> +
> + bool is_mst;
> +
> + if (!mhdp->can_mst)
> + return false;
> +
> + drm_dp_dpcd_read(&mhdp->aux, DP_DPCD_REV, dpcd_cap,
> + DP_RECEIVER_CAP_SIZE);
> +
> + if (dpcd_cap[DP_DPCD_REV] < 0x12)
> + return false;
> +
> + if (drm_dp_dpcd_readb(&mhdp->aux, DP_MSTM_CAP, &mstm_cap) != 1)
> + return false;
> +
> + if (mstm_cap & DP_MST_CAP) {
> + DRM_DEBUG_KMS("Sink is MST capable\n");
> + is_mst = true;
> + } else {
> + DRM_DEBUG_KMS("Sink is not MST capable\n");
> + is_mst = false;
> + }
> +
> + if (is_mst != mhdp->is_mst) {
> + mhdp->is_mst = is_mst;
> + cdns_mhdp_set_mst_enable(mhdp, mhdp->is_mst);
> +
> + drm_dp_mst_topology_mgr_set_mst(&mhdp->mst_mgr,
> + mhdp->is_mst);
> + }
> +
> + return mhdp->is_mst;
> +}
> +
> +int cdns_mhdp_mst_init(struct cdns_mhdp_device *mhdp)
> +{
> + struct cdns_mhdp_bridge *bridge = &mhdp->bridge;
> + struct drm_device *dev = bridge->base.dev;
> + struct cdns_mhdp_connector *connector = bridge->connector;
> + int ret;
> +
> + mhdp->mst_mgr.cbs = &mst_cbs;
> + ret = drm_dp_mst_topology_mgr_init(&mhdp->mst_mgr, dev,
> + &mhdp->aux, 16,
> + CDNS_MHDP_MAX_STREAMS,
> + connector->base.base.id);
> + if (ret)
> + mhdp->can_mst = false;
> + else
> + mhdp->can_mst = true;
> +
> + mhdp->is_mst = false;
> +
> + bridge->stream_id = -1;
> +
> + return ret;
> +}
> +
> +void cdns_mhdp_mst_deinit(struct cdns_mhdp_device *mhdp)
> +{
> + if (mhdp->is_mst) {
> + mhdp->is_mst = false;
> + drm_dp_mst_topology_mgr_set_mst(&mhdp->mst_mgr,
> + mhdp->is_mst);
> + }
> +
> + if (mhdp->can_mst)
> + drm_dp_mst_topology_mgr_destroy(&mhdp->mst_mgr);
> +}
> diff --git a/drivers/gpu/drm/bridge/cdns-mhdp.c b/drivers/gpu/drm/bridge/cdns-mhdp.c
> index a3bbc0e809a5..48ac5cf1e031 100644
> --- a/drivers/gpu/drm/bridge/cdns-mhdp.c
> +++ b/drivers/gpu/drm/bridge/cdns-mhdp.c
> @@ -27,146 +27,15 @@
> #include <drm/bridge/cdns-mhdp-common.h>
>
> #include <sound/hdmi-codec.h>
> +#include <linux/irq.h>
> +#include <linux/of_irq.h>
>
> +#include "cdns-mhdp.h"
>
> #define DEBUG_MSG
>
> #define FW_NAME "cadence/mhdp8546.bin"
>
> -#define CDNS_APB_CFG 0x00000
> -#define CDNS_APB_CTRL (CDNS_APB_CFG + 0x00)
> -#define CDNS_MAILBOX_FULL (CDNS_APB_CFG + 0x08)
> -#define CDNS_MAILBOX_EMPTY (CDNS_APB_CFG + 0x0c)
> -#define CDNS_MAILBOX_TX_DATA (CDNS_APB_CFG + 0x10)
> -#define CDNS_MAILBOX_RX_DATA (CDNS_APB_CFG + 0x14)
> -#define CDNS_KEEP_ALIVE (CDNS_APB_CFG + 0x18)
> -#define CDNS_KEEP_ALIVE_MASK GENMASK(7, 0)
> -
> -#define CDNS_SW_CLK_L (CDNS_APB_CFG + 0x3c)
> -#define CDNS_SW_CLK_H (CDNS_APB_CFG + 0x40)
> -#define CDNS_SW_EVENT0 (CDNS_APB_CFG + 0x44)
> -#define CDNS_DPTX_HPD BIT(0)
> -
> -#define CDNS_SW_EVENT1 (CDNS_APB_CFG + 0x48)
> -#define CDNS_SW_EVENT2 (CDNS_APB_CFG + 0x4c)
> -#define CDNS_SW_EVENT3 (CDNS_APB_CFG + 0x50)
> -
> -#define CDNS_DPTX_CAR (CDNS_APB_CFG + 0x904)
> -#define CDNS_VIF_CLK_EN BIT(0)
> -#define CDNS_VIF_CLK_RSTN BIT(1)
> -
> -#define CDNS_SOURCE_VIDEO_INTERFACE 0x00b00
> -#define CDNS_BND_HSYNC2VSYNC (CDNS_SOURCE_VIDEO_INTERFACE + \
> - 0x00)
> -#define CDNS_IP_DTCT_WIN GENMASK(11, 0)
> -#define CDNS_IP_DET_INTERLACE_FORMAT BIT(12)
> -#define CDNS_IP_BYPASS_V_INTERFACE BIT(13)
> -
> -#define CDNS_HSYNC2VSYNC_POL_CTRL (CDNS_SOURCE_VIDEO_INTERFACE + \
> - 0x10)
> -#define CDNS_H2V_HSYNC_POL_ACTIVE_LOW BIT(1)
> -#define CDNS_H2V_VSYNC_POL_ACTIVE_LOW BIT(2)
> -
> -#define CDNS_DPTX_PHY_CONFIG 0x02000
> -#define CDNS_PHY_TRAINING_EN BIT(0)
> -#define CDNS_PHY_TRAINING_TYPE(x) (((x) & GENMASK(3, 0)) << 1)
> -#define CDNS_PHY_SCRAMBLER_BYPASS BIT(5)
> -#define CDNS_PHY_ENCODER_BYPASS BIT(6)
> -#define CDNS_PHY_SKEW_BYPASS BIT(7)
> -#define CDNS_PHY_TRAINING_AUTO BIT(8)
> -#define CDNS_PHY_LANE0_SKEW(x) (((x) & GENMASK(2, 0)) << 9)
> -#define CDNS_PHY_LANE1_SKEW(x) (((x) & GENMASK(2, 0)) << 12)
> -#define CDNS_PHY_LANE2_SKEW(x) (((x) & GENMASK(2, 0)) << 15)
> -#define CDNS_PHY_LANE3_SKEW(x) (((x) & GENMASK(2, 0)) << 18)
> -#define CDNS_PHY_COMMON_CONFIG (CDNS_PHY_LANE1_SKEW(1) | \
> - CDNS_PHY_LANE2_SKEW(2) | \
> - CDNS_PHY_LANE3_SKEW(3))
> -#define CDNS_PHY_10BIT_EN BIT(21)
> -
> -#define CDNS_DPTX_FRAMER 0x02200
> -#define CDNS_DP_FRAMER_GLOBAL_CONFIG (CDNS_DPTX_FRAMER + 0x00)
> -#define CDNS_DP_NUM_LANES(x) (x - 1)
> -#define CDNS_DP_FRAMER_EN BIT(3)
> -#define CDNS_DP_RATE_GOVERNOR_EN BIT(4)
> -#define CDNS_DP_NO_VIDEO_MODE BIT(5)
> -#define CDNS_DP_DISABLE_PHY_RST BIT(6)
> -#define CDNS_DP_WR_FAILING_EDGE_VSYNC BIT(7)
> -
> -#define CDNS_DP_SW_RESET (CDNS_DPTX_FRAMER + 0x04)
> -#define CDNS_DP_FRAMER_TU (CDNS_DPTX_FRAMER + 0x08)
> -#define CDNS_DP_FRAMER_TU_SIZE(x) (((x) & GENMASK(6, 0)) << 8)
> -#define CDNS_DP_FRAMER_TU_VS(x) ((x) & GENMASK(5, 0))
> -#define CDNS_DP_FRAMER_TU_CNT_RST_EN BIT(15)
> -
> -#define CDNS_DPTX_STREAM 0x03000
> -#define CDNS_DP_MSA_HORIZONTAL_0 (CDNS_DPTX_STREAM + 0x00)
> -#define CDNS_DP_MSAH0_H_TOTAL(x) (x)
> -#define CDNS_DP_MSAH0_HSYNC_START(x) ((x) << 16)
> -
> -#define CDNS_DP_MSA_HORIZONTAL_1 (CDNS_DPTX_STREAM + 0x04)
> -#define CDNS_DP_MSAH1_HSYNC_WIDTH(x) (x)
> -#define CDNS_DP_MSAH1_HSYNC_POL_LOW BIT(15)
> -#define CDNS_DP_MSAH1_HDISP_WIDTH(x) ((x) << 16)
> -
> -#define CDNS_DP_MSA_VERTICAL_0 (CDNS_DPTX_STREAM + 0x08)
> -#define CDNS_DP_MSAV0_V_TOTAL(x) (x)
> -#define CDNS_DP_MSAV0_VSYNC_START(x) ((x) << 16)
> -
> -#define CDNS_DP_MSA_VERTICAL_1 (CDNS_DPTX_STREAM + 0x0c)
> -#define CDNS_DP_MSAV1_VSYNC_WIDTH(x) (x)
> -#define CDNS_DP_MSAV1_VSYNC_POL_LOW BIT(15)
> -#define CDNS_DP_MSAV1_VDISP_WIDTH(x) ((x) << 16)
> -
> -#define CDNS_DP_MSA_MISC (CDNS_DPTX_STREAM + 0x10)
> -#define CDNS_DP_STREAM_CONFIG (CDNS_DPTX_STREAM + 0x14)
> -#define CDNS_DP_RATE_GOVERNOR_STATUS (CDNS_DPTX_STREAM + 0x2c)
> -#define CDNS_DP_RG_TU_VS_DIFF(x) ((x) << 8)
> -
> -#define CDNS_DP_HORIZONTAL (CDNS_DPTX_STREAM + 0x30)
> -#define CDNS_DP_H_HSYNC_WIDTH(x) (x)
> -#define CDNS_DP_H_H_TOTAL(x) ((x) << 16)
> -
> -#define CDNS_DP_VERTICAL_0 (CDNS_DPTX_STREAM + 0x34)
> -#define CDNS_DP_V0_VHEIGHT(x) (x)
> -#define CDNS_DP_V0_VSTART(x) ((x) << 16)
> -
> -#define CDNS_DP_VERTICAL_1 (CDNS_DPTX_STREAM + 0x38)
> -#define CDNS_DP_V1_VTOTAL(x) (x)
> -#define CDNS_DP_V1_VTOTAL_EVEN BIT(16)
> -
> -#define CDNS_DP_FRAMER_PXL_REPR (CDNS_DPTX_STREAM + 0x4c)
> -#define CDNS_DP_FRAMER_6_BPC BIT(0)
> -#define CDNS_DP_FRAMER_8_BPC BIT(1)
> -#define CDNS_DP_FRAMER_10_BPC BIT(2)
> -#define CDNS_DP_FRAMER_12_BPC BIT(3)
> -#define CDNS_DP_FRAMER_16_BPC BIT(4)
> -#define CDNS_DP_FRAMER_PXL_FORMAT 0x8
> -#define CDNS_DP_FRAMER_RGB BIT(0)
> -#define CDNS_DP_FRAMER_YCBCR444 BIT(1)
> -#define CDNS_DP_FRAMER_YCBCR422 BIT(2)
> -#define CDNS_DP_FRAMER_YCBCR420 BIT(3)
> -#define CDNS_DP_FRAMER_Y_ONLY BIT(4)
> -
> -#define CDNS_DP_FRAMER_SP (CDNS_DPTX_STREAM + 0x10)
> -#define CDNS_DP_FRAMER_VSYNC_POL_LOW BIT(0)
> -#define CDNS_DP_FRAMER_HSYNC_POL_LOW BIT(1)
> -#define CDNS_DP_FRAMER_INTERLACE BIT(2)
> -
> -#define CDNS_DP_LINE_THRESH (CDNS_DPTX_STREAM + 0x64)
> -#define CDNS_DP_VB_ID (CDNS_DPTX_STREAM + 0x68)
> -#define CDNS_DP_VB_ID_INTERLACED BIT(2)
> -
> -#define CDNS_DP_FRONT_BACK_PORCH (CDNS_DPTX_STREAM + 0x78)
> -#define CDNS_DP_BACK_PORCH(x) (x)
> -#define CDNS_DP_FRONT_PORCH(x) ((x) << 16)
> -
> -#define CDNS_DP_BYTE_COUNT (CDNS_DPTX_STREAM + 0x7c)
> -
> -#define CDNS_DPTX_GLOBAL 0x02300
> -#define CDNS_DP_LANE_EN (CDNS_DPTX_GLOBAL + 0x00)
> -#define CDNS_DP_LANE_EN_LANES(x) GENMASK(x - 1, 0)
> -#define CDNS_DP_ENHNCD (CDNS_DPTX_GLOBAL + 0x04)
> -
> #define CDNS_MHDP_IMEM 0x10000
> #define CDNS_MHDP_DMEM 0x20000
>
> @@ -216,13 +85,17 @@ MODULE_DEVICE_TABLE(of, mhdp_ids);
> static inline struct cdns_mhdp_device *connector_to_mhdp(
> struct drm_connector *conn)
> {
> - return container_of(conn, struct cdns_mhdp_device, connector);
> + struct cdns_mhdp_connector *mhdp_connector = to_mhdp_connector(conn);
> +
> + return mhdp_connector->bridge->mhdp;
> }
>
> static inline struct cdns_mhdp_device *bridge_to_mhdp(
> struct drm_bridge *bridge)
> {
> - return container_of(bridge, struct cdns_mhdp_device, bridge);
> + struct cdns_mhdp_bridge *mhdp_bridge = to_mhdp_bridge(bridge);
> +
> + return mhdp_bridge->mhdp;
> }
>
> static unsigned int max_link_rate(struct cdns_mhdp_host host,
> @@ -237,6 +110,62 @@ static u8 eq_training_pattern_supported(struct cdns_mhdp_host host,
> return fls(host.pattern_supp & sink.pattern_supp);
> }
>
> +static void mhdp_hotplug_work_func(struct work_struct *work)
> +{
> + struct cdns_mhdp_device *mhdp;
> + int dret, retry;
> + u8 esi[16] = { 0 };
> + bool new_irq_handled;
> + struct drm_connector *connector;
> + bool old_plugged;
> +
> +
> + mhdp = container_of(work, struct cdns_mhdp_device,
> + hotplug_work.work);
> + connector = &mhdp->connector.base;
> +
> + old_plugged = mhdp->plugged;
> + connector->status = connector->funcs->detect(connector, false);
> + if (old_plugged != mhdp->plugged) {
> + drm_kms_helper_hotplug_event(mhdp->bridge.base.dev);
> + return;
> + }
> +
> + if (mhdp->plugged) {
> + dret = drm_dp_dpcd_read(&mhdp->aux,
> + DP_SINK_COUNT_ESI, esi, 8);
> +
> + if (dret == 8) {
> + drm_dp_mst_hpd_irq(&mhdp->mst_mgr,
> + esi,
> + &new_irq_handled);
> + }
> +
> + if (new_irq_handled) {
> + for (retry = 0; retry < 3; retry++) {
> + int wret;
> +
> + wret = drm_dp_dpcd_write(&mhdp->aux,
> + DP_SINK_COUNT_ESI+1,
> + &esi[1], 3);
> + if (wret == 3)
> + break;
> + }
> + }
> + }
> +
> +}
> +
> +static irqreturn_t mhdp_irq_handler(int irq, void *data)
> +{
> + struct cdns_mhdp_device *mhdp = (struct cdns_mhdp_device *)data;
> +
> + if (readl(mhdp->regs + CDNS_SW_EVENT0) & CDNS_DPTX_HPD)
> + schedule_delayed_work(&mhdp->hotplug_work, 0);
> +
> + return IRQ_HANDLED;
> +}
> +
> static ssize_t mhdp_transfer(struct drm_dp_aux *aux,
> struct drm_dp_aux_msg *msg)
> {
> @@ -300,10 +229,16 @@ static enum drm_connector_status cdns_mhdp_detect(struct drm_connector *conn,
> int ret;
>
> ret = cdns_mhdp_get_hpd_status(mhdp);
> - if (ret > 0)
> - status = connector_status_connected;
> - else if (ret < 0)
> + if (ret > 0) {
> + mhdp->plugged = true;
> + cdns_mhdp_mst_probe(mhdp);
> + // for MST mode this connector will be always disconnected
> + if (!mhdp->is_mst)
> + status = connector_status_connected;
> + } else if (ret < 0)
> dev_err(mhdp->dev, "Failed to obtain HPD state\n");
> + else
> + mhdp->plugged = false;
>
> return status;
> }
> @@ -321,11 +256,15 @@ static const struct drm_connector_funcs cdns_mhdp_conn_funcs = {
> static int cdns_mhdp_attach(struct drm_bridge *bridge)
> {
> struct cdns_mhdp_device *mhdp = bridge_to_mhdp(bridge);
> - struct drm_connector *conn = &mhdp->connector;
> + struct drm_connector *conn = &mhdp->connector.base;
> int ret;
>
> - conn->polled = DRM_CONNECTOR_POLL_CONNECT |
> - DRM_CONNECTOR_POLL_DISCONNECT;
> + if (&mhdp->bridge.base != bridge)
> + return -ENODEV;
> +
> + cdns_mhdp_mst_init(mhdp);
> +
> + conn->polled = DRM_CONNECTOR_POLL_HPD;
>
> ret = drm_connector_init(bridge->dev, conn, &cdns_mhdp_conn_funcs,
> DRM_MODE_CONNECTOR_DisplayPort);
> @@ -342,17 +281,12 @@ static int cdns_mhdp_attach(struct drm_bridge *bridge)
> return ret;
> }
>
> + /* enable interrupts */
> + writel(~CDNS_APB_INT_MASK_SW_EVENT_INT, mhdp->regs + CDNS_APB_INT_MASK);
> +
> return 0;
> }
>
> -enum pixel_format {
> - PIXEL_FORMAT_RGB = 1,
> - PIXEL_FORMAT_YCBCR_444 = 2,
> - PIXEL_FORMAT_YCBCR_422 = 4,
> - PIXEL_FORMAT_YCBCR_420 = 8,
> - PIXEL_FORMAT_Y_ONLY = 16,
> -};
> -
> static void mhdp_link_training_init(struct cdns_mhdp_device *mhdp)
> {
> u32 reg32;
> @@ -716,13 +650,11 @@ static int mhdp_link_training(struct cdns_mhdp_device *mhdp,
> cdns_mhdp_reg_write(mhdp, CDNS_DP_SW_RESET, 1);
> cdns_mhdp_reg_write(mhdp, CDNS_DP_SW_RESET, 0);
>
> - /* Enable framer */
> - /* FIXME: update when MST supported, BIT(2) */
> cdns_mhdp_reg_write(mhdp, CDNS_DP_FRAMER_GLOBAL_CONFIG,
> - CDNS_DP_FRAMER_EN |
> CDNS_DP_NUM_LANES(mhdp->link.num_lanes) |
> CDNS_DP_DISABLE_PHY_RST |
> CDNS_DP_WR_FAILING_EDGE_VSYNC |
> + (mhdp->is_mst ? CDNS_DP_MST_EN : 0) |
> (!video_mode ? CDNS_DP_NO_VIDEO_MODE : 0));
>
> /* Reset PHY config */
> @@ -751,31 +683,20 @@ static void cdns_mhdp_disable(struct drm_bridge *bridge)
>
> cdns_mhdp_set_video_status(mhdp, 0);
>
> + mhdp->link_up = false;
> +
> drm_dp_link_power_down(&mhdp->aux, &mhdp->link);
> + if (mhdp->is_mst)
> + cdns_mhdp_mst_disable(bridge);
> }
>
> -static void cdns_mhdp_enable(struct drm_bridge *bridge)
> +static int cdns_mhdp_link_up(struct cdns_mhdp_device *mhdp)
> {
> - struct cdns_mhdp_device *mhdp = bridge_to_mhdp(bridge);
> - struct drm_display_mode *mode;
> - struct drm_display_info *disp_info = &mhdp->connector.display_info;
> - enum pixel_format pxlfmt;
> - int pxlclock;
> - unsigned int rate, tu_size = 30, vs, vs_f, bpp, required_bandwidth,
> - available_bandwidth, dp_framer_sp = 0, msa_horizontal_1,
> - msa_vertical_1, bnd_hsync2vsync, hsync2vsync_pol_ctrl,
> - misc0 = 0, misc1 = 0, line_thresh = 0, pxl_repr,
> - front_porch, back_porch, msa_h0, msa_v0, hsync, vsync,
> - dp_vertical_1, line_thresh1, line_thresh2;
> u32 resp;
> -
> - unsigned int size = DP_RECEIVER_CAP_SIZE, dp_framer_global_config,
> + u32 size = DP_RECEIVER_CAP_SIZE, dp_framer_global_config,
> video_mode, training_interval_us;
> u8 reg0[size], reg8, amp[2];
>
> - mode = &bridge->encoder->crtc->state->adjusted_mode;
> - pxlclock = mode->crtc_clock;
> -
> /*
> * Upon power-on reset/device disconnection: [2:0] bits should be 0b001
> * and [7:5] bits 0b000.
> @@ -824,13 +745,17 @@ static void cdns_mhdp_enable(struct drm_bridge *bridge)
> default:
> dev_err(mhdp->dev,
> "wrong training interval returned by DPCD: %d\n", reg8);
> - return;
> + return -EIO;
> }
>
> cdns_mhdp_reg_read(mhdp, CDNS_DP_FRAMER_GLOBAL_CONFIG, &resp);
>
> dp_framer_global_config = be32_to_cpu(resp);
>
> + cdns_mhdp_mst_probe(mhdp);
> + if (mhdp->is_mst)
> + dp_framer_global_config |= CDNS_DP_MST_EN;
> +
> video_mode = !(dp_framer_global_config & CDNS_DP_NO_VIDEO_MODE);
>
> if (dp_framer_global_config & CDNS_DP_FRAMER_EN)
> @@ -850,50 +775,168 @@ static void cdns_mhdp_enable(struct drm_bridge *bridge)
> if (mhdp_link_training(mhdp, video_mode,
> training_interval_us)) {
> dev_err(mhdp->dev, "Link training failed. Exiting.\n");
> - return;
> + return -EIO;
> }
> }
>
> + mhdp->link_up = true;
> +
> + return 0;
> +}
> +
> +static int cdns_mhdp_sst_enable(struct drm_bridge *bridge)
> +{
> + struct cdns_mhdp_bridge *mhdp_bridge = to_mhdp_bridge(bridge);
> + struct cdns_mhdp_device *mhdp = mhdp_bridge->mhdp;
> + u32 rate, vs, vs_f, required_bandwidth, available_bandwidth;
> + u32 bpp, tu_size = 30, line_thresh1, line_thresh2, line_thresh = 0;
> + struct drm_display_mode *mode;
> + int pxlclock;
> + enum pixel_format pxlfmt;
> + struct drm_display_info *disp_info = &mhdp->connector.base.display_info;
> +
> +
> + mode = &bridge->encoder->crtc->state->adjusted_mode;
> + pxlclock = mode->crtc_clock;
> +
> + mhdp_bridge->stream_id = 0;
> +
> rate = mhdp->link.rate / 1000;
>
> + pxlfmt = cdns_mhdp_get_pxlfmt(disp_info->color_formats);
> + bpp = cdns_mhdp_get_bpp(disp_info->bpc, pxlfmt);
> +
> + /* find optimal tu_size */
> + required_bandwidth = pxlclock * bpp / 8;
> + available_bandwidth = mhdp->link.num_lanes * rate;
> + do {
> + tu_size += 2;
> +
> + vs_f = tu_size * required_bandwidth / available_bandwidth;
> + vs = vs_f / 1000;
> + vs_f = vs_f % 1000;
> + /*
> + * FIXME (CDNS): downspreading?
> + * It's unused is what I've been told.
> + */
> + } while ((vs == 1 || ((vs_f > 850 || vs_f < 100) && vs_f != 0) ||
> + tu_size - vs < 2) && tu_size < 64);
> +
> + if (vs > 64)
> + return -EINVAL;
> +
> +
> + cdns_mhdp_reg_write(mhdp, CDNS_DP_FRAMER_TU,
> + CDNS_DP_FRAMER_TU_VS(vs) |
> + CDNS_DP_FRAMER_TU_SIZE(tu_size) |
> + CDNS_DP_FRAMER_TU_CNT_RST_EN);
> +
> + line_thresh1 = ((vs + 1) << 5) * 8 / bpp;
> + line_thresh2 = (pxlclock << 5) / 1000 / rate * (vs + 1) - (1 << 5);
> + line_thresh = line_thresh1 - line_thresh2 / mhdp->link.num_lanes;
> + line_thresh = (line_thresh >> 5) + 2;
> + cdns_mhdp_reg_write(mhdp, CDNS_DP_LINE_THRESH(0),
> + line_thresh & GENMASK(5, 0));
> +
> + cdns_mhdp_reg_write(mhdp, CDNS_DP_STREAM_CONFIG_2(0),
> + CDNS_DP_SC2_TU_VS_DIFF((tu_size - vs > 3) ?
> + 0 : tu_size - vs));
> +
> + cdns_mhdp_configure_video(bridge);
> +
> + cdns_mhdp_set_video_status(mhdp, 1);
> +
> + return 0;
> +}
> +
> +enum pixel_format cdns_mhdp_get_pxlfmt(u32 color_formats)
> +{
> + enum pixel_format pxlfmt;
> +
> /* FIXME: what about Y_ONLY? how is it handled in the kernel? */
> - if (disp_info->color_formats & DRM_COLOR_FORMAT_YCRCB444)
> + if (color_formats & DRM_COLOR_FORMAT_YCRCB444)
> pxlfmt = PIXEL_FORMAT_YCBCR_444;
> - else if (disp_info->color_formats & DRM_COLOR_FORMAT_YCRCB422)
> + else if (color_formats & DRM_COLOR_FORMAT_YCRCB422)
> pxlfmt = PIXEL_FORMAT_YCBCR_422;
> - else if (disp_info->color_formats & DRM_COLOR_FORMAT_YCRCB420)
> + else if (color_formats & DRM_COLOR_FORMAT_YCRCB420)
> pxlfmt = PIXEL_FORMAT_YCBCR_420;
> else
> pxlfmt = PIXEL_FORMAT_RGB;
>
> + return pxlfmt;
> +}
> +
> +
> +u32 cdns_mhdp_get_bpp(u32 bpc, enum pixel_format pxlfmt)
> +{
> + u32 bpp;
> +
> + switch (pxlfmt) {
> + case PIXEL_FORMAT_RGB:
> + bpp = bpc * 3;
> + break;
> + case PIXEL_FORMAT_YCBCR_444:
> + bpp = bpc * 3;
> + break;
> + case PIXEL_FORMAT_YCBCR_422:
> + bpp = bpc * 2;
> + break;
> + case PIXEL_FORMAT_YCBCR_420:
> + bpp = bpc * 3 / 2;
> + break;
> + default:
> + bpp = bpc;
> + }
> + return bpp;
> +}
> +
> +void cdns_mhdp_configure_video(struct drm_bridge *bridge)
> +{
> + struct cdns_mhdp_bridge *mhdp_bridge = to_mhdp_bridge(bridge);
> + struct cdns_mhdp_device *mhdp = mhdp_bridge->mhdp;
> + struct drm_display_info *disp_info;
> + unsigned int bpp, dp_framer_sp = 0, msa_horizontal_1,
> + msa_vertical_1, bnd_hsync2vsync, hsync2vsync_pol_ctrl,
> + misc0 = 0, misc1 = 0, pxl_repr,
> + front_porch, back_porch, msa_h0, msa_v0, hsync, vsync,
> + dp_vertical_1;
> + struct drm_display_mode *mode;
> + enum pixel_format pxlfmt;
> + int pxlclock;
> + u32 tmp;
> + u8 stream_id = mhdp_bridge->stream_id;
> +
> + mode = &bridge->encoder->crtc->state->adjusted_mode;
> + pxlclock = mode->crtc_clock;
> +
> + disp_info = &mhdp_bridge->connector->base.display_info;
> + pxlfmt = cdns_mhdp_get_pxlfmt(disp_info->color_formats);
> +
> /* if YCBCR supported and stream not SD, use ITU709 */
> /* FIXME: handle ITU version with YCBCR420 when supported */
> if ((pxlfmt == PIXEL_FORMAT_YCBCR_444 ||
> pxlfmt == PIXEL_FORMAT_YCBCR_422) && mode->crtc_vdisplay >= 720)
> misc0 = DP_YCBCR_COEFFICIENTS_ITU709;
>
> + bpp = cdns_mhdp_get_bpp(disp_info->bpc, pxlfmt);
> +
> switch (pxlfmt) {
> case PIXEL_FORMAT_RGB:
> - bpp = disp_info->bpc * 3;
> pxl_repr = CDNS_DP_FRAMER_RGB << CDNS_DP_FRAMER_PXL_FORMAT;
> misc0 |= DP_COLOR_FORMAT_RGB;
> break;
> case PIXEL_FORMAT_YCBCR_444:
> - bpp = disp_info->bpc * 3;
> pxl_repr = CDNS_DP_FRAMER_YCBCR444 << CDNS_DP_FRAMER_PXL_FORMAT;
> misc0 |= DP_COLOR_FORMAT_YCbCr444 | DP_TEST_DYNAMIC_RANGE_CEA;
> break;
> case PIXEL_FORMAT_YCBCR_422:
> - bpp = disp_info->bpc * 2;
> pxl_repr = CDNS_DP_FRAMER_YCBCR422 << CDNS_DP_FRAMER_PXL_FORMAT;
> misc0 |= DP_COLOR_FORMAT_YCbCr422 | DP_TEST_DYNAMIC_RANGE_CEA;
> break;
> case PIXEL_FORMAT_YCBCR_420:
> - bpp = disp_info->bpc * 3 / 2;
> pxl_repr = CDNS_DP_FRAMER_YCBCR420 << CDNS_DP_FRAMER_PXL_FORMAT;
> break;
> default:
> - bpp = disp_info->bpc;
> pxl_repr = CDNS_DP_FRAMER_Y_ONLY << CDNS_DP_FRAMER_PXL_FORMAT;
> }
>
> @@ -920,30 +963,12 @@ static void cdns_mhdp_enable(struct drm_bridge *bridge)
> break;
> }
>
> - /* find optimal tu_size */
> - required_bandwidth = pxlclock * bpp / 8;
> - available_bandwidth = mhdp->link.num_lanes * rate;
> - do {
> - tu_size += 2;
> -
> - vs_f = tu_size * required_bandwidth / available_bandwidth;
> - vs = vs_f / 1000;
> - vs_f = vs_f % 1000;
> - /*
> - * FIXME (CDNS): downspreading?
> - * It's unused is what I've been told.
> - */
> - } while ((vs == 1 || ((vs_f > 850 || vs_f < 100) && vs_f != 0) ||
> - tu_size - vs < 2) && tu_size < 64);
> -
> - if (vs > 64)
> - return;
> -
> bnd_hsync2vsync = CDNS_IP_BYPASS_V_INTERFACE;
> if (mode->flags & DRM_MODE_FLAG_INTERLACE)
> bnd_hsync2vsync |= CDNS_IP_DET_INTERLACE_FORMAT;
>
> - cdns_mhdp_reg_write(mhdp, CDNS_BND_HSYNC2VSYNC, bnd_hsync2vsync);
> + cdns_mhdp_reg_write(mhdp, CDNS_BND_HSYNC2VSYNC(stream_id),
> + bnd_hsync2vsync);
>
> if (mode->flags & DRM_MODE_FLAG_INTERLACE &&
> mode->flags & DRM_MODE_FLAG_PHSYNC)
> @@ -952,15 +977,10 @@ static void cdns_mhdp_enable(struct drm_bridge *bridge)
> else
> hsync2vsync_pol_ctrl = 0;
>
> - cdns_mhdp_reg_write(mhdp, CDNS_HSYNC2VSYNC_POL_CTRL,
> + cdns_mhdp_reg_write(mhdp, CDNS_HSYNC2VSYNC_POL_CTRL(stream_id),
> hsync2vsync_pol_ctrl);
>
> - cdns_mhdp_reg_write(mhdp, CDNS_DP_FRAMER_TU,
> - CDNS_DP_FRAMER_TU_VS(vs) |
> - CDNS_DP_FRAMER_TU_SIZE(tu_size) |
> - CDNS_DP_FRAMER_TU_CNT_RST_EN);
> -
> - cdns_mhdp_reg_write(mhdp, CDNS_DP_FRAMER_PXL_REPR, pxl_repr);
> + cdns_mhdp_reg_write(mhdp, CDNS_DP_FRAMER_PXL_REPR(stream_id), pxl_repr);
>
> if (mode->flags & DRM_MODE_FLAG_INTERLACE)
> dp_framer_sp |= CDNS_DP_FRAMER_INTERLACE;
> @@ -968,19 +988,19 @@ static void cdns_mhdp_enable(struct drm_bridge *bridge)
> dp_framer_sp |= CDNS_DP_FRAMER_HSYNC_POL_LOW;
> if (mode->flags & DRM_MODE_FLAG_NVSYNC)
> dp_framer_sp |= CDNS_DP_FRAMER_VSYNC_POL_LOW;
> - cdns_mhdp_reg_write(mhdp, CDNS_DP_FRAMER_SP, dp_framer_sp);
> + cdns_mhdp_reg_write(mhdp, CDNS_DP_FRAMER_SP(stream_id), dp_framer_sp);
>
> front_porch = mode->crtc_hsync_start - mode->crtc_hdisplay;
> back_porch = mode->crtc_htotal - mode->crtc_hsync_end;
> - cdns_mhdp_reg_write(mhdp, CDNS_DP_FRONT_BACK_PORCH,
> + cdns_mhdp_reg_write(mhdp, CDNS_DP_FRONT_BACK_PORCH(stream_id),
> CDNS_DP_FRONT_PORCH(front_porch) |
> CDNS_DP_BACK_PORCH(back_porch));
>
> - cdns_mhdp_reg_write(mhdp, CDNS_DP_BYTE_COUNT,
> + cdns_mhdp_reg_write(mhdp, CDNS_DP_BYTE_COUNT(stream_id),
> mode->crtc_hdisplay * bpp / 8);
>
> msa_h0 = mode->crtc_htotal - mode->crtc_hsync_start;
> - cdns_mhdp_reg_write(mhdp, CDNS_DP_MSA_HORIZONTAL_0,
> + cdns_mhdp_reg_write(mhdp, CDNS_DP_MSA_HORIZONTAL_0(stream_id),
> CDNS_DP_MSAH0_H_TOTAL(mode->crtc_htotal) |
> CDNS_DP_MSAH0_HSYNC_START(msa_h0));
>
> @@ -989,11 +1009,11 @@ static void cdns_mhdp_enable(struct drm_bridge *bridge)
> CDNS_DP_MSAH1_HDISP_WIDTH(mode->crtc_hdisplay);
> if (mode->flags & DRM_MODE_FLAG_NHSYNC)
> msa_horizontal_1 |= CDNS_DP_MSAH1_HSYNC_POL_LOW;
> - cdns_mhdp_reg_write(mhdp, CDNS_DP_MSA_HORIZONTAL_1,
> + cdns_mhdp_reg_write(mhdp, CDNS_DP_MSA_HORIZONTAL_1(stream_id),
> msa_horizontal_1);
>
> msa_v0 = mode->crtc_vtotal - mode->crtc_vsync_start;
> - cdns_mhdp_reg_write(mhdp, CDNS_DP_MSA_VERTICAL_0,
> + cdns_mhdp_reg_write(mhdp, CDNS_DP_MSA_VERTICAL_0(stream_id),
> CDNS_DP_MSAV0_V_TOTAL(mode->crtc_vtotal) |
> CDNS_DP_MSAV0_VSYNC_START(msa_v0));
>
> @@ -1002,7 +1022,8 @@ static void cdns_mhdp_enable(struct drm_bridge *bridge)
> CDNS_DP_MSAV1_VDISP_WIDTH(mode->crtc_vdisplay);
> if (mode->flags & DRM_MODE_FLAG_NVSYNC)
> msa_vertical_1 |= CDNS_DP_MSAV1_VSYNC_POL_LOW;
> - cdns_mhdp_reg_write(mhdp, CDNS_DP_MSA_VERTICAL_1, msa_vertical_1);
> + cdns_mhdp_reg_write(mhdp, CDNS_DP_MSA_VERTICAL_1(stream_id),
> + msa_vertical_1);
>
> if ((mode->flags & DRM_MODE_FLAG_INTERLACE) &&
> mode->crtc_vtotal % 2 == 0)
> @@ -1014,16 +1035,14 @@ static void cdns_mhdp_enable(struct drm_bridge *bridge)
> if (pxlfmt == PIXEL_FORMAT_YCBCR_420)
> misc1 = CDNS_DP_TEST_VSC_SDP;
>
> - cdns_mhdp_reg_write(mhdp, CDNS_DP_MSA_MISC, misc0 | (misc1 << 8));
> + cdns_mhdp_reg_write(mhdp, CDNS_DP_MSA_MISC(stream_id),
> + misc0 | (misc1 << 8));
>
> - /* FIXME: to be changed if MST mode */
> - cdns_mhdp_reg_write(mhdp, CDNS_DP_STREAM_CONFIG, 1);
> -
> - cdns_mhdp_reg_write(mhdp, CDNS_DP_HORIZONTAL,
> + cdns_mhdp_reg_write(mhdp, CDNS_DP_HORIZONTAL(stream_id),
> CDNS_DP_H_HSYNC_WIDTH(hsync) |
> CDNS_DP_H_H_TOTAL(mode->crtc_hdisplay));
>
> - cdns_mhdp_reg_write(mhdp, CDNS_DP_VERTICAL_0,
> + cdns_mhdp_reg_write(mhdp, CDNS_DP_VERTICAL_0(stream_id),
> CDNS_DP_V0_VHEIGHT(mode->crtc_vdisplay) |
> CDNS_DP_V0_VSTART(msa_v0));
>
> @@ -1032,30 +1051,51 @@ static void cdns_mhdp_enable(struct drm_bridge *bridge)
> mode->crtc_vtotal % 2 == 0)
> dp_vertical_1 |= CDNS_DP_V1_VTOTAL_EVEN;
>
> - cdns_mhdp_reg_write(mhdp, CDNS_DP_VERTICAL_1, dp_vertical_1);
> + cdns_mhdp_reg_write(mhdp, CDNS_DP_VERTICAL_1(stream_id), dp_vertical_1);
>
> - cdns_mhdp_reg_write_bit(mhdp, CDNS_DP_VB_ID, 2, 1,
> + cdns_mhdp_reg_write_bit(mhdp, CDNS_DP_VB_ID(stream_id), 2, 1,
> (mode->flags & DRM_MODE_FLAG_INTERLACE) ?
> CDNS_DP_VB_ID_INTERLACED : 0);
>
> - line_thresh1 = ((vs + 1) << 5) * 8 / bpp;
> - line_thresh2 = (pxlclock << 5) / 1000 / rate * (vs + 1) - (1 << 5);
> - line_thresh = line_thresh1 - line_thresh2 / mhdp->link.num_lanes;
> - line_thresh = (line_thresh >> 5) + 2;
> - cdns_mhdp_reg_write(mhdp, CDNS_DP_LINE_THRESH,
> - line_thresh & GENMASK(5, 0));
>
> - cdns_mhdp_reg_write(mhdp, CDNS_DP_RATE_GOVERNOR_STATUS,
> - CDNS_DP_RG_TU_VS_DIFF((tu_size - vs > 3) ?
> - 0 : tu_size - vs));
> + cdns_mhdp_reg_read(mhdp, CDNS_DP_FRAMER_GLOBAL_CONFIG, &tmp);
> + tmp |= CDNS_DP_FRAMER_EN;
> + cdns_mhdp_reg_write(mhdp, CDNS_DP_FRAMER_GLOBAL_CONFIG, tmp);
> +}
>
> - cdns_mhdp_set_video_status(mhdp, 1);
> +void cdns_mhdp_enable(struct drm_bridge *bridge)
> +{
> + struct cdns_mhdp_bridge *mhdp_bridge = to_mhdp_bridge(bridge);
> + struct cdns_mhdp_device *mhdp = mhdp_bridge->mhdp;
> + int ret = 0;
> +
> + bool link_up = mhdp->link_up;
> +
> + if (!link_up)
> + cdns_mhdp_link_up(mhdp);
> +
> +
> + if (!mhdp->is_mst)
> + ret = cdns_mhdp_sst_enable(bridge);
> + else
> + cdns_mhdp_mst_enable(bridge);
> +
ret unused, link_up not neccessary, requires cleanup.
> +}
> +
> +static void cdns_mhdp_detach(struct drm_bridge *bridge)
> +{
> + struct cdns_mhdp_device *mhdp = bridge_to_mhdp(bridge);
> + struct cdns_mhdp_mst_cbs cbs_null = {0};
> +
> + cdns_mhdp_mst_deinit(mhdp);
> + mhdp->cbs = cbs_null;
> }
>
> static const struct drm_bridge_funcs cdns_mhdp_bridge_funcs = {
> .enable = cdns_mhdp_enable,
> .disable = cdns_mhdp_disable,
> .attach = cdns_mhdp_attach,
> + .detach = cdns_mhdp_detach,
> };
>
> static int load_firmware(struct cdns_mhdp_device *mhdp, const char *name,
> @@ -1127,8 +1167,8 @@ static int cdns_mhdp_audio_get_eld(struct device *dev, void *data,
> {
> struct cdns_mhdp_device *mhdp = dev_get_drvdata(dev);
>
> - memcpy(buf, mhdp->connector.eld,
> - min(sizeof(mhdp->connector.eld), len));
> + memcpy(buf, mhdp->connector.base.eld,
> + min(sizeof(mhdp->connector.base.eld), len));
>
> return 0;
> }
> @@ -1149,6 +1189,7 @@ static int mhdp_probe(struct platform_device *pdev)
> unsigned int reg;
> unsigned long rate;
> u32 resp;
> + int irq;
>
> struct hdmi_codec_pdata codec_data = {
> .i2s = 1,
> @@ -1192,6 +1233,14 @@ static int mhdp_probe(struct platform_device *pdev)
> /* Leave debug mode */
> writel(0, mhdp->regs + CDNS_APB_CTRL);
>
> + irq = platform_get_irq(pdev, 0);
> + ret = request_irq(irq, mhdp_irq_handler, 0, "mhdp8546", mhdp);
No free_irq, why dont you use devm_request_irq.
> + if (ret) {
> + dev_err(&pdev->dev,
> + "cannot install IRQ %d\n", irq);
> + return -EIO;
> + }
> +
> /*
> * Wait for the KEEP_ALIVE "message" on the first 8 bits.
> * Updated each sched "tick" (~2ms)
> @@ -1222,8 +1271,8 @@ static int mhdp_probe(struct platform_device *pdev)
> mhdp->host.lane_mapping = CDNS_LANE_MAPPING_FLIPPED;
> mhdp->host.enhanced = true;
>
> - mhdp->bridge.of_node = pdev->dev.of_node;
> - mhdp->bridge.funcs = &cdns_mhdp_bridge_funcs;
> + mhdp->bridge.base.of_node = pdev->dev.of_node;
> + mhdp->bridge.base.funcs = &cdns_mhdp_bridge_funcs;
>
> /* Init events to 0 as it's not cleared by FW at boot but on read */
> readl(mhdp->regs + CDNS_SW_EVENT0);
> @@ -1247,21 +1296,14 @@ static int mhdp_probe(struct platform_device *pdev)
> cdns_mhdp_reg_write(mhdp, CDNS_DPTX_CAR,
> resp | CDNS_VIF_CLK_EN | CDNS_VIF_CLK_RSTN);
>
> - /* Loop over HDP change */
> - /*
> - * FIXME: does not work when put in mhdp_bridge_enable.
> - * Where should we put it?
> - */
> - /* Is it still needed with use of mb message HPD STATUS? */
> - ret = readl_poll_timeout(mhdp->regs + CDNS_SW_EVENT0, reg,
> - reg & CDNS_DPTX_HPD, 500,
> - CDNS_SW_EVENT0_TIMEOUT);
> - if (ret) {
> - dev_err(mhdp->dev, "no HPD received %d\n", reg);
> - return -ENODEV;
> - }
> + INIT_DELAYED_WORK(&mhdp->hotplug_work, mhdp_hotplug_work_func);
You are removing lot of the code introduced by previous patch, kinda ugly.
I am not sure if merging both patches wouldn't be better, otherwise it
would be better to split this big patch to smaller chunks - according to
rule - one change per one patch.
Regards
Andrzej
> +
> + mhdp->bridge.connector = &mhdp->connector;
> + mhdp->connector.bridge = &mhdp->bridge;
> + mhdp->bridge.mhdp = mhdp;
> + mhdp->bridge.is_active = false;
>
> - drm_bridge_add(&mhdp->bridge);
> + drm_bridge_add(&mhdp->bridge.base);
>
> return 0;
> }
> @@ -1273,9 +1315,11 @@ static int mhdp_remove(struct platform_device *pdev)
> struct cdns_mhdp_device *mhdp = dev_get_drvdata(&pdev->dev);
> int ret;
>
> + flush_delayed_work(&mhdp->hotplug_work);
> platform_device_unregister(mhdp->audio_pdev);
>
> - drm_bridge_remove(&mhdp->bridge);
> + cdns_mhdp_mst_deinit(mhdp);
> + drm_bridge_remove(&mhdp->bridge.base);
>
> ret = cdns_mhdp_set_firmware_active(mhdp, false);
> if (ret) {
> @@ -1288,6 +1332,17 @@ static int mhdp_remove(struct platform_device *pdev)
> return 0;
> }
>
> +int mhdp_bridge_attach_mst_cbs(struct drm_bridge *bridge,
> + struct cdns_mhdp_mst_cbs *cbs)
> +{
> + struct cdns_mhdp_device *mhdp = bridge_to_mhdp(bridge);
> +
> + mhdp->cbs = *cbs;
> +
> + return 0;
> +}
> +EXPORT_SYMBOL_GPL(mhdp_bridge_attach_mst_cbs);
> +
> static struct platform_driver mhdp_driver = {
> .driver = {
> .name = "cdns-mhdp",
> @@ -1299,6 +1354,9 @@ static struct platform_driver mhdp_driver = {
> module_platform_driver(mhdp_driver);
>
> MODULE_AUTHOR("Quentin Schulz <quentin.schulz@free-electrons.com>");
> +MODULE_AUTHOR("Przemyslaw Gaj <pgaj@cadence.com>");
> +MODULE_AUTHOR("Damian Kos <dkos@cadence.com>");
> +MODULE_AUTHOR("Piotr Sroka <piotrs@cadence.com>");
> MODULE_DESCRIPTION("Cadence MHDP DP bridge driver");
> MODULE_LICENSE("GPL");
> MODULE_ALIAS("platform:cdns-mhdp");
> diff --git a/drivers/gpu/drm/bridge/cdns-mhdp.h b/drivers/gpu/drm/bridge/cdns-mhdp.h
> new file mode 100644
> index 000000000000..abc1fa3f51a6
> --- /dev/null
> +++ b/drivers/gpu/drm/bridge/cdns-mhdp.h
> @@ -0,0 +1,209 @@
> +/* SPDX-License-Identifier: GPL v2 */
> +/*
> + * Cadence MHDP DP MST bridge driver.
> + *
> + * Copyright: 2018 Cadence Design Systems, Inc.
> + *
> + * Author: Quentin Schulz <quentin.schulz@free-electrons.com>
> + */
> +
> +
> +#ifndef CDNS_MHDP_H
> +#define CDNS_MHDP_H
> +
> +#include <drm/drm_dp_mst_helper.h>
> +
> +#define CDNS_APB_CFG 0x00000
> +#define CDNS_APB_CTRL (CDNS_APB_CFG + 0x00)
> +#define CDNS_MAILBOX_FULL (CDNS_APB_CFG + 0x08)
> +#define CDNS_MAILBOX_EMPTY (CDNS_APB_CFG + 0x0c)
> +#define CDNS_MAILBOX_TX_DATA (CDNS_APB_CFG + 0x10)
> +#define CDNS_MAILBOX_RX_DATA (CDNS_APB_CFG + 0x14)
> +#define CDNS_KEEP_ALIVE (CDNS_APB_CFG + 0x18)
> +#define CDNS_KEEP_ALIVE_MASK GENMASK(7, 0)
> +
> +#define CDNS_MB_INT_MASK (CDNS_APB_CFG + 0x34)
> +
> +#define CDNS_SW_CLK_L (CDNS_APB_CFG + 0x3c)
> +#define CDNS_SW_CLK_H (CDNS_APB_CFG + 0x40)
> +#define CDNS_SW_EVENT0 (CDNS_APB_CFG + 0x44)
> +#define CDNS_DPTX_HPD BIT(0)
> +
> +#define CDNS_SW_EVENT1 (CDNS_APB_CFG + 0x48)
> +#define CDNS_SW_EVENT2 (CDNS_APB_CFG + 0x4c)
> +#define CDNS_SW_EVENT3 (CDNS_APB_CFG + 0x50)
> +
> +#define CDNS_APB_INT_MASK (CDNS_APB_CFG + 0x6C)
> +#define CDNS_APB_INT_MASK_MAILBOX_INT BIT(0)
> +#define CDNS_APB_INT_MASK_SW_EVENT_INT BIT(1)
> +
> +#define CDNS_DPTX_CAR (CDNS_APB_CFG + 0x904)
> +#define CDNS_VIF_CLK_EN BIT(0)
> +#define CDNS_VIF_CLK_RSTN BIT(1)
> +
> +#define CDNS_SOURCE_VIDEO_IF(s) (0x00b00 + (s * 0x20))
> +#define CDNS_BND_HSYNC2VSYNC(s) (CDNS_SOURCE_VIDEO_IF(s) + \
> + 0x00)
> +#define CDNS_IP_DTCT_WIN GENMASK(11, 0)
> +#define CDNS_IP_DET_INTERLACE_FORMAT BIT(12)
> +#define CDNS_IP_BYPASS_V_INTERFACE BIT(13)
> +
> +#define CDNS_HSYNC2VSYNC_POL_CTRL(s) (CDNS_SOURCE_VIDEO_IF(s) + \
> + 0x10)
> +#define CDNS_H2V_HSYNC_POL_ACTIVE_LOW BIT(1)
> +#define CDNS_H2V_VSYNC_POL_ACTIVE_LOW BIT(2)
> +
> +#define CDNS_DPTX_PHY_CONFIG 0x02000
> +#define CDNS_PHY_TRAINING_EN BIT(0)
> +#define CDNS_PHY_TRAINING_TYPE(x) (((x) & GENMASK(3, 0)) << 1)
> +#define CDNS_PHY_SCRAMBLER_BYPASS BIT(5)
> +#define CDNS_PHY_ENCODER_BYPASS BIT(6)
> +#define CDNS_PHY_SKEW_BYPASS BIT(7)
> +#define CDNS_PHY_TRAINING_AUTO BIT(8)
> +#define CDNS_PHY_LANE0_SKEW(x) (((x) & GENMASK(2, 0)) << 9)
> +#define CDNS_PHY_LANE1_SKEW(x) (((x) & GENMASK(2, 0)) << 12)
> +#define CDNS_PHY_LANE2_SKEW(x) (((x) & GENMASK(2, 0)) << 15)
> +#define CDNS_PHY_LANE3_SKEW(x) (((x) & GENMASK(2, 0)) << 18)
> +#define CDNS_PHY_COMMON_CONFIG (CDNS_PHY_LANE1_SKEW(1) | \
> + CDNS_PHY_LANE2_SKEW(2) | \
> + CDNS_PHY_LANE3_SKEW(3))
> +#define CDNS_PHY_10BIT_EN BIT(21)
> +
> +#define CDNS_DPTX_FRAMER 0x02200
> +#define CDNS_DP_FRAMER_GLOBAL_CONFIG (CDNS_DPTX_FRAMER + 0x00)
> +#define CDNS_DP_NUM_LANES(x) (x - 1)
> +#define CDNS_DP_MST_EN BIT(2)
> +#define CDNS_DP_FRAMER_EN BIT(3)
> +#define CDNS_DP_RATE_GOVERNOR_EN BIT(4)
> +#define CDNS_DP_NO_VIDEO_MODE BIT(5)
> +#define CDNS_DP_DISABLE_PHY_RST BIT(6)
> +#define CDNS_DP_WR_FAILING_EDGE_VSYNC BIT(7)
> +
> +#define CDNS_DP_SW_RESET (CDNS_DPTX_FRAMER + 0x04)
> +#define CDNS_DP_FRAMER_TU (CDNS_DPTX_FRAMER + 0x08)
> +#define CDNS_DP_FRAMER_TU_SIZE(x) (((x) & GENMASK(6, 0)) << 8)
> +#define CDNS_DP_FRAMER_TU_VS(x) ((x) & GENMASK(5, 0))
> +#define CDNS_DP_FRAMER_TU_CNT_RST_EN BIT(15)
> +
> +#define CDNS_DPTX_STREAM(s) (0x03000 + s * 0x80)
> +#define CDNS_DP_MSA_HORIZONTAL_0(s) (CDNS_DPTX_STREAM(s) + 0x00)
> +#define CDNS_DP_MSAH0_H_TOTAL(x) (x)
> +#define CDNS_DP_MSAH0_HSYNC_START(x) ((x) << 16)
> +
> +#define CDNS_DP_MSA_HORIZONTAL_1(s) (CDNS_DPTX_STREAM(s) + 0x04)
> +#define CDNS_DP_MSAH1_HSYNC_WIDTH(x) (x)
> +#define CDNS_DP_MSAH1_HSYNC_POL_LOW BIT(15)
> +#define CDNS_DP_MSAH1_HDISP_WIDTH(x) ((x) << 16)
> +
> +#define CDNS_DP_MSA_VERTICAL_0(s) (CDNS_DPTX_STREAM(s) + 0x08)
> +#define CDNS_DP_MSAV0_V_TOTAL(x) (x)
> +#define CDNS_DP_MSAV0_VSYNC_START(x) ((x) << 16)
> +
> +#define CDNS_DP_MSA_VERTICAL_1(s) (CDNS_DPTX_STREAM(s) + 0x0c)
> +#define CDNS_DP_MSAV1_VSYNC_WIDTH(x) (x)
> +#define CDNS_DP_MSAV1_VSYNC_POL_LOW BIT(15)
> +#define CDNS_DP_MSAV1_VDISP_WIDTH(x) ((x) << 16)
> +
> +#define CDNS_DP_MSA_MISC(s) (CDNS_DPTX_STREAM(s) + 0x10)
> +#define CDNS_DP_STREAM_CONFIGs(s) (CDNS_DPTX_STREAM(s) + 0x14)
> +#define CDNS_DP_STREAM_CONFIG_2(s) (CDNS_DPTX_STREAM(s) + 0x2c)
> +#define CDNS_DP_SC2_TU_VS_DIFF(x) ((x) << 8)
> +
> +#define CDNS_DP_HORIZONTAL(s) (CDNS_DPTX_STREAM(s) + 0x30)
> +#define CDNS_DP_H_HSYNC_WIDTH(x) (x)
> +#define CDNS_DP_H_H_TOTAL(x) ((x) << 16)
> +
> +#define CDNS_DP_VERTICAL_0(s) (CDNS_DPTX_STREAM(s) + 0x34)
> +#define CDNS_DP_V0_VHEIGHT(x) (x)
> +#define CDNS_DP_V0_VSTART(x) ((x) << 16)
> +
> +#define CDNS_DP_VERTICAL_1(s) (CDNS_DPTX_STREAM(s) + 0x38)
> +#define CDNS_DP_V1_VTOTAL(x) (x)
> +#define CDNS_DP_V1_VTOTAL_EVEN BIT(16)
> +
> +#define CDNS_DP_FRAMER_PXL_REPR(s) (CDNS_DPTX_STREAM(s) + 0x4c)
> +#define CDNS_DP_FRAMER_6_BPC BIT(0)
> +#define CDNS_DP_FRAMER_8_BPC BIT(1)
> +#define CDNS_DP_FRAMER_10_BPC BIT(2)
> +#define CDNS_DP_FRAMER_12_BPC BIT(3)
> +#define CDNS_DP_FRAMER_16_BPC BIT(4)
> +#define CDNS_DP_FRAMER_PXL_FORMAT 0x8
> +#define CDNS_DP_FRAMER_RGB BIT(0)
> +#define CDNS_DP_FRAMER_YCBCR444 BIT(1)
> +#define CDNS_DP_FRAMER_YCBCR422 BIT(2)
> +#define CDNS_DP_FRAMER_YCBCR420 BIT(3)
> +#define CDNS_DP_FRAMER_Y_ONLY BIT(4)
> +
> +#define CDNS_DP_FRAMER_SP(s) (CDNS_DPTX_STREAM(s) + 0x10)
> +#define CDNS_DP_FRAMER_VSYNC_POL_LOW BIT(0)
> +#define CDNS_DP_FRAMER_HSYNC_POL_LOW BIT(1)
> +#define CDNS_DP_FRAMER_INTERLACE BIT(2)
> +
> +#define CDNS_DP_LINE_THRESH(s) (CDNS_DPTX_STREAM(s) + 0x64)
> +#define CDNS_DP_ACTIVE_LINE_THRESH(x) (x)
> +
> +#define CDNS_DP_VB_ID(s) (CDNS_DPTX_STREAM(s) + 0x68)
> +#define CDNS_DP_VB_ID_INTERLACED BIT(2)
> +#define CDNS_DP_VB_ID_COMPRESSED BIT(6)
> +
> +#define CDNS_DP_FRONT_BACK_PORCH(s) (CDNS_DPTX_STREAM(s) + 0x78)
> +#define CDNS_DP_BACK_PORCH(x) (x)
> +#define CDNS_DP_FRONT_PORCH(x) ((x) << 16)
> +
> +#define CDNS_DP_BYTE_COUNT(s) (CDNS_DPTX_STREAM(s) + 0x7c)
> +#define CDNS_DP_BYTE_COUNT_BYTES_IN_CHUNK_SHIFT 16
> +
> +#define CDNS_DP_MST_STREAM_CONFIG(s) (CDNS_DPTX_STREAM(s) + 0x14)
> +#define CDNS_DP_MST_STRM_CFG_STREAM_EN BIT(0)
> +#define CDNS_DP_MST_STRM_CFG_NO_VIDEO BIT(1)
> +
> +#define CDNS_DP_MST_SLOT_ALLOCATE(s) (CDNS_DPTX_STREAM(s) + 0x44)
> +#define CDNS_DP_S_ALLOC_START_SLOT(x) (x)
> +#define CDNS_DP_S_ALLOC_END_SLOT(x) ((x) << 8)
> +
> +#define CDNS_DP_RATE_GOVERNING(s) (CDNS_DPTX_STREAM(s) + 0x48)
> +#define CDNS_DP_RG_TARG_AV_SLOTS_Y(x) (x)
> +#define CDNS_DP_RG_TARG_AV_SLOTS_X(x) (x << 4)
> +#define CDNS_DP_RG_ENABLE BIT(10)
> +
> +#define CDNS_DP_MTPH_CONTROL 0x2264
> +#define CDNS_DP_MTPH_ECF_EN BIT(0)
> +#define CDNS_DP_MTPH_ACT_EN BIT(1)
> +#define CDNS_DP_MTPH_LVP_EN BIT(2)
> +
> +#define CDNS_DP_MTPH_STATUS 0x226C
> +#define CDNS_DP_MTPH_ACT_STATUS BIT(0)
> +
> +
> +#define CDNS_DPTX_GLOBAL 0x02300
> +#define CDNS_DP_LANE_EN (CDNS_DPTX_GLOBAL + 0x00)
> +#define CDNS_DP_LANE_EN_LANES(x) GENMASK(x - 1, 0)
> +#define CDNS_DP_ENHNCD (CDNS_DPTX_GLOBAL + 0x04)
> +
> +
> +#define to_mhdp_connector(x) container_of(x, struct cdns_mhdp_connector, base)
> +#define to_mhdp_bridge(x) container_of(x, struct cdns_mhdp_bridge, base)
> +#define mgr_to_mhdp(x) container_of(x, struct cdns_mhdp_device, mst_mgr)
> +
> +#define CDNS_MHDP_MAX_STREAMS 4
> +
> +enum pixel_format {
> + PIXEL_FORMAT_RGB = 1,
> + PIXEL_FORMAT_YCBCR_444 = 2,
> + PIXEL_FORMAT_YCBCR_422 = 4,
> + PIXEL_FORMAT_YCBCR_420 = 8,
> + PIXEL_FORMAT_Y_ONLY = 16,
> +};
> +
> +
> +int cdns_mhdp_mst_init(struct cdns_mhdp_device *mhdp);
> +void cdns_mhdp_mst_deinit(struct cdns_mhdp_device *mhdp);
> +bool cdns_mhdp_mst_probe(struct cdns_mhdp_device *mhdp);
> +enum pixel_format cdns_mhdp_get_pxlfmt(u32 color_formats);
> +u32 cdns_mhdp_get_bpp(u32 bpc, u32 color_formats);
> +void cdns_mhdp_configure_video(struct drm_bridge *bridge);
> +void cdns_mhdp_mst_enable(struct drm_bridge *bridge);
> +void cdns_mhdp_mst_disable(struct drm_bridge *bridge);
> +void cdns_mhdp_enable(struct drm_bridge *bridge);
> +
> +#endif
> diff --git a/drivers/gpu/drm/rockchip/cdn-dp-core.c b/drivers/gpu/drm/rockchip/cdn-dp-core.c
> index 343f381e3440..a5a668f1912b 100644
> --- a/drivers/gpu/drm/rockchip/cdn-dp-core.c
> +++ b/drivers/gpu/drm/rockchip/cdn-dp-core.c
> @@ -34,7 +34,7 @@
> #include "rockchip_drm_vop.h"
>
> #define connector_to_dp(c) \
> - container_of(c, struct cdn_dp_device, mhdp.connector)
> + container_of(c, struct cdn_dp_device, mhdp.connector.base)
>
> #define encoder_to_dp(c) \
> container_of(c, struct cdn_dp_device, encoder)
> @@ -291,7 +291,7 @@ static int cdn_dp_connector_mode_valid(struct drm_connector *connector,
> {
> struct cdn_dp_device *dp = connector_to_dp(connector);
> struct drm_display_info *display_info =
> - &dp->mhdp.connector.display_info;
> + &dp->mhdp.connector.base.display_info;
> u32 requested, actual, rate, sink_max, source_max = 0;
> u8 lanes, bpc;
>
> @@ -387,7 +387,7 @@ static int cdn_dp_get_sink_capability(struct cdn_dp_device *dp)
> }
>
> kfree(dp->edid);
> - dp->edid = drm_do_get_edid(&dp->mhdp.connector,
> + dp->edid = drm_do_get_edid(&dp->mhdp.connector.base,
> cdns_mhdp_get_edid_block, &dp->mhdp);
> return 0;
> }
> @@ -559,7 +559,7 @@ static void cdn_dp_encoder_mode_set(struct drm_encoder *encoder,
> {
> struct cdn_dp_device *dp = encoder_to_dp(encoder);
> struct drm_display_info *display_info =
> - &dp->mhdp.connector.display_info;
> + &dp->mhdp.connector.base.display_info;
> struct video_info *video = &dp->mhdp.video_info;
>
> switch (display_info->bpc) {
> @@ -863,8 +863,8 @@ static int cdn_dp_audio_get_eld(struct device *dev, void *data,
> {
> struct cdn_dp_device *dp = dev_get_drvdata(dev);
>
> - memcpy(buf, dp->mhdp.connector.eld,
> - min(sizeof(dp->mhdp.connector.eld), len));
> + memcpy(buf, dp->mhdp.connector.base.eld,
> + min(sizeof(dp->mhdp.connector.base.eld), len));
>
> return 0;
> }
> @@ -936,7 +936,7 @@ static void cdn_dp_pd_event_work(struct work_struct *work)
> {
> struct cdn_dp_device *dp = container_of(work, struct cdn_dp_device,
> event_work);
> - struct drm_connector *connector = &dp->mhdp.connector;
> + struct drm_connector *connector = &dp->mhdp.connector.base;
> enum drm_connector_status old_status;
> struct device *dev = dp->mhdp.dev;
>
> @@ -1062,7 +1062,7 @@ static int cdn_dp_bind(struct device *dev, struct device *master, void *data)
>
> drm_encoder_helper_add(encoder, &cdn_dp_encoder_helper_funcs);
>
> - connector = &dp->mhdp.connector;
> + connector = &dp->mhdp.connector.base;
> connector->polled = DRM_CONNECTOR_POLL_HPD;
> connector->dpms = DRM_MODE_DPMS_OFF;
>
> @@ -1113,7 +1113,7 @@ 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;
> - struct drm_connector *connector = &dp->mhdp.connector;
> + struct drm_connector *connector = &dp->mhdp.connector.base;
>
> cancel_work_sync(&dp->event_work);
> cdn_dp_encoder_disable(encoder);
> diff --git a/include/drm/bridge/cdns-mhdp-cbs.h b/include/drm/bridge/cdns-mhdp-cbs.h
> new file mode 100644
> index 000000000000..af07cbfcb729
> --- /dev/null
> +++ b/include/drm/bridge/cdns-mhdp-cbs.h
> @@ -0,0 +1,27 @@
> +/* SPDX-License-Identifier: GPL v2 */
> +/*
> + * Cadence MHDP DP bridge callbacks.
> + *
> + * Copyright: 2018 Cadence Design Systems, Inc.
> + *
> + * Author: Piotr Sroka <piotrs@cadence.com>
> + */
> +
> +#ifndef CDNS_MHDP_CBS_H
> +#define CDNS_MHDP_CBS_H
> +
> +struct cdns_mhdp_mst_cbs_funcs {
> + struct drm_encoder *(*create_mst_encoder)(void *priv_data,
> + struct drm_bridge *bridge);
> + void (*destroy_mst_encoder)(void *priv_data, struct drm_bridge *bridge);
> +};
> +
> +struct cdns_mhdp_mst_cbs {
> + struct cdns_mhdp_mst_cbs_funcs funcs;
> + void *priv_data;
> +};
> +
> +int mhdp_bridge_attach_mst_cbs(struct drm_bridge *bridge,
> + struct cdns_mhdp_mst_cbs *cbs);
> +
> +#endif
> diff --git a/include/drm/bridge/cdns-mhdp-common.h b/include/drm/bridge/cdns-mhdp-common.h
> index c5a5c4fa7fc4..d4711091ff2b 100644
> --- a/include/drm/bridge/cdns-mhdp-common.h
> +++ b/include/drm/bridge/cdns-mhdp-common.h
> @@ -15,10 +15,12 @@
> #ifndef CDNS_MHDP_COMMON_H_
> #define CDNS_MHDP_COMMON_H_
>
> +#include <drm/drm_dp_mst_helper.h>
> #include <linux/bitops.h>
> #include <drm/drm_dp_helper.h>
> #include <drm/drm_connector.h>
> #include <drm/drm_bridge.h>
> +#include <drm/bridge/cdns-mhdp-cbs.h>
>
> #define ADDR_IMEM 0x10000
> #define ADDR_DMEM 0x20000
> @@ -326,11 +328,11 @@
> #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 GENERAL_REGISTER_READ 0x07
> +#define GENERAL_MAIN_CONTROL 0x01
> +#define GENERAL_TEST_ECHO 0x02
> +#define GENERAL_BUS_SETTINGS 0x03
> +#define GENERAL_TEST_ACCESS 0x04
> +#define GENERAL_REGISTER_READ 0x07
>
> #define DPTX_SET_POWER_MNG 0x00
> #define DPTX_SET_HOST_CAPABILITIES 0x01
> @@ -512,13 +514,34 @@ struct cdns_mhdp_sink {
> u8 enhanced;
> };
>
> +struct cdns_mhdp_bridge;
> +struct cdns_mhdp_connector;
> +
> +struct cdns_mhdp_bridge {
> + struct cdns_mhdp_device *mhdp;
> + struct drm_bridge base;
> + int pbn;
> + int8_t stream_id;
> + struct cdns_mhdp_connector *connector;
> + bool is_active;
> +};
> +
> +
> +struct cdns_mhdp_connector {
> + struct drm_connector base;
> + bool is_mst_connector;
> + struct drm_dp_mst_port *port;
> + struct cdns_mhdp_bridge *bridge;
> +};
> +
> +
> struct cdns_mhdp_device {
> void __iomem *regs;
>
> struct device *dev;
>
> struct drm_dp_link link;
> - struct drm_connector connector;
> + struct cdns_mhdp_connector connector;
> struct clk *spdif_clk;
> struct reset_control *spdif_rst;
>
> @@ -528,13 +551,22 @@ struct cdns_mhdp_device {
> struct drm_dp_aux aux;
> struct cdns_mhdp_host host;
> struct cdns_mhdp_sink sink;
> - struct drm_bridge bridge;
> + struct cdns_mhdp_bridge bridge;
> struct phy *phy;
> void __iomem *dbg_regs;
>
> struct video_info video_info;
> struct drm_display_mode mode;
> unsigned int fw_version;
> +
> + struct drm_dp_mst_topology_mgr mst_mgr;
> + struct delayed_work hotplug_work;
> +
> + struct cdns_mhdp_mst_cbs cbs;
> + bool is_mst;
> + bool can_mst;
> + bool link_up;
> + bool plugged;
> };
>
> void cdns_mhdp_clock_reset(struct cdns_mhdp_device *mhdp);
> @@ -562,7 +594,7 @@ int cdns_mhdp_audio_config(struct cdns_mhdp_device *mhdp,
> int cdns_mhdp_reg_read(struct cdns_mhdp_device *mhdp, u32 addr, u32 *value);
> int cdns_mhdp_reg_write(struct cdns_mhdp_device *mhdp, u16 addr, u32 val);
> int cdns_mhdp_reg_write_bit(struct cdns_mhdp_device *mhdp, u16 addr,
> - u8 start_bit, u8 bits_no, u32 val);
> + u8 start_bit, u8 bits_no, u32 val);
> int cdns_mhdp_adjust_lt(struct cdns_mhdp_device *mhdp, u8 nlanes,
> u16 udelay, u8 *lanes_data,
> u8 *dpcd);
^ permalink raw reply [flat|nested] 45+ messages in thread
* [PATCH v6 5/6] drm/bridge: add support for MST in mhdp8546 driver
@ 2018-11-07 11:40 ` Andrzej Hajda
0 siblings, 0 replies; 45+ messages in thread
From: Andrzej Hajda @ 2018-11-07 11:40 UTC (permalink / raw)
To: linux-arm-kernel
On 08.10.2018 23:42, Damian Kos wrote:
> From: Piotr Sroka <piotrs@cadence.com>
>
> - add hot plug support to handle HDP IRQ interrupts in case sideband
> message is ready to read.
> - there is only one connector created at initialization stage. It is
> used as SST connector when controller works in SST mode. If controller
> works in MST mode then the SST connector status is disconnected all the
> time. MST connectors are created/destroyed in runtime depends on what
> devices are connected to the DP controller.
> - add callbacks functions to be able to inform module managing encoders
> objects to create or destroy an encoder in case new a MST connector is
> created/destroyed
I am not familiar with MST so I will stick to bike-shedding :) Reviewer
with MST experience needed.
>
> Signed-off-by: Piotr Sroka <piotrs@cadence.com>
> Signed-off-by: Damian Kos <dkos@cadence.com>
> ---
> drivers/gpu/drm/bridge/Makefile | 2 +-
> drivers/gpu/drm/bridge/cdns-mhdp-mst.c | 594 +++++++++++++++++++++++++
> drivers/gpu/drm/bridge/cdns-mhdp.c | 560 ++++++++++++-----------
> drivers/gpu/drm/bridge/cdns-mhdp.h | 209 +++++++++
> drivers/gpu/drm/rockchip/cdn-dp-core.c | 18 +-
> include/drm/bridge/cdns-mhdp-cbs.h | 27 ++
> include/drm/bridge/cdns-mhdp-common.h | 48 +-
> 7 files changed, 1189 insertions(+), 269 deletions(-)
> create mode 100644 drivers/gpu/drm/bridge/cdns-mhdp-mst.c
> create mode 100644 drivers/gpu/drm/bridge/cdns-mhdp.h
> create mode 100644 include/drm/bridge/cdns-mhdp-cbs.h
>
> diff --git a/drivers/gpu/drm/bridge/Makefile b/drivers/gpu/drm/bridge/Makefile
> index e802fdb85750..b80f3d6ed2a6 100644
> --- a/drivers/gpu/drm/bridge/Makefile
> +++ b/drivers/gpu/drm/bridge/Makefile
> @@ -19,4 +19,4 @@ obj-$(CONFIG_DRM_TI_TFP410) += ti-tfp410.o
> obj-$(CONFIG_DRM_CDNS_MHDP) += mhdp8546.o
> obj-y += synopsys/
>
> -mhdp8546-objs := cdns-mhdp-common.o cdns-mhdp.o
> +mhdp8546-objs := cdns-mhdp-common.o cdns-mhdp.o cdns-mhdp-mst.o
> diff --git a/drivers/gpu/drm/bridge/cdns-mhdp-mst.c b/drivers/gpu/drm/bridge/cdns-mhdp-mst.c
> new file mode 100644
> index 000000000000..782d4bf9b667
> --- /dev/null
> +++ b/drivers/gpu/drm/bridge/cdns-mhdp-mst.c
> @@ -0,0 +1,594 @@
> +// SPDX-License-Identifier: GPL v2
> +/*
> + * Cadence MHDP DP MST bridge driver.
> + *
> + * Copyright: 2018 Cadence Design Systems, Inc.
> + *
> + * Author: Piotr Sroka <piotrs@cadence.com>
> + */
> +#include <drm/drm_print.h>
> +#include <drm/drm_crtc_helper.h>
> +#include <drm/drm_atomic_helper.h>
> +#include <drm/drm_fixed.h>
> +#include <drm/drm_connector.h>
> +#include <linux/iopoll.h>
> +
> +#include <drm/bridge/cdns-mhdp-common.h>
Alphabetic order.
> +#include "cdns-mhdp.h"
> +
> +
> +static void cdns_mhdp_mst_stream_enable(struct cdns_mhdp_bridge *mhdp_bridge,
> + bool enable)
> +{
> + u32 reg;
> + struct cdns_mhdp_device *mhdp = mhdp_bridge->mhdp;
> + u8 stream_id = mhdp_bridge->stream_id;
> +
> + cdns_mhdp_reg_read(mhdp, CDNS_DP_MST_STREAM_CONFIG(stream_id), ®);
> +
> + if (enable) {
> + reg |= CDNS_DP_MST_STRM_CFG_STREAM_EN;
> + reg &= ~CDNS_DP_MST_STRM_CFG_NO_VIDEO;
> + } else {
> + reg &= ~CDNS_DP_MST_STRM_CFG_STREAM_EN;
> + reg |= CDNS_DP_MST_STRM_CFG_NO_VIDEO;
> + }
> +
> + cdns_mhdp_reg_write(mhdp, CDNS_DP_MST_STREAM_CONFIG(stream_id), reg);
> +}
> +
> +static inline s64 calc_fixed_avg_slots(u32 pbn, u32 pbn_div)
> +{
> + s64 fixed_pbn, fixed_pbn_div, fixed_targ_avg_slots;
> +
> + fixed_pbn = drm_int2fixp(pbn);
> + fixed_pbn_div = drm_int2fixp(pbn_div);
> + fixed_targ_avg_slots = drm_fixp_div(fixed_pbn, fixed_pbn_div);
> +
> + return fixed_targ_avg_slots;
> +}
> +
> +static void cdns_mhdp_mst_set_threshold(struct cdns_mhdp_bridge *bridge)
> +{
> + u32 threshold;
> + u8 stream_id = bridge->stream_id;
> + struct cdns_mhdp_device *mhdp = bridge->mhdp;
> + s64 fixed_targ_avg_slots, fixed_thresh, fixed_targ_entries;
> +
> + fixed_targ_avg_slots = calc_fixed_avg_slots(bridge->pbn,
> + mhdp->mst_mgr.pbn_div);
> +
> + fixed_targ_entries = drm_fixp_div(fixed_targ_avg_slots,
> + drm_int2fixp(2));
> + fixed_thresh = drm_fixp_mul(fixed_targ_entries, fixed_targ_entries);
> + fixed_thresh = drm_fixp_div(fixed_thresh, drm_int2fixp(32));
> + fixed_thresh = fixed_targ_entries - fixed_thresh;
> + fixed_thresh = drm_fixp_mul(fixed_thresh,
> + drm_int2fixp(mhdp->link.num_lanes));
> + fixed_thresh = drm_fixp_div(fixed_thresh, drm_int2fixp(4));
> +
> + threshold = drm_fixp2int_ceil(fixed_thresh);
> + if (threshold < 2)
> + threshold = 2;
> +
> + cdns_mhdp_reg_write(mhdp, CDNS_DP_LINE_THRESH(stream_id),
> + CDNS_DP_ACTIVE_LINE_THRESH(threshold));
All this magic makes me think I am not a right person to review this
code, or the code is overcomplicated. Lets try layman approach.
Formula is as below:
threshold = (pbn/pbn_div/2 - (pbn/pbn_div/2)^2 / 32)*num_lanes / 4
plus round_up, and cap by 2.
Please describe the formula in comment to increase readability and use
some temporary variables instead of overusing fixed_thresh.
Where this formula comes from? Document it.
Moreover if there is no difference between drm_fixp_div(x,
drm_int2fixp(const)) and div_s64(x, const) I guess the latter is better.
> +}
> +
> +static void cdns_mhdp_set_rate_governing(struct cdns_mhdp_bridge *bridge,
> + bool enable)
> +{
> + struct cdns_mhdp_device *mhdp = bridge->mhdp;
> + u8 stream_id = bridge->stream_id;
> +
> + if (enable) {
> + s64 fixed_targ_avg_slots, fixed_y;
> + u32 x, y;
> +
> + fixed_targ_avg_slots =
> + calc_fixed_avg_slots(bridge->pbn,
> + mhdp->mst_mgr.pbn_div);
> +
> + x = drm_fixp2int(fixed_targ_avg_slots);
> +
> + fixed_y = (fixed_targ_avg_slots - drm_int2fixp(x));
> + fixed_y = drm_fixp_mul(fixed_y, drm_int2fixp(16));
Again, maybe fixed_y *= 16;
> + y = drm_fixp2int_ceil(fixed_y);
Ok, at this point x is integer part of fixed_targ_avg_slots and y is
fractional part of fixed_targ_avg_slots * 16.
Looking at calc_fixed_avg_slots it means, that:
x = bridge->pbn / mhdp->mst_mgr.pbn_div;
y = bridge->pbn % mhdp->mst_mgr.pbn_div * 16 / mhdp->mst_mgr.pbn_div;
Without using fixed arithmetic, more direct?
> +
> + cdns_mhdp_reg_write(mhdp, CDNS_DP_RATE_GOVERNING(stream_id),
> + CDNS_DP_RG_TARG_AV_SLOTS_Y(y) |
> + CDNS_DP_RG_TARG_AV_SLOTS_X(x) |
> + CDNS_DP_RG_ENABLE);
> + } else
> + cdns_mhdp_reg_write(mhdp, CDNS_DP_RATE_GOVERNING(stream_id), 0);
> +}
> +
> +
> +static struct drm_dp_payload *
> +cdns_mhdp_get_payload(struct cdns_mhdp_bridge *bridge)
> +{
> + int vcpi = bridge->connector->port->vcpi.vcpi, i;
> + struct cdns_mhdp_device *mhdp = bridge->mhdp;
> +
> + for (i = 0; i < mhdp->mst_mgr.max_payloads; i++) {
> + struct drm_dp_payload *payload = &mhdp->mst_mgr.payloads[i];
> +
> + if (payload->vcpi == vcpi)
> + return payload;
> + }
> +
> + return NULL;
> +}
> +
> +
> +static int
> +cdns_mhdp_set_act_enable(struct cdns_mhdp_device *mhdp)
> +{
> + u32 reg;
> + int ret;
> +
> + cdns_mhdp_reg_read(mhdp, CDNS_DP_MTPH_CONTROL, ®);
> + cdns_mhdp_reg_write(mhdp, CDNS_DP_MTPH_CONTROL,
> + reg | CDNS_DP_MTPH_ACT_EN);
> +
> + ret = readl_poll_timeout(mhdp->regs + CDNS_DP_MTPH_STATUS, reg,
> + ((reg & CDNS_DP_MTPH_ACT_STATUS) == 0), 0,
> + 30);
> + if (ret) {
> + dev_err(mhdp->dev,
> + "ACT sequence cannot complete in 30us\n");
> + return -EIO;
> + }
> +
> + return drm_dp_check_act_status(&mhdp->mst_mgr);
> +}
> +
> +
> +static int
> +cdns_mhdp_apply_slot_allocation(struct cdns_mhdp_bridge *mhdp_bridge)
> +{
> + struct drm_dp_payload *payload;
> + struct cdns_mhdp_device *mhdp = mhdp_bridge->mhdp;
> + u8 stream_id = mhdp_bridge->stream_id;
> +
> + payload = cdns_mhdp_get_payload(mhdp_bridge);
> +
> + if (!payload) {
> + DRM_ERROR("payload is not found\n");
> + return -EIO;
> + }
> +
> + cdns_mhdp_reg_write(mhdp, CDNS_DP_MST_SLOT_ALLOCATE(stream_id),
> + CDNS_DP_S_ALLOC_START_SLOT(payload->start_slot) |
> + CDNS_DP_S_ALLOC_END_SLOT(payload->start_slot
> + + payload->num_slots - 1));
> +
> + return 0;
> +}
> +
> +static void
> +cdns_mhdp_update_slot_allocation(struct cdns_mhdp_bridge *mhdp_bridge)
> +{
> + struct drm_device *dev = mhdp_bridge->base.dev;
> + struct drm_connector *connector;
> +
> + list_for_each_entry(connector, &dev->mode_config.connector_list, head) {
> + struct cdns_mhdp_connector *mhdp_connector;
> +
> + mhdp_connector = to_mhdp_connector(connector);
> + if (!connector->encoder)
> + continue;
> + if (!mhdp_connector->is_mst_connector)
> + continue;
> +
> + if (mhdp_connector->bridge->stream_id != -1)
> + cdns_mhdp_apply_slot_allocation(mhdp_connector->bridge);
> + }
> +}
> +
> +static enum drm_connector_status
> +cdns_dp_mst_detect(struct drm_connector *connector, bool force)
> +{
> + enum drm_connector_status stat;
> + struct cdns_mhdp_connector *mhdp_connector;
> + struct cdns_mhdp_device *mhdp;
> +
> + mhdp_connector = to_mhdp_connector(connector);
> + mhdp = mhdp_connector->bridge->mhdp;
> +
> + stat = drm_dp_mst_detect_port(connector, &mhdp->mst_mgr,
> + mhdp_connector->port);
> + return stat;
> +}
> +
> +static void
> +cdns_dp_mst_connector_destroy(struct drm_connector *connector)
> +{
> + struct cdns_mhdp_connector *mhdp_connector;
> + struct cdns_mhdp_bridge *mhdp_bridge;
> +
> + mhdp_connector = to_mhdp_connector(connector);
> + mhdp_bridge = mhdp_connector->bridge;
> +
> + drm_connector_cleanup(&mhdp_connector->base);
> + drm_bridge_remove(&mhdp_bridge->base);
> + kfree(mhdp_connector);
> + kfree(mhdp_bridge);
> +}
> +
> +static const struct drm_connector_funcs cdns_mhdp_mst_connector_funcs = {
> + .atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state,
> + .atomic_destroy_state = drm_atomic_helper_connector_destroy_state,
> + .reset = drm_atomic_helper_connector_reset,
> + .dpms = drm_helper_connector_dpms,
> + .detect = cdns_dp_mst_detect,
> + .fill_modes = drm_helper_probe_single_connector_modes,
> + .destroy = cdns_dp_mst_connector_destroy,
> +};
> +
> +
> +static int cdns_mhdp_mst_get_ddc_modes(struct drm_connector *connector)
> +{
> + struct cdns_mhdp_connector *mhdp_connector;
> + struct cdns_mhdp_device *mhdp;
> + struct edid *edid;
> + int ret = 0;
> +
> + mhdp_connector = to_mhdp_connector(connector);
> + mhdp = mhdp_connector->bridge->mhdp;
> +
> + edid = drm_dp_mst_get_edid(connector, &mhdp->mst_mgr,
> + mhdp_connector->port);
> +
> + DRM_DEBUG_KMS("edid retrieved %p\n", edid);
> + if (edid) {
> + drm_connector_update_edid_property(connector, edid);
> + ret = drm_add_edid_modes(connector, edid);
> + return ret;
> + }
> + drm_connector_update_edid_property(connector, NULL);
> +
> + return ret;
I suspect edid should be freed, but looking at other users of
drm_dp_mst_get_edid it is not so obvious (only intel frees it) - memory
leaks?
> +}
> +
> +static int cdns_mhdp_mst_get_modes(struct drm_connector *connector)
> +{
> + return cdns_mhdp_mst_get_ddc_modes(connector);
> +}
> +
> +
> +static struct
> +drm_encoder *cdns_mhdp_mst_best_encoder(struct drm_connector *connector)
> +{
> + struct cdns_mhdp_connector *mhdp_connector;
> +
> + mhdp_connector = to_mhdp_connector(connector);
> +
> + return mhdp_connector->bridge->base.encoder;
> +}+
> +static const struct drm_connector_helper_funcs cdns_mhdp_mst_conn_helper_fun = {
> + .get_modes = cdns_mhdp_mst_get_modes,
> + .best_encoder = cdns_mhdp_mst_best_encoder,
> +};
> +
> +void cdns_mhdp_mst_enable(struct drm_bridge *bridge)
> +{
> + struct cdns_mhdp_bridge *mhdp_bridge = to_mhdp_bridge(bridge);
> + struct cdns_mhdp_device *mhdp = mhdp_bridge->mhdp;
> + struct drm_display_info *disp_info;
> + struct drm_display_mode *mode;
> + struct cdns_mhdp_connector *mhdp_connector;
> + u32 bpp;
> + enum pixel_format pxlfmt;
> + int ret, slots, stream_id;
> +
> + disp_info = &mhdp_bridge->connector->base.display_info;
> +
> + pxlfmt = cdns_mhdp_get_pxlfmt(disp_info->color_formats);
> + bpp = cdns_mhdp_get_bpp(disp_info->bpc, pxlfmt);
> +
> + mhdp_connector = mhdp_bridge->connector;
> + if (mhdp_bridge->stream_id > -1) {
> + DRM_ERROR("ERROR stream id is attached before bridge is enabled\n");
> + return;
> + }
> +
> + stream_id = bridge->encoder->crtc->index;
> +
> + mode = &bridge->encoder->crtc->state->adjusted_mode;
> + mhdp_bridge->pbn = drm_dp_calc_pbn_mode(mode->clock, bpp);
> +
> + slots = drm_dp_find_vcpi_slots(&mhdp->mst_mgr, mhdp_bridge->pbn);
> + ret = drm_dp_mst_allocate_vcpi(&mhdp->mst_mgr,
> + mhdp_connector->port,
> + mhdp_bridge->pbn, slots);
> + if (ret == false) {
> + DRM_ERROR("failed to allocate vcpi\n");
> + return;
> + }
> + ret = drm_dp_update_payload_part1(&mhdp->mst_mgr);
> + if (ret < 0)
> + DRM_ERROR("failed update_payload_part1\n");
> +
> + mhdp_bridge->stream_id = stream_id;
> + mhdp_bridge->is_active = true;
> +
> + cdns_mhdp_mst_stream_enable(mhdp_bridge, true);
> + cdns_mhdp_configure_video(bridge);
> +
> + ret = cdns_mhdp_apply_slot_allocation(mhdp_bridge);
> + if (ret < 0) {
> + cdns_mhdp_mst_stream_enable(mhdp_bridge, false);
> + mhdp_bridge->stream_id = -1;
> + mhdp_bridge->is_active = false;
> + return;
> + }
> +
> + ret = cdns_mhdp_set_act_enable(mhdp);
> + if (ret)
> + DRM_ERROR("failed ACT sequence\n");
> +
> + cdns_mhdp_set_rate_governing(mhdp_bridge, true);
> +
> + cdns_mhdp_mst_set_threshold(mhdp_bridge);
> +
> + drm_dp_update_payload_part2(&mhdp->mst_mgr);
> +}
> +
> +void cdns_mhdp_mst_disable(struct drm_bridge *bridge)
> +{
> + struct cdns_mhdp_bridge *mhdp_bridge = to_mhdp_bridge(bridge);
> + struct cdns_mhdp_device *mhdp = mhdp_bridge->mhdp;
> + struct cdns_mhdp_connector *connector = mhdp_bridge->connector;
> +
> + drm_dp_mst_reset_vcpi_slots(&mhdp->mst_mgr, connector->port);
> + drm_dp_update_payload_part1(&mhdp->mst_mgr);
> +
> + cdns_mhdp_update_slot_allocation(mhdp_bridge);
> +
> + drm_dp_check_act_status(&mhdp->mst_mgr);
> +
> + drm_dp_update_payload_part2(&mhdp->mst_mgr);
> +
> + drm_dp_mst_deallocate_vcpi(&mhdp->mst_mgr, connector->port);
> +
> + cdns_mhdp_set_rate_governing(mhdp_bridge, false);
> + cdns_mhdp_mst_stream_enable(mhdp_bridge, false);
> + mhdp_bridge->stream_id = -1;
> + mhdp_bridge->is_active = false;
> +}
> +
> +static const struct drm_bridge_funcs cdns_mhdp_mst_bridge_funcs = {
> + .enable = cdns_mhdp_enable,
> + .disable = cdns_mhdp_mst_disable,
> +};
> +
> +
> +static struct cdns_mhdp_bridge*
> +cdns_mhpd_create_fake_mst_bridge(struct cdns_mhdp_device *mhdp,
> + struct cdns_mhdp_connector *mhdp_connector)
> +{
> + struct cdns_mhdp_bridge *mhdp_bridge;
> + struct drm_encoder *encoder = NULL;
> + struct cdns_mhdp_mst_cbs *cbs = &mhdp->cbs;
> +
> + mhdp_bridge = kzalloc(sizeof(*mhdp_bridge), GFP_KERNEL);
> + if (!mhdp_bridge)
> + return NULL;
> +
> + mhdp_bridge->mhdp = mhdp;
> + mhdp_bridge->stream_id = -1;
> + mhdp_bridge->connector = mhdp_connector;
> + mhdp_bridge->is_active = false;
> +
> + mhdp_bridge->base.funcs = &cdns_mhdp_mst_bridge_funcs;
> +
> + drm_bridge_add(&mhdp_bridge->base);
> +
> + if (cbs->funcs.create_mst_encoder)
> + encoder = cbs->funcs.create_mst_encoder(cbs->priv_data,
> + &mhdp_bridge->base);
> + if (encoder) {
> + int ret;
> + /* use the same drm device as is in the first encoder */
> + encoder->dev = mhdp->bridge.base.encoder->dev;
> + encoder->possible_crtcs &= ((1 << CDNS_MHDP_MAX_STREAMS) - 1);
> + ret = drm_bridge_attach(encoder, &mhdp_bridge->base, NULL);
> + if (ret) {
> + dev_err(mhdp->dev, "bridge attaching error %d\n", ret);
> + return NULL;
> + }
> +
> + ret = drm_connector_attach_encoder(&mhdp_connector->base,
> + encoder);
> + if (ret) {
> + dev_err(mhdp->dev, "failed to attach connector to encoder\n");
> + return NULL;
> + }
> + }
> +
> + return mhdp_bridge;
> +}
> +
> +static struct drm_connector *
> +cdns_mhdp_mst_cbs_add_connector(struct drm_dp_mst_topology_mgr *mgr,
> + struct drm_dp_mst_port *port,
> + const char *pathprop)
> +{
> + struct cdns_mhdp_device *mhdp = mgr_to_mhdp(mgr);
> + struct drm_device *dev = mhdp->bridge.base.dev;
> + struct cdns_mhdp_connector *mhdp_connector;
> + struct drm_connector *connector;
> + struct drm_connector_state *conn_state;
> + int ret;
> +
> + mhdp_connector = kzalloc(sizeof(struct cdns_mhdp_connector),
> + GFP_KERNEL);
> + if (!mhdp_connector)
> + return NULL;
> +
> + mhdp_connector->is_mst_connector = true;
> + connector = &mhdp_connector->base;
> + mhdp_connector->port = port;
> + DRM_DEBUG_KMS("\n");
> +
> + conn_state = kzalloc(sizeof(*conn_state), GFP_KERNEL);
> + if (!conn_state)
> + return NULL;
> +
> + __drm_atomic_helper_connector_reset(connector,
> + conn_state);
> +
> + drm_connector_init(dev, connector, &cdns_mhdp_mst_connector_funcs,
> + DRM_MODE_CONNECTOR_DisplayPort);
> + drm_connector_helper_add(connector, &cdns_mhdp_mst_conn_helper_fun);
> + mhdp_connector->bridge =
> + cdns_mhpd_create_fake_mst_bridge(mhdp, mhdp_connector);
> +
> + drm_object_attach_property(&connector->base,
> + dev->mode_config.path_property, 0);
> + drm_object_attach_property(&connector->base,
> + dev->mode_config.tile_property, 0);
> + ret = drm_connector_set_path_property(connector, pathprop);
> +
> + if (ret)
> + DRM_ERROR("ERROR set path propertty failed\n");
> +
> + return connector;
> +}
> +
> +static void
> +cdns_mhdp_mst_cbs_destroy_connector(struct drm_dp_mst_topology_mgr *mgr,
> + struct drm_connector *connector)
> +{
> + struct cdns_mhdp_connector *mhdp_connector;
> + struct cdns_mhdp_device *mhdp;
> + struct cdns_mhdp_bridge *mhdp_bridge;
> +
> + mhdp_connector = to_mhdp_connector(connector);
> + mhdp_bridge = mhdp_connector->bridge;
> + mhdp = mhdp_bridge->mhdp;
> +
> + drm_connector_unregister(&mhdp_connector->base);
> +
> + if (mhdp->cbs.funcs.create_mst_encoder)
> + mhdp->cbs.funcs.destroy_mst_encoder(mhdp->cbs.priv_data,
> + &mhdp_bridge->base);
> + drm_connector_unreference(&mhdp_connector->base);
> +}
> +
> +static void cdns_mhdp_mst_cbs_hotplug(struct drm_dp_mst_topology_mgr *mgr)
> +{
> + struct cdns_mhdp_device *mhdp = mgr_to_mhdp(mgr);
> + struct drm_device *dev = mhdp->bridge.base.encoder->dev;
> +
> + drm_kms_helper_hotplug_event(dev);
> +}
> +
> +static void
> +cdns_mhdp_mst_cbs_register_connector(struct drm_connector *connector)
> +{
> + int ret;
> +
> + ret = drm_connector_register(connector);
> + if (ret)
> + DRM_ERROR("Register connector failed\n");
> +
> +}
> +
> +static const struct drm_dp_mst_topology_cbs mst_cbs = {
> + .add_connector = cdns_mhdp_mst_cbs_add_connector,
> + .register_connector = cdns_mhdp_mst_cbs_register_connector,
> + .destroy_connector = cdns_mhdp_mst_cbs_destroy_connector,
> + .hotplug = cdns_mhdp_mst_cbs_hotplug,
> +};
> +
> +
> +static void cdns_mhdp_set_mst_enable(struct cdns_mhdp_device *mhdp, bool enable)
> +{
> + u32 reg_val;
> +
> + cdns_mhdp_reg_read(mhdp, CDNS_DP_FRAMER_GLOBAL_CONFIG, ®_val);
> +
> + if (enable)
> + reg_val |= CDNS_DP_MST_EN;
> + else
> + reg_val &= ~CDNS_DP_MST_EN;
> +
> + cdns_mhdp_reg_write(mhdp, CDNS_DP_FRAMER_GLOBAL_CONFIG, reg_val);
> +}
> +
> +bool cdns_mhdp_mst_probe(struct cdns_mhdp_device *mhdp)
> +{
> + u8 mstm_cap;
> + u8 dpcd_cap[DP_RECEIVER_CAP_SIZE];
> +
> + bool is_mst;
> +
> + if (!mhdp->can_mst)
> + return false;
> +
> + drm_dp_dpcd_read(&mhdp->aux, DP_DPCD_REV, dpcd_cap,
> + DP_RECEIVER_CAP_SIZE);
> +
> + if (dpcd_cap[DP_DPCD_REV] < 0x12)
> + return false;
> +
> + if (drm_dp_dpcd_readb(&mhdp->aux, DP_MSTM_CAP, &mstm_cap) != 1)
> + return false;
> +
> + if (mstm_cap & DP_MST_CAP) {
> + DRM_DEBUG_KMS("Sink is MST capable\n");
> + is_mst = true;
> + } else {
> + DRM_DEBUG_KMS("Sink is not MST capable\n");
> + is_mst = false;
> + }
> +
> + if (is_mst != mhdp->is_mst) {
> + mhdp->is_mst = is_mst;
> + cdns_mhdp_set_mst_enable(mhdp, mhdp->is_mst);
> +
> + drm_dp_mst_topology_mgr_set_mst(&mhdp->mst_mgr,
> + mhdp->is_mst);
> + }
> +
> + return mhdp->is_mst;
> +}
> +
> +int cdns_mhdp_mst_init(struct cdns_mhdp_device *mhdp)
> +{
> + struct cdns_mhdp_bridge *bridge = &mhdp->bridge;
> + struct drm_device *dev = bridge->base.dev;
> + struct cdns_mhdp_connector *connector = bridge->connector;
> + int ret;
> +
> + mhdp->mst_mgr.cbs = &mst_cbs;
> + ret = drm_dp_mst_topology_mgr_init(&mhdp->mst_mgr, dev,
> + &mhdp->aux, 16,
> + CDNS_MHDP_MAX_STREAMS,
> + connector->base.base.id);
> + if (ret)
> + mhdp->can_mst = false;
> + else
> + mhdp->can_mst = true;
> +
> + mhdp->is_mst = false;
> +
> + bridge->stream_id = -1;
> +
> + return ret;
> +}
> +
> +void cdns_mhdp_mst_deinit(struct cdns_mhdp_device *mhdp)
> +{
> + if (mhdp->is_mst) {
> + mhdp->is_mst = false;
> + drm_dp_mst_topology_mgr_set_mst(&mhdp->mst_mgr,
> + mhdp->is_mst);
> + }
> +
> + if (mhdp->can_mst)
> + drm_dp_mst_topology_mgr_destroy(&mhdp->mst_mgr);
> +}
> diff --git a/drivers/gpu/drm/bridge/cdns-mhdp.c b/drivers/gpu/drm/bridge/cdns-mhdp.c
> index a3bbc0e809a5..48ac5cf1e031 100644
> --- a/drivers/gpu/drm/bridge/cdns-mhdp.c
> +++ b/drivers/gpu/drm/bridge/cdns-mhdp.c
> @@ -27,146 +27,15 @@
> #include <drm/bridge/cdns-mhdp-common.h>
>
> #include <sound/hdmi-codec.h>
> +#include <linux/irq.h>
> +#include <linux/of_irq.h>
>
> +#include "cdns-mhdp.h"
>
> #define DEBUG_MSG
>
> #define FW_NAME "cadence/mhdp8546.bin"
>
> -#define CDNS_APB_CFG 0x00000
> -#define CDNS_APB_CTRL (CDNS_APB_CFG + 0x00)
> -#define CDNS_MAILBOX_FULL (CDNS_APB_CFG + 0x08)
> -#define CDNS_MAILBOX_EMPTY (CDNS_APB_CFG + 0x0c)
> -#define CDNS_MAILBOX_TX_DATA (CDNS_APB_CFG + 0x10)
> -#define CDNS_MAILBOX_RX_DATA (CDNS_APB_CFG + 0x14)
> -#define CDNS_KEEP_ALIVE (CDNS_APB_CFG + 0x18)
> -#define CDNS_KEEP_ALIVE_MASK GENMASK(7, 0)
> -
> -#define CDNS_SW_CLK_L (CDNS_APB_CFG + 0x3c)
> -#define CDNS_SW_CLK_H (CDNS_APB_CFG + 0x40)
> -#define CDNS_SW_EVENT0 (CDNS_APB_CFG + 0x44)
> -#define CDNS_DPTX_HPD BIT(0)
> -
> -#define CDNS_SW_EVENT1 (CDNS_APB_CFG + 0x48)
> -#define CDNS_SW_EVENT2 (CDNS_APB_CFG + 0x4c)
> -#define CDNS_SW_EVENT3 (CDNS_APB_CFG + 0x50)
> -
> -#define CDNS_DPTX_CAR (CDNS_APB_CFG + 0x904)
> -#define CDNS_VIF_CLK_EN BIT(0)
> -#define CDNS_VIF_CLK_RSTN BIT(1)
> -
> -#define CDNS_SOURCE_VIDEO_INTERFACE 0x00b00
> -#define CDNS_BND_HSYNC2VSYNC (CDNS_SOURCE_VIDEO_INTERFACE + \
> - 0x00)
> -#define CDNS_IP_DTCT_WIN GENMASK(11, 0)
> -#define CDNS_IP_DET_INTERLACE_FORMAT BIT(12)
> -#define CDNS_IP_BYPASS_V_INTERFACE BIT(13)
> -
> -#define CDNS_HSYNC2VSYNC_POL_CTRL (CDNS_SOURCE_VIDEO_INTERFACE + \
> - 0x10)
> -#define CDNS_H2V_HSYNC_POL_ACTIVE_LOW BIT(1)
> -#define CDNS_H2V_VSYNC_POL_ACTIVE_LOW BIT(2)
> -
> -#define CDNS_DPTX_PHY_CONFIG 0x02000
> -#define CDNS_PHY_TRAINING_EN BIT(0)
> -#define CDNS_PHY_TRAINING_TYPE(x) (((x) & GENMASK(3, 0)) << 1)
> -#define CDNS_PHY_SCRAMBLER_BYPASS BIT(5)
> -#define CDNS_PHY_ENCODER_BYPASS BIT(6)
> -#define CDNS_PHY_SKEW_BYPASS BIT(7)
> -#define CDNS_PHY_TRAINING_AUTO BIT(8)
> -#define CDNS_PHY_LANE0_SKEW(x) (((x) & GENMASK(2, 0)) << 9)
> -#define CDNS_PHY_LANE1_SKEW(x) (((x) & GENMASK(2, 0)) << 12)
> -#define CDNS_PHY_LANE2_SKEW(x) (((x) & GENMASK(2, 0)) << 15)
> -#define CDNS_PHY_LANE3_SKEW(x) (((x) & GENMASK(2, 0)) << 18)
> -#define CDNS_PHY_COMMON_CONFIG (CDNS_PHY_LANE1_SKEW(1) | \
> - CDNS_PHY_LANE2_SKEW(2) | \
> - CDNS_PHY_LANE3_SKEW(3))
> -#define CDNS_PHY_10BIT_EN BIT(21)
> -
> -#define CDNS_DPTX_FRAMER 0x02200
> -#define CDNS_DP_FRAMER_GLOBAL_CONFIG (CDNS_DPTX_FRAMER + 0x00)
> -#define CDNS_DP_NUM_LANES(x) (x - 1)
> -#define CDNS_DP_FRAMER_EN BIT(3)
> -#define CDNS_DP_RATE_GOVERNOR_EN BIT(4)
> -#define CDNS_DP_NO_VIDEO_MODE BIT(5)
> -#define CDNS_DP_DISABLE_PHY_RST BIT(6)
> -#define CDNS_DP_WR_FAILING_EDGE_VSYNC BIT(7)
> -
> -#define CDNS_DP_SW_RESET (CDNS_DPTX_FRAMER + 0x04)
> -#define CDNS_DP_FRAMER_TU (CDNS_DPTX_FRAMER + 0x08)
> -#define CDNS_DP_FRAMER_TU_SIZE(x) (((x) & GENMASK(6, 0)) << 8)
> -#define CDNS_DP_FRAMER_TU_VS(x) ((x) & GENMASK(5, 0))
> -#define CDNS_DP_FRAMER_TU_CNT_RST_EN BIT(15)
> -
> -#define CDNS_DPTX_STREAM 0x03000
> -#define CDNS_DP_MSA_HORIZONTAL_0 (CDNS_DPTX_STREAM + 0x00)
> -#define CDNS_DP_MSAH0_H_TOTAL(x) (x)
> -#define CDNS_DP_MSAH0_HSYNC_START(x) ((x) << 16)
> -
> -#define CDNS_DP_MSA_HORIZONTAL_1 (CDNS_DPTX_STREAM + 0x04)
> -#define CDNS_DP_MSAH1_HSYNC_WIDTH(x) (x)
> -#define CDNS_DP_MSAH1_HSYNC_POL_LOW BIT(15)
> -#define CDNS_DP_MSAH1_HDISP_WIDTH(x) ((x) << 16)
> -
> -#define CDNS_DP_MSA_VERTICAL_0 (CDNS_DPTX_STREAM + 0x08)
> -#define CDNS_DP_MSAV0_V_TOTAL(x) (x)
> -#define CDNS_DP_MSAV0_VSYNC_START(x) ((x) << 16)
> -
> -#define CDNS_DP_MSA_VERTICAL_1 (CDNS_DPTX_STREAM + 0x0c)
> -#define CDNS_DP_MSAV1_VSYNC_WIDTH(x) (x)
> -#define CDNS_DP_MSAV1_VSYNC_POL_LOW BIT(15)
> -#define CDNS_DP_MSAV1_VDISP_WIDTH(x) ((x) << 16)
> -
> -#define CDNS_DP_MSA_MISC (CDNS_DPTX_STREAM + 0x10)
> -#define CDNS_DP_STREAM_CONFIG (CDNS_DPTX_STREAM + 0x14)
> -#define CDNS_DP_RATE_GOVERNOR_STATUS (CDNS_DPTX_STREAM + 0x2c)
> -#define CDNS_DP_RG_TU_VS_DIFF(x) ((x) << 8)
> -
> -#define CDNS_DP_HORIZONTAL (CDNS_DPTX_STREAM + 0x30)
> -#define CDNS_DP_H_HSYNC_WIDTH(x) (x)
> -#define CDNS_DP_H_H_TOTAL(x) ((x) << 16)
> -
> -#define CDNS_DP_VERTICAL_0 (CDNS_DPTX_STREAM + 0x34)
> -#define CDNS_DP_V0_VHEIGHT(x) (x)
> -#define CDNS_DP_V0_VSTART(x) ((x) << 16)
> -
> -#define CDNS_DP_VERTICAL_1 (CDNS_DPTX_STREAM + 0x38)
> -#define CDNS_DP_V1_VTOTAL(x) (x)
> -#define CDNS_DP_V1_VTOTAL_EVEN BIT(16)
> -
> -#define CDNS_DP_FRAMER_PXL_REPR (CDNS_DPTX_STREAM + 0x4c)
> -#define CDNS_DP_FRAMER_6_BPC BIT(0)
> -#define CDNS_DP_FRAMER_8_BPC BIT(1)
> -#define CDNS_DP_FRAMER_10_BPC BIT(2)
> -#define CDNS_DP_FRAMER_12_BPC BIT(3)
> -#define CDNS_DP_FRAMER_16_BPC BIT(4)
> -#define CDNS_DP_FRAMER_PXL_FORMAT 0x8
> -#define CDNS_DP_FRAMER_RGB BIT(0)
> -#define CDNS_DP_FRAMER_YCBCR444 BIT(1)
> -#define CDNS_DP_FRAMER_YCBCR422 BIT(2)
> -#define CDNS_DP_FRAMER_YCBCR420 BIT(3)
> -#define CDNS_DP_FRAMER_Y_ONLY BIT(4)
> -
> -#define CDNS_DP_FRAMER_SP (CDNS_DPTX_STREAM + 0x10)
> -#define CDNS_DP_FRAMER_VSYNC_POL_LOW BIT(0)
> -#define CDNS_DP_FRAMER_HSYNC_POL_LOW BIT(1)
> -#define CDNS_DP_FRAMER_INTERLACE BIT(2)
> -
> -#define CDNS_DP_LINE_THRESH (CDNS_DPTX_STREAM + 0x64)
> -#define CDNS_DP_VB_ID (CDNS_DPTX_STREAM + 0x68)
> -#define CDNS_DP_VB_ID_INTERLACED BIT(2)
> -
> -#define CDNS_DP_FRONT_BACK_PORCH (CDNS_DPTX_STREAM + 0x78)
> -#define CDNS_DP_BACK_PORCH(x) (x)
> -#define CDNS_DP_FRONT_PORCH(x) ((x) << 16)
> -
> -#define CDNS_DP_BYTE_COUNT (CDNS_DPTX_STREAM + 0x7c)
> -
> -#define CDNS_DPTX_GLOBAL 0x02300
> -#define CDNS_DP_LANE_EN (CDNS_DPTX_GLOBAL + 0x00)
> -#define CDNS_DP_LANE_EN_LANES(x) GENMASK(x - 1, 0)
> -#define CDNS_DP_ENHNCD (CDNS_DPTX_GLOBAL + 0x04)
> -
> #define CDNS_MHDP_IMEM 0x10000
> #define CDNS_MHDP_DMEM 0x20000
>
> @@ -216,13 +85,17 @@ MODULE_DEVICE_TABLE(of, mhdp_ids);
> static inline struct cdns_mhdp_device *connector_to_mhdp(
> struct drm_connector *conn)
> {
> - return container_of(conn, struct cdns_mhdp_device, connector);
> + struct cdns_mhdp_connector *mhdp_connector = to_mhdp_connector(conn);
> +
> + return mhdp_connector->bridge->mhdp;
> }
>
> static inline struct cdns_mhdp_device *bridge_to_mhdp(
> struct drm_bridge *bridge)
> {
> - return container_of(bridge, struct cdns_mhdp_device, bridge);
> + struct cdns_mhdp_bridge *mhdp_bridge = to_mhdp_bridge(bridge);
> +
> + return mhdp_bridge->mhdp;
> }
>
> static unsigned int max_link_rate(struct cdns_mhdp_host host,
> @@ -237,6 +110,62 @@ static u8 eq_training_pattern_supported(struct cdns_mhdp_host host,
> return fls(host.pattern_supp & sink.pattern_supp);
> }
>
> +static void mhdp_hotplug_work_func(struct work_struct *work)
> +{
> + struct cdns_mhdp_device *mhdp;
> + int dret, retry;
> + u8 esi[16] = { 0 };
> + bool new_irq_handled;
> + struct drm_connector *connector;
> + bool old_plugged;
> +
> +
> + mhdp = container_of(work, struct cdns_mhdp_device,
> + hotplug_work.work);
> + connector = &mhdp->connector.base;
> +
> + old_plugged = mhdp->plugged;
> + connector->status = connector->funcs->detect(connector, false);
> + if (old_plugged != mhdp->plugged) {
> + drm_kms_helper_hotplug_event(mhdp->bridge.base.dev);
> + return;
> + }
> +
> + if (mhdp->plugged) {
> + dret = drm_dp_dpcd_read(&mhdp->aux,
> + DP_SINK_COUNT_ESI, esi, 8);
> +
> + if (dret == 8) {
> + drm_dp_mst_hpd_irq(&mhdp->mst_mgr,
> + esi,
> + &new_irq_handled);
> + }
> +
> + if (new_irq_handled) {
> + for (retry = 0; retry < 3; retry++) {
> + int wret;
> +
> + wret = drm_dp_dpcd_write(&mhdp->aux,
> + DP_SINK_COUNT_ESI+1,
> + &esi[1], 3);
> + if (wret == 3)
> + break;
> + }
> + }
> + }
> +
> +}
> +
> +static irqreturn_t mhdp_irq_handler(int irq, void *data)
> +{
> + struct cdns_mhdp_device *mhdp = (struct cdns_mhdp_device *)data;
> +
> + if (readl(mhdp->regs + CDNS_SW_EVENT0) & CDNS_DPTX_HPD)
> + schedule_delayed_work(&mhdp->hotplug_work, 0);
> +
> + return IRQ_HANDLED;
> +}
> +
> static ssize_t mhdp_transfer(struct drm_dp_aux *aux,
> struct drm_dp_aux_msg *msg)
> {
> @@ -300,10 +229,16 @@ static enum drm_connector_status cdns_mhdp_detect(struct drm_connector *conn,
> int ret;
>
> ret = cdns_mhdp_get_hpd_status(mhdp);
> - if (ret > 0)
> - status = connector_status_connected;
> - else if (ret < 0)
> + if (ret > 0) {
> + mhdp->plugged = true;
> + cdns_mhdp_mst_probe(mhdp);
> + // for MST mode this connector will be always disconnected
> + if (!mhdp->is_mst)
> + status = connector_status_connected;
> + } else if (ret < 0)
> dev_err(mhdp->dev, "Failed to obtain HPD state\n");
> + else
> + mhdp->plugged = false;
>
> return status;
> }
> @@ -321,11 +256,15 @@ static const struct drm_connector_funcs cdns_mhdp_conn_funcs = {
> static int cdns_mhdp_attach(struct drm_bridge *bridge)
> {
> struct cdns_mhdp_device *mhdp = bridge_to_mhdp(bridge);
> - struct drm_connector *conn = &mhdp->connector;
> + struct drm_connector *conn = &mhdp->connector.base;
> int ret;
>
> - conn->polled = DRM_CONNECTOR_POLL_CONNECT |
> - DRM_CONNECTOR_POLL_DISCONNECT;
> + if (&mhdp->bridge.base != bridge)
> + return -ENODEV;
> +
> + cdns_mhdp_mst_init(mhdp);
> +
> + conn->polled = DRM_CONNECTOR_POLL_HPD;
>
> ret = drm_connector_init(bridge->dev, conn, &cdns_mhdp_conn_funcs,
> DRM_MODE_CONNECTOR_DisplayPort);
> @@ -342,17 +281,12 @@ static int cdns_mhdp_attach(struct drm_bridge *bridge)
> return ret;
> }
>
> + /* enable interrupts */
> + writel(~CDNS_APB_INT_MASK_SW_EVENT_INT, mhdp->regs + CDNS_APB_INT_MASK);
> +
> return 0;
> }
>
> -enum pixel_format {
> - PIXEL_FORMAT_RGB = 1,
> - PIXEL_FORMAT_YCBCR_444 = 2,
> - PIXEL_FORMAT_YCBCR_422 = 4,
> - PIXEL_FORMAT_YCBCR_420 = 8,
> - PIXEL_FORMAT_Y_ONLY = 16,
> -};
> -
> static void mhdp_link_training_init(struct cdns_mhdp_device *mhdp)
> {
> u32 reg32;
> @@ -716,13 +650,11 @@ static int mhdp_link_training(struct cdns_mhdp_device *mhdp,
> cdns_mhdp_reg_write(mhdp, CDNS_DP_SW_RESET, 1);
> cdns_mhdp_reg_write(mhdp, CDNS_DP_SW_RESET, 0);
>
> - /* Enable framer */
> - /* FIXME: update when MST supported, BIT(2) */
> cdns_mhdp_reg_write(mhdp, CDNS_DP_FRAMER_GLOBAL_CONFIG,
> - CDNS_DP_FRAMER_EN |
> CDNS_DP_NUM_LANES(mhdp->link.num_lanes) |
> CDNS_DP_DISABLE_PHY_RST |
> CDNS_DP_WR_FAILING_EDGE_VSYNC |
> + (mhdp->is_mst ? CDNS_DP_MST_EN : 0) |
> (!video_mode ? CDNS_DP_NO_VIDEO_MODE : 0));
>
> /* Reset PHY config */
> @@ -751,31 +683,20 @@ static void cdns_mhdp_disable(struct drm_bridge *bridge)
>
> cdns_mhdp_set_video_status(mhdp, 0);
>
> + mhdp->link_up = false;
> +
> drm_dp_link_power_down(&mhdp->aux, &mhdp->link);
> + if (mhdp->is_mst)
> + cdns_mhdp_mst_disable(bridge);
> }
>
> -static void cdns_mhdp_enable(struct drm_bridge *bridge)
> +static int cdns_mhdp_link_up(struct cdns_mhdp_device *mhdp)
> {
> - struct cdns_mhdp_device *mhdp = bridge_to_mhdp(bridge);
> - struct drm_display_mode *mode;
> - struct drm_display_info *disp_info = &mhdp->connector.display_info;
> - enum pixel_format pxlfmt;
> - int pxlclock;
> - unsigned int rate, tu_size = 30, vs, vs_f, bpp, required_bandwidth,
> - available_bandwidth, dp_framer_sp = 0, msa_horizontal_1,
> - msa_vertical_1, bnd_hsync2vsync, hsync2vsync_pol_ctrl,
> - misc0 = 0, misc1 = 0, line_thresh = 0, pxl_repr,
> - front_porch, back_porch, msa_h0, msa_v0, hsync, vsync,
> - dp_vertical_1, line_thresh1, line_thresh2;
> u32 resp;
> -
> - unsigned int size = DP_RECEIVER_CAP_SIZE, dp_framer_global_config,
> + u32 size = DP_RECEIVER_CAP_SIZE, dp_framer_global_config,
> video_mode, training_interval_us;
> u8 reg0[size], reg8, amp[2];
>
> - mode = &bridge->encoder->crtc->state->adjusted_mode;
> - pxlclock = mode->crtc_clock;
> -
> /*
> * Upon power-on reset/device disconnection: [2:0] bits should be 0b001
> * and [7:5] bits 0b000.
> @@ -824,13 +745,17 @@ static void cdns_mhdp_enable(struct drm_bridge *bridge)
> default:
> dev_err(mhdp->dev,
> "wrong training interval returned by DPCD: %d\n", reg8);
> - return;
> + return -EIO;
> }
>
> cdns_mhdp_reg_read(mhdp, CDNS_DP_FRAMER_GLOBAL_CONFIG, &resp);
>
> dp_framer_global_config = be32_to_cpu(resp);
>
> + cdns_mhdp_mst_probe(mhdp);
> + if (mhdp->is_mst)
> + dp_framer_global_config |= CDNS_DP_MST_EN;
> +
> video_mode = !(dp_framer_global_config & CDNS_DP_NO_VIDEO_MODE);
>
> if (dp_framer_global_config & CDNS_DP_FRAMER_EN)
> @@ -850,50 +775,168 @@ static void cdns_mhdp_enable(struct drm_bridge *bridge)
> if (mhdp_link_training(mhdp, video_mode,
> training_interval_us)) {
> dev_err(mhdp->dev, "Link training failed. Exiting.\n");
> - return;
> + return -EIO;
> }
> }
>
> + mhdp->link_up = true;
> +
> + return 0;
> +}
> +
> +static int cdns_mhdp_sst_enable(struct drm_bridge *bridge)
> +{
> + struct cdns_mhdp_bridge *mhdp_bridge = to_mhdp_bridge(bridge);
> + struct cdns_mhdp_device *mhdp = mhdp_bridge->mhdp;
> + u32 rate, vs, vs_f, required_bandwidth, available_bandwidth;
> + u32 bpp, tu_size = 30, line_thresh1, line_thresh2, line_thresh = 0;
> + struct drm_display_mode *mode;
> + int pxlclock;
> + enum pixel_format pxlfmt;
> + struct drm_display_info *disp_info = &mhdp->connector.base.display_info;
> +
> +
> + mode = &bridge->encoder->crtc->state->adjusted_mode;
> + pxlclock = mode->crtc_clock;
> +
> + mhdp_bridge->stream_id = 0;
> +
> rate = mhdp->link.rate / 1000;
>
> + pxlfmt = cdns_mhdp_get_pxlfmt(disp_info->color_formats);
> + bpp = cdns_mhdp_get_bpp(disp_info->bpc, pxlfmt);
> +
> + /* find optimal tu_size */
> + required_bandwidth = pxlclock * bpp / 8;
> + available_bandwidth = mhdp->link.num_lanes * rate;
> + do {
> + tu_size += 2;
> +
> + vs_f = tu_size * required_bandwidth / available_bandwidth;
> + vs = vs_f / 1000;
> + vs_f = vs_f % 1000;
> + /*
> + * FIXME (CDNS): downspreading?
> + * It's unused is what I've been told.
> + */
> + } while ((vs == 1 || ((vs_f > 850 || vs_f < 100) && vs_f != 0) ||
> + tu_size - vs < 2) && tu_size < 64);
> +
> + if (vs > 64)
> + return -EINVAL;
> +
> +
> + cdns_mhdp_reg_write(mhdp, CDNS_DP_FRAMER_TU,
> + CDNS_DP_FRAMER_TU_VS(vs) |
> + CDNS_DP_FRAMER_TU_SIZE(tu_size) |
> + CDNS_DP_FRAMER_TU_CNT_RST_EN);
> +
> + line_thresh1 = ((vs + 1) << 5) * 8 / bpp;
> + line_thresh2 = (pxlclock << 5) / 1000 / rate * (vs + 1) - (1 << 5);
> + line_thresh = line_thresh1 - line_thresh2 / mhdp->link.num_lanes;
> + line_thresh = (line_thresh >> 5) + 2;
> + cdns_mhdp_reg_write(mhdp, CDNS_DP_LINE_THRESH(0),
> + line_thresh & GENMASK(5, 0));
> +
> + cdns_mhdp_reg_write(mhdp, CDNS_DP_STREAM_CONFIG_2(0),
> + CDNS_DP_SC2_TU_VS_DIFF((tu_size - vs > 3) ?
> + 0 : tu_size - vs));
> +
> + cdns_mhdp_configure_video(bridge);
> +
> + cdns_mhdp_set_video_status(mhdp, 1);
> +
> + return 0;
> +}
> +
> +enum pixel_format cdns_mhdp_get_pxlfmt(u32 color_formats)
> +{
> + enum pixel_format pxlfmt;
> +
> /* FIXME: what about Y_ONLY? how is it handled in the kernel? */
> - if (disp_info->color_formats & DRM_COLOR_FORMAT_YCRCB444)
> + if (color_formats & DRM_COLOR_FORMAT_YCRCB444)
> pxlfmt = PIXEL_FORMAT_YCBCR_444;
> - else if (disp_info->color_formats & DRM_COLOR_FORMAT_YCRCB422)
> + else if (color_formats & DRM_COLOR_FORMAT_YCRCB422)
> pxlfmt = PIXEL_FORMAT_YCBCR_422;
> - else if (disp_info->color_formats & DRM_COLOR_FORMAT_YCRCB420)
> + else if (color_formats & DRM_COLOR_FORMAT_YCRCB420)
> pxlfmt = PIXEL_FORMAT_YCBCR_420;
> else
> pxlfmt = PIXEL_FORMAT_RGB;
>
> + return pxlfmt;
> +}
> +
> +
> +u32 cdns_mhdp_get_bpp(u32 bpc, enum pixel_format pxlfmt)
> +{
> + u32 bpp;
> +
> + switch (pxlfmt) {
> + case PIXEL_FORMAT_RGB:
> + bpp = bpc * 3;
> + break;
> + case PIXEL_FORMAT_YCBCR_444:
> + bpp = bpc * 3;
> + break;
> + case PIXEL_FORMAT_YCBCR_422:
> + bpp = bpc * 2;
> + break;
> + case PIXEL_FORMAT_YCBCR_420:
> + bpp = bpc * 3 / 2;
> + break;
> + default:
> + bpp = bpc;
> + }
> + return bpp;
> +}
> +
> +void cdns_mhdp_configure_video(struct drm_bridge *bridge)
> +{
> + struct cdns_mhdp_bridge *mhdp_bridge = to_mhdp_bridge(bridge);
> + struct cdns_mhdp_device *mhdp = mhdp_bridge->mhdp;
> + struct drm_display_info *disp_info;
> + unsigned int bpp, dp_framer_sp = 0, msa_horizontal_1,
> + msa_vertical_1, bnd_hsync2vsync, hsync2vsync_pol_ctrl,
> + misc0 = 0, misc1 = 0, pxl_repr,
> + front_porch, back_porch, msa_h0, msa_v0, hsync, vsync,
> + dp_vertical_1;
> + struct drm_display_mode *mode;
> + enum pixel_format pxlfmt;
> + int pxlclock;
> + u32 tmp;
> + u8 stream_id = mhdp_bridge->stream_id;
> +
> + mode = &bridge->encoder->crtc->state->adjusted_mode;
> + pxlclock = mode->crtc_clock;
> +
> + disp_info = &mhdp_bridge->connector->base.display_info;
> + pxlfmt = cdns_mhdp_get_pxlfmt(disp_info->color_formats);
> +
> /* if YCBCR supported and stream not SD, use ITU709 */
> /* FIXME: handle ITU version with YCBCR420 when supported */
> if ((pxlfmt == PIXEL_FORMAT_YCBCR_444 ||
> pxlfmt == PIXEL_FORMAT_YCBCR_422) && mode->crtc_vdisplay >= 720)
> misc0 = DP_YCBCR_COEFFICIENTS_ITU709;
>
> + bpp = cdns_mhdp_get_bpp(disp_info->bpc, pxlfmt);
> +
> switch (pxlfmt) {
> case PIXEL_FORMAT_RGB:
> - bpp = disp_info->bpc * 3;
> pxl_repr = CDNS_DP_FRAMER_RGB << CDNS_DP_FRAMER_PXL_FORMAT;
> misc0 |= DP_COLOR_FORMAT_RGB;
> break;
> case PIXEL_FORMAT_YCBCR_444:
> - bpp = disp_info->bpc * 3;
> pxl_repr = CDNS_DP_FRAMER_YCBCR444 << CDNS_DP_FRAMER_PXL_FORMAT;
> misc0 |= DP_COLOR_FORMAT_YCbCr444 | DP_TEST_DYNAMIC_RANGE_CEA;
> break;
> case PIXEL_FORMAT_YCBCR_422:
> - bpp = disp_info->bpc * 2;
> pxl_repr = CDNS_DP_FRAMER_YCBCR422 << CDNS_DP_FRAMER_PXL_FORMAT;
> misc0 |= DP_COLOR_FORMAT_YCbCr422 | DP_TEST_DYNAMIC_RANGE_CEA;
> break;
> case PIXEL_FORMAT_YCBCR_420:
> - bpp = disp_info->bpc * 3 / 2;
> pxl_repr = CDNS_DP_FRAMER_YCBCR420 << CDNS_DP_FRAMER_PXL_FORMAT;
> break;
> default:
> - bpp = disp_info->bpc;
> pxl_repr = CDNS_DP_FRAMER_Y_ONLY << CDNS_DP_FRAMER_PXL_FORMAT;
> }
>
> @@ -920,30 +963,12 @@ static void cdns_mhdp_enable(struct drm_bridge *bridge)
> break;
> }
>
> - /* find optimal tu_size */
> - required_bandwidth = pxlclock * bpp / 8;
> - available_bandwidth = mhdp->link.num_lanes * rate;
> - do {
> - tu_size += 2;
> -
> - vs_f = tu_size * required_bandwidth / available_bandwidth;
> - vs = vs_f / 1000;
> - vs_f = vs_f % 1000;
> - /*
> - * FIXME (CDNS): downspreading?
> - * It's unused is what I've been told.
> - */
> - } while ((vs == 1 || ((vs_f > 850 || vs_f < 100) && vs_f != 0) ||
> - tu_size - vs < 2) && tu_size < 64);
> -
> - if (vs > 64)
> - return;
> -
> bnd_hsync2vsync = CDNS_IP_BYPASS_V_INTERFACE;
> if (mode->flags & DRM_MODE_FLAG_INTERLACE)
> bnd_hsync2vsync |= CDNS_IP_DET_INTERLACE_FORMAT;
>
> - cdns_mhdp_reg_write(mhdp, CDNS_BND_HSYNC2VSYNC, bnd_hsync2vsync);
> + cdns_mhdp_reg_write(mhdp, CDNS_BND_HSYNC2VSYNC(stream_id),
> + bnd_hsync2vsync);
>
> if (mode->flags & DRM_MODE_FLAG_INTERLACE &&
> mode->flags & DRM_MODE_FLAG_PHSYNC)
> @@ -952,15 +977,10 @@ static void cdns_mhdp_enable(struct drm_bridge *bridge)
> else
> hsync2vsync_pol_ctrl = 0;
>
> - cdns_mhdp_reg_write(mhdp, CDNS_HSYNC2VSYNC_POL_CTRL,
> + cdns_mhdp_reg_write(mhdp, CDNS_HSYNC2VSYNC_POL_CTRL(stream_id),
> hsync2vsync_pol_ctrl);
>
> - cdns_mhdp_reg_write(mhdp, CDNS_DP_FRAMER_TU,
> - CDNS_DP_FRAMER_TU_VS(vs) |
> - CDNS_DP_FRAMER_TU_SIZE(tu_size) |
> - CDNS_DP_FRAMER_TU_CNT_RST_EN);
> -
> - cdns_mhdp_reg_write(mhdp, CDNS_DP_FRAMER_PXL_REPR, pxl_repr);
> + cdns_mhdp_reg_write(mhdp, CDNS_DP_FRAMER_PXL_REPR(stream_id), pxl_repr);
>
> if (mode->flags & DRM_MODE_FLAG_INTERLACE)
> dp_framer_sp |= CDNS_DP_FRAMER_INTERLACE;
> @@ -968,19 +988,19 @@ static void cdns_mhdp_enable(struct drm_bridge *bridge)
> dp_framer_sp |= CDNS_DP_FRAMER_HSYNC_POL_LOW;
> if (mode->flags & DRM_MODE_FLAG_NVSYNC)
> dp_framer_sp |= CDNS_DP_FRAMER_VSYNC_POL_LOW;
> - cdns_mhdp_reg_write(mhdp, CDNS_DP_FRAMER_SP, dp_framer_sp);
> + cdns_mhdp_reg_write(mhdp, CDNS_DP_FRAMER_SP(stream_id), dp_framer_sp);
>
> front_porch = mode->crtc_hsync_start - mode->crtc_hdisplay;
> back_porch = mode->crtc_htotal - mode->crtc_hsync_end;
> - cdns_mhdp_reg_write(mhdp, CDNS_DP_FRONT_BACK_PORCH,
> + cdns_mhdp_reg_write(mhdp, CDNS_DP_FRONT_BACK_PORCH(stream_id),
> CDNS_DP_FRONT_PORCH(front_porch) |
> CDNS_DP_BACK_PORCH(back_porch));
>
> - cdns_mhdp_reg_write(mhdp, CDNS_DP_BYTE_COUNT,
> + cdns_mhdp_reg_write(mhdp, CDNS_DP_BYTE_COUNT(stream_id),
> mode->crtc_hdisplay * bpp / 8);
>
> msa_h0 = mode->crtc_htotal - mode->crtc_hsync_start;
> - cdns_mhdp_reg_write(mhdp, CDNS_DP_MSA_HORIZONTAL_0,
> + cdns_mhdp_reg_write(mhdp, CDNS_DP_MSA_HORIZONTAL_0(stream_id),
> CDNS_DP_MSAH0_H_TOTAL(mode->crtc_htotal) |
> CDNS_DP_MSAH0_HSYNC_START(msa_h0));
>
> @@ -989,11 +1009,11 @@ static void cdns_mhdp_enable(struct drm_bridge *bridge)
> CDNS_DP_MSAH1_HDISP_WIDTH(mode->crtc_hdisplay);
> if (mode->flags & DRM_MODE_FLAG_NHSYNC)
> msa_horizontal_1 |= CDNS_DP_MSAH1_HSYNC_POL_LOW;
> - cdns_mhdp_reg_write(mhdp, CDNS_DP_MSA_HORIZONTAL_1,
> + cdns_mhdp_reg_write(mhdp, CDNS_DP_MSA_HORIZONTAL_1(stream_id),
> msa_horizontal_1);
>
> msa_v0 = mode->crtc_vtotal - mode->crtc_vsync_start;
> - cdns_mhdp_reg_write(mhdp, CDNS_DP_MSA_VERTICAL_0,
> + cdns_mhdp_reg_write(mhdp, CDNS_DP_MSA_VERTICAL_0(stream_id),
> CDNS_DP_MSAV0_V_TOTAL(mode->crtc_vtotal) |
> CDNS_DP_MSAV0_VSYNC_START(msa_v0));
>
> @@ -1002,7 +1022,8 @@ static void cdns_mhdp_enable(struct drm_bridge *bridge)
> CDNS_DP_MSAV1_VDISP_WIDTH(mode->crtc_vdisplay);
> if (mode->flags & DRM_MODE_FLAG_NVSYNC)
> msa_vertical_1 |= CDNS_DP_MSAV1_VSYNC_POL_LOW;
> - cdns_mhdp_reg_write(mhdp, CDNS_DP_MSA_VERTICAL_1, msa_vertical_1);
> + cdns_mhdp_reg_write(mhdp, CDNS_DP_MSA_VERTICAL_1(stream_id),
> + msa_vertical_1);
>
> if ((mode->flags & DRM_MODE_FLAG_INTERLACE) &&
> mode->crtc_vtotal % 2 == 0)
> @@ -1014,16 +1035,14 @@ static void cdns_mhdp_enable(struct drm_bridge *bridge)
> if (pxlfmt == PIXEL_FORMAT_YCBCR_420)
> misc1 = CDNS_DP_TEST_VSC_SDP;
>
> - cdns_mhdp_reg_write(mhdp, CDNS_DP_MSA_MISC, misc0 | (misc1 << 8));
> + cdns_mhdp_reg_write(mhdp, CDNS_DP_MSA_MISC(stream_id),
> + misc0 | (misc1 << 8));
>
> - /* FIXME: to be changed if MST mode */
> - cdns_mhdp_reg_write(mhdp, CDNS_DP_STREAM_CONFIG, 1);
> -
> - cdns_mhdp_reg_write(mhdp, CDNS_DP_HORIZONTAL,
> + cdns_mhdp_reg_write(mhdp, CDNS_DP_HORIZONTAL(stream_id),
> CDNS_DP_H_HSYNC_WIDTH(hsync) |
> CDNS_DP_H_H_TOTAL(mode->crtc_hdisplay));
>
> - cdns_mhdp_reg_write(mhdp, CDNS_DP_VERTICAL_0,
> + cdns_mhdp_reg_write(mhdp, CDNS_DP_VERTICAL_0(stream_id),
> CDNS_DP_V0_VHEIGHT(mode->crtc_vdisplay) |
> CDNS_DP_V0_VSTART(msa_v0));
>
> @@ -1032,30 +1051,51 @@ static void cdns_mhdp_enable(struct drm_bridge *bridge)
> mode->crtc_vtotal % 2 == 0)
> dp_vertical_1 |= CDNS_DP_V1_VTOTAL_EVEN;
>
> - cdns_mhdp_reg_write(mhdp, CDNS_DP_VERTICAL_1, dp_vertical_1);
> + cdns_mhdp_reg_write(mhdp, CDNS_DP_VERTICAL_1(stream_id), dp_vertical_1);
>
> - cdns_mhdp_reg_write_bit(mhdp, CDNS_DP_VB_ID, 2, 1,
> + cdns_mhdp_reg_write_bit(mhdp, CDNS_DP_VB_ID(stream_id), 2, 1,
> (mode->flags & DRM_MODE_FLAG_INTERLACE) ?
> CDNS_DP_VB_ID_INTERLACED : 0);
>
> - line_thresh1 = ((vs + 1) << 5) * 8 / bpp;
> - line_thresh2 = (pxlclock << 5) / 1000 / rate * (vs + 1) - (1 << 5);
> - line_thresh = line_thresh1 - line_thresh2 / mhdp->link.num_lanes;
> - line_thresh = (line_thresh >> 5) + 2;
> - cdns_mhdp_reg_write(mhdp, CDNS_DP_LINE_THRESH,
> - line_thresh & GENMASK(5, 0));
>
> - cdns_mhdp_reg_write(mhdp, CDNS_DP_RATE_GOVERNOR_STATUS,
> - CDNS_DP_RG_TU_VS_DIFF((tu_size - vs > 3) ?
> - 0 : tu_size - vs));
> + cdns_mhdp_reg_read(mhdp, CDNS_DP_FRAMER_GLOBAL_CONFIG, &tmp);
> + tmp |= CDNS_DP_FRAMER_EN;
> + cdns_mhdp_reg_write(mhdp, CDNS_DP_FRAMER_GLOBAL_CONFIG, tmp);
> +}
>
> - cdns_mhdp_set_video_status(mhdp, 1);
> +void cdns_mhdp_enable(struct drm_bridge *bridge)
> +{
> + struct cdns_mhdp_bridge *mhdp_bridge = to_mhdp_bridge(bridge);
> + struct cdns_mhdp_device *mhdp = mhdp_bridge->mhdp;
> + int ret = 0;
> +
> + bool link_up = mhdp->link_up;
> +
> + if (!link_up)
> + cdns_mhdp_link_up(mhdp);
> +
> +
> + if (!mhdp->is_mst)
> + ret = cdns_mhdp_sst_enable(bridge);
> + else
> + cdns_mhdp_mst_enable(bridge);
> +
ret unused, link_up not neccessary, requires cleanup.
> +}
> +
> +static void cdns_mhdp_detach(struct drm_bridge *bridge)
> +{
> + struct cdns_mhdp_device *mhdp = bridge_to_mhdp(bridge);
> + struct cdns_mhdp_mst_cbs cbs_null = {0};
> +
> + cdns_mhdp_mst_deinit(mhdp);
> + mhdp->cbs = cbs_null;
> }
>
> static const struct drm_bridge_funcs cdns_mhdp_bridge_funcs = {
> .enable = cdns_mhdp_enable,
> .disable = cdns_mhdp_disable,
> .attach = cdns_mhdp_attach,
> + .detach = cdns_mhdp_detach,
> };
>
> static int load_firmware(struct cdns_mhdp_device *mhdp, const char *name,
> @@ -1127,8 +1167,8 @@ static int cdns_mhdp_audio_get_eld(struct device *dev, void *data,
> {
> struct cdns_mhdp_device *mhdp = dev_get_drvdata(dev);
>
> - memcpy(buf, mhdp->connector.eld,
> - min(sizeof(mhdp->connector.eld), len));
> + memcpy(buf, mhdp->connector.base.eld,
> + min(sizeof(mhdp->connector.base.eld), len));
>
> return 0;
> }
> @@ -1149,6 +1189,7 @@ static int mhdp_probe(struct platform_device *pdev)
> unsigned int reg;
> unsigned long rate;
> u32 resp;
> + int irq;
>
> struct hdmi_codec_pdata codec_data = {
> .i2s = 1,
> @@ -1192,6 +1233,14 @@ static int mhdp_probe(struct platform_device *pdev)
> /* Leave debug mode */
> writel(0, mhdp->regs + CDNS_APB_CTRL);
>
> + irq = platform_get_irq(pdev, 0);
> + ret = request_irq(irq, mhdp_irq_handler, 0, "mhdp8546", mhdp);
No free_irq, why dont you use devm_request_irq.
> + if (ret) {
> + dev_err(&pdev->dev,
> + "cannot install IRQ %d\n", irq);
> + return -EIO;
> + }
> +
> /*
> * Wait for the KEEP_ALIVE "message" on the first 8 bits.
> * Updated each sched "tick" (~2ms)
> @@ -1222,8 +1271,8 @@ static int mhdp_probe(struct platform_device *pdev)
> mhdp->host.lane_mapping = CDNS_LANE_MAPPING_FLIPPED;
> mhdp->host.enhanced = true;
>
> - mhdp->bridge.of_node = pdev->dev.of_node;
> - mhdp->bridge.funcs = &cdns_mhdp_bridge_funcs;
> + mhdp->bridge.base.of_node = pdev->dev.of_node;
> + mhdp->bridge.base.funcs = &cdns_mhdp_bridge_funcs;
>
> /* Init events to 0 as it's not cleared by FW at boot but on read */
> readl(mhdp->regs + CDNS_SW_EVENT0);
> @@ -1247,21 +1296,14 @@ static int mhdp_probe(struct platform_device *pdev)
> cdns_mhdp_reg_write(mhdp, CDNS_DPTX_CAR,
> resp | CDNS_VIF_CLK_EN | CDNS_VIF_CLK_RSTN);
>
> - /* Loop over HDP change */
> - /*
> - * FIXME: does not work when put in mhdp_bridge_enable.
> - * Where should we put it?
> - */
> - /* Is it still needed with use of mb message HPD STATUS? */
> - ret = readl_poll_timeout(mhdp->regs + CDNS_SW_EVENT0, reg,
> - reg & CDNS_DPTX_HPD, 500,
> - CDNS_SW_EVENT0_TIMEOUT);
> - if (ret) {
> - dev_err(mhdp->dev, "no HPD received %d\n", reg);
> - return -ENODEV;
> - }
> + INIT_DELAYED_WORK(&mhdp->hotplug_work, mhdp_hotplug_work_func);
You are removing lot of the code introduced by previous patch, kinda ugly.
I am not sure if merging both patches wouldn't be better, otherwise it
would be better to split this big patch to smaller chunks - according to
rule - one change per one patch.
Regards
Andrzej
> +
> + mhdp->bridge.connector = &mhdp->connector;
> + mhdp->connector.bridge = &mhdp->bridge;
> + mhdp->bridge.mhdp = mhdp;
> + mhdp->bridge.is_active = false;
>
> - drm_bridge_add(&mhdp->bridge);
> + drm_bridge_add(&mhdp->bridge.base);
>
> return 0;
> }
> @@ -1273,9 +1315,11 @@ static int mhdp_remove(struct platform_device *pdev)
> struct cdns_mhdp_device *mhdp = dev_get_drvdata(&pdev->dev);
> int ret;
>
> + flush_delayed_work(&mhdp->hotplug_work);
> platform_device_unregister(mhdp->audio_pdev);
>
> - drm_bridge_remove(&mhdp->bridge);
> + cdns_mhdp_mst_deinit(mhdp);
> + drm_bridge_remove(&mhdp->bridge.base);
>
> ret = cdns_mhdp_set_firmware_active(mhdp, false);
> if (ret) {
> @@ -1288,6 +1332,17 @@ static int mhdp_remove(struct platform_device *pdev)
> return 0;
> }
>
> +int mhdp_bridge_attach_mst_cbs(struct drm_bridge *bridge,
> + struct cdns_mhdp_mst_cbs *cbs)
> +{
> + struct cdns_mhdp_device *mhdp = bridge_to_mhdp(bridge);
> +
> + mhdp->cbs = *cbs;
> +
> + return 0;
> +}
> +EXPORT_SYMBOL_GPL(mhdp_bridge_attach_mst_cbs);
> +
> static struct platform_driver mhdp_driver = {
> .driver = {
> .name = "cdns-mhdp",
> @@ -1299,6 +1354,9 @@ static struct platform_driver mhdp_driver = {
> module_platform_driver(mhdp_driver);
>
> MODULE_AUTHOR("Quentin Schulz <quentin.schulz@free-electrons.com>");
> +MODULE_AUTHOR("Przemyslaw Gaj <pgaj@cadence.com>");
> +MODULE_AUTHOR("Damian Kos <dkos@cadence.com>");
> +MODULE_AUTHOR("Piotr Sroka <piotrs@cadence.com>");
> MODULE_DESCRIPTION("Cadence MHDP DP bridge driver");
> MODULE_LICENSE("GPL");
> MODULE_ALIAS("platform:cdns-mhdp");
> diff --git a/drivers/gpu/drm/bridge/cdns-mhdp.h b/drivers/gpu/drm/bridge/cdns-mhdp.h
> new file mode 100644
> index 000000000000..abc1fa3f51a6
> --- /dev/null
> +++ b/drivers/gpu/drm/bridge/cdns-mhdp.h
> @@ -0,0 +1,209 @@
> +/* SPDX-License-Identifier: GPL v2 */
> +/*
> + * Cadence MHDP DP MST bridge driver.
> + *
> + * Copyright: 2018 Cadence Design Systems, Inc.
> + *
> + * Author: Quentin Schulz <quentin.schulz@free-electrons.com>
> + */
> +
> +
> +#ifndef CDNS_MHDP_H
> +#define CDNS_MHDP_H
> +
> +#include <drm/drm_dp_mst_helper.h>
> +
> +#define CDNS_APB_CFG 0x00000
> +#define CDNS_APB_CTRL (CDNS_APB_CFG + 0x00)
> +#define CDNS_MAILBOX_FULL (CDNS_APB_CFG + 0x08)
> +#define CDNS_MAILBOX_EMPTY (CDNS_APB_CFG + 0x0c)
> +#define CDNS_MAILBOX_TX_DATA (CDNS_APB_CFG + 0x10)
> +#define CDNS_MAILBOX_RX_DATA (CDNS_APB_CFG + 0x14)
> +#define CDNS_KEEP_ALIVE (CDNS_APB_CFG + 0x18)
> +#define CDNS_KEEP_ALIVE_MASK GENMASK(7, 0)
> +
> +#define CDNS_MB_INT_MASK (CDNS_APB_CFG + 0x34)
> +
> +#define CDNS_SW_CLK_L (CDNS_APB_CFG + 0x3c)
> +#define CDNS_SW_CLK_H (CDNS_APB_CFG + 0x40)
> +#define CDNS_SW_EVENT0 (CDNS_APB_CFG + 0x44)
> +#define CDNS_DPTX_HPD BIT(0)
> +
> +#define CDNS_SW_EVENT1 (CDNS_APB_CFG + 0x48)
> +#define CDNS_SW_EVENT2 (CDNS_APB_CFG + 0x4c)
> +#define CDNS_SW_EVENT3 (CDNS_APB_CFG + 0x50)
> +
> +#define CDNS_APB_INT_MASK (CDNS_APB_CFG + 0x6C)
> +#define CDNS_APB_INT_MASK_MAILBOX_INT BIT(0)
> +#define CDNS_APB_INT_MASK_SW_EVENT_INT BIT(1)
> +
> +#define CDNS_DPTX_CAR (CDNS_APB_CFG + 0x904)
> +#define CDNS_VIF_CLK_EN BIT(0)
> +#define CDNS_VIF_CLK_RSTN BIT(1)
> +
> +#define CDNS_SOURCE_VIDEO_IF(s) (0x00b00 + (s * 0x20))
> +#define CDNS_BND_HSYNC2VSYNC(s) (CDNS_SOURCE_VIDEO_IF(s) + \
> + 0x00)
> +#define CDNS_IP_DTCT_WIN GENMASK(11, 0)
> +#define CDNS_IP_DET_INTERLACE_FORMAT BIT(12)
> +#define CDNS_IP_BYPASS_V_INTERFACE BIT(13)
> +
> +#define CDNS_HSYNC2VSYNC_POL_CTRL(s) (CDNS_SOURCE_VIDEO_IF(s) + \
> + 0x10)
> +#define CDNS_H2V_HSYNC_POL_ACTIVE_LOW BIT(1)
> +#define CDNS_H2V_VSYNC_POL_ACTIVE_LOW BIT(2)
> +
> +#define CDNS_DPTX_PHY_CONFIG 0x02000
> +#define CDNS_PHY_TRAINING_EN BIT(0)
> +#define CDNS_PHY_TRAINING_TYPE(x) (((x) & GENMASK(3, 0)) << 1)
> +#define CDNS_PHY_SCRAMBLER_BYPASS BIT(5)
> +#define CDNS_PHY_ENCODER_BYPASS BIT(6)
> +#define CDNS_PHY_SKEW_BYPASS BIT(7)
> +#define CDNS_PHY_TRAINING_AUTO BIT(8)
> +#define CDNS_PHY_LANE0_SKEW(x) (((x) & GENMASK(2, 0)) << 9)
> +#define CDNS_PHY_LANE1_SKEW(x) (((x) & GENMASK(2, 0)) << 12)
> +#define CDNS_PHY_LANE2_SKEW(x) (((x) & GENMASK(2, 0)) << 15)
> +#define CDNS_PHY_LANE3_SKEW(x) (((x) & GENMASK(2, 0)) << 18)
> +#define CDNS_PHY_COMMON_CONFIG (CDNS_PHY_LANE1_SKEW(1) | \
> + CDNS_PHY_LANE2_SKEW(2) | \
> + CDNS_PHY_LANE3_SKEW(3))
> +#define CDNS_PHY_10BIT_EN BIT(21)
> +
> +#define CDNS_DPTX_FRAMER 0x02200
> +#define CDNS_DP_FRAMER_GLOBAL_CONFIG (CDNS_DPTX_FRAMER + 0x00)
> +#define CDNS_DP_NUM_LANES(x) (x - 1)
> +#define CDNS_DP_MST_EN BIT(2)
> +#define CDNS_DP_FRAMER_EN BIT(3)
> +#define CDNS_DP_RATE_GOVERNOR_EN BIT(4)
> +#define CDNS_DP_NO_VIDEO_MODE BIT(5)
> +#define CDNS_DP_DISABLE_PHY_RST BIT(6)
> +#define CDNS_DP_WR_FAILING_EDGE_VSYNC BIT(7)
> +
> +#define CDNS_DP_SW_RESET (CDNS_DPTX_FRAMER + 0x04)
> +#define CDNS_DP_FRAMER_TU (CDNS_DPTX_FRAMER + 0x08)
> +#define CDNS_DP_FRAMER_TU_SIZE(x) (((x) & GENMASK(6, 0)) << 8)
> +#define CDNS_DP_FRAMER_TU_VS(x) ((x) & GENMASK(5, 0))
> +#define CDNS_DP_FRAMER_TU_CNT_RST_EN BIT(15)
> +
> +#define CDNS_DPTX_STREAM(s) (0x03000 + s * 0x80)
> +#define CDNS_DP_MSA_HORIZONTAL_0(s) (CDNS_DPTX_STREAM(s) + 0x00)
> +#define CDNS_DP_MSAH0_H_TOTAL(x) (x)
> +#define CDNS_DP_MSAH0_HSYNC_START(x) ((x) << 16)
> +
> +#define CDNS_DP_MSA_HORIZONTAL_1(s) (CDNS_DPTX_STREAM(s) + 0x04)
> +#define CDNS_DP_MSAH1_HSYNC_WIDTH(x) (x)
> +#define CDNS_DP_MSAH1_HSYNC_POL_LOW BIT(15)
> +#define CDNS_DP_MSAH1_HDISP_WIDTH(x) ((x) << 16)
> +
> +#define CDNS_DP_MSA_VERTICAL_0(s) (CDNS_DPTX_STREAM(s) + 0x08)
> +#define CDNS_DP_MSAV0_V_TOTAL(x) (x)
> +#define CDNS_DP_MSAV0_VSYNC_START(x) ((x) << 16)
> +
> +#define CDNS_DP_MSA_VERTICAL_1(s) (CDNS_DPTX_STREAM(s) + 0x0c)
> +#define CDNS_DP_MSAV1_VSYNC_WIDTH(x) (x)
> +#define CDNS_DP_MSAV1_VSYNC_POL_LOW BIT(15)
> +#define CDNS_DP_MSAV1_VDISP_WIDTH(x) ((x) << 16)
> +
> +#define CDNS_DP_MSA_MISC(s) (CDNS_DPTX_STREAM(s) + 0x10)
> +#define CDNS_DP_STREAM_CONFIGs(s) (CDNS_DPTX_STREAM(s) + 0x14)
> +#define CDNS_DP_STREAM_CONFIG_2(s) (CDNS_DPTX_STREAM(s) + 0x2c)
> +#define CDNS_DP_SC2_TU_VS_DIFF(x) ((x) << 8)
> +
> +#define CDNS_DP_HORIZONTAL(s) (CDNS_DPTX_STREAM(s) + 0x30)
> +#define CDNS_DP_H_HSYNC_WIDTH(x) (x)
> +#define CDNS_DP_H_H_TOTAL(x) ((x) << 16)
> +
> +#define CDNS_DP_VERTICAL_0(s) (CDNS_DPTX_STREAM(s) + 0x34)
> +#define CDNS_DP_V0_VHEIGHT(x) (x)
> +#define CDNS_DP_V0_VSTART(x) ((x) << 16)
> +
> +#define CDNS_DP_VERTICAL_1(s) (CDNS_DPTX_STREAM(s) + 0x38)
> +#define CDNS_DP_V1_VTOTAL(x) (x)
> +#define CDNS_DP_V1_VTOTAL_EVEN BIT(16)
> +
> +#define CDNS_DP_FRAMER_PXL_REPR(s) (CDNS_DPTX_STREAM(s) + 0x4c)
> +#define CDNS_DP_FRAMER_6_BPC BIT(0)
> +#define CDNS_DP_FRAMER_8_BPC BIT(1)
> +#define CDNS_DP_FRAMER_10_BPC BIT(2)
> +#define CDNS_DP_FRAMER_12_BPC BIT(3)
> +#define CDNS_DP_FRAMER_16_BPC BIT(4)
> +#define CDNS_DP_FRAMER_PXL_FORMAT 0x8
> +#define CDNS_DP_FRAMER_RGB BIT(0)
> +#define CDNS_DP_FRAMER_YCBCR444 BIT(1)
> +#define CDNS_DP_FRAMER_YCBCR422 BIT(2)
> +#define CDNS_DP_FRAMER_YCBCR420 BIT(3)
> +#define CDNS_DP_FRAMER_Y_ONLY BIT(4)
> +
> +#define CDNS_DP_FRAMER_SP(s) (CDNS_DPTX_STREAM(s) + 0x10)
> +#define CDNS_DP_FRAMER_VSYNC_POL_LOW BIT(0)
> +#define CDNS_DP_FRAMER_HSYNC_POL_LOW BIT(1)
> +#define CDNS_DP_FRAMER_INTERLACE BIT(2)
> +
> +#define CDNS_DP_LINE_THRESH(s) (CDNS_DPTX_STREAM(s) + 0x64)
> +#define CDNS_DP_ACTIVE_LINE_THRESH(x) (x)
> +
> +#define CDNS_DP_VB_ID(s) (CDNS_DPTX_STREAM(s) + 0x68)
> +#define CDNS_DP_VB_ID_INTERLACED BIT(2)
> +#define CDNS_DP_VB_ID_COMPRESSED BIT(6)
> +
> +#define CDNS_DP_FRONT_BACK_PORCH(s) (CDNS_DPTX_STREAM(s) + 0x78)
> +#define CDNS_DP_BACK_PORCH(x) (x)
> +#define CDNS_DP_FRONT_PORCH(x) ((x) << 16)
> +
> +#define CDNS_DP_BYTE_COUNT(s) (CDNS_DPTX_STREAM(s) + 0x7c)
> +#define CDNS_DP_BYTE_COUNT_BYTES_IN_CHUNK_SHIFT 16
> +
> +#define CDNS_DP_MST_STREAM_CONFIG(s) (CDNS_DPTX_STREAM(s) + 0x14)
> +#define CDNS_DP_MST_STRM_CFG_STREAM_EN BIT(0)
> +#define CDNS_DP_MST_STRM_CFG_NO_VIDEO BIT(1)
> +
> +#define CDNS_DP_MST_SLOT_ALLOCATE(s) (CDNS_DPTX_STREAM(s) + 0x44)
> +#define CDNS_DP_S_ALLOC_START_SLOT(x) (x)
> +#define CDNS_DP_S_ALLOC_END_SLOT(x) ((x) << 8)
> +
> +#define CDNS_DP_RATE_GOVERNING(s) (CDNS_DPTX_STREAM(s) + 0x48)
> +#define CDNS_DP_RG_TARG_AV_SLOTS_Y(x) (x)
> +#define CDNS_DP_RG_TARG_AV_SLOTS_X(x) (x << 4)
> +#define CDNS_DP_RG_ENABLE BIT(10)
> +
> +#define CDNS_DP_MTPH_CONTROL 0x2264
> +#define CDNS_DP_MTPH_ECF_EN BIT(0)
> +#define CDNS_DP_MTPH_ACT_EN BIT(1)
> +#define CDNS_DP_MTPH_LVP_EN BIT(2)
> +
> +#define CDNS_DP_MTPH_STATUS 0x226C
> +#define CDNS_DP_MTPH_ACT_STATUS BIT(0)
> +
> +
> +#define CDNS_DPTX_GLOBAL 0x02300
> +#define CDNS_DP_LANE_EN (CDNS_DPTX_GLOBAL + 0x00)
> +#define CDNS_DP_LANE_EN_LANES(x) GENMASK(x - 1, 0)
> +#define CDNS_DP_ENHNCD (CDNS_DPTX_GLOBAL + 0x04)
> +
> +
> +#define to_mhdp_connector(x) container_of(x, struct cdns_mhdp_connector, base)
> +#define to_mhdp_bridge(x) container_of(x, struct cdns_mhdp_bridge, base)
> +#define mgr_to_mhdp(x) container_of(x, struct cdns_mhdp_device, mst_mgr)
> +
> +#define CDNS_MHDP_MAX_STREAMS 4
> +
> +enum pixel_format {
> + PIXEL_FORMAT_RGB = 1,
> + PIXEL_FORMAT_YCBCR_444 = 2,
> + PIXEL_FORMAT_YCBCR_422 = 4,
> + PIXEL_FORMAT_YCBCR_420 = 8,
> + PIXEL_FORMAT_Y_ONLY = 16,
> +};
> +
> +
> +int cdns_mhdp_mst_init(struct cdns_mhdp_device *mhdp);
> +void cdns_mhdp_mst_deinit(struct cdns_mhdp_device *mhdp);
> +bool cdns_mhdp_mst_probe(struct cdns_mhdp_device *mhdp);
> +enum pixel_format cdns_mhdp_get_pxlfmt(u32 color_formats);
> +u32 cdns_mhdp_get_bpp(u32 bpc, u32 color_formats);
> +void cdns_mhdp_configure_video(struct drm_bridge *bridge);
> +void cdns_mhdp_mst_enable(struct drm_bridge *bridge);
> +void cdns_mhdp_mst_disable(struct drm_bridge *bridge);
> +void cdns_mhdp_enable(struct drm_bridge *bridge);
> +
> +#endif
> diff --git a/drivers/gpu/drm/rockchip/cdn-dp-core.c b/drivers/gpu/drm/rockchip/cdn-dp-core.c
> index 343f381e3440..a5a668f1912b 100644
> --- a/drivers/gpu/drm/rockchip/cdn-dp-core.c
> +++ b/drivers/gpu/drm/rockchip/cdn-dp-core.c
> @@ -34,7 +34,7 @@
> #include "rockchip_drm_vop.h"
>
> #define connector_to_dp(c) \
> - container_of(c, struct cdn_dp_device, mhdp.connector)
> + container_of(c, struct cdn_dp_device, mhdp.connector.base)
>
> #define encoder_to_dp(c) \
> container_of(c, struct cdn_dp_device, encoder)
> @@ -291,7 +291,7 @@ static int cdn_dp_connector_mode_valid(struct drm_connector *connector,
> {
> struct cdn_dp_device *dp = connector_to_dp(connector);
> struct drm_display_info *display_info =
> - &dp->mhdp.connector.display_info;
> + &dp->mhdp.connector.base.display_info;
> u32 requested, actual, rate, sink_max, source_max = 0;
> u8 lanes, bpc;
>
> @@ -387,7 +387,7 @@ static int cdn_dp_get_sink_capability(struct cdn_dp_device *dp)
> }
>
> kfree(dp->edid);
> - dp->edid = drm_do_get_edid(&dp->mhdp.connector,
> + dp->edid = drm_do_get_edid(&dp->mhdp.connector.base,
> cdns_mhdp_get_edid_block, &dp->mhdp);
> return 0;
> }
> @@ -559,7 +559,7 @@ static void cdn_dp_encoder_mode_set(struct drm_encoder *encoder,
> {
> struct cdn_dp_device *dp = encoder_to_dp(encoder);
> struct drm_display_info *display_info =
> - &dp->mhdp.connector.display_info;
> + &dp->mhdp.connector.base.display_info;
> struct video_info *video = &dp->mhdp.video_info;
>
> switch (display_info->bpc) {
> @@ -863,8 +863,8 @@ static int cdn_dp_audio_get_eld(struct device *dev, void *data,
> {
> struct cdn_dp_device *dp = dev_get_drvdata(dev);
>
> - memcpy(buf, dp->mhdp.connector.eld,
> - min(sizeof(dp->mhdp.connector.eld), len));
> + memcpy(buf, dp->mhdp.connector.base.eld,
> + min(sizeof(dp->mhdp.connector.base.eld), len));
>
> return 0;
> }
> @@ -936,7 +936,7 @@ static void cdn_dp_pd_event_work(struct work_struct *work)
> {
> struct cdn_dp_device *dp = container_of(work, struct cdn_dp_device,
> event_work);
> - struct drm_connector *connector = &dp->mhdp.connector;
> + struct drm_connector *connector = &dp->mhdp.connector.base;
> enum drm_connector_status old_status;
> struct device *dev = dp->mhdp.dev;
>
> @@ -1062,7 +1062,7 @@ static int cdn_dp_bind(struct device *dev, struct device *master, void *data)
>
> drm_encoder_helper_add(encoder, &cdn_dp_encoder_helper_funcs);
>
> - connector = &dp->mhdp.connector;
> + connector = &dp->mhdp.connector.base;
> connector->polled = DRM_CONNECTOR_POLL_HPD;
> connector->dpms = DRM_MODE_DPMS_OFF;
>
> @@ -1113,7 +1113,7 @@ 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;
> - struct drm_connector *connector = &dp->mhdp.connector;
> + struct drm_connector *connector = &dp->mhdp.connector.base;
>
> cancel_work_sync(&dp->event_work);
> cdn_dp_encoder_disable(encoder);
> diff --git a/include/drm/bridge/cdns-mhdp-cbs.h b/include/drm/bridge/cdns-mhdp-cbs.h
> new file mode 100644
> index 000000000000..af07cbfcb729
> --- /dev/null
> +++ b/include/drm/bridge/cdns-mhdp-cbs.h
> @@ -0,0 +1,27 @@
> +/* SPDX-License-Identifier: GPL v2 */
> +/*
> + * Cadence MHDP DP bridge callbacks.
> + *
> + * Copyright: 2018 Cadence Design Systems, Inc.
> + *
> + * Author: Piotr Sroka <piotrs@cadence.com>
> + */
> +
> +#ifndef CDNS_MHDP_CBS_H
> +#define CDNS_MHDP_CBS_H
> +
> +struct cdns_mhdp_mst_cbs_funcs {
> + struct drm_encoder *(*create_mst_encoder)(void *priv_data,
> + struct drm_bridge *bridge);
> + void (*destroy_mst_encoder)(void *priv_data, struct drm_bridge *bridge);
> +};
> +
> +struct cdns_mhdp_mst_cbs {
> + struct cdns_mhdp_mst_cbs_funcs funcs;
> + void *priv_data;
> +};
> +
> +int mhdp_bridge_attach_mst_cbs(struct drm_bridge *bridge,
> + struct cdns_mhdp_mst_cbs *cbs);
> +
> +#endif
> diff --git a/include/drm/bridge/cdns-mhdp-common.h b/include/drm/bridge/cdns-mhdp-common.h
> index c5a5c4fa7fc4..d4711091ff2b 100644
> --- a/include/drm/bridge/cdns-mhdp-common.h
> +++ b/include/drm/bridge/cdns-mhdp-common.h
> @@ -15,10 +15,12 @@
> #ifndef CDNS_MHDP_COMMON_H_
> #define CDNS_MHDP_COMMON_H_
>
> +#include <drm/drm_dp_mst_helper.h>
> #include <linux/bitops.h>
> #include <drm/drm_dp_helper.h>
> #include <drm/drm_connector.h>
> #include <drm/drm_bridge.h>
> +#include <drm/bridge/cdns-mhdp-cbs.h>
>
> #define ADDR_IMEM 0x10000
> #define ADDR_DMEM 0x20000
> @@ -326,11 +328,11 @@
> #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 GENERAL_REGISTER_READ 0x07
> +#define GENERAL_MAIN_CONTROL 0x01
> +#define GENERAL_TEST_ECHO 0x02
> +#define GENERAL_BUS_SETTINGS 0x03
> +#define GENERAL_TEST_ACCESS 0x04
> +#define GENERAL_REGISTER_READ 0x07
>
> #define DPTX_SET_POWER_MNG 0x00
> #define DPTX_SET_HOST_CAPABILITIES 0x01
> @@ -512,13 +514,34 @@ struct cdns_mhdp_sink {
> u8 enhanced;
> };
>
> +struct cdns_mhdp_bridge;
> +struct cdns_mhdp_connector;
> +
> +struct cdns_mhdp_bridge {
> + struct cdns_mhdp_device *mhdp;
> + struct drm_bridge base;
> + int pbn;
> + int8_t stream_id;
> + struct cdns_mhdp_connector *connector;
> + bool is_active;
> +};
> +
> +
> +struct cdns_mhdp_connector {
> + struct drm_connector base;
> + bool is_mst_connector;
> + struct drm_dp_mst_port *port;
> + struct cdns_mhdp_bridge *bridge;
> +};
> +
> +
> struct cdns_mhdp_device {
> void __iomem *regs;
>
> struct device *dev;
>
> struct drm_dp_link link;
> - struct drm_connector connector;
> + struct cdns_mhdp_connector connector;
> struct clk *spdif_clk;
> struct reset_control *spdif_rst;
>
> @@ -528,13 +551,22 @@ struct cdns_mhdp_device {
> struct drm_dp_aux aux;
> struct cdns_mhdp_host host;
> struct cdns_mhdp_sink sink;
> - struct drm_bridge bridge;
> + struct cdns_mhdp_bridge bridge;
> struct phy *phy;
> void __iomem *dbg_regs;
>
> struct video_info video_info;
> struct drm_display_mode mode;
> unsigned int fw_version;
> +
> + struct drm_dp_mst_topology_mgr mst_mgr;
> + struct delayed_work hotplug_work;
> +
> + struct cdns_mhdp_mst_cbs cbs;
> + bool is_mst;
> + bool can_mst;
> + bool link_up;
> + bool plugged;
> };
>
> void cdns_mhdp_clock_reset(struct cdns_mhdp_device *mhdp);
> @@ -562,7 +594,7 @@ int cdns_mhdp_audio_config(struct cdns_mhdp_device *mhdp,
> int cdns_mhdp_reg_read(struct cdns_mhdp_device *mhdp, u32 addr, u32 *value);
> int cdns_mhdp_reg_write(struct cdns_mhdp_device *mhdp, u16 addr, u32 val);
> int cdns_mhdp_reg_write_bit(struct cdns_mhdp_device *mhdp, u16 addr,
> - u8 start_bit, u8 bits_no, u32 val);
> + u8 start_bit, u8 bits_no, u32 val);
> int cdns_mhdp_adjust_lt(struct cdns_mhdp_device *mhdp, u8 nlanes,
> u16 udelay, u8 *lanes_data,
> u8 *dpcd);
^ permalink raw reply [flat|nested] 45+ messages in thread
* Re: [PATCH v6 6/6] drm/bridge: add PHY initialization in mhdp8546 driver.
2018-10-08 21:42 ` Damian Kos
@ 2018-11-07 11:49 ` Andrzej Hajda
-1 siblings, 0 replies; 45+ messages in thread
From: Andrzej Hajda @ 2018-11-07 11:49 UTC (permalink / raw)
To: Damian Kos, David Airlie, Rob Herring, Mark Rutland,
Archit Taneja, Laurent Pinchart, Gustavo Padovan,
Maarten Lankhorst, Sean Paul, Sandy Huang, Heiko Stübner,
Quentin Schulz, Piotr Sroka, dri-devel, devicetree, linux-kernel,
linux-arm-kernel, linux-rockchip
Cc: rafalc, quentin.schulz, jbergsagel
On 08.10.2018 23:42, Damian Kos wrote:
> This patch modifies the mhdp8546 driver to initialize sd0801 "Torrent" PHY.
>
> And removes the dbg_regs field from cdns_mhdp_device structure.
>
> Signed-off-by: Damian Kos <dkos@cadence.com>
> ---
> drivers/gpu/drm/bridge/cdns-mhdp.c | 9 +++++++++
> include/drm/bridge/cdns-mhdp-common.h | 1 -
> 2 files changed, 9 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/bridge/cdns-mhdp.c b/drivers/gpu/drm/bridge/cdns-mhdp.c
> index 48ac5cf1e031..caaf3c17d74f 100644
> --- a/drivers/gpu/drm/bridge/cdns-mhdp.c
> +++ b/drivers/gpu/drm/bridge/cdns-mhdp.c
> @@ -17,6 +17,7 @@
> #include <linux/of.h>
> #include <linux/platform_device.h>
> #include <linux/slab.h>
> +#include <linux/phy/phy.h>
>
> #include <drm/drm_atomic_helper.h>
> #include <drm/drm_bridge.h>
> @@ -1220,6 +1221,12 @@ static int mhdp_probe(struct platform_device *pdev)
> if (IS_ERR(mhdp->regs))
> return PTR_ERR(mhdp->regs);
>
> + mhdp->phy = devm_phy_get(&pdev->dev, "dpphy");
It is not documented in the bindings.
> + if (IS_ERR(mhdp->phy)) {
> + dev_err(&pdev->dev, "no PHY configured\n");
dev_err only if err != -EPROBE_DEFER
> + return PTR_ERR(mhdp->phy);
> + }
> +
> platform_set_drvdata(pdev, mhdp);
>
> ret = load_firmware(mhdp, FW_NAME, CDNS_MHDP_IMEM);
> @@ -1291,6 +1298,8 @@ static int mhdp_probe(struct platform_device *pdev)
> mhdp->dev, HDMI_CODEC_DRV_NAME, PLATFORM_DEVID_AUTO,
> &codec_data, sizeof(codec_data));
>
> + phy_init(mhdp->phy);
> +
Beside this:
Reviewed-by: Andrzej Hajda <a.hajda@samsung.com>
--
Regards
Andrzej
> /* Enable VIF clock for stream 0 */
> cdns_mhdp_reg_read(mhdp, CDNS_DPTX_CAR, &resp);
> cdns_mhdp_reg_write(mhdp, CDNS_DPTX_CAR,
> diff --git a/include/drm/bridge/cdns-mhdp-common.h b/include/drm/bridge/cdns-mhdp-common.h
> index d4711091ff2b..1e8a44138ce2 100644
> --- a/include/drm/bridge/cdns-mhdp-common.h
> +++ b/include/drm/bridge/cdns-mhdp-common.h
> @@ -553,7 +553,6 @@ struct cdns_mhdp_device {
> struct cdns_mhdp_sink sink;
> struct cdns_mhdp_bridge bridge;
> struct phy *phy;
> - void __iomem *dbg_regs;
>
> struct video_info video_info;
> struct drm_display_mode mode;
^ permalink raw reply [flat|nested] 45+ messages in thread
* [PATCH v6 6/6] drm/bridge: add PHY initialization in mhdp8546 driver.
@ 2018-11-07 11:49 ` Andrzej Hajda
0 siblings, 0 replies; 45+ messages in thread
From: Andrzej Hajda @ 2018-11-07 11:49 UTC (permalink / raw)
To: linux-arm-kernel
On 08.10.2018 23:42, Damian Kos wrote:
> This patch modifies the mhdp8546 driver to initialize sd0801 "Torrent" PHY.
>
> And removes the dbg_regs field from cdns_mhdp_device structure.
>
> Signed-off-by: Damian Kos <dkos@cadence.com>
> ---
> drivers/gpu/drm/bridge/cdns-mhdp.c | 9 +++++++++
> include/drm/bridge/cdns-mhdp-common.h | 1 -
> 2 files changed, 9 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/bridge/cdns-mhdp.c b/drivers/gpu/drm/bridge/cdns-mhdp.c
> index 48ac5cf1e031..caaf3c17d74f 100644
> --- a/drivers/gpu/drm/bridge/cdns-mhdp.c
> +++ b/drivers/gpu/drm/bridge/cdns-mhdp.c
> @@ -17,6 +17,7 @@
> #include <linux/of.h>
> #include <linux/platform_device.h>
> #include <linux/slab.h>
> +#include <linux/phy/phy.h>
>
> #include <drm/drm_atomic_helper.h>
> #include <drm/drm_bridge.h>
> @@ -1220,6 +1221,12 @@ static int mhdp_probe(struct platform_device *pdev)
> if (IS_ERR(mhdp->regs))
> return PTR_ERR(mhdp->regs);
>
> + mhdp->phy = devm_phy_get(&pdev->dev, "dpphy");
It is not documented in the bindings.
> + if (IS_ERR(mhdp->phy)) {
> + dev_err(&pdev->dev, "no PHY configured\n");
dev_err only if err != -EPROBE_DEFER
> + return PTR_ERR(mhdp->phy);
> + }
> +
> platform_set_drvdata(pdev, mhdp);
>
> ret = load_firmware(mhdp, FW_NAME, CDNS_MHDP_IMEM);
> @@ -1291,6 +1298,8 @@ static int mhdp_probe(struct platform_device *pdev)
> mhdp->dev, HDMI_CODEC_DRV_NAME, PLATFORM_DEVID_AUTO,
> &codec_data, sizeof(codec_data));
>
> + phy_init(mhdp->phy);
> +
Beside this:
Reviewed-by: Andrzej Hajda <a.hajda@samsung.com>
?--
Regards
Andrzej
> /* Enable VIF clock for stream 0 */
> cdns_mhdp_reg_read(mhdp, CDNS_DPTX_CAR, &resp);
> cdns_mhdp_reg_write(mhdp, CDNS_DPTX_CAR,
> diff --git a/include/drm/bridge/cdns-mhdp-common.h b/include/drm/bridge/cdns-mhdp-common.h
> index d4711091ff2b..1e8a44138ce2 100644
> --- a/include/drm/bridge/cdns-mhdp-common.h
> +++ b/include/drm/bridge/cdns-mhdp-common.h
> @@ -553,7 +553,6 @@ struct cdns_mhdp_device {
> struct cdns_mhdp_sink sink;
> struct cdns_mhdp_bridge bridge;
> struct phy *phy;
> - void __iomem *dbg_regs;
>
> struct video_info video_info;
> struct drm_display_mode mode;
^ permalink raw reply [flat|nested] 45+ messages in thread
* RE: [PATCH v6 5/6] drm/bridge: add support for MST in mhdp8546 driver
@ 2018-11-08 14:53 ` Damian Kos
0 siblings, 0 replies; 45+ messages in thread
From: Damian Kos @ 2018-11-08 14:53 UTC (permalink / raw)
To: Andrzej Hajda, David Airlie, Rob Herring, Mark Rutland,
Archit Taneja, Laurent Pinchart, Gustavo Padovan,
Maarten Lankhorst, Sean Paul, Sandy Huang, Heiko Stübner,
Quentin Schulz, Piotr Sroka, dri-devel, devicetree, linux-kernel,
linux-arm-kernel, linux-rockchip
Cc: Rafal Ciepiela, quentin.schulz, jbergsagel
From: Andrzej Hajda <a.hajda@samsung.com>
Sent: Wednesday, November 7, 2018 12:40
To: Damian Kos <dkos@cadence.com>; David Airlie <airlied@linux.ie>; Rob Herring <robh+dt@kernel.org>; Mark Rutland <mark.rutland@arm.com>; Archit Taneja <architt@codeaurora.org>; Laurent Pinchart <Laurent.pinchart@ideasonboard.com>; Gustavo Padovan <gustavo@padovan.org>; Maarten Lankhorst <maarten.lankhorst@linux.intel.com>; Sean Paul <sean@poorly.run>; Sandy Huang <hjc@rock-chips.com>; Heiko Stübner <heiko@sntech.de>; Quentin Schulz <quentin.schulz@free-electrons.com>; Piotr Sroka <piotrs@cadence.com>; dri-devel@lists.freedesktop.org; devicetree@vger.kernel.org; linux-kernel@vger.kernel.org; linux-arm-kernel@lists.infradead.org; linux-rockchip@lists.infradead.org
Cc: Rafal Ciepiela <rafalc@cadence.com>; quentin.schulz@bootlin.com; jbergsagel@ti.com
Subject: Re: [PATCH v6 5/6] drm/bridge: add support for MST in mhdp8546 driver
> On 08.10.2018 23:42, Damian Kos wrote:
> > From: Piotr Sroka <piotrs@cadence.com>
> >
> > - add hot plug support to handle HDP IRQ interrupts in case sideband
> > message is ready to read.
> > - there is only one connector created at initialization stage. It is
> > used as SST connector when controller works in SST mode. If controller
> > works in MST mode then the SST connector status is disconnected all the
> > time. MST connectors are created/destroyed in runtime depends on what
> > devices are connected to the DP controller.
> > - add callbacks functions to be able to inform module managing encoders
> > objects to create or destroy an encoder in case new a MST connector is
> > created/destroyed
>
>
> I am not familiar with MST so I will stick to bike-shedding :) Reviewer
> with MST experience needed.
>
Nonetheless, thank you, Andrzej, for the feedback for this and the other
patches.
This will keep us busy for a while :)
>
> >
> > Signed-off-by: Piotr Sroka <piotrs@cadence.com>
> > Signed-off-by: Damian Kos <dkos@cadence.com>
> > ---
> > drivers/gpu/drm/bridge/Makefile | 2 +-
> > drivers/gpu/drm/bridge/cdns-mhdp-mst.c | 594 +++++++++++++++++++++++++
> > drivers/gpu/drm/bridge/cdns-mhdp.c | 560 ++++++++++++-----------
> > drivers/gpu/drm/bridge/cdns-mhdp.h | 209 +++++++++
> > drivers/gpu/drm/rockchip/cdn-dp-core.c | 18 +-
> > include/drm/bridge/cdns-mhdp-cbs.h | 27 ++
> > include/drm/bridge/cdns-mhdp-common.h | 48 +-
> > 7 files changed, 1189 insertions(+), 269 deletions(-)
> > create mode 100644 drivers/gpu/drm/bridge/cdns-mhdp-mst.c
> > create mode 100644 drivers/gpu/drm/bridge/cdns-mhdp.h
> > create mode 100644 include/drm/bridge/cdns-mhdp-cbs.h
> >
> > diff --git a/drivers/gpu/drm/bridge/Makefile b/drivers/gpu/drm/bridge/Makefile
> > index e802fdb85750..b80f3d6ed2a6 100644
> > --- a/drivers/gpu/drm/bridge/Makefile
> > +++ b/drivers/gpu/drm/bridge/Makefile
> > @@ -19,4 +19,4 @@ obj-$(CONFIG_DRM_TI_TFP410) += ti-tfp410.o
> > obj-$(CONFIG_DRM_CDNS_MHDP) += mhdp8546.o
> > obj-y += synopsys/
> >
> > -mhdp8546-objs := cdns-mhdp-common.o cdns-mhdp.o
> > +mhdp8546-objs := cdns-mhdp-common.o cdns-mhdp.o cdns-mhdp-mst.o
> > diff --git a/drivers/gpu/drm/bridge/cdns-mhdp-mst.c b/drivers/gpu/drm/bridge/cdns-mhdp-mst.c
> > new file mode 100644
> > index 000000000000..782d4bf9b667
> > --- /dev/null
> > +++ b/drivers/gpu/drm/bridge/cdns-mhdp-mst.c
> > @@ -0,0 +1,594 @@
> > +// SPDX-License-Identifier: GPL v2
> > +/*
> > + * Cadence MHDP DP MST bridge driver.
> > + *
> > + * Copyright: 2018 Cadence Design Systems, Inc.
> > + *
> > + * Author: Piotr Sroka <piotrs@cadence.com>
> > + */
> > +#include <drm/drm_print.h>
> > +#include <drm/drm_crtc_helper.h>
> > +#include <drm/drm_atomic_helper.h>
> > +#include <drm/drm_fixed.h>
> > +#include <drm/drm_connector.h>
> > +#include <linux/iopoll.h>
> > +
> > +#include <drm/bridge/cdns-mhdp-common.h>
>
>
> Alphabetic order.
>
>
> > +#include "cdns-mhdp.h"
> > +
> > +
> > +static void cdns_mhdp_mst_stream_enable(struct cdns_mhdp_bridge *mhdp_bridge,
> > + bool enable)
> > +{
> > + u32 reg;
> > + struct cdns_mhdp_device *mhdp = mhdp_bridge->mhdp;
> > + u8 stream_id = mhdp_bridge->stream_id;
> > +
> > + cdns_mhdp_reg_read(mhdp, CDNS_DP_MST_STREAM_CONFIG(stream_id), ®);
> > +
> > + if (enable) {
> > + reg |= CDNS_DP_MST_STRM_CFG_STREAM_EN;
> > + reg &= ~CDNS_DP_MST_STRM_CFG_NO_VIDEO;
> > + } else {
> > + reg &= ~CDNS_DP_MST_STRM_CFG_STREAM_EN;
> > + reg |= CDNS_DP_MST_STRM_CFG_NO_VIDEO;
> > + }
> > +
> > + cdns_mhdp_reg_write(mhdp, CDNS_DP_MST_STREAM_CONFIG(stream_id), reg);
> > +}
> > +
> > +static inline s64 calc_fixed_avg_slots(u32 pbn, u32 pbn_div)
> > +{
> > + s64 fixed_pbn, fixed_pbn_div, fixed_targ_avg_slots;
> > +
> > + fixed_pbn = drm_int2fixp(pbn);
> > + fixed_pbn_div = drm_int2fixp(pbn_div);
> > + fixed_targ_avg_slots = drm_fixp_div(fixed_pbn, fixed_pbn_div);
> > +
> > + return fixed_targ_avg_slots;
> > +}
> > +
> > +static void cdns_mhdp_mst_set_threshold(struct cdns_mhdp_bridge *bridge)
> > +{
> > + u32 threshold;
> > + u8 stream_id = bridge->stream_id;
> > + struct cdns_mhdp_device *mhdp = bridge->mhdp;
> > + s64 fixed_targ_avg_slots, fixed_thresh, fixed_targ_entries;
> > +
> > + fixed_targ_avg_slots = calc_fixed_avg_slots(bridge->pbn,
> > + mhdp->mst_mgr.pbn_div);
> > +
> > + fixed_targ_entries = drm_fixp_div(fixed_targ_avg_slots,
> > + drm_int2fixp(2));
> > + fixed_thresh = drm_fixp_mul(fixed_targ_entries, fixed_targ_entries);
> > + fixed_thresh = drm_fixp_div(fixed_thresh, drm_int2fixp(32));
> > + fixed_thresh = fixed_targ_entries - fixed_thresh;
> > + fixed_thresh = drm_fixp_mul(fixed_thresh,
> > + drm_int2fixp(mhdp->link.num_lanes));
> > + fixed_thresh = drm_fixp_div(fixed_thresh, drm_int2fixp(4));
> > +
> > + threshold = drm_fixp2int_ceil(fixed_thresh);
> > + if (threshold < 2)
> > + threshold = 2;
> > +
> > + cdns_mhdp_reg_write(mhdp, CDNS_DP_LINE_THRESH(stream_id),
> > + CDNS_DP_ACTIVE_LINE_THRESH(threshold));
>
>
> All this magic makes me think I am not a right person to review this
> code, or the code is overcomplicated. Lets try layman approach.
>
> Formula is as below:
>
> threshold = (pbn/pbn_div/2 - (pbn/pbn_div/2)^2 / 32)*num_lanes / 4
>
> plus round_up, and cap by 2.
>
> Please describe the formula in comment to increase readability and use
> some temporary variables instead of overusing fixed_thresh.
>
> Where this formula comes from? Document it.
>
> Moreover if there is no difference between drm_fixp_div(x,
> drm_int2fixp(const)) and div_s64(x, const) I guess the latter is better.
>
I've spoke with people behind this code and it turned out that some of it
might not be needed anymore as the HW can now calculate threshold value.
Need to double check and rework it.
>
> > +}
> > +
> > +static void cdns_mhdp_set_rate_governing(struct cdns_mhdp_bridge *bridge,
> > + bool enable)
> > +{
> > + struct cdns_mhdp_device *mhdp = bridge->mhdp;
> > + u8 stream_id = bridge->stream_id;
> > +
> > + if (enable) {
> > + s64 fixed_targ_avg_slots, fixed_y;
> > + u32 x, y;
> > +
> > + fixed_targ_avg_slots =
> > + calc_fixed_avg_slots(bridge->pbn,
> > + mhdp->mst_mgr.pbn_div);
> > +
> > + x = drm_fixp2int(fixed_targ_avg_slots);
> > +
> > + fixed_y = (fixed_targ_avg_slots - drm_int2fixp(x));
> > + fixed_y = drm_fixp_mul(fixed_y, drm_int2fixp(16));
>
> Again, maybe fixed_y *= 16;
>
>
> > + y = drm_fixp2int_ceil(fixed_y);
>
> Ok, at this point x is integer part of fixed_targ_avg_slots and y is
> fractional part of fixed_targ_avg_slots * 16.
>
> Looking at calc_fixed_avg_slots it means, that:
>
> x = bridge->pbn / mhdp->mst_mgr.pbn_div;
>
> y = bridge->pbn % mhdp->mst_mgr.pbn_div * 16 / mhdp->mst_mgr.pbn_div;
>
>
> Without using fixed arithmetic, more direct?
>
>
> > +
> > + cdns_mhdp_reg_write(mhdp, CDNS_DP_RATE_GOVERNING(stream_id),
> > + CDNS_DP_RG_TARG_AV_SLOTS_Y(y) |
> > + CDNS_DP_RG_TARG_AV_SLOTS_X(x) |
> > + CDNS_DP_RG_ENABLE);
> > + } else
> > + cdns_mhdp_reg_write(mhdp, CDNS_DP_RATE_GOVERNING(stream_id), 0);
> > +}
> > +
> > +
> > +static struct drm_dp_payload *
> > +cdns_mhdp_get_payload(struct cdns_mhdp_bridge *bridge)
> > +{
> > + int vcpi = bridge->connector->port->vcpi.vcpi, i;
> > + struct cdns_mhdp_device *mhdp = bridge->mhdp;
> > +
> > + for (i = 0; i < mhdp->mst_mgr.max_payloads; i++) {
> > + struct drm_dp_payload *payload = &mhdp->mst_mgr.payloads[i];
> > +
> > + if (payload->vcpi == vcpi)
> > + return payload;
> > + }
> > +
> > + return NULL;
> > +}
> > +
> > +
> > +static int
> > +cdns_mhdp_set_act_enable(struct cdns_mhdp_device *mhdp)
> > +{
> > + u32 reg;
> > + int ret;
> > +
> > + cdns_mhdp_reg_read(mhdp, CDNS_DP_MTPH_CONTROL, ®);
> > + cdns_mhdp_reg_write(mhdp, CDNS_DP_MTPH_CONTROL,
> > + reg | CDNS_DP_MTPH_ACT_EN);
> > +
> > + ret = readl_poll_timeout(mhdp->regs + CDNS_DP_MTPH_STATUS, reg,
> > + ((reg & CDNS_DP_MTPH_ACT_STATUS) == 0), 0,
> > + 30);
> > + if (ret) {
> > + dev_err(mhdp->dev,
> > + "ACT sequence cannot complete in 30us\n");
> > + return -EIO;
> > + }
> > +
> > + return drm_dp_check_act_status(&mhdp->mst_mgr);
> > +}
> > +
> > +
> > +static int
> > +cdns_mhdp_apply_slot_allocation(struct cdns_mhdp_bridge *mhdp_bridge)
> > +{
> > + struct drm_dp_payload *payload;
> > + struct cdns_mhdp_device *mhdp = mhdp_bridge->mhdp;
> > + u8 stream_id = mhdp_bridge->stream_id;
> > +
> > + payload = cdns_mhdp_get_payload(mhdp_bridge);
> > +
> > + if (!payload) {
> > + DRM_ERROR("payload is not found\n");
> > + return -EIO;
> > + }
> > +
> > + cdns_mhdp_reg_write(mhdp, CDNS_DP_MST_SLOT_ALLOCATE(stream_id),
> > + CDNS_DP_S_ALLOC_START_SLOT(payload->start_slot) |
> > + CDNS_DP_S_ALLOC_END_SLOT(payload->start_slot
> > + + payload->num_slots - 1));
> > +
> > + return 0;
> > +}
> > +
> > +static void
> > +cdns_mhdp_update_slot_allocation(struct cdns_mhdp_bridge *mhdp_bridge)
> > +{
> > + struct drm_device *dev = mhdp_bridge->base.dev;
> > + struct drm_connector *connector;
> > +
> > + list_for_each_entry(connector, &dev->mode_config.connector_list, head) {
> > + struct cdns_mhdp_connector *mhdp_connector;
> > +
> > + mhdp_connector = to_mhdp_connector(connector);
> > + if (!connector->encoder)
> > + continue;
> > + if (!mhdp_connector->is_mst_connector)
> > + continue;
> > +
> > + if (mhdp_connector->bridge->stream_id != -1)
> > + cdns_mhdp_apply_slot_allocation(mhdp_connector->bridge);
> > + }
> > +}
> > +
> > +static enum drm_connector_status
> > +cdns_dp_mst_detect(struct drm_connector *connector, bool force)
> > +{
> > + enum drm_connector_status stat;
> > + struct cdns_mhdp_connector *mhdp_connector;
> > + struct cdns_mhdp_device *mhdp;
> > +
> > + mhdp_connector = to_mhdp_connector(connector);
> > + mhdp = mhdp_connector->bridge->mhdp;
> > +
> > + stat = drm_dp_mst_detect_port(connector, &mhdp->mst_mgr,
> > + mhdp_connector->port);
> > + return stat;
> > +}
> > +
> > +static void
> > +cdns_dp_mst_connector_destroy(struct drm_connector *connector)
> > +{
> > + struct cdns_mhdp_connector *mhdp_connector;
> > + struct cdns_mhdp_bridge *mhdp_bridge;
> > +
> > + mhdp_connector = to_mhdp_connector(connector);
> > + mhdp_bridge = mhdp_connector->bridge;
> > +
> > + drm_connector_cleanup(&mhdp_connector->base);
> > + drm_bridge_remove(&mhdp_bridge->base);
> > + kfree(mhdp_connector);
> > + kfree(mhdp_bridge);
> > +}
> > +
> > +static const struct drm_connector_funcs cdns_mhdp_mst_connector_funcs = {
> > + .atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state,
> > + .atomic_destroy_state = drm_atomic_helper_connector_destroy_state,
> > + .reset = drm_atomic_helper_connector_reset,
> > + .dpms = drm_helper_connector_dpms,
> > + .detect = cdns_dp_mst_detect,
> > + .fill_modes = drm_helper_probe_single_connector_modes,
> > + .destroy = cdns_dp_mst_connector_destroy,
> > +};
> > +
> > +
> > +static int cdns_mhdp_mst_get_ddc_modes(struct drm_connector *connector)
> > +{
> > + struct cdns_mhdp_connector *mhdp_connector;
> > + struct cdns_mhdp_device *mhdp;
> > + struct edid *edid;
> > + int ret = 0;
> > +
> > + mhdp_connector = to_mhdp_connector(connector);
> > + mhdp = mhdp_connector->bridge->mhdp;
> > +
> > + edid = drm_dp_mst_get_edid(connector, &mhdp->mst_mgr,
> > + mhdp_connector->port);
> > +
> > + DRM_DEBUG_KMS("edid retrieved %p\n", edid);
> > + if (edid) {
> > + drm_connector_update_edid_property(connector, edid);
> > + ret = drm_add_edid_modes(connector, edid);
> > + return ret;
> > + }
> > + drm_connector_update_edid_property(connector, NULL);
> > +
> > + return ret;
>
>
> I suspect edid should be freed, but looking at other users of
> drm_dp_mst_get_edid it is not so obvious (only intel frees it) - memory
> leaks?
>
>
> > +}
> > +
> > +static int cdns_mhdp_mst_get_modes(struct drm_connector *connector)
> > +{
> > + return cdns_mhdp_mst_get_ddc_modes(connector);
> > +}
> > +
> > +
> > +static struct
> > +drm_encoder *cdns_mhdp_mst_best_encoder(struct drm_connector *connector)
> > +{
> > + struct cdns_mhdp_connector *mhdp_connector;
> > +
> > + mhdp_connector = to_mhdp_connector(connector);
> > +
> > + return mhdp_connector->bridge->base.encoder;
> > +}+
> > +static const struct drm_connector_helper_funcs cdns_mhdp_mst_conn_helper_fun = {
> > + .get_modes = cdns_mhdp_mst_get_modes,
> > + .best_encoder = cdns_mhdp_mst_best_encoder,
> > +};
> > +
> > +void cdns_mhdp_mst_enable(struct drm_bridge *bridge)
> > +{
> > + struct cdns_mhdp_bridge *mhdp_bridge = to_mhdp_bridge(bridge);
> > + struct cdns_mhdp_device *mhdp = mhdp_bridge->mhdp;
> > + struct drm_display_info *disp_info;
> > + struct drm_display_mode *mode;
> > + struct cdns_mhdp_connector *mhdp_connector;
> > + u32 bpp;
> > + enum pixel_format pxlfmt;
> > + int ret, slots, stream_id;
> > +
> > + disp_info = &mhdp_bridge->connector->base.display_info;
> > +
> > + pxlfmt = cdns_mhdp_get_pxlfmt(disp_info->color_formats);
> > + bpp = cdns_mhdp_get_bpp(disp_info->bpc, pxlfmt);
> > +
> > + mhdp_connector = mhdp_bridge->connector;
> > + if (mhdp_bridge->stream_id > -1) {
> > + DRM_ERROR("ERROR stream id is attached before bridge is enabled\n");
> > + return;
> > + }
> > +
> > + stream_id = bridge->encoder->crtc->index;
> > +
> > + mode = &bridge->encoder->crtc->state->adjusted_mode;
> > + mhdp_bridge->pbn = drm_dp_calc_pbn_mode(mode->clock, bpp);
> > +
> > + slots = drm_dp_find_vcpi_slots(&mhdp->mst_mgr, mhdp_bridge->pbn);
> > + ret = drm_dp_mst_allocate_vcpi(&mhdp->mst_mgr,
> > + mhdp_connector->port,
> > + mhdp_bridge->pbn, slots);
> > + if (ret == false) {
> > + DRM_ERROR("failed to allocate vcpi\n");
> > + return;
> > + }
> > + ret = drm_dp_update_payload_part1(&mhdp->mst_mgr);
> > + if (ret < 0)
> > + DRM_ERROR("failed update_payload_part1\n");
> > +
> > + mhdp_bridge->stream_id = stream_id;
> > + mhdp_bridge->is_active = true;
> > +
> > + cdns_mhdp_mst_stream_enable(mhdp_bridge, true);
> > + cdns_mhdp_configure_video(bridge);
> > +
> > + ret = cdns_mhdp_apply_slot_allocation(mhdp_bridge);
> > + if (ret < 0) {
> > + cdns_mhdp_mst_stream_enable(mhdp_bridge, false);
> > + mhdp_bridge->stream_id = -1;
> > + mhdp_bridge->is_active = false;
> > + return;
> > + }
> > +
> > + ret = cdns_mhdp_set_act_enable(mhdp);
> > + if (ret)
> > + DRM_ERROR("failed ACT sequence\n");
> > +
> > + cdns_mhdp_set_rate_governing(mhdp_bridge, true);
> > +
> > + cdns_mhdp_mst_set_threshold(mhdp_bridge);
> > +
> > + drm_dp_update_payload_part2(&mhdp->mst_mgr);
> > +}
> > +
> > +void cdns_mhdp_mst_disable(struct drm_bridge *bridge)
> > +{
> > + struct cdns_mhdp_bridge *mhdp_bridge = to_mhdp_bridge(bridge);
> > + struct cdns_mhdp_device *mhdp = mhdp_bridge->mhdp;
> > + struct cdns_mhdp_connector *connector = mhdp_bridge->connector;
> > +
> > + drm_dp_mst_reset_vcpi_slots(&mhdp->mst_mgr, connector->port);
> > + drm_dp_update_payload_part1(&mhdp->mst_mgr);
> > +
> > + cdns_mhdp_update_slot_allocation(mhdp_bridge);
> > +
> > + drm_dp_check_act_status(&mhdp->mst_mgr);
> > +
> > + drm_dp_update_payload_part2(&mhdp->mst_mgr);
> > +
> > + drm_dp_mst_deallocate_vcpi(&mhdp->mst_mgr, connector->port);
> > +
> > + cdns_mhdp_set_rate_governing(mhdp_bridge, false);
> > + cdns_mhdp_mst_stream_enable(mhdp_bridge, false);
> > + mhdp_bridge->stream_id = -1;
> > + mhdp_bridge->is_active = false;
> > +}
> > +
> > +static const struct drm_bridge_funcs cdns_mhdp_mst_bridge_funcs = {
> > + .enable = cdns_mhdp_enable,
> > + .disable = cdns_mhdp_mst_disable,
> > +};
> > +
> > +
> > +static struct cdns_mhdp_bridge*
> > +cdns_mhpd_create_fake_mst_bridge(struct cdns_mhdp_device *mhdp,
> > + struct cdns_mhdp_connector *mhdp_connector)
> > +{
> > + struct cdns_mhdp_bridge *mhdp_bridge;
> > + struct drm_encoder *encoder = NULL;
> > + struct cdns_mhdp_mst_cbs *cbs = &mhdp->cbs;
> > +
> > + mhdp_bridge = kzalloc(sizeof(*mhdp_bridge), GFP_KERNEL);
> > + if (!mhdp_bridge)
> > + return NULL;
> > +
> > + mhdp_bridge->mhdp = mhdp;
> > + mhdp_bridge->stream_id = -1;
> > + mhdp_bridge->connector = mhdp_connector;
> > + mhdp_bridge->is_active = false;
> > +
> > + mhdp_bridge->base.funcs = &cdns_mhdp_mst_bridge_funcs;
> > +
> > + drm_bridge_add(&mhdp_bridge->base);
> > +
> > + if (cbs->funcs.create_mst_encoder)
> > + encoder = cbs->funcs.create_mst_encoder(cbs->priv_data,
> > + &mhdp_bridge->base);
> > + if (encoder) {
> > + int ret;
> > + /* use the same drm device as is in the first encoder */
> > + encoder->dev = mhdp->bridge.base.encoder->dev;
> > + encoder->possible_crtcs &= ((1 << CDNS_MHDP_MAX_STREAMS) - 1);
> > + ret = drm_bridge_attach(encoder, &mhdp_bridge->base, NULL);
> > + if (ret) {
> > + dev_err(mhdp->dev, "bridge attaching error %d\n", ret);
> > + return NULL;
> > + }
> > +
> > + ret = drm_connector_attach_encoder(&mhdp_connector->base,
> > + encoder);
> > + if (ret) {
> > + dev_err(mhdp->dev, "failed to attach connector to encoder\n");
> > + return NULL;
> > + }
> > + }
> > +
> > + return mhdp_bridge;
> > +}
> > +
> > +static struct drm_connector *
> > +cdns_mhdp_mst_cbs_add_connector(struct drm_dp_mst_topology_mgr *mgr,
> > + struct drm_dp_mst_port *port,
> > + const char *pathprop)
> > +{
> > + struct cdns_mhdp_device *mhdp = mgr_to_mhdp(mgr);
> > + struct drm_device *dev = mhdp->bridge.base.dev;
> > + struct cdns_mhdp_connector *mhdp_connector;
> > + struct drm_connector *connector;
> > + struct drm_connector_state *conn_state;
> > + int ret;
> > +
> > + mhdp_connector = kzalloc(sizeof(struct cdns_mhdp_connector),
> > + GFP_KERNEL);
> > + if (!mhdp_connector)
> > + return NULL;
> > +
> > + mhdp_connector->is_mst_connector = true;
> > + connector = &mhdp_connector->base;
> > + mhdp_connector->port = port;
> > + DRM_DEBUG_KMS("\n");
> > +
> > + conn_state = kzalloc(sizeof(*conn_state), GFP_KERNEL);
> > + if (!conn_state)
> > + return NULL;
> > +
> > + __drm_atomic_helper_connector_reset(connector,
> > + conn_state);
> > +
> > + drm_connector_init(dev, connector, &cdns_mhdp_mst_connector_funcs,
> > + DRM_MODE_CONNECTOR_DisplayPort);
> > + drm_connector_helper_add(connector, &cdns_mhdp_mst_conn_helper_fun);
> > + mhdp_connector->bridge =
> > + cdns_mhpd_create_fake_mst_bridge(mhdp, mhdp_connector);
> > +
> > + drm_object_attach_property(&connector->base,
> > + dev->mode_config.path_property, 0);
> > + drm_object_attach_property(&connector->base,
> > + dev->mode_config.tile_property, 0);
> > + ret = drm_connector_set_path_property(connector, pathprop);
> > +
> > + if (ret)
> > + DRM_ERROR("ERROR set path propertty failed\n");
> > +
> > + return connector;
> > +}
> > +
> > +static void
> > +cdns_mhdp_mst_cbs_destroy_connector(struct drm_dp_mst_topology_mgr *mgr,
> > + struct drm_connector *connector)
> > +{
> > + struct cdns_mhdp_connector *mhdp_connector;
> > + struct cdns_mhdp_device *mhdp;
> > + struct cdns_mhdp_bridge *mhdp_bridge;
> > +
> > + mhdp_connector = to_mhdp_connector(connector);
> > + mhdp_bridge = mhdp_connector->bridge;
> > + mhdp = mhdp_bridge->mhdp;
> > +
> > + drm_connector_unregister(&mhdp_connector->base);
> > +
> > + if (mhdp->cbs.funcs.create_mst_encoder)
> > + mhdp->cbs.funcs.destroy_mst_encoder(mhdp->cbs.priv_data,
> > + &mhdp_bridge->base);
> > + drm_connector_unreference(&mhdp_connector->base);
> > +}
> > +
> > +static void cdns_mhdp_mst_cbs_hotplug(struct drm_dp_mst_topology_mgr *mgr)
> > +{
> > + struct cdns_mhdp_device *mhdp = mgr_to_mhdp(mgr);
> > + struct drm_device *dev = mhdp->bridge.base.encoder->dev;
> > +
> > + drm_kms_helper_hotplug_event(dev);
> > +}
> > +
> > +static void
> > +cdns_mhdp_mst_cbs_register_connector(struct drm_connector *connector)
> > +{
> > + int ret;
> > +
> > + ret = drm_connector_register(connector);
> > + if (ret)
> > + DRM_ERROR("Register connector failed\n");
> > +
> > +}
> > +
> > +static const struct drm_dp_mst_topology_cbs mst_cbs = {
> > + .add_connector = cdns_mhdp_mst_cbs_add_connector,
> > + .register_connector = cdns_mhdp_mst_cbs_register_connector,
> > + .destroy_connector = cdns_mhdp_mst_cbs_destroy_connector,
> > + .hotplug = cdns_mhdp_mst_cbs_hotplug,
> > +};
> > +
> > +
> > +static void cdns_mhdp_set_mst_enable(struct cdns_mhdp_device *mhdp, bool enable)
> > +{
> > + u32 reg_val;
> > +
> > + cdns_mhdp_reg_read(mhdp, CDNS_DP_FRAMER_GLOBAL_CONFIG, ®_val);
> > +
> > + if (enable)
> > + reg_val |= CDNS_DP_MST_EN;
> > + else
> > + reg_val &= ~CDNS_DP_MST_EN;
> > +
> > + cdns_mhdp_reg_write(mhdp, CDNS_DP_FRAMER_GLOBAL_CONFIG, reg_val);
> > +}
> > +
> > +bool cdns_mhdp_mst_probe(struct cdns_mhdp_device *mhdp)
> > +{
> > + u8 mstm_cap;
> > + u8 dpcd_cap[DP_RECEIVER_CAP_SIZE];
> > +
> > + bool is_mst;
> > +
> > + if (!mhdp->can_mst)
> > + return false;
> > +
> > + drm_dp_dpcd_read(&mhdp->aux, DP_DPCD_REV, dpcd_cap,
> > + DP_RECEIVER_CAP_SIZE);
> > +
> > + if (dpcd_cap[DP_DPCD_REV] < 0x12)
> > + return false;
> > +
> > + if (drm_dp_dpcd_readb(&mhdp->aux, DP_MSTM_CAP, &mstm_cap) != 1)
> > + return false;
> > +
> > + if (mstm_cap & DP_MST_CAP) {
> > + DRM_DEBUG_KMS("Sink is MST capable\n");
> > + is_mst = true;
> > + } else {
> > + DRM_DEBUG_KMS("Sink is not MST capable\n");
> > + is_mst = false;
> > + }
> > +
> > + if (is_mst != mhdp->is_mst) {
> > + mhdp->is_mst = is_mst;
> > + cdns_mhdp_set_mst_enable(mhdp, mhdp->is_mst);
> > +
> > + drm_dp_mst_topology_mgr_set_mst(&mhdp->mst_mgr,
> > + mhdp->is_mst);
> > + }
> > +
> > + return mhdp->is_mst;
> > +}
> > +
> > +int cdns_mhdp_mst_init(struct cdns_mhdp_device *mhdp)
> > +{
> > + struct cdns_mhdp_bridge *bridge = &mhdp->bridge;
> > + struct drm_device *dev = bridge->base.dev;
> > + struct cdns_mhdp_connector *connector = bridge->connector;
> > + int ret;
> > +
> > + mhdp->mst_mgr.cbs = &mst_cbs;
> > + ret = drm_dp_mst_topology_mgr_init(&mhdp->mst_mgr, dev,
> > + &mhdp->aux, 16,
> > + CDNS_MHDP_MAX_STREAMS,
> > + connector->base.base.id);
> > + if (ret)
> > + mhdp->can_mst = false;
> > + else
> > + mhdp->can_mst = true;
> > +
> > + mhdp->is_mst = false;
> > +
> > + bridge->stream_id = -1;
> > +
> > + return ret;
> > +}
> > +
> > +void cdns_mhdp_mst_deinit(struct cdns_mhdp_device *mhdp)
> > +{
> > + if (mhdp->is_mst) {
> > + mhdp->is_mst = false;
> > + drm_dp_mst_topology_mgr_set_mst(&mhdp->mst_mgr,
> > + mhdp->is_mst);
> > + }
> > +
> > + if (mhdp->can_mst)
> > + drm_dp_mst_topology_mgr_destroy(&mhdp->mst_mgr);
> > +}
> > diff --git a/drivers/gpu/drm/bridge/cdns-mhdp.c b/drivers/gpu/drm/bridge/cdns-mhdp.c
> > index a3bbc0e809a5..48ac5cf1e031 100644
> > --- a/drivers/gpu/drm/bridge/cdns-mhdp.c
> > +++ b/drivers/gpu/drm/bridge/cdns-mhdp.c
> > @@ -27,146 +27,15 @@
> > #include <drm/bridge/cdns-mhdp-common.h>
> >
> > #include <sound/hdmi-codec.h>
> > +#include <linux/irq.h>
> > +#include <linux/of_irq.h>
> >
> > +#include "cdns-mhdp.h"
> >
> > #define DEBUG_MSG
> >
> > #define FW_NAME "cadence/mhdp8546.bin"
> >
> > -#define CDNS_APB_CFG 0x00000
> > -#define CDNS_APB_CTRL (CDNS_APB_CFG + 0x00)
> > -#define CDNS_MAILBOX_FULL (CDNS_APB_CFG + 0x08)
> > -#define CDNS_MAILBOX_EMPTY (CDNS_APB_CFG + 0x0c)
> > -#define CDNS_MAILBOX_TX_DATA (CDNS_APB_CFG + 0x10)
> > -#define CDNS_MAILBOX_RX_DATA (CDNS_APB_CFG + 0x14)
> > -#define CDNS_KEEP_ALIVE (CDNS_APB_CFG + 0x18)
> > -#define CDNS_KEEP_ALIVE_MASK GENMASK(7, 0)
> > -
> > -#define CDNS_SW_CLK_L (CDNS_APB_CFG + 0x3c)
> > -#define CDNS_SW_CLK_H (CDNS_APB_CFG + 0x40)
> > -#define CDNS_SW_EVENT0 (CDNS_APB_CFG + 0x44)
> > -#define CDNS_DPTX_HPD BIT(0)
> > -
> > -#define CDNS_SW_EVENT1 (CDNS_APB_CFG + 0x48)
> > -#define CDNS_SW_EVENT2 (CDNS_APB_CFG + 0x4c)
> > -#define CDNS_SW_EVENT3 (CDNS_APB_CFG + 0x50)
> > -
> > -#define CDNS_DPTX_CAR (CDNS_APB_CFG + 0x904)
> > -#define CDNS_VIF_CLK_EN BIT(0)
> > -#define CDNS_VIF_CLK_RSTN BIT(1)
> > -
> > -#define CDNS_SOURCE_VIDEO_INTERFACE 0x00b00
> > -#define CDNS_BND_HSYNC2VSYNC (CDNS_SOURCE_VIDEO_INTERFACE + \
> > - 0x00)
> > -#define CDNS_IP_DTCT_WIN GENMASK(11, 0)
> > -#define CDNS_IP_DET_INTERLACE_FORMAT BIT(12)
> > -#define CDNS_IP_BYPASS_V_INTERFACE BIT(13)
> > -
> > -#define CDNS_HSYNC2VSYNC_POL_CTRL (CDNS_SOURCE_VIDEO_INTERFACE + \
> > - 0x10)
> > -#define CDNS_H2V_HSYNC_POL_ACTIVE_LOW BIT(1)
> > -#define CDNS_H2V_VSYNC_POL_ACTIVE_LOW BIT(2)
> > -
> > -#define CDNS_DPTX_PHY_CONFIG 0x02000
> > -#define CDNS_PHY_TRAINING_EN BIT(0)
> > -#define CDNS_PHY_TRAINING_TYPE(x) (((x) & GENMASK(3, 0)) << 1)
> > -#define CDNS_PHY_SCRAMBLER_BYPASS BIT(5)
> > -#define CDNS_PHY_ENCODER_BYPASS BIT(6)
> > -#define CDNS_PHY_SKEW_BYPASS BIT(7)
> > -#define CDNS_PHY_TRAINING_AUTO BIT(8)
> > -#define CDNS_PHY_LANE0_SKEW(x) (((x) & GENMASK(2, 0)) << 9)
> > -#define CDNS_PHY_LANE1_SKEW(x) (((x) & GENMASK(2, 0)) << 12)
> > -#define CDNS_PHY_LANE2_SKEW(x) (((x) & GENMASK(2, 0)) << 15)
> > -#define CDNS_PHY_LANE3_SKEW(x) (((x) & GENMASK(2, 0)) << 18)
> > -#define CDNS_PHY_COMMON_CONFIG (CDNS_PHY_LANE1_SKEW(1) | \
> > - CDNS_PHY_LANE2_SKEW(2) | \
> > - CDNS_PHY_LANE3_SKEW(3))
> > -#define CDNS_PHY_10BIT_EN BIT(21)
> > -
> > -#define CDNS_DPTX_FRAMER 0x02200
> > -#define CDNS_DP_FRAMER_GLOBAL_CONFIG (CDNS_DPTX_FRAMER + 0x00)
> > -#define CDNS_DP_NUM_LANES(x) (x - 1)
> > -#define CDNS_DP_FRAMER_EN BIT(3)
> > -#define CDNS_DP_RATE_GOVERNOR_EN BIT(4)
> > -#define CDNS_DP_NO_VIDEO_MODE BIT(5)
> > -#define CDNS_DP_DISABLE_PHY_RST BIT(6)
> > -#define CDNS_DP_WR_FAILING_EDGE_VSYNC BIT(7)
> > -
> > -#define CDNS_DP_SW_RESET (CDNS_DPTX_FRAMER + 0x04)
> > -#define CDNS_DP_FRAMER_TU (CDNS_DPTX_FRAMER + 0x08)
> > -#define CDNS_DP_FRAMER_TU_SIZE(x) (((x) & GENMASK(6, 0)) << 8)
> > -#define CDNS_DP_FRAMER_TU_VS(x) ((x) & GENMASK(5, 0))
> > -#define CDNS_DP_FRAMER_TU_CNT_RST_EN BIT(15)
> > -
> > -#define CDNS_DPTX_STREAM 0x03000
> > -#define CDNS_DP_MSA_HORIZONTAL_0 (CDNS_DPTX_STREAM + 0x00)
> > -#define CDNS_DP_MSAH0_H_TOTAL(x) (x)
> > -#define CDNS_DP_MSAH0_HSYNC_START(x) ((x) << 16)
> > -
> > -#define CDNS_DP_MSA_HORIZONTAL_1 (CDNS_DPTX_STREAM + 0x04)
> > -#define CDNS_DP_MSAH1_HSYNC_WIDTH(x) (x)
> > -#define CDNS_DP_MSAH1_HSYNC_POL_LOW BIT(15)
> > -#define CDNS_DP_MSAH1_HDISP_WIDTH(x) ((x) << 16)
> > -
> > -#define CDNS_DP_MSA_VERTICAL_0 (CDNS_DPTX_STREAM + 0x08)
> > -#define CDNS_DP_MSAV0_V_TOTAL(x) (x)
> > -#define CDNS_DP_MSAV0_VSYNC_START(x) ((x) << 16)
> > -
> > -#define CDNS_DP_MSA_VERTICAL_1 (CDNS_DPTX_STREAM + 0x0c)
> > -#define CDNS_DP_MSAV1_VSYNC_WIDTH(x) (x)
> > -#define CDNS_DP_MSAV1_VSYNC_POL_LOW BIT(15)
> > -#define CDNS_DP_MSAV1_VDISP_WIDTH(x) ((x) << 16)
> > -
> > -#define CDNS_DP_MSA_MISC (CDNS_DPTX_STREAM + 0x10)
> > -#define CDNS_DP_STREAM_CONFIG (CDNS_DPTX_STREAM + 0x14)
> > -#define CDNS_DP_RATE_GOVERNOR_STATUS (CDNS_DPTX_STREAM + 0x2c)
> > -#define CDNS_DP_RG_TU_VS_DIFF(x) ((x) << 8)
> > -
> > -#define CDNS_DP_HORIZONTAL (CDNS_DPTX_STREAM + 0x30)
> > -#define CDNS_DP_H_HSYNC_WIDTH(x) (x)
> > -#define CDNS_DP_H_H_TOTAL(x) ((x) << 16)
> > -
> > -#define CDNS_DP_VERTICAL_0 (CDNS_DPTX_STREAM + 0x34)
> > -#define CDNS_DP_V0_VHEIGHT(x) (x)
> > -#define CDNS_DP_V0_VSTART(x) ((x) << 16)
> > -
> > -#define CDNS_DP_VERTICAL_1 (CDNS_DPTX_STREAM + 0x38)
> > -#define CDNS_DP_V1_VTOTAL(x) (x)
> > -#define CDNS_DP_V1_VTOTAL_EVEN BIT(16)
> > -
> > -#define CDNS_DP_FRAMER_PXL_REPR (CDNS_DPTX_STREAM + 0x4c)
> > -#define CDNS_DP_FRAMER_6_BPC BIT(0)
> > -#define CDNS_DP_FRAMER_8_BPC BIT(1)
> > -#define CDNS_DP_FRAMER_10_BPC BIT(2)
> > -#define CDNS_DP_FRAMER_12_BPC BIT(3)
> > -#define CDNS_DP_FRAMER_16_BPC BIT(4)
> > -#define CDNS_DP_FRAMER_PXL_FORMAT 0x8
> > -#define CDNS_DP_FRAMER_RGB BIT(0)
> > -#define CDNS_DP_FRAMER_YCBCR444 BIT(1)
> > -#define CDNS_DP_FRAMER_YCBCR422 BIT(2)
> > -#define CDNS_DP_FRAMER_YCBCR420 BIT(3)
> > -#define CDNS_DP_FRAMER_Y_ONLY BIT(4)
> > -
> > -#define CDNS_DP_FRAMER_SP (CDNS_DPTX_STREAM + 0x10)
> > -#define CDNS_DP_FRAMER_VSYNC_POL_LOW BIT(0)
> > -#define CDNS_DP_FRAMER_HSYNC_POL_LOW BIT(1)
> > -#define CDNS_DP_FRAMER_INTERLACE BIT(2)
> > -
> > -#define CDNS_DP_LINE_THRESH (CDNS_DPTX_STREAM + 0x64)
> > -#define CDNS_DP_VB_ID (CDNS_DPTX_STREAM + 0x68)
> > -#define CDNS_DP_VB_ID_INTERLACED BIT(2)
> > -
> > -#define CDNS_DP_FRONT_BACK_PORCH (CDNS_DPTX_STREAM + 0x78)
> > -#define CDNS_DP_BACK_PORCH(x) (x)
> > -#define CDNS_DP_FRONT_PORCH(x) ((x) << 16)
> > -
> > -#define CDNS_DP_BYTE_COUNT (CDNS_DPTX_STREAM + 0x7c)
> > -
> > -#define CDNS_DPTX_GLOBAL 0x02300
> > -#define CDNS_DP_LANE_EN (CDNS_DPTX_GLOBAL + 0x00)
> > -#define CDNS_DP_LANE_EN_LANES(x) GENMASK(x - 1, 0)
> > -#define CDNS_DP_ENHNCD (CDNS_DPTX_GLOBAL + 0x04)
> > -
> > #define CDNS_MHDP_IMEM 0x10000
> > #define CDNS_MHDP_DMEM 0x20000
> >
> > @@ -216,13 +85,17 @@ MODULE_DEVICE_TABLE(of, mhdp_ids);
> > static inline struct cdns_mhdp_device *connector_to_mhdp(
> > struct drm_connector *conn)
> > {
> > - return container_of(conn, struct cdns_mhdp_device, connector);
> > + struct cdns_mhdp_connector *mhdp_connector = to_mhdp_connector(conn);
> > +
> > + return mhdp_connector->bridge->mhdp;
> > }
> >
> > static inline struct cdns_mhdp_device *bridge_to_mhdp(
> > struct drm_bridge *bridge)
> > {
> > - return container_of(bridge, struct cdns_mhdp_device, bridge);
> > + struct cdns_mhdp_bridge *mhdp_bridge = to_mhdp_bridge(bridge);
> > +
> > + return mhdp_bridge->mhdp;
> > }
> >
> > static unsigned int max_link_rate(struct cdns_mhdp_host host,
> > @@ -237,6 +110,62 @@ static u8 eq_training_pattern_supported(struct cdns_mhdp_host host,
> > return fls(host.pattern_supp & sink.pattern_supp);
> > }
> >
> > +static void mhdp_hotplug_work_func(struct work_struct *work)
> > +{
> > + struct cdns_mhdp_device *mhdp;
> > + int dret, retry;
> > + u8 esi[16] = { 0 };
> > + bool new_irq_handled;
> > + struct drm_connector *connector;
> > + bool old_plugged;
> > +
> > +
> > + mhdp = container_of(work, struct cdns_mhdp_device,
> > + hotplug_work.work);
> > + connector = &mhdp->connector.base;
> > +
> > + old_plugged = mhdp->plugged;
> > + connector->status = connector->funcs->detect(connector, false);
> > + if (old_plugged != mhdp->plugged) {
> > + drm_kms_helper_hotplug_event(mhdp->bridge.base.dev);
> > + return;
> > + }
> > +
> > + if (mhdp->plugged) {
> > + dret = drm_dp_dpcd_read(&mhdp->aux,
> > + DP_SINK_COUNT_ESI, esi, 8);
> > +
> > + if (dret == 8) {
> > + drm_dp_mst_hpd_irq(&mhdp->mst_mgr,
> > + esi,
> > + &new_irq_handled);
> > + }
> > +
> > + if (new_irq_handled) {
> > + for (retry = 0; retry < 3; retry++) {
> > + int wret;
> > +
> > + wret = drm_dp_dpcd_write(&mhdp->aux,
> > + DP_SINK_COUNT_ESI+1,
> > + &esi[1], 3);
> > + if (wret == 3)
> > + break;
> > + }
> > + }
> > + }
> > +
> > +}
> > +
> > +static irqreturn_t mhdp_irq_handler(int irq, void *data)
> > +{
> > + struct cdns_mhdp_device *mhdp = (struct cdns_mhdp_device *)data;
> > +
> > + if (readl(mhdp->regs + CDNS_SW_EVENT0) & CDNS_DPTX_HPD)
> > + schedule_delayed_work(&mhdp->hotplug_work, 0);
> > +
> > + return IRQ_HANDLED;
> > +}
> > +
> > static ssize_t mhdp_transfer(struct drm_dp_aux *aux,
> > struct drm_dp_aux_msg *msg)
> > {
> > @@ -300,10 +229,16 @@ static enum drm_connector_status cdns_mhdp_detect(struct drm_connector *conn,
> > int ret;
> >
> > ret = cdns_mhdp_get_hpd_status(mhdp);
> > - if (ret > 0)
> > - status = connector_status_connected;
> > - else if (ret < 0)
> > + if (ret > 0) {
> > + mhdp->plugged = true;
> > + cdns_mhdp_mst_probe(mhdp);
> > + // for MST mode this connector will be always disconnected
> > + if (!mhdp->is_mst)
> > + status = connector_status_connected;
> > + } else if (ret < 0)
> > dev_err(mhdp->dev, "Failed to obtain HPD state\n");
> > + else
> > + mhdp->plugged = false;
> >
> > return status;
> > }
> > @@ -321,11 +256,15 @@ static const struct drm_connector_funcs cdns_mhdp_conn_funcs = {
> > static int cdns_mhdp_attach(struct drm_bridge *bridge)
> > {
> > struct cdns_mhdp_device *mhdp = bridge_to_mhdp(bridge);
> > - struct drm_connector *conn = &mhdp->connector;
> > + struct drm_connector *conn = &mhdp->connector.base;
> > int ret;
> >
> > - conn->polled = DRM_CONNECTOR_POLL_CONNECT |
> > - DRM_CONNECTOR_POLL_DISCONNECT;
> > + if (&mhdp->bridge.base != bridge)
> > + return -ENODEV;
> > +
> > + cdns_mhdp_mst_init(mhdp);
> > +
> > + conn->polled = DRM_CONNECTOR_POLL_HPD;
> >
> > ret = drm_connector_init(bridge->dev, conn, &cdns_mhdp_conn_funcs,
> > DRM_MODE_CONNECTOR_DisplayPort);
> > @@ -342,17 +281,12 @@ static int cdns_mhdp_attach(struct drm_bridge *bridge)
> > return ret;
> > }
> >
> > + /* enable interrupts */
> > + writel(~CDNS_APB_INT_MASK_SW_EVENT_INT, mhdp->regs + CDNS_APB_INT_MASK);
> > +
> > return 0;
> > }
> >
> > -enum pixel_format {
> > - PIXEL_FORMAT_RGB = 1,
> > - PIXEL_FORMAT_YCBCR_444 = 2,
> > - PIXEL_FORMAT_YCBCR_422 = 4,
> > - PIXEL_FORMAT_YCBCR_420 = 8,
> > - PIXEL_FORMAT_Y_ONLY = 16,
> > -};
> > -
> > static void mhdp_link_training_init(struct cdns_mhdp_device *mhdp)
> > {
> > u32 reg32;
> > @@ -716,13 +650,11 @@ static int mhdp_link_training(struct cdns_mhdp_device *mhdp,
> > cdns_mhdp_reg_write(mhdp, CDNS_DP_SW_RESET, 1);
> > cdns_mhdp_reg_write(mhdp, CDNS_DP_SW_RESET, 0);
> >
> > - /* Enable framer */
> > - /* FIXME: update when MST supported, BIT(2) */
> > cdns_mhdp_reg_write(mhdp, CDNS_DP_FRAMER_GLOBAL_CONFIG,
> > - CDNS_DP_FRAMER_EN |
> > CDNS_DP_NUM_LANES(mhdp->link.num_lanes) |
> > CDNS_DP_DISABLE_PHY_RST |
> > CDNS_DP_WR_FAILING_EDGE_VSYNC |
> > + (mhdp->is_mst ? CDNS_DP_MST_EN : 0) |
> > (!video_mode ? CDNS_DP_NO_VIDEO_MODE : 0));
> >
> > /* Reset PHY config */
> > @@ -751,31 +683,20 @@ static void cdns_mhdp_disable(struct drm_bridge *bridge)
> >
> > cdns_mhdp_set_video_status(mhdp, 0);
> >
> > + mhdp->link_up = false;
> > +
> > drm_dp_link_power_down(&mhdp->aux, &mhdp->link);
> > + if (mhdp->is_mst)
> > + cdns_mhdp_mst_disable(bridge);
> > }
> >
> > -static void cdns_mhdp_enable(struct drm_bridge *bridge)
> > +static int cdns_mhdp_link_up(struct cdns_mhdp_device *mhdp)
> > {
> > - struct cdns_mhdp_device *mhdp = bridge_to_mhdp(bridge);
> > - struct drm_display_mode *mode;
> > - struct drm_display_info *disp_info = &mhdp->connector.display_info;
> > - enum pixel_format pxlfmt;
> > - int pxlclock;
> > - unsigned int rate, tu_size = 30, vs, vs_f, bpp, required_bandwidth,
> > - available_bandwidth, dp_framer_sp = 0, msa_horizontal_1,
> > - msa_vertical_1, bnd_hsync2vsync, hsync2vsync_pol_ctrl,
> > - misc0 = 0, misc1 = 0, line_thresh = 0, pxl_repr,
> > - front_porch, back_porch, msa_h0, msa_v0, hsync, vsync,
> > - dp_vertical_1, line_thresh1, line_thresh2;
> > u32 resp;
> > -
> > - unsigned int size = DP_RECEIVER_CAP_SIZE, dp_framer_global_config,
> > + u32 size = DP_RECEIVER_CAP_SIZE, dp_framer_global_config,
> > video_mode, training_interval_us;
> > u8 reg0[size], reg8, amp[2];
> >
> > - mode = &bridge->encoder->crtc->state->adjusted_mode;
> > - pxlclock = mode->crtc_clock;
> > -
> > /*
> > * Upon power-on reset/device disconnection: [2:0] bits should be 0b001
> > * and [7:5] bits 0b000.
> > @@ -824,13 +745,17 @@ static void cdns_mhdp_enable(struct drm_bridge *bridge)
> > default:
> > dev_err(mhdp->dev,
> > "wrong training interval returned by DPCD: %d\n", reg8);
> > - return;
> > + return -EIO;
> > }
> >
> > cdns_mhdp_reg_read(mhdp, CDNS_DP_FRAMER_GLOBAL_CONFIG, &resp);
> >
> > dp_framer_global_config = be32_to_cpu(resp);
> >
> > + cdns_mhdp_mst_probe(mhdp);
> > + if (mhdp->is_mst)
> > + dp_framer_global_config |= CDNS_DP_MST_EN;
> > +
> > video_mode = !(dp_framer_global_config & CDNS_DP_NO_VIDEO_MODE);
> >
> > if (dp_framer_global_config & CDNS_DP_FRAMER_EN)
> > @@ -850,50 +775,168 @@ static void cdns_mhdp_enable(struct drm_bridge *bridge)
> > if (mhdp_link_training(mhdp, video_mode,
> > training_interval_us)) {
> > dev_err(mhdp->dev, "Link training failed. Exiting.\n");
> > - return;
> > + return -EIO;
> > }
> > }
> >
> > + mhdp->link_up = true;
> > +
> > + return 0;
> > +}
> > +
> > +static int cdns_mhdp_sst_enable(struct drm_bridge *bridge)
> > +{
> > + struct cdns_mhdp_bridge *mhdp_bridge = to_mhdp_bridge(bridge);
> > + struct cdns_mhdp_device *mhdp = mhdp_bridge->mhdp;
> > + u32 rate, vs, vs_f, required_bandwidth, available_bandwidth;
> > + u32 bpp, tu_size = 30, line_thresh1, line_thresh2, line_thresh = 0;
> > + struct drm_display_mode *mode;
> > + int pxlclock;
> > + enum pixel_format pxlfmt;
> > + struct drm_display_info *disp_info = &mhdp->connector.base.display_info;
> > +
> > +
> > + mode = &bridge->encoder->crtc->state->adjusted_mode;
> > + pxlclock = mode->crtc_clock;
> > +
> > + mhdp_bridge->stream_id = 0;
> > +
> > rate = mhdp->link.rate / 1000;
> >
> > + pxlfmt = cdns_mhdp_get_pxlfmt(disp_info->color_formats);
> > + bpp = cdns_mhdp_get_bpp(disp_info->bpc, pxlfmt);
> > +
> > + /* find optimal tu_size */
> > + required_bandwidth = pxlclock * bpp / 8;
> > + available_bandwidth = mhdp->link.num_lanes * rate;
> > + do {
> > + tu_size += 2;
> > +
> > + vs_f = tu_size * required_bandwidth / available_bandwidth;
> > + vs = vs_f / 1000;
> > + vs_f = vs_f % 1000;
> > + /*
> > + * FIXME (CDNS): downspreading?
> > + * It's unused is what I've been told.
> > + */
> > + } while ((vs == 1 || ((vs_f > 850 || vs_f < 100) && vs_f != 0) ||
> > + tu_size - vs < 2) && tu_size < 64);
> > +
> > + if (vs > 64)
> > + return -EINVAL;
> > +
> > +
> > + cdns_mhdp_reg_write(mhdp, CDNS_DP_FRAMER_TU,
> > + CDNS_DP_FRAMER_TU_VS(vs) |
> > + CDNS_DP_FRAMER_TU_SIZE(tu_size) |
> > + CDNS_DP_FRAMER_TU_CNT_RST_EN);
> > +
> > + line_thresh1 = ((vs + 1) << 5) * 8 / bpp;
> > + line_thresh2 = (pxlclock << 5) / 1000 / rate * (vs + 1) - (1 << 5);
> > + line_thresh = line_thresh1 - line_thresh2 / mhdp->link.num_lanes;
> > + line_thresh = (line_thresh >> 5) + 2;
> > + cdns_mhdp_reg_write(mhdp, CDNS_DP_LINE_THRESH(0),
> > + line_thresh & GENMASK(5, 0));
> > +
> > + cdns_mhdp_reg_write(mhdp, CDNS_DP_STREAM_CONFIG_2(0),
> > + CDNS_DP_SC2_TU_VS_DIFF((tu_size - vs > 3) ?
> > + 0 : tu_size - vs));
> > +
> > + cdns_mhdp_configure_video(bridge);
> > +
> > + cdns_mhdp_set_video_status(mhdp, 1);
> > +
> > + return 0;
> > +}
> > +
> > +enum pixel_format cdns_mhdp_get_pxlfmt(u32 color_formats)
> > +{
> > + enum pixel_format pxlfmt;
> > +
> > /* FIXME: what about Y_ONLY? how is it handled in the kernel? */
> > - if (disp_info->color_formats & DRM_COLOR_FORMAT_YCRCB444)
> > + if (color_formats & DRM_COLOR_FORMAT_YCRCB444)
> > pxlfmt = PIXEL_FORMAT_YCBCR_444;
> > - else if (disp_info->color_formats & DRM_COLOR_FORMAT_YCRCB422)
> > + else if (color_formats & DRM_COLOR_FORMAT_YCRCB422)
> > pxlfmt = PIXEL_FORMAT_YCBCR_422;
> > - else if (disp_info->color_formats & DRM_COLOR_FORMAT_YCRCB420)
> > + else if (color_formats & DRM_COLOR_FORMAT_YCRCB420)
> > pxlfmt = PIXEL_FORMAT_YCBCR_420;
> > else
> > pxlfmt = PIXEL_FORMAT_RGB;
> >
> > + return pxlfmt;
> > +}
> > +
> > +
> > +u32 cdns_mhdp_get_bpp(u32 bpc, enum pixel_format pxlfmt)
> > +{
> > + u32 bpp;
> > +
> > + switch (pxlfmt) {
> > + case PIXEL_FORMAT_RGB:
> > + bpp = bpc * 3;
> > + break;
> > + case PIXEL_FORMAT_YCBCR_444:
> > + bpp = bpc * 3;
> > + break;
> > + case PIXEL_FORMAT_YCBCR_422:
> > + bpp = bpc * 2;
> > + break;
> > + case PIXEL_FORMAT_YCBCR_420:
> > + bpp = bpc * 3 / 2;
> > + break;
> > + default:
> > + bpp = bpc;
> > + }
> > + return bpp;
> > +}
> > +
> > +void cdns_mhdp_configure_video(struct drm_bridge *bridge)
> > +{
> > + struct cdns_mhdp_bridge *mhdp_bridge = to_mhdp_bridge(bridge);
> > + struct cdns_mhdp_device *mhdp = mhdp_bridge->mhdp;
> > + struct drm_display_info *disp_info;
> > + unsigned int bpp, dp_framer_sp = 0, msa_horizontal_1,
> > + msa_vertical_1, bnd_hsync2vsync, hsync2vsync_pol_ctrl,
> > + misc0 = 0, misc1 = 0, pxl_repr,
> > + front_porch, back_porch, msa_h0, msa_v0, hsync, vsync,
> > + dp_vertical_1;
> > + struct drm_display_mode *mode;
> > + enum pixel_format pxlfmt;
> > + int pxlclock;
> > + u32 tmp;
> > + u8 stream_id = mhdp_bridge->stream_id;
> > +
> > + mode = &bridge->encoder->crtc->state->adjusted_mode;
> > + pxlclock = mode->crtc_clock;
> > +
> > + disp_info = &mhdp_bridge->connector->base.display_info;
> > + pxlfmt = cdns_mhdp_get_pxlfmt(disp_info->color_formats);
> > +
> > /* if YCBCR supported and stream not SD, use ITU709 */
> > /* FIXME: handle ITU version with YCBCR420 when supported */
> > if ((pxlfmt == PIXEL_FORMAT_YCBCR_444 ||
> > pxlfmt == PIXEL_FORMAT_YCBCR_422) && mode->crtc_vdisplay >= 720)
> > misc0 = DP_YCBCR_COEFFICIENTS_ITU709;
> >
> > + bpp = cdns_mhdp_get_bpp(disp_info->bpc, pxlfmt);
> > +
> > switch (pxlfmt) {
> > case PIXEL_FORMAT_RGB:
> > - bpp = disp_info->bpc * 3;
> > pxl_repr = CDNS_DP_FRAMER_RGB << CDNS_DP_FRAMER_PXL_FORMAT;
> > misc0 |= DP_COLOR_FORMAT_RGB;
> > break;
> > case PIXEL_FORMAT_YCBCR_444:
> > - bpp = disp_info->bpc * 3;
> > pxl_repr = CDNS_DP_FRAMER_YCBCR444 << CDNS_DP_FRAMER_PXL_FORMAT;
> > misc0 |= DP_COLOR_FORMAT_YCbCr444 | DP_TEST_DYNAMIC_RANGE_CEA;
> > break;
> > case PIXEL_FORMAT_YCBCR_422:
> > - bpp = disp_info->bpc * 2;
> > pxl_repr = CDNS_DP_FRAMER_YCBCR422 << CDNS_DP_FRAMER_PXL_FORMAT;
> > misc0 |= DP_COLOR_FORMAT_YCbCr422 | DP_TEST_DYNAMIC_RANGE_CEA;
> > break;
> > case PIXEL_FORMAT_YCBCR_420:
> > - bpp = disp_info->bpc * 3 / 2;
> > pxl_repr = CDNS_DP_FRAMER_YCBCR420 << CDNS_DP_FRAMER_PXL_FORMAT;
> > break;
> > default:
> > - bpp = disp_info->bpc;
> > pxl_repr = CDNS_DP_FRAMER_Y_ONLY << CDNS_DP_FRAMER_PXL_FORMAT;
> > }
> >
> > @@ -920,30 +963,12 @@ static void cdns_mhdp_enable(struct drm_bridge *bridge)
> > break;
> > }
> >
> > - /* find optimal tu_size */
> > - required_bandwidth = pxlclock * bpp / 8;
> > - available_bandwidth = mhdp->link.num_lanes * rate;
> > - do {
> > - tu_size += 2;
> > -
> > - vs_f = tu_size * required_bandwidth / available_bandwidth;
> > - vs = vs_f / 1000;
> > - vs_f = vs_f % 1000;
> > - /*
> > - * FIXME (CDNS): downspreading?
> > - * It's unused is what I've been told.
> > - */
> > - } while ((vs == 1 || ((vs_f > 850 || vs_f < 100) && vs_f != 0) ||
> > - tu_size - vs < 2) && tu_size < 64);
> > -
> > - if (vs > 64)
> > - return;
> > -
> > bnd_hsync2vsync = CDNS_IP_BYPASS_V_INTERFACE;
> > if (mode->flags & DRM_MODE_FLAG_INTERLACE)
> > bnd_hsync2vsync |= CDNS_IP_DET_INTERLACE_FORMAT;
> >
> > - cdns_mhdp_reg_write(mhdp, CDNS_BND_HSYNC2VSYNC, bnd_hsync2vsync);
> > + cdns_mhdp_reg_write(mhdp, CDNS_BND_HSYNC2VSYNC(stream_id),
> > + bnd_hsync2vsync);
> >
> > if (mode->flags & DRM_MODE_FLAG_INTERLACE &&
> > mode->flags & DRM_MODE_FLAG_PHSYNC)
> > @@ -952,15 +977,10 @@ static void cdns_mhdp_enable(struct drm_bridge *bridge)
> > else
> > hsync2vsync_pol_ctrl = 0;
> >
> > - cdns_mhdp_reg_write(mhdp, CDNS_HSYNC2VSYNC_POL_CTRL,
> > + cdns_mhdp_reg_write(mhdp, CDNS_HSYNC2VSYNC_POL_CTRL(stream_id),
> > hsync2vsync_pol_ctrl);
> >
> > - cdns_mhdp_reg_write(mhdp, CDNS_DP_FRAMER_TU,
> > - CDNS_DP_FRAMER_TU_VS(vs) |
> > - CDNS_DP_FRAMER_TU_SIZE(tu_size) |
> > - CDNS_DP_FRAMER_TU_CNT_RST_EN);
> > -
> > - cdns_mhdp_reg_write(mhdp, CDNS_DP_FRAMER_PXL_REPR, pxl_repr);
> > + cdns_mhdp_reg_write(mhdp, CDNS_DP_FRAMER_PXL_REPR(stream_id), pxl_repr);
> >
> > if (mode->flags & DRM_MODE_FLAG_INTERLACE)
> > dp_framer_sp |= CDNS_DP_FRAMER_INTERLACE;
> > @@ -968,19 +988,19 @@ static void cdns_mhdp_enable(struct drm_bridge *bridge)
> > dp_framer_sp |= CDNS_DP_FRAMER_HSYNC_POL_LOW;
> > if (mode->flags & DRM_MODE_FLAG_NVSYNC)
> > dp_framer_sp |= CDNS_DP_FRAMER_VSYNC_POL_LOW;
> > - cdns_mhdp_reg_write(mhdp, CDNS_DP_FRAMER_SP, dp_framer_sp);
> > + cdns_mhdp_reg_write(mhdp, CDNS_DP_FRAMER_SP(stream_id), dp_framer_sp);
> >
> > front_porch = mode->crtc_hsync_start - mode->crtc_hdisplay;
> > back_porch = mode->crtc_htotal - mode->crtc_hsync_end;
> > - cdns_mhdp_reg_write(mhdp, CDNS_DP_FRONT_BACK_PORCH,
> > + cdns_mhdp_reg_write(mhdp, CDNS_DP_FRONT_BACK_PORCH(stream_id),
> > CDNS_DP_FRONT_PORCH(front_porch) |
> > CDNS_DP_BACK_PORCH(back_porch));
> >
> > - cdns_mhdp_reg_write(mhdp, CDNS_DP_BYTE_COUNT,
> > + cdns_mhdp_reg_write(mhdp, CDNS_DP_BYTE_COUNT(stream_id),
> > mode->crtc_hdisplay * bpp / 8);
> >
> > msa_h0 = mode->crtc_htotal - mode->crtc_hsync_start;
> > - cdns_mhdp_reg_write(mhdp, CDNS_DP_MSA_HORIZONTAL_0,
> > + cdns_mhdp_reg_write(mhdp, CDNS_DP_MSA_HORIZONTAL_0(stream_id),
> > CDNS_DP_MSAH0_H_TOTAL(mode->crtc_htotal) |
> > CDNS_DP_MSAH0_HSYNC_START(msa_h0));
> >
> > @@ -989,11 +1009,11 @@ static void cdns_mhdp_enable(struct drm_bridge *bridge)
> > CDNS_DP_MSAH1_HDISP_WIDTH(mode->crtc_hdisplay);
> > if (mode->flags & DRM_MODE_FLAG_NHSYNC)
> > msa_horizontal_1 |= CDNS_DP_MSAH1_HSYNC_POL_LOW;
> > - cdns_mhdp_reg_write(mhdp, CDNS_DP_MSA_HORIZONTAL_1,
> > + cdns_mhdp_reg_write(mhdp, CDNS_DP_MSA_HORIZONTAL_1(stream_id),
> > msa_horizontal_1);
> >
> > msa_v0 = mode->crtc_vtotal - mode->crtc_vsync_start;
> > - cdns_mhdp_reg_write(mhdp, CDNS_DP_MSA_VERTICAL_0,
> > + cdns_mhdp_reg_write(mhdp, CDNS_DP_MSA_VERTICAL_0(stream_id),
> > CDNS_DP_MSAV0_V_TOTAL(mode->crtc_vtotal) |
> > CDNS_DP_MSAV0_VSYNC_START(msa_v0));
> >
> > @@ -1002,7 +1022,8 @@ static void cdns_mhdp_enable(struct drm_bridge *bridge)
> > CDNS_DP_MSAV1_VDISP_WIDTH(mode->crtc_vdisplay);
> > if (mode->flags & DRM_MODE_FLAG_NVSYNC)
> > msa_vertical_1 |= CDNS_DP_MSAV1_VSYNC_POL_LOW;
> > - cdns_mhdp_reg_write(mhdp, CDNS_DP_MSA_VERTICAL_1, msa_vertical_1);
> > + cdns_mhdp_reg_write(mhdp, CDNS_DP_MSA_VERTICAL_1(stream_id),
> > + msa_vertical_1);
> >
> > if ((mode->flags & DRM_MODE_FLAG_INTERLACE) &&
> > mode->crtc_vtotal % 2 == 0)
> > @@ -1014,16 +1035,14 @@ static void cdns_mhdp_enable(struct drm_bridge *bridge)
> > if (pxlfmt == PIXEL_FORMAT_YCBCR_420)
> > misc1 = CDNS_DP_TEST_VSC_SDP;
> >
> > - cdns_mhdp_reg_write(mhdp, CDNS_DP_MSA_MISC, misc0 | (misc1 << 8));
> > + cdns_mhdp_reg_write(mhdp, CDNS_DP_MSA_MISC(stream_id),
> > + misc0 | (misc1 << 8));
> >
> > - /* FIXME: to be changed if MST mode */
> > - cdns_mhdp_reg_write(mhdp, CDNS_DP_STREAM_CONFIG, 1);
> > -
> > - cdns_mhdp_reg_write(mhdp, CDNS_DP_HORIZONTAL,
> > + cdns_mhdp_reg_write(mhdp, CDNS_DP_HORIZONTAL(stream_id),
> > CDNS_DP_H_HSYNC_WIDTH(hsync) |
> > CDNS_DP_H_H_TOTAL(mode->crtc_hdisplay));
> >
> > - cdns_mhdp_reg_write(mhdp, CDNS_DP_VERTICAL_0,
> > + cdns_mhdp_reg_write(mhdp, CDNS_DP_VERTICAL_0(stream_id),
> > CDNS_DP_V0_VHEIGHT(mode->crtc_vdisplay) |
> > CDNS_DP_V0_VSTART(msa_v0));
> >
> > @@ -1032,30 +1051,51 @@ static void cdns_mhdp_enable(struct drm_bridge *bridge)
> > mode->crtc_vtotal % 2 == 0)
> > dp_vertical_1 |= CDNS_DP_V1_VTOTAL_EVEN;
> >
> > - cdns_mhdp_reg_write(mhdp, CDNS_DP_VERTICAL_1, dp_vertical_1);
> > + cdns_mhdp_reg_write(mhdp, CDNS_DP_VERTICAL_1(stream_id), dp_vertical_1);
> >
> > - cdns_mhdp_reg_write_bit(mhdp, CDNS_DP_VB_ID, 2, 1,
> > + cdns_mhdp_reg_write_bit(mhdp, CDNS_DP_VB_ID(stream_id), 2, 1,
> > (mode->flags & DRM_MODE_FLAG_INTERLACE) ?
> > CDNS_DP_VB_ID_INTERLACED : 0);
> >
> > - line_thresh1 = ((vs + 1) << 5) * 8 / bpp;
> > - line_thresh2 = (pxlclock << 5) / 1000 / rate * (vs + 1) - (1 << 5);
> > - line_thresh = line_thresh1 - line_thresh2 / mhdp->link.num_lanes;
> > - line_thresh = (line_thresh >> 5) + 2;
> > - cdns_mhdp_reg_write(mhdp, CDNS_DP_LINE_THRESH,
> > - line_thresh & GENMASK(5, 0));
> >
> > - cdns_mhdp_reg_write(mhdp, CDNS_DP_RATE_GOVERNOR_STATUS,
> > - CDNS_DP_RG_TU_VS_DIFF((tu_size - vs > 3) ?
> > - 0 : tu_size - vs));
> > + cdns_mhdp_reg_read(mhdp, CDNS_DP_FRAMER_GLOBAL_CONFIG, &tmp);
> > + tmp |= CDNS_DP_FRAMER_EN;
> > + cdns_mhdp_reg_write(mhdp, CDNS_DP_FRAMER_GLOBAL_CONFIG, tmp);
> > +}
> >
> > - cdns_mhdp_set_video_status(mhdp, 1);
> > +void cdns_mhdp_enable(struct drm_bridge *bridge)
> > +{
> > + struct cdns_mhdp_bridge *mhdp_bridge = to_mhdp_bridge(bridge);
> > + struct cdns_mhdp_device *mhdp = mhdp_bridge->mhdp;
> > + int ret = 0;
> > +
> > + bool link_up = mhdp->link_up;
> > +
> > + if (!link_up)
> > + cdns_mhdp_link_up(mhdp);
> > +
> > +
> > + if (!mhdp->is_mst)
> > + ret = cdns_mhdp_sst_enable(bridge);
> > + else
> > + cdns_mhdp_mst_enable(bridge);
> > +
>
>
> ret unused, link_up not neccessary, requires cleanup.
>
>
>
> > +}
> > +
> > +static void cdns_mhdp_detach(struct drm_bridge *bridge)
> > +{
> > + struct cdns_mhdp_device *mhdp = bridge_to_mhdp(bridge);
> > + struct cdns_mhdp_mst_cbs cbs_null = {0};
> > +
> > + cdns_mhdp_mst_deinit(mhdp);
> > + mhdp->cbs = cbs_null;
> > }
> >
> > static const struct drm_bridge_funcs cdns_mhdp_bridge_funcs = {
> > .enable = cdns_mhdp_enable,
> > .disable = cdns_mhdp_disable,
> > .attach = cdns_mhdp_attach,
> > + .detach = cdns_mhdp_detach,
> > };
> >
> > static int load_firmware(struct cdns_mhdp_device *mhdp, const char *name,
> > @@ -1127,8 +1167,8 @@ static int cdns_mhdp_audio_get_eld(struct device *dev, void *data,
> > {
> > struct cdns_mhdp_device *mhdp = dev_get_drvdata(dev);
> >
> > - memcpy(buf, mhdp->connector.eld,
> > - min(sizeof(mhdp->connector.eld), len));
> > + memcpy(buf, mhdp->connector.base.eld,
> > + min(sizeof(mhdp->connector.base.eld), len));
> >
> > return 0;
> > }
> > @@ -1149,6 +1189,7 @@ static int mhdp_probe(struct platform_device *pdev)
> > unsigned int reg;
> > unsigned long rate;
> > u32 resp;
> > + int irq;
> >
> > struct hdmi_codec_pdata codec_data = {
> > .i2s = 1,
> > @@ -1192,6 +1233,14 @@ static int mhdp_probe(struct platform_device *pdev)
> > /* Leave debug mode */
> > writel(0, mhdp->regs + CDNS_APB_CTRL);
> >
> > + irq = platform_get_irq(pdev, 0);
> > + ret = request_irq(irq, mhdp_irq_handler, 0, "mhdp8546", mhdp);
>
>
> No free_irq, why dont you use devm_request_irq.
>
>
>
> > + if (ret) {
> > + dev_err(&pdev->dev,
> > + "cannot install IRQ %d\n", irq);
> > + return -EIO;
> > + }
> > +
> > /*
> > * Wait for the KEEP_ALIVE "message" on the first 8 bits.
> > * Updated each sched "tick" (~2ms)
> > @@ -1222,8 +1271,8 @@ static int mhdp_probe(struct platform_device *pdev)
> > mhdp->host.lane_mapping = CDNS_LANE_MAPPING_FLIPPED;
> > mhdp->host.enhanced = true;
> >
> > - mhdp->bridge.of_node = pdev->dev.of_node;
> > - mhdp->bridge.funcs = &cdns_mhdp_bridge_funcs;
> > + mhdp->bridge.base.of_node = pdev->dev.of_node;
> > + mhdp->bridge.base.funcs = &cdns_mhdp_bridge_funcs;
> >
> > /* Init events to 0 as it's not cleared by FW at boot but on read */
> > readl(mhdp->regs + CDNS_SW_EVENT0);
> > @@ -1247,21 +1296,14 @@ static int mhdp_probe(struct platform_device *pdev)
> > cdns_mhdp_reg_write(mhdp, CDNS_DPTX_CAR,
> > resp | CDNS_VIF_CLK_EN | CDNS_VIF_CLK_RSTN);
> >
> > - /* Loop over HDP change */
> > - /*
> > - * FIXME: does not work when put in mhdp_bridge_enable.
> > - * Where should we put it?
> > - */
> > - /* Is it still needed with use of mb message HPD STATUS? */
> > - ret = readl_poll_timeout(mhdp->regs + CDNS_SW_EVENT0, reg,
> > - reg & CDNS_DPTX_HPD, 500,
> > - CDNS_SW_EVENT0_TIMEOUT);
> > - if (ret) {
> > - dev_err(mhdp->dev, "no HPD received %d\n", reg);
> > - return -ENODEV;
> > - }
> > + INIT_DELAYED_WORK(&mhdp->hotplug_work, mhdp_hotplug_work_func);
>
>
> You are removing lot of the code introduced by previous patch, kinda ugly.
>
> I am not sure if merging both patches wouldn't be better, otherwise it
> would be better to split this big patch to smaller chunks - according to
> rule - one change per one patch.
>
>
> Regards
>
> Andrzej
>
>
>
>
> > +
> > + mhdp->bridge.connector = &mhdp->connector;
> > + mhdp->connector.bridge = &mhdp->bridge;
> > + mhdp->bridge.mhdp = mhdp;
> > + mhdp->bridge.is_active = false;
> >
> > - drm_bridge_add(&mhdp->bridge);
> > + drm_bridge_add(&mhdp->bridge.base);
> >
> > return 0;
> > }
> > @@ -1273,9 +1315,11 @@ static int mhdp_remove(struct platform_device *pdev)
> > struct cdns_mhdp_device *mhdp = dev_get_drvdata(&pdev->dev);
> > int ret;
> >
> > + flush_delayed_work(&mhdp->hotplug_work);
> > platform_device_unregister(mhdp->audio_pdev);
> >
> > - drm_bridge_remove(&mhdp->bridge);
> > + cdns_mhdp_mst_deinit(mhdp);
> > + drm_bridge_remove(&mhdp->bridge.base);
> >
> > ret = cdns_mhdp_set_firmware_active(mhdp, false);
> > if (ret) {
> > @@ -1288,6 +1332,17 @@ static int mhdp_remove(struct platform_device *pdev)
> > return 0;
> > }
> >
> > +int mhdp_bridge_attach_mst_cbs(struct drm_bridge *bridge,
> > + struct cdns_mhdp_mst_cbs *cbs)
> > +{
> > + struct cdns_mhdp_device *mhdp = bridge_to_mhdp(bridge);
> > +
> > + mhdp->cbs = *cbs;
> > +
> > + return 0;
> > +}
> > +EXPORT_SYMBOL_GPL(mhdp_bridge_attach_mst_cbs);
> > +
> > static struct platform_driver mhdp_driver = {
> > .driver = {
> > .name = "cdns-mhdp",
> > @@ -1299,6 +1354,9 @@ static struct platform_driver mhdp_driver = {
> > module_platform_driver(mhdp_driver);
> >
> > MODULE_AUTHOR("Quentin Schulz <quentin.schulz@free-electrons.com>");
> > +MODULE_AUTHOR("Przemyslaw Gaj <pgaj@cadence.com>");
> > +MODULE_AUTHOR("Damian Kos <dkos@cadence.com>");
> > +MODULE_AUTHOR("Piotr Sroka <piotrs@cadence.com>");
> > MODULE_DESCRIPTION("Cadence MHDP DP bridge driver");
> > MODULE_LICENSE("GPL");
> > MODULE_ALIAS("platform:cdns-mhdp");
> > diff --git a/drivers/gpu/drm/bridge/cdns-mhdp.h b/drivers/gpu/drm/bridge/cdns-mhdp.h
> > new file mode 100644
> > index 000000000000..abc1fa3f51a6
> > --- /dev/null
> > +++ b/drivers/gpu/drm/bridge/cdns-mhdp.h
> > @@ -0,0 +1,209 @@
> > +/* SPDX-License-Identifier: GPL v2 */
> > +/*
> > + * Cadence MHDP DP MST bridge driver.
> > + *
> > + * Copyright: 2018 Cadence Design Systems, Inc.
> > + *
> > + * Author: Quentin Schulz <quentin.schulz@free-electrons.com>
> > + */
> > +
> > +
> > +#ifndef CDNS_MHDP_H
> > +#define CDNS_MHDP_H
> > +
> > +#include <drm/drm_dp_mst_helper.h>
> > +
> > +#define CDNS_APB_CFG 0x00000
> > +#define CDNS_APB_CTRL (CDNS_APB_CFG + 0x00)
> > +#define CDNS_MAILBOX_FULL (CDNS_APB_CFG + 0x08)
> > +#define CDNS_MAILBOX_EMPTY (CDNS_APB_CFG + 0x0c)
> > +#define CDNS_MAILBOX_TX_DATA (CDNS_APB_CFG + 0x10)
> > +#define CDNS_MAILBOX_RX_DATA (CDNS_APB_CFG + 0x14)
> > +#define CDNS_KEEP_ALIVE (CDNS_APB_CFG + 0x18)
> > +#define CDNS_KEEP_ALIVE_MASK GENMASK(7, 0)
> > +
> > +#define CDNS_MB_INT_MASK (CDNS_APB_CFG + 0x34)
> > +
> > +#define CDNS_SW_CLK_L (CDNS_APB_CFG + 0x3c)
> > +#define CDNS_SW_CLK_H (CDNS_APB_CFG + 0x40)
> > +#define CDNS_SW_EVENT0 (CDNS_APB_CFG + 0x44)
> > +#define CDNS_DPTX_HPD BIT(0)
> > +
> > +#define CDNS_SW_EVENT1 (CDNS_APB_CFG + 0x48)
> > +#define CDNS_SW_EVENT2 (CDNS_APB_CFG + 0x4c)
> > +#define CDNS_SW_EVENT3 (CDNS_APB_CFG + 0x50)
> > +
> > +#define CDNS_APB_INT_MASK (CDNS_APB_CFG + 0x6C)
> > +#define CDNS_APB_INT_MASK_MAILBOX_INT BIT(0)
> > +#define CDNS_APB_INT_MASK_SW_EVENT_INT BIT(1)
> > +
> > +#define CDNS_DPTX_CAR (CDNS_APB_CFG + 0x904)
> > +#define CDNS_VIF_CLK_EN BIT(0)
> > +#define CDNS_VIF_CLK_RSTN BIT(1)
> > +
> > +#define CDNS_SOURCE_VIDEO_IF(s) (0x00b00 + (s * 0x20))
> > +#define CDNS_BND_HSYNC2VSYNC(s) (CDNS_SOURCE_VIDEO_IF(s) + \
> > + 0x00)
> > +#define CDNS_IP_DTCT_WIN GENMASK(11, 0)
> > +#define CDNS_IP_DET_INTERLACE_FORMAT BIT(12)
> > +#define CDNS_IP_BYPASS_V_INTERFACE BIT(13)
> > +
> > +#define CDNS_HSYNC2VSYNC_POL_CTRL(s) (CDNS_SOURCE_VIDEO_IF(s) + \
> > + 0x10)
> > +#define CDNS_H2V_HSYNC_POL_ACTIVE_LOW BIT(1)
> > +#define CDNS_H2V_VSYNC_POL_ACTIVE_LOW BIT(2)
> > +
> > +#define CDNS_DPTX_PHY_CONFIG 0x02000
> > +#define CDNS_PHY_TRAINING_EN BIT(0)
> > +#define CDNS_PHY_TRAINING_TYPE(x) (((x) & GENMASK(3, 0)) << 1)
> > +#define CDNS_PHY_SCRAMBLER_BYPASS BIT(5)
> > +#define CDNS_PHY_ENCODER_BYPASS BIT(6)
> > +#define CDNS_PHY_SKEW_BYPASS BIT(7)
> > +#define CDNS_PHY_TRAINING_AUTO BIT(8)
> > +#define CDNS_PHY_LANE0_SKEW(x) (((x) & GENMASK(2, 0)) << 9)
> > +#define CDNS_PHY_LANE1_SKEW(x) (((x) & GENMASK(2, 0)) << 12)
> > +#define CDNS_PHY_LANE2_SKEW(x) (((x) & GENMASK(2, 0)) << 15)
> > +#define CDNS_PHY_LANE3_SKEW(x) (((x) & GENMASK(2, 0)) << 18)
> > +#define CDNS_PHY_COMMON_CONFIG (CDNS_PHY_LANE1_SKEW(1) | \
> > + CDNS_PHY_LANE2_SKEW(2) | \
> > + CDNS_PHY_LANE3_SKEW(3))
> > +#define CDNS_PHY_10BIT_EN BIT(21)
> > +
> > +#define CDNS_DPTX_FRAMER 0x02200
> > +#define CDNS_DP_FRAMER_GLOBAL_CONFIG (CDNS_DPTX_FRAMER + 0x00)
> > +#define CDNS_DP_NUM_LANES(x) (x - 1)
> > +#define CDNS_DP_MST_EN BIT(2)
> > +#define CDNS_DP_FRAMER_EN BIT(3)
> > +#define CDNS_DP_RATE_GOVERNOR_EN BIT(4)
> > +#define CDNS_DP_NO_VIDEO_MODE BIT(5)
> > +#define CDNS_DP_DISABLE_PHY_RST BIT(6)
> > +#define CDNS_DP_WR_FAILING_EDGE_VSYNC BIT(7)
> > +
> > +#define CDNS_DP_SW_RESET (CDNS_DPTX_FRAMER + 0x04)
> > +#define CDNS_DP_FRAMER_TU (CDNS_DPTX_FRAMER + 0x08)
> > +#define CDNS_DP_FRAMER_TU_SIZE(x) (((x) & GENMASK(6, 0)) << 8)
> > +#define CDNS_DP_FRAMER_TU_VS(x) ((x) & GENMASK(5, 0))
> > +#define CDNS_DP_FRAMER_TU_CNT_RST_EN BIT(15)
> > +
> > +#define CDNS_DPTX_STREAM(s) (0x03000 + s * 0x80)
> > +#define CDNS_DP_MSA_HORIZONTAL_0(s) (CDNS_DPTX_STREAM(s) + 0x00)
> > +#define CDNS_DP_MSAH0_H_TOTAL(x) (x)
> > +#define CDNS_DP_MSAH0_HSYNC_START(x) ((x) << 16)
> > +
> > +#define CDNS_DP_MSA_HORIZONTAL_1(s) (CDNS_DPTX_STREAM(s) + 0x04)
> > +#define CDNS_DP_MSAH1_HSYNC_WIDTH(x) (x)
> > +#define CDNS_DP_MSAH1_HSYNC_POL_LOW BIT(15)
> > +#define CDNS_DP_MSAH1_HDISP_WIDTH(x) ((x) << 16)
> > +
> > +#define CDNS_DP_MSA_VERTICAL_0(s) (CDNS_DPTX_STREAM(s) + 0x08)
> > +#define CDNS_DP_MSAV0_V_TOTAL(x) (x)
> > +#define CDNS_DP_MSAV0_VSYNC_START(x) ((x) << 16)
> > +
> > +#define CDNS_DP_MSA_VERTICAL_1(s) (CDNS_DPTX_STREAM(s) + 0x0c)
> > +#define CDNS_DP_MSAV1_VSYNC_WIDTH(x) (x)
> > +#define CDNS_DP_MSAV1_VSYNC_POL_LOW BIT(15)
> > +#define CDNS_DP_MSAV1_VDISP_WIDTH(x) ((x) << 16)
> > +
> > +#define CDNS_DP_MSA_MISC(s) (CDNS_DPTX_STREAM(s) + 0x10)
> > +#define CDNS_DP_STREAM_CONFIGs(s) (CDNS_DPTX_STREAM(s) + 0x14)
> > +#define CDNS_DP_STREAM_CONFIG_2(s) (CDNS_DPTX_STREAM(s) + 0x2c)
> > +#define CDNS_DP_SC2_TU_VS_DIFF(x) ((x) << 8)
> > +
> > +#define CDNS_DP_HORIZONTAL(s) (CDNS_DPTX_STREAM(s) + 0x30)
> > +#define CDNS_DP_H_HSYNC_WIDTH(x) (x)
> > +#define CDNS_DP_H_H_TOTAL(x) ((x) << 16)
> > +
> > +#define CDNS_DP_VERTICAL_0(s) (CDNS_DPTX_STREAM(s) + 0x34)
> > +#define CDNS_DP_V0_VHEIGHT(x) (x)
> > +#define CDNS_DP_V0_VSTART(x) ((x) << 16)
> > +
> > +#define CDNS_DP_VERTICAL_1(s) (CDNS_DPTX_STREAM(s) + 0x38)
> > +#define CDNS_DP_V1_VTOTAL(x) (x)
> > +#define CDNS_DP_V1_VTOTAL_EVEN BIT(16)
> > +
> > +#define CDNS_DP_FRAMER_PXL_REPR(s) (CDNS_DPTX_STREAM(s) + 0x4c)
> > +#define CDNS_DP_FRAMER_6_BPC BIT(0)
> > +#define CDNS_DP_FRAMER_8_BPC BIT(1)
> > +#define CDNS_DP_FRAMER_10_BPC BIT(2)
> > +#define CDNS_DP_FRAMER_12_BPC BIT(3)
> > +#define CDNS_DP_FRAMER_16_BPC BIT(4)
> > +#define CDNS_DP_FRAMER_PXL_FORMAT 0x8
> > +#define CDNS_DP_FRAMER_RGB BIT(0)
> > +#define CDNS_DP_FRAMER_YCBCR444 BIT(1)
> > +#define CDNS_DP_FRAMER_YCBCR422 BIT(2)
> > +#define CDNS_DP_FRAMER_YCBCR420 BIT(3)
> > +#define CDNS_DP_FRAMER_Y_ONLY BIT(4)
> > +
> > +#define CDNS_DP_FRAMER_SP(s) (CDNS_DPTX_STREAM(s) + 0x10)
> > +#define CDNS_DP_FRAMER_VSYNC_POL_LOW BIT(0)
> > +#define CDNS_DP_FRAMER_HSYNC_POL_LOW BIT(1)
> > +#define CDNS_DP_FRAMER_INTERLACE BIT(2)
> > +
> > +#define CDNS_DP_LINE_THRESH(s) (CDNS_DPTX_STREAM(s) + 0x64)
> > +#define CDNS_DP_ACTIVE_LINE_THRESH(x) (x)
> > +
> > +#define CDNS_DP_VB_ID(s) (CDNS_DPTX_STREAM(s) + 0x68)
> > +#define CDNS_DP_VB_ID_INTERLACED BIT(2)
> > +#define CDNS_DP_VB_ID_COMPRESSED BIT(6)
> > +
> > +#define CDNS_DP_FRONT_BACK_PORCH(s) (CDNS_DPTX_STREAM(s) + 0x78)
> > +#define CDNS_DP_BACK_PORCH(x) (x)
> > +#define CDNS_DP_FRONT_PORCH(x) ((x) << 16)
> > +
> > +#define CDNS_DP_BYTE_COUNT(s) (CDNS_DPTX_STREAM(s) + 0x7c)
> > +#define CDNS_DP_BYTE_COUNT_BYTES_IN_CHUNK_SHIFT 16
> > +
> > +#define CDNS_DP_MST_STREAM_CONFIG(s) (CDNS_DPTX_STREAM(s) + 0x14)
> > +#define CDNS_DP_MST_STRM_CFG_STREAM_EN BIT(0)
> > +#define CDNS_DP_MST_STRM_CFG_NO_VIDEO BIT(1)
> > +
> > +#define CDNS_DP_MST_SLOT_ALLOCATE(s) (CDNS_DPTX_STREAM(s) + 0x44)
> > +#define CDNS_DP_S_ALLOC_START_SLOT(x) (x)
> > +#define CDNS_DP_S_ALLOC_END_SLOT(x) ((x) << 8)
> > +
> > +#define CDNS_DP_RATE_GOVERNING(s) (CDNS_DPTX_STREAM(s) + 0x48)
> > +#define CDNS_DP_RG_TARG_AV_SLOTS_Y(x) (x)
> > +#define CDNS_DP_RG_TARG_AV_SLOTS_X(x) (x << 4)
> > +#define CDNS_DP_RG_ENABLE BIT(10)
> > +
> > +#define CDNS_DP_MTPH_CONTROL 0x2264
> > +#define CDNS_DP_MTPH_ECF_EN BIT(0)
> > +#define CDNS_DP_MTPH_ACT_EN BIT(1)
> > +#define CDNS_DP_MTPH_LVP_EN BIT(2)
> > +
> > +#define CDNS_DP_MTPH_STATUS 0x226C
> > +#define CDNS_DP_MTPH_ACT_STATUS BIT(0)
> > +
> > +
> > +#define CDNS_DPTX_GLOBAL 0x02300
> > +#define CDNS_DP_LANE_EN (CDNS_DPTX_GLOBAL + 0x00)
> > +#define CDNS_DP_LANE_EN_LANES(x) GENMASK(x - 1, 0)
> > +#define CDNS_DP_ENHNCD (CDNS_DPTX_GLOBAL + 0x04)
> > +
> > +
> > +#define to_mhdp_connector(x) container_of(x, struct cdns_mhdp_connector, base)
> > +#define to_mhdp_bridge(x) container_of(x, struct cdns_mhdp_bridge, base)
> > +#define mgr_to_mhdp(x) container_of(x, struct cdns_mhdp_device, mst_mgr)
> > +
> > +#define CDNS_MHDP_MAX_STREAMS 4
> > +
> > +enum pixel_format {
> > + PIXEL_FORMAT_RGB = 1,
> > + PIXEL_FORMAT_YCBCR_444 = 2,
> > + PIXEL_FORMAT_YCBCR_422 = 4,
> > + PIXEL_FORMAT_YCBCR_420 = 8,
> > + PIXEL_FORMAT_Y_ONLY = 16,
> > +};
> > +
> > +
> > +int cdns_mhdp_mst_init(struct cdns_mhdp_device *mhdp);
> > +void cdns_mhdp_mst_deinit(struct cdns_mhdp_device *mhdp);
> > +bool cdns_mhdp_mst_probe(struct cdns_mhdp_device *mhdp);
> > +enum pixel_format cdns_mhdp_get_pxlfmt(u32 color_formats);
> > +u32 cdns_mhdp_get_bpp(u32 bpc, u32 color_formats);
> > +void cdns_mhdp_configure_video(struct drm_bridge *bridge);
> > +void cdns_mhdp_mst_enable(struct drm_bridge *bridge);
> > +void cdns_mhdp_mst_disable(struct drm_bridge *bridge);
> > +void cdns_mhdp_enable(struct drm_bridge *bridge);
> > +
> > +#endif
> > diff --git a/drivers/gpu/drm/rockchip/cdn-dp-core.c b/drivers/gpu/drm/rockchip/cdn-dp-core.c
> > index 343f381e3440..a5a668f1912b 100644
> > --- a/drivers/gpu/drm/rockchip/cdn-dp-core.c
> > +++ b/drivers/gpu/drm/rockchip/cdn-dp-core.c
> > @@ -34,7 +34,7 @@
> > #include "rockchip_drm_vop.h"
> >
> > #define connector_to_dp(c) \
> > - container_of(c, struct cdn_dp_device, mhdp.connector)
> > + container_of(c, struct cdn_dp_device, mhdp.connector.base)
> >
> > #define encoder_to_dp(c) \
> > container_of(c, struct cdn_dp_device, encoder)
> > @@ -291,7 +291,7 @@ static int cdn_dp_connector_mode_valid(struct drm_connector *connector,
> > {
> > struct cdn_dp_device *dp = connector_to_dp(connector);
> > struct drm_display_info *display_info =
> > - &dp->mhdp.connector.display_info;
> > + &dp->mhdp.connector.base.display_info;
> > u32 requested, actual, rate, sink_max, source_max = 0;
> > u8 lanes, bpc;
> >
> > @@ -387,7 +387,7 @@ static int cdn_dp_get_sink_capability(struct cdn_dp_device *dp)
> > }
> >
> > kfree(dp->edid);
> > - dp->edid = drm_do_get_edid(&dp->mhdp.connector,
> > + dp->edid = drm_do_get_edid(&dp->mhdp.connector.base,
> > cdns_mhdp_get_edid_block, &dp->mhdp);
> > return 0;
> > }
> > @@ -559,7 +559,7 @@ static void cdn_dp_encoder_mode_set(struct drm_encoder *encoder,
> > {
> > struct cdn_dp_device *dp = encoder_to_dp(encoder);
> > struct drm_display_info *display_info =
> > - &dp->mhdp.connector.display_info;
> > + &dp->mhdp.connector.base.display_info;
> > struct video_info *video = &dp->mhdp.video_info;
> >
> > switch (display_info->bpc) {
> > @@ -863,8 +863,8 @@ static int cdn_dp_audio_get_eld(struct device *dev, void *data,
> > {
> > struct cdn_dp_device *dp = dev_get_drvdata(dev);
> >
> > - memcpy(buf, dp->mhdp.connector.eld,
> > - min(sizeof(dp->mhdp.connector.eld), len));
> > + memcpy(buf, dp->mhdp.connector.base.eld,
> > + min(sizeof(dp->mhdp.connector.base.eld), len));
> >
> > return 0;
> > }
> > @@ -936,7 +936,7 @@ static void cdn_dp_pd_event_work(struct work_struct *work)
> > {
> > struct cdn_dp_device *dp = container_of(work, struct cdn_dp_device,
> > event_work);
> > - struct drm_connector *connector = &dp->mhdp.connector;
> > + struct drm_connector *connector = &dp->mhdp.connector.base;
> > enum drm_connector_status old_status;
> > struct device *dev = dp->mhdp.dev;
> >
> > @@ -1062,7 +1062,7 @@ static int cdn_dp_bind(struct device *dev, struct device *master, void *data)
> >
> > drm_encoder_helper_add(encoder, &cdn_dp_encoder_helper_funcs);
> >
> > - connector = &dp->mhdp.connector;
> > + connector = &dp->mhdp.connector.base;
> > connector->polled = DRM_CONNECTOR_POLL_HPD;
> > connector->dpms = DRM_MODE_DPMS_OFF;
> >
> > @@ -1113,7 +1113,7 @@ 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;
> > - struct drm_connector *connector = &dp->mhdp.connector;
> > + struct drm_connector *connector = &dp->mhdp.connector.base;
> >
> > cancel_work_sync(&dp->event_work);
> > cdn_dp_encoder_disable(encoder);
> > diff --git a/include/drm/bridge/cdns-mhdp-cbs.h b/include/drm/bridge/cdns-mhdp-cbs.h
> > new file mode 100644
> > index 000000000000..af07cbfcb729
> > --- /dev/null
> > +++ b/include/drm/bridge/cdns-mhdp-cbs.h
> > @@ -0,0 +1,27 @@
> > +/* SPDX-License-Identifier: GPL v2 */
> > +/*
> > + * Cadence MHDP DP bridge callbacks.
> > + *
> > + * Copyright: 2018 Cadence Design Systems, Inc.
> > + *
> > + * Author: Piotr Sroka <piotrs@cadence.com>
> > + */
> > +
> > +#ifndef CDNS_MHDP_CBS_H
> > +#define CDNS_MHDP_CBS_H
> > +
> > +struct cdns_mhdp_mst_cbs_funcs {
> > + struct drm_encoder *(*create_mst_encoder)(void *priv_data,
> > + struct drm_bridge *bridge);
> > + void (*destroy_mst_encoder)(void *priv_data, struct drm_bridge *bridge);
> > +};
> > +
> > +struct cdns_mhdp_mst_cbs {
> > + struct cdns_mhdp_mst_cbs_funcs funcs;
> > + void *priv_data;
> > +};
> > +
> > +int mhdp_bridge_attach_mst_cbs(struct drm_bridge *bridge,
> > + struct cdns_mhdp_mst_cbs *cbs);
> > +
> > +#endif
> > diff --git a/include/drm/bridge/cdns-mhdp-common.h b/include/drm/bridge/cdns-mhdp-common.h
> > index c5a5c4fa7fc4..d4711091ff2b 100644
> > --- a/include/drm/bridge/cdns-mhdp-common.h
> > +++ b/include/drm/bridge/cdns-mhdp-common.h
> > @@ -15,10 +15,12 @@
> > #ifndef CDNS_MHDP_COMMON_H_
> > #define CDNS_MHDP_COMMON_H_
> >
> > +#include <drm/drm_dp_mst_helper.h>
> > #include <linux/bitops.h>
> > #include <drm/drm_dp_helper.h>
> > #include <drm/drm_connector.h>
> > #include <drm/drm_bridge.h>
> > +#include <drm/bridge/cdns-mhdp-cbs.h>
> >
> > #define ADDR_IMEM 0x10000
> > #define ADDR_DMEM 0x20000
> > @@ -326,11 +328,11 @@
> > #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 GENERAL_REGISTER_READ 0x07
> > +#define GENERAL_MAIN_CONTROL 0x01
> > +#define GENERAL_TEST_ECHO 0x02
> > +#define GENERAL_BUS_SETTINGS 0x03
> > +#define GENERAL_TEST_ACCESS 0x04
> > +#define GENERAL_REGISTER_READ 0x07
> >
> > #define DPTX_SET_POWER_MNG 0x00
> > #define DPTX_SET_HOST_CAPABILITIES 0x01
> > @@ -512,13 +514,34 @@ struct cdns_mhdp_sink {
> > u8 enhanced;
> > };
> >
> > +struct cdns_mhdp_bridge;
> > +struct cdns_mhdp_connector;
> > +
> > +struct cdns_mhdp_bridge {
> > + struct cdns_mhdp_device *mhdp;
> > + struct drm_bridge base;
> > + int pbn;
> > + int8_t stream_id;
> > + struct cdns_mhdp_connector *connector;
> > + bool is_active;
> > +};
> > +
> > +
> > +struct cdns_mhdp_connector {
> > + struct drm_connector base;
> > + bool is_mst_connector;
> > + struct drm_dp_mst_port *port;
> > + struct cdns_mhdp_bridge *bridge;
> > +};
> > +
> > +
> > struct cdns_mhdp_device {
> > void __iomem *regs;
> >
> > struct device *dev;
> >
> > struct drm_dp_link link;
> > - struct drm_connector connector;
> > + struct cdns_mhdp_connector connector;
> > struct clk *spdif_clk;
> > struct reset_control *spdif_rst;
> >
> > @@ -528,13 +551,22 @@ struct cdns_mhdp_device {
> > struct drm_dp_aux aux;
> > struct cdns_mhdp_host host;
> > struct cdns_mhdp_sink sink;
> > - struct drm_bridge bridge;
> > + struct cdns_mhdp_bridge bridge;
> > struct phy *phy;
> > void __iomem *dbg_regs;
> >
> > struct video_info video_info;
> > struct drm_display_mode mode;
> > unsigned int fw_version;
> > +
> > + struct drm_dp_mst_topology_mgr mst_mgr;
> > + struct delayed_work hotplug_work;
> > +
> > + struct cdns_mhdp_mst_cbs cbs;
> > + bool is_mst;
> > + bool can_mst;
> > + bool link_up;
> > + bool plugged;
> > };
> >
> > void cdns_mhdp_clock_reset(struct cdns_mhdp_device *mhdp);
> > @@ -562,7 +594,7 @@ int cdns_mhdp_audio_config(struct cdns_mhdp_device *mhdp,
> > int cdns_mhdp_reg_read(struct cdns_mhdp_device *mhdp, u32 addr, u32 *value);
> > int cdns_mhdp_reg_write(struct cdns_mhdp_device *mhdp, u16 addr, u32 val);
> > int cdns_mhdp_reg_write_bit(struct cdns_mhdp_device *mhdp, u16 addr,
> > - u8 start_bit, u8 bits_no, u32 val);
> > + u8 start_bit, u8 bits_no, u32 val);
> > int cdns_mhdp_adjust_lt(struct cdns_mhdp_device *mhdp, u8 nlanes,
> > u16 udelay, u8 *lanes_data,
> > u8 *dpcd);
^ permalink raw reply [flat|nested] 45+ messages in thread
* RE: [PATCH v6 5/6] drm/bridge: add support for MST in mhdp8546 driver
@ 2018-11-08 14:53 ` Damian Kos
0 siblings, 0 replies; 45+ messages in thread
From: Damian Kos @ 2018-11-08 14:53 UTC (permalink / raw)
To: Andrzej Hajda, David Airlie, Rob Herring, Mark Rutland,
Archit Taneja, Laurent Pinchart, Gustavo Padovan,
Maarten Lankhorst, Sean Paul, Sandy Huang, Heiko Stübner,
Quentin Schulz, Piotr Sroka,
dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW,
devicetree-u79uwXL29TY76Z2rM5mHXA,
linux-kernel-u79uwXL29TY76Z2rM5mHXA,
linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
linux-rockchip-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r
Cc: jbergsagel-l0cyMroinI0, Rafal Ciepiela,
quentin.schulz-LDxbnhwyfcJBDgjK7y7TUQ
From: Andrzej Hajda <a.hajda@samsung.com>
Sent: Wednesday, November 7, 2018 12:40
To: Damian Kos <dkos@cadence.com>; David Airlie <airlied@linux.ie>; Rob Herring <robh+dt@kernel.org>; Mark Rutland <mark.rutland@arm.com>; Archit Taneja <architt@codeaurora.org>; Laurent Pinchart <Laurent.pinchart@ideasonboard.com>; Gustavo Padovan <gustavo@padovan.org>; Maarten Lankhorst <maarten.lankhorst@linux.intel.com>; Sean Paul <sean@poorly.run>; Sandy Huang <hjc@rock-chips.com>; Heiko Stübner <heiko@sntech.de>; Quentin Schulz <quentin.schulz@free-electrons.com>; Piotr Sroka <piotrs@cadence.com>; dri-devel@lists.freedesktop.org; devicetree@vger.kernel.org; linux-kernel@vger.kernel.org; linux-arm-kernel@lists.infradead.org; linux-rockchip@lists.infradead.org
Cc: Rafal Ciepiela <rafalc@cadence.com>; quentin.schulz@bootlin.com; jbergsagel@ti.com
Subject: Re: [PATCH v6 5/6] drm/bridge: add support for MST in mhdp8546 driver
> On 08.10.2018 23:42, Damian Kos wrote:
> > From: Piotr Sroka <piotrs@cadence.com>
> >
> > - add hot plug support to handle HDP IRQ interrupts in case sideband
> > message is ready to read.
> > - there is only one connector created at initialization stage. It is
> > used as SST connector when controller works in SST mode. If controller
> > works in MST mode then the SST connector status is disconnected all the
> > time. MST connectors are created/destroyed in runtime depends on what
> > devices are connected to the DP controller.
> > - add callbacks functions to be able to inform module managing encoders
> > objects to create or destroy an encoder in case new a MST connector is
> > created/destroyed
>
>
> I am not familiar with MST so I will stick to bike-shedding :) Reviewer
> with MST experience needed.
>
Nonetheless, thank you, Andrzej, for the feedback for this and the other
patches.
This will keep us busy for a while :)
>
> >
> > Signed-off-by: Piotr Sroka <piotrs@cadence.com>
> > Signed-off-by: Damian Kos <dkos@cadence.com>
> > ---
> > drivers/gpu/drm/bridge/Makefile | 2 +-
> > drivers/gpu/drm/bridge/cdns-mhdp-mst.c | 594 +++++++++++++++++++++++++
> > drivers/gpu/drm/bridge/cdns-mhdp.c | 560 ++++++++++++-----------
> > drivers/gpu/drm/bridge/cdns-mhdp.h | 209 +++++++++
> > drivers/gpu/drm/rockchip/cdn-dp-core.c | 18 +-
> > include/drm/bridge/cdns-mhdp-cbs.h | 27 ++
> > include/drm/bridge/cdns-mhdp-common.h | 48 +-
> > 7 files changed, 1189 insertions(+), 269 deletions(-)
> > create mode 100644 drivers/gpu/drm/bridge/cdns-mhdp-mst.c
> > create mode 100644 drivers/gpu/drm/bridge/cdns-mhdp.h
> > create mode 100644 include/drm/bridge/cdns-mhdp-cbs.h
> >
> > diff --git a/drivers/gpu/drm/bridge/Makefile b/drivers/gpu/drm/bridge/Makefile
> > index e802fdb85750..b80f3d6ed2a6 100644
> > --- a/drivers/gpu/drm/bridge/Makefile
> > +++ b/drivers/gpu/drm/bridge/Makefile
> > @@ -19,4 +19,4 @@ obj-$(CONFIG_DRM_TI_TFP410) += ti-tfp410.o
> > obj-$(CONFIG_DRM_CDNS_MHDP) += mhdp8546.o
> > obj-y += synopsys/
> >
> > -mhdp8546-objs := cdns-mhdp-common.o cdns-mhdp.o
> > +mhdp8546-objs := cdns-mhdp-common.o cdns-mhdp.o cdns-mhdp-mst.o
> > diff --git a/drivers/gpu/drm/bridge/cdns-mhdp-mst.c b/drivers/gpu/drm/bridge/cdns-mhdp-mst.c
> > new file mode 100644
> > index 000000000000..782d4bf9b667
> > --- /dev/null
> > +++ b/drivers/gpu/drm/bridge/cdns-mhdp-mst.c
> > @@ -0,0 +1,594 @@
> > +// SPDX-License-Identifier: GPL v2
> > +/*
> > + * Cadence MHDP DP MST bridge driver.
> > + *
> > + * Copyright: 2018 Cadence Design Systems, Inc.
> > + *
> > + * Author: Piotr Sroka <piotrs@cadence.com>
> > + */
> > +#include <drm/drm_print.h>
> > +#include <drm/drm_crtc_helper.h>
> > +#include <drm/drm_atomic_helper.h>
> > +#include <drm/drm_fixed.h>
> > +#include <drm/drm_connector.h>
> > +#include <linux/iopoll.h>
> > +
> > +#include <drm/bridge/cdns-mhdp-common.h>
>
>
> Alphabetic order.
>
>
> > +#include "cdns-mhdp.h"
> > +
> > +
> > +static void cdns_mhdp_mst_stream_enable(struct cdns_mhdp_bridge *mhdp_bridge,
> > + bool enable)
> > +{
> > + u32 reg;
> > + struct cdns_mhdp_device *mhdp = mhdp_bridge->mhdp;
> > + u8 stream_id = mhdp_bridge->stream_id;
> > +
> > + cdns_mhdp_reg_read(mhdp, CDNS_DP_MST_STREAM_CONFIG(stream_id), ®);
> > +
> > + if (enable) {
> > + reg |= CDNS_DP_MST_STRM_CFG_STREAM_EN;
> > + reg &= ~CDNS_DP_MST_STRM_CFG_NO_VIDEO;
> > + } else {
> > + reg &= ~CDNS_DP_MST_STRM_CFG_STREAM_EN;
> > + reg |= CDNS_DP_MST_STRM_CFG_NO_VIDEO;
> > + }
> > +
> > + cdns_mhdp_reg_write(mhdp, CDNS_DP_MST_STREAM_CONFIG(stream_id), reg);
> > +}
> > +
> > +static inline s64 calc_fixed_avg_slots(u32 pbn, u32 pbn_div)
> > +{
> > + s64 fixed_pbn, fixed_pbn_div, fixed_targ_avg_slots;
> > +
> > + fixed_pbn = drm_int2fixp(pbn);
> > + fixed_pbn_div = drm_int2fixp(pbn_div);
> > + fixed_targ_avg_slots = drm_fixp_div(fixed_pbn, fixed_pbn_div);
> > +
> > + return fixed_targ_avg_slots;
> > +}
> > +
> > +static void cdns_mhdp_mst_set_threshold(struct cdns_mhdp_bridge *bridge)
> > +{
> > + u32 threshold;
> > + u8 stream_id = bridge->stream_id;
> > + struct cdns_mhdp_device *mhdp = bridge->mhdp;
> > + s64 fixed_targ_avg_slots, fixed_thresh, fixed_targ_entries;
> > +
> > + fixed_targ_avg_slots = calc_fixed_avg_slots(bridge->pbn,
> > + mhdp->mst_mgr.pbn_div);
> > +
> > + fixed_targ_entries = drm_fixp_div(fixed_targ_avg_slots,
> > + drm_int2fixp(2));
> > + fixed_thresh = drm_fixp_mul(fixed_targ_entries, fixed_targ_entries);
> > + fixed_thresh = drm_fixp_div(fixed_thresh, drm_int2fixp(32));
> > + fixed_thresh = fixed_targ_entries - fixed_thresh;
> > + fixed_thresh = drm_fixp_mul(fixed_thresh,
> > + drm_int2fixp(mhdp->link.num_lanes));
> > + fixed_thresh = drm_fixp_div(fixed_thresh, drm_int2fixp(4));
> > +
> > + threshold = drm_fixp2int_ceil(fixed_thresh);
> > + if (threshold < 2)
> > + threshold = 2;
> > +
> > + cdns_mhdp_reg_write(mhdp, CDNS_DP_LINE_THRESH(stream_id),
> > + CDNS_DP_ACTIVE_LINE_THRESH(threshold));
>
>
> All this magic makes me think I am not a right person to review this
> code, or the code is overcomplicated. Lets try layman approach.
>
> Formula is as below:
>
> threshold = (pbn/pbn_div/2 - (pbn/pbn_div/2)^2 / 32)*num_lanes / 4
>
> plus round_up, and cap by 2.
>
> Please describe the formula in comment to increase readability and use
> some temporary variables instead of overusing fixed_thresh.
>
> Where this formula comes from? Document it.
>
> Moreover if there is no difference between drm_fixp_div(x,
> drm_int2fixp(const)) and div_s64(x, const) I guess the latter is better.
>
I've spoke with people behind this code and it turned out that some of it
might not be needed anymore as the HW can now calculate threshold value.
Need to double check and rework it.
>
> > +}
> > +
> > +static void cdns_mhdp_set_rate_governing(struct cdns_mhdp_bridge *bridge,
> > + bool enable)
> > +{
> > + struct cdns_mhdp_device *mhdp = bridge->mhdp;
> > + u8 stream_id = bridge->stream_id;
> > +
> > + if (enable) {
> > + s64 fixed_targ_avg_slots, fixed_y;
> > + u32 x, y;
> > +
> > + fixed_targ_avg_slots =
> > + calc_fixed_avg_slots(bridge->pbn,
> > + mhdp->mst_mgr.pbn_div);
> > +
> > + x = drm_fixp2int(fixed_targ_avg_slots);
> > +
> > + fixed_y = (fixed_targ_avg_slots - drm_int2fixp(x));
> > + fixed_y = drm_fixp_mul(fixed_y, drm_int2fixp(16));
>
> Again, maybe fixed_y *= 16;
>
>
> > + y = drm_fixp2int_ceil(fixed_y);
>
> Ok, at this point x is integer part of fixed_targ_avg_slots and y is
> fractional part of fixed_targ_avg_slots * 16.
>
> Looking at calc_fixed_avg_slots it means, that:
>
> x = bridge->pbn / mhdp->mst_mgr.pbn_div;
>
> y = bridge->pbn % mhdp->mst_mgr.pbn_div * 16 / mhdp->mst_mgr.pbn_div;
>
>
> Without using fixed arithmetic, more direct?
>
>
> > +
> > + cdns_mhdp_reg_write(mhdp, CDNS_DP_RATE_GOVERNING(stream_id),
> > + CDNS_DP_RG_TARG_AV_SLOTS_Y(y) |
> > + CDNS_DP_RG_TARG_AV_SLOTS_X(x) |
> > + CDNS_DP_RG_ENABLE);
> > + } else
> > + cdns_mhdp_reg_write(mhdp, CDNS_DP_RATE_GOVERNING(stream_id), 0);
> > +}
> > +
> > +
> > +static struct drm_dp_payload *
> > +cdns_mhdp_get_payload(struct cdns_mhdp_bridge *bridge)
> > +{
> > + int vcpi = bridge->connector->port->vcpi.vcpi, i;
> > + struct cdns_mhdp_device *mhdp = bridge->mhdp;
> > +
> > + for (i = 0; i < mhdp->mst_mgr.max_payloads; i++) {
> > + struct drm_dp_payload *payload = &mhdp->mst_mgr.payloads[i];
> > +
> > + if (payload->vcpi == vcpi)
> > + return payload;
> > + }
> > +
> > + return NULL;
> > +}
> > +
> > +
> > +static int
> > +cdns_mhdp_set_act_enable(struct cdns_mhdp_device *mhdp)
> > +{
> > + u32 reg;
> > + int ret;
> > +
> > + cdns_mhdp_reg_read(mhdp, CDNS_DP_MTPH_CONTROL, ®);
> > + cdns_mhdp_reg_write(mhdp, CDNS_DP_MTPH_CONTROL,
> > + reg | CDNS_DP_MTPH_ACT_EN);
> > +
> > + ret = readl_poll_timeout(mhdp->regs + CDNS_DP_MTPH_STATUS, reg,
> > + ((reg & CDNS_DP_MTPH_ACT_STATUS) == 0), 0,
> > + 30);
> > + if (ret) {
> > + dev_err(mhdp->dev,
> > + "ACT sequence cannot complete in 30us\n");
> > + return -EIO;
> > + }
> > +
> > + return drm_dp_check_act_status(&mhdp->mst_mgr);
> > +}
> > +
> > +
> > +static int
> > +cdns_mhdp_apply_slot_allocation(struct cdns_mhdp_bridge *mhdp_bridge)
> > +{
> > + struct drm_dp_payload *payload;
> > + struct cdns_mhdp_device *mhdp = mhdp_bridge->mhdp;
> > + u8 stream_id = mhdp_bridge->stream_id;
> > +
> > + payload = cdns_mhdp_get_payload(mhdp_bridge);
> > +
> > + if (!payload) {
> > + DRM_ERROR("payload is not found\n");
> > + return -EIO;
> > + }
> > +
> > + cdns_mhdp_reg_write(mhdp, CDNS_DP_MST_SLOT_ALLOCATE(stream_id),
> > + CDNS_DP_S_ALLOC_START_SLOT(payload->start_slot) |
> > + CDNS_DP_S_ALLOC_END_SLOT(payload->start_slot
> > + + payload->num_slots - 1));
> > +
> > + return 0;
> > +}
> > +
> > +static void
> > +cdns_mhdp_update_slot_allocation(struct cdns_mhdp_bridge *mhdp_bridge)
> > +{
> > + struct drm_device *dev = mhdp_bridge->base.dev;
> > + struct drm_connector *connector;
> > +
> > + list_for_each_entry(connector, &dev->mode_config.connector_list, head) {
> > + struct cdns_mhdp_connector *mhdp_connector;
> > +
> > + mhdp_connector = to_mhdp_connector(connector);
> > + if (!connector->encoder)
> > + continue;
> > + if (!mhdp_connector->is_mst_connector)
> > + continue;
> > +
> > + if (mhdp_connector->bridge->stream_id != -1)
> > + cdns_mhdp_apply_slot_allocation(mhdp_connector->bridge);
> > + }
> > +}
> > +
> > +static enum drm_connector_status
> > +cdns_dp_mst_detect(struct drm_connector *connector, bool force)
> > +{
> > + enum drm_connector_status stat;
> > + struct cdns_mhdp_connector *mhdp_connector;
> > + struct cdns_mhdp_device *mhdp;
> > +
> > + mhdp_connector = to_mhdp_connector(connector);
> > + mhdp = mhdp_connector->bridge->mhdp;
> > +
> > + stat = drm_dp_mst_detect_port(connector, &mhdp->mst_mgr,
> > + mhdp_connector->port);
> > + return stat;
> > +}
> > +
> > +static void
> > +cdns_dp_mst_connector_destroy(struct drm_connector *connector)
> > +{
> > + struct cdns_mhdp_connector *mhdp_connector;
> > + struct cdns_mhdp_bridge *mhdp_bridge;
> > +
> > + mhdp_connector = to_mhdp_connector(connector);
> > + mhdp_bridge = mhdp_connector->bridge;
> > +
> > + drm_connector_cleanup(&mhdp_connector->base);
> > + drm_bridge_remove(&mhdp_bridge->base);
> > + kfree(mhdp_connector);
> > + kfree(mhdp_bridge);
> > +}
> > +
> > +static const struct drm_connector_funcs cdns_mhdp_mst_connector_funcs = {
> > + .atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state,
> > + .atomic_destroy_state = drm_atomic_helper_connector_destroy_state,
> > + .reset = drm_atomic_helper_connector_reset,
> > + .dpms = drm_helper_connector_dpms,
> > + .detect = cdns_dp_mst_detect,
> > + .fill_modes = drm_helper_probe_single_connector_modes,
> > + .destroy = cdns_dp_mst_connector_destroy,
> > +};
> > +
> > +
> > +static int cdns_mhdp_mst_get_ddc_modes(struct drm_connector *connector)
> > +{
> > + struct cdns_mhdp_connector *mhdp_connector;
> > + struct cdns_mhdp_device *mhdp;
> > + struct edid *edid;
> > + int ret = 0;
> > +
> > + mhdp_connector = to_mhdp_connector(connector);
> > + mhdp = mhdp_connector->bridge->mhdp;
> > +
> > + edid = drm_dp_mst_get_edid(connector, &mhdp->mst_mgr,
> > + mhdp_connector->port);
> > +
> > + DRM_DEBUG_KMS("edid retrieved %p\n", edid);
> > + if (edid) {
> > + drm_connector_update_edid_property(connector, edid);
> > + ret = drm_add_edid_modes(connector, edid);
> > + return ret;
> > + }
> > + drm_connector_update_edid_property(connector, NULL);
> > +
> > + return ret;
>
>
> I suspect edid should be freed, but looking at other users of
> drm_dp_mst_get_edid it is not so obvious (only intel frees it) - memory
> leaks?
>
>
> > +}
> > +
> > +static int cdns_mhdp_mst_get_modes(struct drm_connector *connector)
> > +{
> > + return cdns_mhdp_mst_get_ddc_modes(connector);
> > +}
> > +
> > +
> > +static struct
> > +drm_encoder *cdns_mhdp_mst_best_encoder(struct drm_connector *connector)
> > +{
> > + struct cdns_mhdp_connector *mhdp_connector;
> > +
> > + mhdp_connector = to_mhdp_connector(connector);
> > +
> > + return mhdp_connector->bridge->base.encoder;
> > +}+
> > +static const struct drm_connector_helper_funcs cdns_mhdp_mst_conn_helper_fun = {
> > + .get_modes = cdns_mhdp_mst_get_modes,
> > + .best_encoder = cdns_mhdp_mst_best_encoder,
> > +};
> > +
> > +void cdns_mhdp_mst_enable(struct drm_bridge *bridge)
> > +{
> > + struct cdns_mhdp_bridge *mhdp_bridge = to_mhdp_bridge(bridge);
> > + struct cdns_mhdp_device *mhdp = mhdp_bridge->mhdp;
> > + struct drm_display_info *disp_info;
> > + struct drm_display_mode *mode;
> > + struct cdns_mhdp_connector *mhdp_connector;
> > + u32 bpp;
> > + enum pixel_format pxlfmt;
> > + int ret, slots, stream_id;
> > +
> > + disp_info = &mhdp_bridge->connector->base.display_info;
> > +
> > + pxlfmt = cdns_mhdp_get_pxlfmt(disp_info->color_formats);
> > + bpp = cdns_mhdp_get_bpp(disp_info->bpc, pxlfmt);
> > +
> > + mhdp_connector = mhdp_bridge->connector;
> > + if (mhdp_bridge->stream_id > -1) {
> > + DRM_ERROR("ERROR stream id is attached before bridge is enabled\n");
> > + return;
> > + }
> > +
> > + stream_id = bridge->encoder->crtc->index;
> > +
> > + mode = &bridge->encoder->crtc->state->adjusted_mode;
> > + mhdp_bridge->pbn = drm_dp_calc_pbn_mode(mode->clock, bpp);
> > +
> > + slots = drm_dp_find_vcpi_slots(&mhdp->mst_mgr, mhdp_bridge->pbn);
> > + ret = drm_dp_mst_allocate_vcpi(&mhdp->mst_mgr,
> > + mhdp_connector->port,
> > + mhdp_bridge->pbn, slots);
> > + if (ret == false) {
> > + DRM_ERROR("failed to allocate vcpi\n");
> > + return;
> > + }
> > + ret = drm_dp_update_payload_part1(&mhdp->mst_mgr);
> > + if (ret < 0)
> > + DRM_ERROR("failed update_payload_part1\n");
> > +
> > + mhdp_bridge->stream_id = stream_id;
> > + mhdp_bridge->is_active = true;
> > +
> > + cdns_mhdp_mst_stream_enable(mhdp_bridge, true);
> > + cdns_mhdp_configure_video(bridge);
> > +
> > + ret = cdns_mhdp_apply_slot_allocation(mhdp_bridge);
> > + if (ret < 0) {
> > + cdns_mhdp_mst_stream_enable(mhdp_bridge, false);
> > + mhdp_bridge->stream_id = -1;
> > + mhdp_bridge->is_active = false;
> > + return;
> > + }
> > +
> > + ret = cdns_mhdp_set_act_enable(mhdp);
> > + if (ret)
> > + DRM_ERROR("failed ACT sequence\n");
> > +
> > + cdns_mhdp_set_rate_governing(mhdp_bridge, true);
> > +
> > + cdns_mhdp_mst_set_threshold(mhdp_bridge);
> > +
> > + drm_dp_update_payload_part2(&mhdp->mst_mgr);
> > +}
> > +
> > +void cdns_mhdp_mst_disable(struct drm_bridge *bridge)
> > +{
> > + struct cdns_mhdp_bridge *mhdp_bridge = to_mhdp_bridge(bridge);
> > + struct cdns_mhdp_device *mhdp = mhdp_bridge->mhdp;
> > + struct cdns_mhdp_connector *connector = mhdp_bridge->connector;
> > +
> > + drm_dp_mst_reset_vcpi_slots(&mhdp->mst_mgr, connector->port);
> > + drm_dp_update_payload_part1(&mhdp->mst_mgr);
> > +
> > + cdns_mhdp_update_slot_allocation(mhdp_bridge);
> > +
> > + drm_dp_check_act_status(&mhdp->mst_mgr);
> > +
> > + drm_dp_update_payload_part2(&mhdp->mst_mgr);
> > +
> > + drm_dp_mst_deallocate_vcpi(&mhdp->mst_mgr, connector->port);
> > +
> > + cdns_mhdp_set_rate_governing(mhdp_bridge, false);
> > + cdns_mhdp_mst_stream_enable(mhdp_bridge, false);
> > + mhdp_bridge->stream_id = -1;
> > + mhdp_bridge->is_active = false;
> > +}
> > +
> > +static const struct drm_bridge_funcs cdns_mhdp_mst_bridge_funcs = {
> > + .enable = cdns_mhdp_enable,
> > + .disable = cdns_mhdp_mst_disable,
> > +};
> > +
> > +
> > +static struct cdns_mhdp_bridge*
> > +cdns_mhpd_create_fake_mst_bridge(struct cdns_mhdp_device *mhdp,
> > + struct cdns_mhdp_connector *mhdp_connector)
> > +{
> > + struct cdns_mhdp_bridge *mhdp_bridge;
> > + struct drm_encoder *encoder = NULL;
> > + struct cdns_mhdp_mst_cbs *cbs = &mhdp->cbs;
> > +
> > + mhdp_bridge = kzalloc(sizeof(*mhdp_bridge), GFP_KERNEL);
> > + if (!mhdp_bridge)
> > + return NULL;
> > +
> > + mhdp_bridge->mhdp = mhdp;
> > + mhdp_bridge->stream_id = -1;
> > + mhdp_bridge->connector = mhdp_connector;
> > + mhdp_bridge->is_active = false;
> > +
> > + mhdp_bridge->base.funcs = &cdns_mhdp_mst_bridge_funcs;
> > +
> > + drm_bridge_add(&mhdp_bridge->base);
> > +
> > + if (cbs->funcs.create_mst_encoder)
> > + encoder = cbs->funcs.create_mst_encoder(cbs->priv_data,
> > + &mhdp_bridge->base);
> > + if (encoder) {
> > + int ret;
> > + /* use the same drm device as is in the first encoder */
> > + encoder->dev = mhdp->bridge.base.encoder->dev;
> > + encoder->possible_crtcs &= ((1 << CDNS_MHDP_MAX_STREAMS) - 1);
> > + ret = drm_bridge_attach(encoder, &mhdp_bridge->base, NULL);
> > + if (ret) {
> > + dev_err(mhdp->dev, "bridge attaching error %d\n", ret);
> > + return NULL;
> > + }
> > +
> > + ret = drm_connector_attach_encoder(&mhdp_connector->base,
> > + encoder);
> > + if (ret) {
> > + dev_err(mhdp->dev, "failed to attach connector to encoder\n");
> > + return NULL;
> > + }
> > + }
> > +
> > + return mhdp_bridge;
> > +}
> > +
> > +static struct drm_connector *
> > +cdns_mhdp_mst_cbs_add_connector(struct drm_dp_mst_topology_mgr *mgr,
> > + struct drm_dp_mst_port *port,
> > + const char *pathprop)
> > +{
> > + struct cdns_mhdp_device *mhdp = mgr_to_mhdp(mgr);
> > + struct drm_device *dev = mhdp->bridge.base.dev;
> > + struct cdns_mhdp_connector *mhdp_connector;
> > + struct drm_connector *connector;
> > + struct drm_connector_state *conn_state;
> > + int ret;
> > +
> > + mhdp_connector = kzalloc(sizeof(struct cdns_mhdp_connector),
> > + GFP_KERNEL);
> > + if (!mhdp_connector)
> > + return NULL;
> > +
> > + mhdp_connector->is_mst_connector = true;
> > + connector = &mhdp_connector->base;
> > + mhdp_connector->port = port;
> > + DRM_DEBUG_KMS("\n");
> > +
> > + conn_state = kzalloc(sizeof(*conn_state), GFP_KERNEL);
> > + if (!conn_state)
> > + return NULL;
> > +
> > + __drm_atomic_helper_connector_reset(connector,
> > + conn_state);
> > +
> > + drm_connector_init(dev, connector, &cdns_mhdp_mst_connector_funcs,
> > + DRM_MODE_CONNECTOR_DisplayPort);
> > + drm_connector_helper_add(connector, &cdns_mhdp_mst_conn_helper_fun);
> > + mhdp_connector->bridge =
> > + cdns_mhpd_create_fake_mst_bridge(mhdp, mhdp_connector);
> > +
> > + drm_object_attach_property(&connector->base,
> > + dev->mode_config.path_property, 0);
> > + drm_object_attach_property(&connector->base,
> > + dev->mode_config.tile_property, 0);
> > + ret = drm_connector_set_path_property(connector, pathprop);
> > +
> > + if (ret)
> > + DRM_ERROR("ERROR set path propertty failed\n");
> > +
> > + return connector;
> > +}
> > +
> > +static void
> > +cdns_mhdp_mst_cbs_destroy_connector(struct drm_dp_mst_topology_mgr *mgr,
> > + struct drm_connector *connector)
> > +{
> > + struct cdns_mhdp_connector *mhdp_connector;
> > + struct cdns_mhdp_device *mhdp;
> > + struct cdns_mhdp_bridge *mhdp_bridge;
> > +
> > + mhdp_connector = to_mhdp_connector(connector);
> > + mhdp_bridge = mhdp_connector->bridge;
> > + mhdp = mhdp_bridge->mhdp;
> > +
> > + drm_connector_unregister(&mhdp_connector->base);
> > +
> > + if (mhdp->cbs.funcs.create_mst_encoder)
> > + mhdp->cbs.funcs.destroy_mst_encoder(mhdp->cbs.priv_data,
> > + &mhdp_bridge->base);
> > + drm_connector_unreference(&mhdp_connector->base);
> > +}
> > +
> > +static void cdns_mhdp_mst_cbs_hotplug(struct drm_dp_mst_topology_mgr *mgr)
> > +{
> > + struct cdns_mhdp_device *mhdp = mgr_to_mhdp(mgr);
> > + struct drm_device *dev = mhdp->bridge.base.encoder->dev;
> > +
> > + drm_kms_helper_hotplug_event(dev);
> > +}
> > +
> > +static void
> > +cdns_mhdp_mst_cbs_register_connector(struct drm_connector *connector)
> > +{
> > + int ret;
> > +
> > + ret = drm_connector_register(connector);
> > + if (ret)
> > + DRM_ERROR("Register connector failed\n");
> > +
> > +}
> > +
> > +static const struct drm_dp_mst_topology_cbs mst_cbs = {
> > + .add_connector = cdns_mhdp_mst_cbs_add_connector,
> > + .register_connector = cdns_mhdp_mst_cbs_register_connector,
> > + .destroy_connector = cdns_mhdp_mst_cbs_destroy_connector,
> > + .hotplug = cdns_mhdp_mst_cbs_hotplug,
> > +};
> > +
> > +
> > +static void cdns_mhdp_set_mst_enable(struct cdns_mhdp_device *mhdp, bool enable)
> > +{
> > + u32 reg_val;
> > +
> > + cdns_mhdp_reg_read(mhdp, CDNS_DP_FRAMER_GLOBAL_CONFIG, ®_val);
> > +
> > + if (enable)
> > + reg_val |= CDNS_DP_MST_EN;
> > + else
> > + reg_val &= ~CDNS_DP_MST_EN;
> > +
> > + cdns_mhdp_reg_write(mhdp, CDNS_DP_FRAMER_GLOBAL_CONFIG, reg_val);
> > +}
> > +
> > +bool cdns_mhdp_mst_probe(struct cdns_mhdp_device *mhdp)
> > +{
> > + u8 mstm_cap;
> > + u8 dpcd_cap[DP_RECEIVER_CAP_SIZE];
> > +
> > + bool is_mst;
> > +
> > + if (!mhdp->can_mst)
> > + return false;
> > +
> > + drm_dp_dpcd_read(&mhdp->aux, DP_DPCD_REV, dpcd_cap,
> > + DP_RECEIVER_CAP_SIZE);
> > +
> > + if (dpcd_cap[DP_DPCD_REV] < 0x12)
> > + return false;
> > +
> > + if (drm_dp_dpcd_readb(&mhdp->aux, DP_MSTM_CAP, &mstm_cap) != 1)
> > + return false;
> > +
> > + if (mstm_cap & DP_MST_CAP) {
> > + DRM_DEBUG_KMS("Sink is MST capable\n");
> > + is_mst = true;
> > + } else {
> > + DRM_DEBUG_KMS("Sink is not MST capable\n");
> > + is_mst = false;
> > + }
> > +
> > + if (is_mst != mhdp->is_mst) {
> > + mhdp->is_mst = is_mst;
> > + cdns_mhdp_set_mst_enable(mhdp, mhdp->is_mst);
> > +
> > + drm_dp_mst_topology_mgr_set_mst(&mhdp->mst_mgr,
> > + mhdp->is_mst);
> > + }
> > +
> > + return mhdp->is_mst;
> > +}
> > +
> > +int cdns_mhdp_mst_init(struct cdns_mhdp_device *mhdp)
> > +{
> > + struct cdns_mhdp_bridge *bridge = &mhdp->bridge;
> > + struct drm_device *dev = bridge->base.dev;
> > + struct cdns_mhdp_connector *connector = bridge->connector;
> > + int ret;
> > +
> > + mhdp->mst_mgr.cbs = &mst_cbs;
> > + ret = drm_dp_mst_topology_mgr_init(&mhdp->mst_mgr, dev,
> > + &mhdp->aux, 16,
> > + CDNS_MHDP_MAX_STREAMS,
> > + connector->base.base.id);
> > + if (ret)
> > + mhdp->can_mst = false;
> > + else
> > + mhdp->can_mst = true;
> > +
> > + mhdp->is_mst = false;
> > +
> > + bridge->stream_id = -1;
> > +
> > + return ret;
> > +}
> > +
> > +void cdns_mhdp_mst_deinit(struct cdns_mhdp_device *mhdp)
> > +{
> > + if (mhdp->is_mst) {
> > + mhdp->is_mst = false;
> > + drm_dp_mst_topology_mgr_set_mst(&mhdp->mst_mgr,
> > + mhdp->is_mst);
> > + }
> > +
> > + if (mhdp->can_mst)
> > + drm_dp_mst_topology_mgr_destroy(&mhdp->mst_mgr);
> > +}
> > diff --git a/drivers/gpu/drm/bridge/cdns-mhdp.c b/drivers/gpu/drm/bridge/cdns-mhdp.c
> > index a3bbc0e809a5..48ac5cf1e031 100644
> > --- a/drivers/gpu/drm/bridge/cdns-mhdp.c
> > +++ b/drivers/gpu/drm/bridge/cdns-mhdp.c
> > @@ -27,146 +27,15 @@
> > #include <drm/bridge/cdns-mhdp-common.h>
> >
> > #include <sound/hdmi-codec.h>
> > +#include <linux/irq.h>
> > +#include <linux/of_irq.h>
> >
> > +#include "cdns-mhdp.h"
> >
> > #define DEBUG_MSG
> >
> > #define FW_NAME "cadence/mhdp8546.bin"
> >
> > -#define CDNS_APB_CFG 0x00000
> > -#define CDNS_APB_CTRL (CDNS_APB_CFG + 0x00)
> > -#define CDNS_MAILBOX_FULL (CDNS_APB_CFG + 0x08)
> > -#define CDNS_MAILBOX_EMPTY (CDNS_APB_CFG + 0x0c)
> > -#define CDNS_MAILBOX_TX_DATA (CDNS_APB_CFG + 0x10)
> > -#define CDNS_MAILBOX_RX_DATA (CDNS_APB_CFG + 0x14)
> > -#define CDNS_KEEP_ALIVE (CDNS_APB_CFG + 0x18)
> > -#define CDNS_KEEP_ALIVE_MASK GENMASK(7, 0)
> > -
> > -#define CDNS_SW_CLK_L (CDNS_APB_CFG + 0x3c)
> > -#define CDNS_SW_CLK_H (CDNS_APB_CFG + 0x40)
> > -#define CDNS_SW_EVENT0 (CDNS_APB_CFG + 0x44)
> > -#define CDNS_DPTX_HPD BIT(0)
> > -
> > -#define CDNS_SW_EVENT1 (CDNS_APB_CFG + 0x48)
> > -#define CDNS_SW_EVENT2 (CDNS_APB_CFG + 0x4c)
> > -#define CDNS_SW_EVENT3 (CDNS_APB_CFG + 0x50)
> > -
> > -#define CDNS_DPTX_CAR (CDNS_APB_CFG + 0x904)
> > -#define CDNS_VIF_CLK_EN BIT(0)
> > -#define CDNS_VIF_CLK_RSTN BIT(1)
> > -
> > -#define CDNS_SOURCE_VIDEO_INTERFACE 0x00b00
> > -#define CDNS_BND_HSYNC2VSYNC (CDNS_SOURCE_VIDEO_INTERFACE + \
> > - 0x00)
> > -#define CDNS_IP_DTCT_WIN GENMASK(11, 0)
> > -#define CDNS_IP_DET_INTERLACE_FORMAT BIT(12)
> > -#define CDNS_IP_BYPASS_V_INTERFACE BIT(13)
> > -
> > -#define CDNS_HSYNC2VSYNC_POL_CTRL (CDNS_SOURCE_VIDEO_INTERFACE + \
> > - 0x10)
> > -#define CDNS_H2V_HSYNC_POL_ACTIVE_LOW BIT(1)
> > -#define CDNS_H2V_VSYNC_POL_ACTIVE_LOW BIT(2)
> > -
> > -#define CDNS_DPTX_PHY_CONFIG 0x02000
> > -#define CDNS_PHY_TRAINING_EN BIT(0)
> > -#define CDNS_PHY_TRAINING_TYPE(x) (((x) & GENMASK(3, 0)) << 1)
> > -#define CDNS_PHY_SCRAMBLER_BYPASS BIT(5)
> > -#define CDNS_PHY_ENCODER_BYPASS BIT(6)
> > -#define CDNS_PHY_SKEW_BYPASS BIT(7)
> > -#define CDNS_PHY_TRAINING_AUTO BIT(8)
> > -#define CDNS_PHY_LANE0_SKEW(x) (((x) & GENMASK(2, 0)) << 9)
> > -#define CDNS_PHY_LANE1_SKEW(x) (((x) & GENMASK(2, 0)) << 12)
> > -#define CDNS_PHY_LANE2_SKEW(x) (((x) & GENMASK(2, 0)) << 15)
> > -#define CDNS_PHY_LANE3_SKEW(x) (((x) & GENMASK(2, 0)) << 18)
> > -#define CDNS_PHY_COMMON_CONFIG (CDNS_PHY_LANE1_SKEW(1) | \
> > - CDNS_PHY_LANE2_SKEW(2) | \
> > - CDNS_PHY_LANE3_SKEW(3))
> > -#define CDNS_PHY_10BIT_EN BIT(21)
> > -
> > -#define CDNS_DPTX_FRAMER 0x02200
> > -#define CDNS_DP_FRAMER_GLOBAL_CONFIG (CDNS_DPTX_FRAMER + 0x00)
> > -#define CDNS_DP_NUM_LANES(x) (x - 1)
> > -#define CDNS_DP_FRAMER_EN BIT(3)
> > -#define CDNS_DP_RATE_GOVERNOR_EN BIT(4)
> > -#define CDNS_DP_NO_VIDEO_MODE BIT(5)
> > -#define CDNS_DP_DISABLE_PHY_RST BIT(6)
> > -#define CDNS_DP_WR_FAILING_EDGE_VSYNC BIT(7)
> > -
> > -#define CDNS_DP_SW_RESET (CDNS_DPTX_FRAMER + 0x04)
> > -#define CDNS_DP_FRAMER_TU (CDNS_DPTX_FRAMER + 0x08)
> > -#define CDNS_DP_FRAMER_TU_SIZE(x) (((x) & GENMASK(6, 0)) << 8)
> > -#define CDNS_DP_FRAMER_TU_VS(x) ((x) & GENMASK(5, 0))
> > -#define CDNS_DP_FRAMER_TU_CNT_RST_EN BIT(15)
> > -
> > -#define CDNS_DPTX_STREAM 0x03000
> > -#define CDNS_DP_MSA_HORIZONTAL_0 (CDNS_DPTX_STREAM + 0x00)
> > -#define CDNS_DP_MSAH0_H_TOTAL(x) (x)
> > -#define CDNS_DP_MSAH0_HSYNC_START(x) ((x) << 16)
> > -
> > -#define CDNS_DP_MSA_HORIZONTAL_1 (CDNS_DPTX_STREAM + 0x04)
> > -#define CDNS_DP_MSAH1_HSYNC_WIDTH(x) (x)
> > -#define CDNS_DP_MSAH1_HSYNC_POL_LOW BIT(15)
> > -#define CDNS_DP_MSAH1_HDISP_WIDTH(x) ((x) << 16)
> > -
> > -#define CDNS_DP_MSA_VERTICAL_0 (CDNS_DPTX_STREAM + 0x08)
> > -#define CDNS_DP_MSAV0_V_TOTAL(x) (x)
> > -#define CDNS_DP_MSAV0_VSYNC_START(x) ((x) << 16)
> > -
> > -#define CDNS_DP_MSA_VERTICAL_1 (CDNS_DPTX_STREAM + 0x0c)
> > -#define CDNS_DP_MSAV1_VSYNC_WIDTH(x) (x)
> > -#define CDNS_DP_MSAV1_VSYNC_POL_LOW BIT(15)
> > -#define CDNS_DP_MSAV1_VDISP_WIDTH(x) ((x) << 16)
> > -
> > -#define CDNS_DP_MSA_MISC (CDNS_DPTX_STREAM + 0x10)
> > -#define CDNS_DP_STREAM_CONFIG (CDNS_DPTX_STREAM + 0x14)
> > -#define CDNS_DP_RATE_GOVERNOR_STATUS (CDNS_DPTX_STREAM + 0x2c)
> > -#define CDNS_DP_RG_TU_VS_DIFF(x) ((x) << 8)
> > -
> > -#define CDNS_DP_HORIZONTAL (CDNS_DPTX_STREAM + 0x30)
> > -#define CDNS_DP_H_HSYNC_WIDTH(x) (x)
> > -#define CDNS_DP_H_H_TOTAL(x) ((x) << 16)
> > -
> > -#define CDNS_DP_VERTICAL_0 (CDNS_DPTX_STREAM + 0x34)
> > -#define CDNS_DP_V0_VHEIGHT(x) (x)
> > -#define CDNS_DP_V0_VSTART(x) ((x) << 16)
> > -
> > -#define CDNS_DP_VERTICAL_1 (CDNS_DPTX_STREAM + 0x38)
> > -#define CDNS_DP_V1_VTOTAL(x) (x)
> > -#define CDNS_DP_V1_VTOTAL_EVEN BIT(16)
> > -
> > -#define CDNS_DP_FRAMER_PXL_REPR (CDNS_DPTX_STREAM + 0x4c)
> > -#define CDNS_DP_FRAMER_6_BPC BIT(0)
> > -#define CDNS_DP_FRAMER_8_BPC BIT(1)
> > -#define CDNS_DP_FRAMER_10_BPC BIT(2)
> > -#define CDNS_DP_FRAMER_12_BPC BIT(3)
> > -#define CDNS_DP_FRAMER_16_BPC BIT(4)
> > -#define CDNS_DP_FRAMER_PXL_FORMAT 0x8
> > -#define CDNS_DP_FRAMER_RGB BIT(0)
> > -#define CDNS_DP_FRAMER_YCBCR444 BIT(1)
> > -#define CDNS_DP_FRAMER_YCBCR422 BIT(2)
> > -#define CDNS_DP_FRAMER_YCBCR420 BIT(3)
> > -#define CDNS_DP_FRAMER_Y_ONLY BIT(4)
> > -
> > -#define CDNS_DP_FRAMER_SP (CDNS_DPTX_STREAM + 0x10)
> > -#define CDNS_DP_FRAMER_VSYNC_POL_LOW BIT(0)
> > -#define CDNS_DP_FRAMER_HSYNC_POL_LOW BIT(1)
> > -#define CDNS_DP_FRAMER_INTERLACE BIT(2)
> > -
> > -#define CDNS_DP_LINE_THRESH (CDNS_DPTX_STREAM + 0x64)
> > -#define CDNS_DP_VB_ID (CDNS_DPTX_STREAM + 0x68)
> > -#define CDNS_DP_VB_ID_INTERLACED BIT(2)
> > -
> > -#define CDNS_DP_FRONT_BACK_PORCH (CDNS_DPTX_STREAM + 0x78)
> > -#define CDNS_DP_BACK_PORCH(x) (x)
> > -#define CDNS_DP_FRONT_PORCH(x) ((x) << 16)
> > -
> > -#define CDNS_DP_BYTE_COUNT (CDNS_DPTX_STREAM + 0x7c)
> > -
> > -#define CDNS_DPTX_GLOBAL 0x02300
> > -#define CDNS_DP_LANE_EN (CDNS_DPTX_GLOBAL + 0x00)
> > -#define CDNS_DP_LANE_EN_LANES(x) GENMASK(x - 1, 0)
> > -#define CDNS_DP_ENHNCD (CDNS_DPTX_GLOBAL + 0x04)
> > -
> > #define CDNS_MHDP_IMEM 0x10000
> > #define CDNS_MHDP_DMEM 0x20000
> >
> > @@ -216,13 +85,17 @@ MODULE_DEVICE_TABLE(of, mhdp_ids);
> > static inline struct cdns_mhdp_device *connector_to_mhdp(
> > struct drm_connector *conn)
> > {
> > - return container_of(conn, struct cdns_mhdp_device, connector);
> > + struct cdns_mhdp_connector *mhdp_connector = to_mhdp_connector(conn);
> > +
> > + return mhdp_connector->bridge->mhdp;
> > }
> >
> > static inline struct cdns_mhdp_device *bridge_to_mhdp(
> > struct drm_bridge *bridge)
> > {
> > - return container_of(bridge, struct cdns_mhdp_device, bridge);
> > + struct cdns_mhdp_bridge *mhdp_bridge = to_mhdp_bridge(bridge);
> > +
> > + return mhdp_bridge->mhdp;
> > }
> >
> > static unsigned int max_link_rate(struct cdns_mhdp_host host,
> > @@ -237,6 +110,62 @@ static u8 eq_training_pattern_supported(struct cdns_mhdp_host host,
> > return fls(host.pattern_supp & sink.pattern_supp);
> > }
> >
> > +static void mhdp_hotplug_work_func(struct work_struct *work)
> > +{
> > + struct cdns_mhdp_device *mhdp;
> > + int dret, retry;
> > + u8 esi[16] = { 0 };
> > + bool new_irq_handled;
> > + struct drm_connector *connector;
> > + bool old_plugged;
> > +
> > +
> > + mhdp = container_of(work, struct cdns_mhdp_device,
> > + hotplug_work.work);
> > + connector = &mhdp->connector.base;
> > +
> > + old_plugged = mhdp->plugged;
> > + connector->status = connector->funcs->detect(connector, false);
> > + if (old_plugged != mhdp->plugged) {
> > + drm_kms_helper_hotplug_event(mhdp->bridge.base.dev);
> > + return;
> > + }
> > +
> > + if (mhdp->plugged) {
> > + dret = drm_dp_dpcd_read(&mhdp->aux,
> > + DP_SINK_COUNT_ESI, esi, 8);
> > +
> > + if (dret == 8) {
> > + drm_dp_mst_hpd_irq(&mhdp->mst_mgr,
> > + esi,
> > + &new_irq_handled);
> > + }
> > +
> > + if (new_irq_handled) {
> > + for (retry = 0; retry < 3; retry++) {
> > + int wret;
> > +
> > + wret = drm_dp_dpcd_write(&mhdp->aux,
> > + DP_SINK_COUNT_ESI+1,
> > + &esi[1], 3);
> > + if (wret == 3)
> > + break;
> > + }
> > + }
> > + }
> > +
> > +}
> > +
> > +static irqreturn_t mhdp_irq_handler(int irq, void *data)
> > +{
> > + struct cdns_mhdp_device *mhdp = (struct cdns_mhdp_device *)data;
> > +
> > + if (readl(mhdp->regs + CDNS_SW_EVENT0) & CDNS_DPTX_HPD)
> > + schedule_delayed_work(&mhdp->hotplug_work, 0);
> > +
> > + return IRQ_HANDLED;
> > +}
> > +
> > static ssize_t mhdp_transfer(struct drm_dp_aux *aux,
> > struct drm_dp_aux_msg *msg)
> > {
> > @@ -300,10 +229,16 @@ static enum drm_connector_status cdns_mhdp_detect(struct drm_connector *conn,
> > int ret;
> >
> > ret = cdns_mhdp_get_hpd_status(mhdp);
> > - if (ret > 0)
> > - status = connector_status_connected;
> > - else if (ret < 0)
> > + if (ret > 0) {
> > + mhdp->plugged = true;
> > + cdns_mhdp_mst_probe(mhdp);
> > + // for MST mode this connector will be always disconnected
> > + if (!mhdp->is_mst)
> > + status = connector_status_connected;
> > + } else if (ret < 0)
> > dev_err(mhdp->dev, "Failed to obtain HPD state\n");
> > + else
> > + mhdp->plugged = false;
> >
> > return status;
> > }
> > @@ -321,11 +256,15 @@ static const struct drm_connector_funcs cdns_mhdp_conn_funcs = {
> > static int cdns_mhdp_attach(struct drm_bridge *bridge)
> > {
> > struct cdns_mhdp_device *mhdp = bridge_to_mhdp(bridge);
> > - struct drm_connector *conn = &mhdp->connector;
> > + struct drm_connector *conn = &mhdp->connector.base;
> > int ret;
> >
> > - conn->polled = DRM_CONNECTOR_POLL_CONNECT |
> > - DRM_CONNECTOR_POLL_DISCONNECT;
> > + if (&mhdp->bridge.base != bridge)
> > + return -ENODEV;
> > +
> > + cdns_mhdp_mst_init(mhdp);
> > +
> > + conn->polled = DRM_CONNECTOR_POLL_HPD;
> >
> > ret = drm_connector_init(bridge->dev, conn, &cdns_mhdp_conn_funcs,
> > DRM_MODE_CONNECTOR_DisplayPort);
> > @@ -342,17 +281,12 @@ static int cdns_mhdp_attach(struct drm_bridge *bridge)
> > return ret;
> > }
> >
> > + /* enable interrupts */
> > + writel(~CDNS_APB_INT_MASK_SW_EVENT_INT, mhdp->regs + CDNS_APB_INT_MASK);
> > +
> > return 0;
> > }
> >
> > -enum pixel_format {
> > - PIXEL_FORMAT_RGB = 1,
> > - PIXEL_FORMAT_YCBCR_444 = 2,
> > - PIXEL_FORMAT_YCBCR_422 = 4,
> > - PIXEL_FORMAT_YCBCR_420 = 8,
> > - PIXEL_FORMAT_Y_ONLY = 16,
> > -};
> > -
> > static void mhdp_link_training_init(struct cdns_mhdp_device *mhdp)
> > {
> > u32 reg32;
> > @@ -716,13 +650,11 @@ static int mhdp_link_training(struct cdns_mhdp_device *mhdp,
> > cdns_mhdp_reg_write(mhdp, CDNS_DP_SW_RESET, 1);
> > cdns_mhdp_reg_write(mhdp, CDNS_DP_SW_RESET, 0);
> >
> > - /* Enable framer */
> > - /* FIXME: update when MST supported, BIT(2) */
> > cdns_mhdp_reg_write(mhdp, CDNS_DP_FRAMER_GLOBAL_CONFIG,
> > - CDNS_DP_FRAMER_EN |
> > CDNS_DP_NUM_LANES(mhdp->link.num_lanes) |
> > CDNS_DP_DISABLE_PHY_RST |
> > CDNS_DP_WR_FAILING_EDGE_VSYNC |
> > + (mhdp->is_mst ? CDNS_DP_MST_EN : 0) |
> > (!video_mode ? CDNS_DP_NO_VIDEO_MODE : 0));
> >
> > /* Reset PHY config */
> > @@ -751,31 +683,20 @@ static void cdns_mhdp_disable(struct drm_bridge *bridge)
> >
> > cdns_mhdp_set_video_status(mhdp, 0);
> >
> > + mhdp->link_up = false;
> > +
> > drm_dp_link_power_down(&mhdp->aux, &mhdp->link);
> > + if (mhdp->is_mst)
> > + cdns_mhdp_mst_disable(bridge);
> > }
> >
> > -static void cdns_mhdp_enable(struct drm_bridge *bridge)
> > +static int cdns_mhdp_link_up(struct cdns_mhdp_device *mhdp)
> > {
> > - struct cdns_mhdp_device *mhdp = bridge_to_mhdp(bridge);
> > - struct drm_display_mode *mode;
> > - struct drm_display_info *disp_info = &mhdp->connector.display_info;
> > - enum pixel_format pxlfmt;
> > - int pxlclock;
> > - unsigned int rate, tu_size = 30, vs, vs_f, bpp, required_bandwidth,
> > - available_bandwidth, dp_framer_sp = 0, msa_horizontal_1,
> > - msa_vertical_1, bnd_hsync2vsync, hsync2vsync_pol_ctrl,
> > - misc0 = 0, misc1 = 0, line_thresh = 0, pxl_repr,
> > - front_porch, back_porch, msa_h0, msa_v0, hsync, vsync,
> > - dp_vertical_1, line_thresh1, line_thresh2;
> > u32 resp;
> > -
> > - unsigned int size = DP_RECEIVER_CAP_SIZE, dp_framer_global_config,
> > + u32 size = DP_RECEIVER_CAP_SIZE, dp_framer_global_config,
> > video_mode, training_interval_us;
> > u8 reg0[size], reg8, amp[2];
> >
> > - mode = &bridge->encoder->crtc->state->adjusted_mode;
> > - pxlclock = mode->crtc_clock;
> > -
> > /*
> > * Upon power-on reset/device disconnection: [2:0] bits should be 0b001
> > * and [7:5] bits 0b000.
> > @@ -824,13 +745,17 @@ static void cdns_mhdp_enable(struct drm_bridge *bridge)
> > default:
> > dev_err(mhdp->dev,
> > "wrong training interval returned by DPCD: %d\n", reg8);
> > - return;
> > + return -EIO;
> > }
> >
> > cdns_mhdp_reg_read(mhdp, CDNS_DP_FRAMER_GLOBAL_CONFIG, &resp);
> >
> > dp_framer_global_config = be32_to_cpu(resp);
> >
> > + cdns_mhdp_mst_probe(mhdp);
> > + if (mhdp->is_mst)
> > + dp_framer_global_config |= CDNS_DP_MST_EN;
> > +
> > video_mode = !(dp_framer_global_config & CDNS_DP_NO_VIDEO_MODE);
> >
> > if (dp_framer_global_config & CDNS_DP_FRAMER_EN)
> > @@ -850,50 +775,168 @@ static void cdns_mhdp_enable(struct drm_bridge *bridge)
> > if (mhdp_link_training(mhdp, video_mode,
> > training_interval_us)) {
> > dev_err(mhdp->dev, "Link training failed. Exiting.\n");
> > - return;
> > + return -EIO;
> > }
> > }
> >
> > + mhdp->link_up = true;
> > +
> > + return 0;
> > +}
> > +
> > +static int cdns_mhdp_sst_enable(struct drm_bridge *bridge)
> > +{
> > + struct cdns_mhdp_bridge *mhdp_bridge = to_mhdp_bridge(bridge);
> > + struct cdns_mhdp_device *mhdp = mhdp_bridge->mhdp;
> > + u32 rate, vs, vs_f, required_bandwidth, available_bandwidth;
> > + u32 bpp, tu_size = 30, line_thresh1, line_thresh2, line_thresh = 0;
> > + struct drm_display_mode *mode;
> > + int pxlclock;
> > + enum pixel_format pxlfmt;
> > + struct drm_display_info *disp_info = &mhdp->connector.base.display_info;
> > +
> > +
> > + mode = &bridge->encoder->crtc->state->adjusted_mode;
> > + pxlclock = mode->crtc_clock;
> > +
> > + mhdp_bridge->stream_id = 0;
> > +
> > rate = mhdp->link.rate / 1000;
> >
> > + pxlfmt = cdns_mhdp_get_pxlfmt(disp_info->color_formats);
> > + bpp = cdns_mhdp_get_bpp(disp_info->bpc, pxlfmt);
> > +
> > + /* find optimal tu_size */
> > + required_bandwidth = pxlclock * bpp / 8;
> > + available_bandwidth = mhdp->link.num_lanes * rate;
> > + do {
> > + tu_size += 2;
> > +
> > + vs_f = tu_size * required_bandwidth / available_bandwidth;
> > + vs = vs_f / 1000;
> > + vs_f = vs_f % 1000;
> > + /*
> > + * FIXME (CDNS): downspreading?
> > + * It's unused is what I've been told.
> > + */
> > + } while ((vs == 1 || ((vs_f > 850 || vs_f < 100) && vs_f != 0) ||
> > + tu_size - vs < 2) && tu_size < 64);
> > +
> > + if (vs > 64)
> > + return -EINVAL;
> > +
> > +
> > + cdns_mhdp_reg_write(mhdp, CDNS_DP_FRAMER_TU,
> > + CDNS_DP_FRAMER_TU_VS(vs) |
> > + CDNS_DP_FRAMER_TU_SIZE(tu_size) |
> > + CDNS_DP_FRAMER_TU_CNT_RST_EN);
> > +
> > + line_thresh1 = ((vs + 1) << 5) * 8 / bpp;
> > + line_thresh2 = (pxlclock << 5) / 1000 / rate * (vs + 1) - (1 << 5);
> > + line_thresh = line_thresh1 - line_thresh2 / mhdp->link.num_lanes;
> > + line_thresh = (line_thresh >> 5) + 2;
> > + cdns_mhdp_reg_write(mhdp, CDNS_DP_LINE_THRESH(0),
> > + line_thresh & GENMASK(5, 0));
> > +
> > + cdns_mhdp_reg_write(mhdp, CDNS_DP_STREAM_CONFIG_2(0),
> > + CDNS_DP_SC2_TU_VS_DIFF((tu_size - vs > 3) ?
> > + 0 : tu_size - vs));
> > +
> > + cdns_mhdp_configure_video(bridge);
> > +
> > + cdns_mhdp_set_video_status(mhdp, 1);
> > +
> > + return 0;
> > +}
> > +
> > +enum pixel_format cdns_mhdp_get_pxlfmt(u32 color_formats)
> > +{
> > + enum pixel_format pxlfmt;
> > +
> > /* FIXME: what about Y_ONLY? how is it handled in the kernel? */
> > - if (disp_info->color_formats & DRM_COLOR_FORMAT_YCRCB444)
> > + if (color_formats & DRM_COLOR_FORMAT_YCRCB444)
> > pxlfmt = PIXEL_FORMAT_YCBCR_444;
> > - else if (disp_info->color_formats & DRM_COLOR_FORMAT_YCRCB422)
> > + else if (color_formats & DRM_COLOR_FORMAT_YCRCB422)
> > pxlfmt = PIXEL_FORMAT_YCBCR_422;
> > - else if (disp_info->color_formats & DRM_COLOR_FORMAT_YCRCB420)
> > + else if (color_formats & DRM_COLOR_FORMAT_YCRCB420)
> > pxlfmt = PIXEL_FORMAT_YCBCR_420;
> > else
> > pxlfmt = PIXEL_FORMAT_RGB;
> >
> > + return pxlfmt;
> > +}
> > +
> > +
> > +u32 cdns_mhdp_get_bpp(u32 bpc, enum pixel_format pxlfmt)
> > +{
> > + u32 bpp;
> > +
> > + switch (pxlfmt) {
> > + case PIXEL_FORMAT_RGB:
> > + bpp = bpc * 3;
> > + break;
> > + case PIXEL_FORMAT_YCBCR_444:
> > + bpp = bpc * 3;
> > + break;
> > + case PIXEL_FORMAT_YCBCR_422:
> > + bpp = bpc * 2;
> > + break;
> > + case PIXEL_FORMAT_YCBCR_420:
> > + bpp = bpc * 3 / 2;
> > + break;
> > + default:
> > + bpp = bpc;
> > + }
> > + return bpp;
> > +}
> > +
> > +void cdns_mhdp_configure_video(struct drm_bridge *bridge)
> > +{
> > + struct cdns_mhdp_bridge *mhdp_bridge = to_mhdp_bridge(bridge);
> > + struct cdns_mhdp_device *mhdp = mhdp_bridge->mhdp;
> > + struct drm_display_info *disp_info;
> > + unsigned int bpp, dp_framer_sp = 0, msa_horizontal_1,
> > + msa_vertical_1, bnd_hsync2vsync, hsync2vsync_pol_ctrl,
> > + misc0 = 0, misc1 = 0, pxl_repr,
> > + front_porch, back_porch, msa_h0, msa_v0, hsync, vsync,
> > + dp_vertical_1;
> > + struct drm_display_mode *mode;
> > + enum pixel_format pxlfmt;
> > + int pxlclock;
> > + u32 tmp;
> > + u8 stream_id = mhdp_bridge->stream_id;
> > +
> > + mode = &bridge->encoder->crtc->state->adjusted_mode;
> > + pxlclock = mode->crtc_clock;
> > +
> > + disp_info = &mhdp_bridge->connector->base.display_info;
> > + pxlfmt = cdns_mhdp_get_pxlfmt(disp_info->color_formats);
> > +
> > /* if YCBCR supported and stream not SD, use ITU709 */
> > /* FIXME: handle ITU version with YCBCR420 when supported */
> > if ((pxlfmt == PIXEL_FORMAT_YCBCR_444 ||
> > pxlfmt == PIXEL_FORMAT_YCBCR_422) && mode->crtc_vdisplay >= 720)
> > misc0 = DP_YCBCR_COEFFICIENTS_ITU709;
> >
> > + bpp = cdns_mhdp_get_bpp(disp_info->bpc, pxlfmt);
> > +
> > switch (pxlfmt) {
> > case PIXEL_FORMAT_RGB:
> > - bpp = disp_info->bpc * 3;
> > pxl_repr = CDNS_DP_FRAMER_RGB << CDNS_DP_FRAMER_PXL_FORMAT;
> > misc0 |= DP_COLOR_FORMAT_RGB;
> > break;
> > case PIXEL_FORMAT_YCBCR_444:
> > - bpp = disp_info->bpc * 3;
> > pxl_repr = CDNS_DP_FRAMER_YCBCR444 << CDNS_DP_FRAMER_PXL_FORMAT;
> > misc0 |= DP_COLOR_FORMAT_YCbCr444 | DP_TEST_DYNAMIC_RANGE_CEA;
> > break;
> > case PIXEL_FORMAT_YCBCR_422:
> > - bpp = disp_info->bpc * 2;
> > pxl_repr = CDNS_DP_FRAMER_YCBCR422 << CDNS_DP_FRAMER_PXL_FORMAT;
> > misc0 |= DP_COLOR_FORMAT_YCbCr422 | DP_TEST_DYNAMIC_RANGE_CEA;
> > break;
> > case PIXEL_FORMAT_YCBCR_420:
> > - bpp = disp_info->bpc * 3 / 2;
> > pxl_repr = CDNS_DP_FRAMER_YCBCR420 << CDNS_DP_FRAMER_PXL_FORMAT;
> > break;
> > default:
> > - bpp = disp_info->bpc;
> > pxl_repr = CDNS_DP_FRAMER_Y_ONLY << CDNS_DP_FRAMER_PXL_FORMAT;
> > }
> >
> > @@ -920,30 +963,12 @@ static void cdns_mhdp_enable(struct drm_bridge *bridge)
> > break;
> > }
> >
> > - /* find optimal tu_size */
> > - required_bandwidth = pxlclock * bpp / 8;
> > - available_bandwidth = mhdp->link.num_lanes * rate;
> > - do {
> > - tu_size += 2;
> > -
> > - vs_f = tu_size * required_bandwidth / available_bandwidth;
> > - vs = vs_f / 1000;
> > - vs_f = vs_f % 1000;
> > - /*
> > - * FIXME (CDNS): downspreading?
> > - * It's unused is what I've been told.
> > - */
> > - } while ((vs == 1 || ((vs_f > 850 || vs_f < 100) && vs_f != 0) ||
> > - tu_size - vs < 2) && tu_size < 64);
> > -
> > - if (vs > 64)
> > - return;
> > -
> > bnd_hsync2vsync = CDNS_IP_BYPASS_V_INTERFACE;
> > if (mode->flags & DRM_MODE_FLAG_INTERLACE)
> > bnd_hsync2vsync |= CDNS_IP_DET_INTERLACE_FORMAT;
> >
> > - cdns_mhdp_reg_write(mhdp, CDNS_BND_HSYNC2VSYNC, bnd_hsync2vsync);
> > + cdns_mhdp_reg_write(mhdp, CDNS_BND_HSYNC2VSYNC(stream_id),
> > + bnd_hsync2vsync);
> >
> > if (mode->flags & DRM_MODE_FLAG_INTERLACE &&
> > mode->flags & DRM_MODE_FLAG_PHSYNC)
> > @@ -952,15 +977,10 @@ static void cdns_mhdp_enable(struct drm_bridge *bridge)
> > else
> > hsync2vsync_pol_ctrl = 0;
> >
> > - cdns_mhdp_reg_write(mhdp, CDNS_HSYNC2VSYNC_POL_CTRL,
> > + cdns_mhdp_reg_write(mhdp, CDNS_HSYNC2VSYNC_POL_CTRL(stream_id),
> > hsync2vsync_pol_ctrl);
> >
> > - cdns_mhdp_reg_write(mhdp, CDNS_DP_FRAMER_TU,
> > - CDNS_DP_FRAMER_TU_VS(vs) |
> > - CDNS_DP_FRAMER_TU_SIZE(tu_size) |
> > - CDNS_DP_FRAMER_TU_CNT_RST_EN);
> > -
> > - cdns_mhdp_reg_write(mhdp, CDNS_DP_FRAMER_PXL_REPR, pxl_repr);
> > + cdns_mhdp_reg_write(mhdp, CDNS_DP_FRAMER_PXL_REPR(stream_id), pxl_repr);
> >
> > if (mode->flags & DRM_MODE_FLAG_INTERLACE)
> > dp_framer_sp |= CDNS_DP_FRAMER_INTERLACE;
> > @@ -968,19 +988,19 @@ static void cdns_mhdp_enable(struct drm_bridge *bridge)
> > dp_framer_sp |= CDNS_DP_FRAMER_HSYNC_POL_LOW;
> > if (mode->flags & DRM_MODE_FLAG_NVSYNC)
> > dp_framer_sp |= CDNS_DP_FRAMER_VSYNC_POL_LOW;
> > - cdns_mhdp_reg_write(mhdp, CDNS_DP_FRAMER_SP, dp_framer_sp);
> > + cdns_mhdp_reg_write(mhdp, CDNS_DP_FRAMER_SP(stream_id), dp_framer_sp);
> >
> > front_porch = mode->crtc_hsync_start - mode->crtc_hdisplay;
> > back_porch = mode->crtc_htotal - mode->crtc_hsync_end;
> > - cdns_mhdp_reg_write(mhdp, CDNS_DP_FRONT_BACK_PORCH,
> > + cdns_mhdp_reg_write(mhdp, CDNS_DP_FRONT_BACK_PORCH(stream_id),
> > CDNS_DP_FRONT_PORCH(front_porch) |
> > CDNS_DP_BACK_PORCH(back_porch));
> >
> > - cdns_mhdp_reg_write(mhdp, CDNS_DP_BYTE_COUNT,
> > + cdns_mhdp_reg_write(mhdp, CDNS_DP_BYTE_COUNT(stream_id),
> > mode->crtc_hdisplay * bpp / 8);
> >
> > msa_h0 = mode->crtc_htotal - mode->crtc_hsync_start;
> > - cdns_mhdp_reg_write(mhdp, CDNS_DP_MSA_HORIZONTAL_0,
> > + cdns_mhdp_reg_write(mhdp, CDNS_DP_MSA_HORIZONTAL_0(stream_id),
> > CDNS_DP_MSAH0_H_TOTAL(mode->crtc_htotal) |
> > CDNS_DP_MSAH0_HSYNC_START(msa_h0));
> >
> > @@ -989,11 +1009,11 @@ static void cdns_mhdp_enable(struct drm_bridge *bridge)
> > CDNS_DP_MSAH1_HDISP_WIDTH(mode->crtc_hdisplay);
> > if (mode->flags & DRM_MODE_FLAG_NHSYNC)
> > msa_horizontal_1 |= CDNS_DP_MSAH1_HSYNC_POL_LOW;
> > - cdns_mhdp_reg_write(mhdp, CDNS_DP_MSA_HORIZONTAL_1,
> > + cdns_mhdp_reg_write(mhdp, CDNS_DP_MSA_HORIZONTAL_1(stream_id),
> > msa_horizontal_1);
> >
> > msa_v0 = mode->crtc_vtotal - mode->crtc_vsync_start;
> > - cdns_mhdp_reg_write(mhdp, CDNS_DP_MSA_VERTICAL_0,
> > + cdns_mhdp_reg_write(mhdp, CDNS_DP_MSA_VERTICAL_0(stream_id),
> > CDNS_DP_MSAV0_V_TOTAL(mode->crtc_vtotal) |
> > CDNS_DP_MSAV0_VSYNC_START(msa_v0));
> >
> > @@ -1002,7 +1022,8 @@ static void cdns_mhdp_enable(struct drm_bridge *bridge)
> > CDNS_DP_MSAV1_VDISP_WIDTH(mode->crtc_vdisplay);
> > if (mode->flags & DRM_MODE_FLAG_NVSYNC)
> > msa_vertical_1 |= CDNS_DP_MSAV1_VSYNC_POL_LOW;
> > - cdns_mhdp_reg_write(mhdp, CDNS_DP_MSA_VERTICAL_1, msa_vertical_1);
> > + cdns_mhdp_reg_write(mhdp, CDNS_DP_MSA_VERTICAL_1(stream_id),
> > + msa_vertical_1);
> >
> > if ((mode->flags & DRM_MODE_FLAG_INTERLACE) &&
> > mode->crtc_vtotal % 2 == 0)
> > @@ -1014,16 +1035,14 @@ static void cdns_mhdp_enable(struct drm_bridge *bridge)
> > if (pxlfmt == PIXEL_FORMAT_YCBCR_420)
> > misc1 = CDNS_DP_TEST_VSC_SDP;
> >
> > - cdns_mhdp_reg_write(mhdp, CDNS_DP_MSA_MISC, misc0 | (misc1 << 8));
> > + cdns_mhdp_reg_write(mhdp, CDNS_DP_MSA_MISC(stream_id),
> > + misc0 | (misc1 << 8));
> >
> > - /* FIXME: to be changed if MST mode */
> > - cdns_mhdp_reg_write(mhdp, CDNS_DP_STREAM_CONFIG, 1);
> > -
> > - cdns_mhdp_reg_write(mhdp, CDNS_DP_HORIZONTAL,
> > + cdns_mhdp_reg_write(mhdp, CDNS_DP_HORIZONTAL(stream_id),
> > CDNS_DP_H_HSYNC_WIDTH(hsync) |
> > CDNS_DP_H_H_TOTAL(mode->crtc_hdisplay));
> >
> > - cdns_mhdp_reg_write(mhdp, CDNS_DP_VERTICAL_0,
> > + cdns_mhdp_reg_write(mhdp, CDNS_DP_VERTICAL_0(stream_id),
> > CDNS_DP_V0_VHEIGHT(mode->crtc_vdisplay) |
> > CDNS_DP_V0_VSTART(msa_v0));
> >
> > @@ -1032,30 +1051,51 @@ static void cdns_mhdp_enable(struct drm_bridge *bridge)
> > mode->crtc_vtotal % 2 == 0)
> > dp_vertical_1 |= CDNS_DP_V1_VTOTAL_EVEN;
> >
> > - cdns_mhdp_reg_write(mhdp, CDNS_DP_VERTICAL_1, dp_vertical_1);
> > + cdns_mhdp_reg_write(mhdp, CDNS_DP_VERTICAL_1(stream_id), dp_vertical_1);
> >
> > - cdns_mhdp_reg_write_bit(mhdp, CDNS_DP_VB_ID, 2, 1,
> > + cdns_mhdp_reg_write_bit(mhdp, CDNS_DP_VB_ID(stream_id), 2, 1,
> > (mode->flags & DRM_MODE_FLAG_INTERLACE) ?
> > CDNS_DP_VB_ID_INTERLACED : 0);
> >
> > - line_thresh1 = ((vs + 1) << 5) * 8 / bpp;
> > - line_thresh2 = (pxlclock << 5) / 1000 / rate * (vs + 1) - (1 << 5);
> > - line_thresh = line_thresh1 - line_thresh2 / mhdp->link.num_lanes;
> > - line_thresh = (line_thresh >> 5) + 2;
> > - cdns_mhdp_reg_write(mhdp, CDNS_DP_LINE_THRESH,
> > - line_thresh & GENMASK(5, 0));
> >
> > - cdns_mhdp_reg_write(mhdp, CDNS_DP_RATE_GOVERNOR_STATUS,
> > - CDNS_DP_RG_TU_VS_DIFF((tu_size - vs > 3) ?
> > - 0 : tu_size - vs));
> > + cdns_mhdp_reg_read(mhdp, CDNS_DP_FRAMER_GLOBAL_CONFIG, &tmp);
> > + tmp |= CDNS_DP_FRAMER_EN;
> > + cdns_mhdp_reg_write(mhdp, CDNS_DP_FRAMER_GLOBAL_CONFIG, tmp);
> > +}
> >
> > - cdns_mhdp_set_video_status(mhdp, 1);
> > +void cdns_mhdp_enable(struct drm_bridge *bridge)
> > +{
> > + struct cdns_mhdp_bridge *mhdp_bridge = to_mhdp_bridge(bridge);
> > + struct cdns_mhdp_device *mhdp = mhdp_bridge->mhdp;
> > + int ret = 0;
> > +
> > + bool link_up = mhdp->link_up;
> > +
> > + if (!link_up)
> > + cdns_mhdp_link_up(mhdp);
> > +
> > +
> > + if (!mhdp->is_mst)
> > + ret = cdns_mhdp_sst_enable(bridge);
> > + else
> > + cdns_mhdp_mst_enable(bridge);
> > +
>
>
> ret unused, link_up not neccessary, requires cleanup.
>
>
>
> > +}
> > +
> > +static void cdns_mhdp_detach(struct drm_bridge *bridge)
> > +{
> > + struct cdns_mhdp_device *mhdp = bridge_to_mhdp(bridge);
> > + struct cdns_mhdp_mst_cbs cbs_null = {0};
> > +
> > + cdns_mhdp_mst_deinit(mhdp);
> > + mhdp->cbs = cbs_null;
> > }
> >
> > static const struct drm_bridge_funcs cdns_mhdp_bridge_funcs = {
> > .enable = cdns_mhdp_enable,
> > .disable = cdns_mhdp_disable,
> > .attach = cdns_mhdp_attach,
> > + .detach = cdns_mhdp_detach,
> > };
> >
> > static int load_firmware(struct cdns_mhdp_device *mhdp, const char *name,
> > @@ -1127,8 +1167,8 @@ static int cdns_mhdp_audio_get_eld(struct device *dev, void *data,
> > {
> > struct cdns_mhdp_device *mhdp = dev_get_drvdata(dev);
> >
> > - memcpy(buf, mhdp->connector.eld,
> > - min(sizeof(mhdp->connector.eld), len));
> > + memcpy(buf, mhdp->connector.base.eld,
> > + min(sizeof(mhdp->connector.base.eld), len));
> >
> > return 0;
> > }
> > @@ -1149,6 +1189,7 @@ static int mhdp_probe(struct platform_device *pdev)
> > unsigned int reg;
> > unsigned long rate;
> > u32 resp;
> > + int irq;
> >
> > struct hdmi_codec_pdata codec_data = {
> > .i2s = 1,
> > @@ -1192,6 +1233,14 @@ static int mhdp_probe(struct platform_device *pdev)
> > /* Leave debug mode */
> > writel(0, mhdp->regs + CDNS_APB_CTRL);
> >
> > + irq = platform_get_irq(pdev, 0);
> > + ret = request_irq(irq, mhdp_irq_handler, 0, "mhdp8546", mhdp);
>
>
> No free_irq, why dont you use devm_request_irq.
>
>
>
> > + if (ret) {
> > + dev_err(&pdev->dev,
> > + "cannot install IRQ %d\n", irq);
> > + return -EIO;
> > + }
> > +
> > /*
> > * Wait for the KEEP_ALIVE "message" on the first 8 bits.
> > * Updated each sched "tick" (~2ms)
> > @@ -1222,8 +1271,8 @@ static int mhdp_probe(struct platform_device *pdev)
> > mhdp->host.lane_mapping = CDNS_LANE_MAPPING_FLIPPED;
> > mhdp->host.enhanced = true;
> >
> > - mhdp->bridge.of_node = pdev->dev.of_node;
> > - mhdp->bridge.funcs = &cdns_mhdp_bridge_funcs;
> > + mhdp->bridge.base.of_node = pdev->dev.of_node;
> > + mhdp->bridge.base.funcs = &cdns_mhdp_bridge_funcs;
> >
> > /* Init events to 0 as it's not cleared by FW at boot but on read */
> > readl(mhdp->regs + CDNS_SW_EVENT0);
> > @@ -1247,21 +1296,14 @@ static int mhdp_probe(struct platform_device *pdev)
> > cdns_mhdp_reg_write(mhdp, CDNS_DPTX_CAR,
> > resp | CDNS_VIF_CLK_EN | CDNS_VIF_CLK_RSTN);
> >
> > - /* Loop over HDP change */
> > - /*
> > - * FIXME: does not work when put in mhdp_bridge_enable.
> > - * Where should we put it?
> > - */
> > - /* Is it still needed with use of mb message HPD STATUS? */
> > - ret = readl_poll_timeout(mhdp->regs + CDNS_SW_EVENT0, reg,
> > - reg & CDNS_DPTX_HPD, 500,
> > - CDNS_SW_EVENT0_TIMEOUT);
> > - if (ret) {
> > - dev_err(mhdp->dev, "no HPD received %d\n", reg);
> > - return -ENODEV;
> > - }
> > + INIT_DELAYED_WORK(&mhdp->hotplug_work, mhdp_hotplug_work_func);
>
>
> You are removing lot of the code introduced by previous patch, kinda ugly.
>
> I am not sure if merging both patches wouldn't be better, otherwise it
> would be better to split this big patch to smaller chunks - according to
> rule - one change per one patch.
>
>
> Regards
>
> Andrzej
>
>
>
>
> > +
> > + mhdp->bridge.connector = &mhdp->connector;
> > + mhdp->connector.bridge = &mhdp->bridge;
> > + mhdp->bridge.mhdp = mhdp;
> > + mhdp->bridge.is_active = false;
> >
> > - drm_bridge_add(&mhdp->bridge);
> > + drm_bridge_add(&mhdp->bridge.base);
> >
> > return 0;
> > }
> > @@ -1273,9 +1315,11 @@ static int mhdp_remove(struct platform_device *pdev)
> > struct cdns_mhdp_device *mhdp = dev_get_drvdata(&pdev->dev);
> > int ret;
> >
> > + flush_delayed_work(&mhdp->hotplug_work);
> > platform_device_unregister(mhdp->audio_pdev);
> >
> > - drm_bridge_remove(&mhdp->bridge);
> > + cdns_mhdp_mst_deinit(mhdp);
> > + drm_bridge_remove(&mhdp->bridge.base);
> >
> > ret = cdns_mhdp_set_firmware_active(mhdp, false);
> > if (ret) {
> > @@ -1288,6 +1332,17 @@ static int mhdp_remove(struct platform_device *pdev)
> > return 0;
> > }
> >
> > +int mhdp_bridge_attach_mst_cbs(struct drm_bridge *bridge,
> > + struct cdns_mhdp_mst_cbs *cbs)
> > +{
> > + struct cdns_mhdp_device *mhdp = bridge_to_mhdp(bridge);
> > +
> > + mhdp->cbs = *cbs;
> > +
> > + return 0;
> > +}
> > +EXPORT_SYMBOL_GPL(mhdp_bridge_attach_mst_cbs);
> > +
> > static struct platform_driver mhdp_driver = {
> > .driver = {
> > .name = "cdns-mhdp",
> > @@ -1299,6 +1354,9 @@ static struct platform_driver mhdp_driver = {
> > module_platform_driver(mhdp_driver);
> >
> > MODULE_AUTHOR("Quentin Schulz <quentin.schulz@free-electrons.com>");
> > +MODULE_AUTHOR("Przemyslaw Gaj <pgaj@cadence.com>");
> > +MODULE_AUTHOR("Damian Kos <dkos@cadence.com>");
> > +MODULE_AUTHOR("Piotr Sroka <piotrs@cadence.com>");
> > MODULE_DESCRIPTION("Cadence MHDP DP bridge driver");
> > MODULE_LICENSE("GPL");
> > MODULE_ALIAS("platform:cdns-mhdp");
> > diff --git a/drivers/gpu/drm/bridge/cdns-mhdp.h b/drivers/gpu/drm/bridge/cdns-mhdp.h
> > new file mode 100644
> > index 000000000000..abc1fa3f51a6
> > --- /dev/null
> > +++ b/drivers/gpu/drm/bridge/cdns-mhdp.h
> > @@ -0,0 +1,209 @@
> > +/* SPDX-License-Identifier: GPL v2 */
> > +/*
> > + * Cadence MHDP DP MST bridge driver.
> > + *
> > + * Copyright: 2018 Cadence Design Systems, Inc.
> > + *
> > + * Author: Quentin Schulz <quentin.schulz@free-electrons.com>
> > + */
> > +
> > +
> > +#ifndef CDNS_MHDP_H
> > +#define CDNS_MHDP_H
> > +
> > +#include <drm/drm_dp_mst_helper.h>
> > +
> > +#define CDNS_APB_CFG 0x00000
> > +#define CDNS_APB_CTRL (CDNS_APB_CFG + 0x00)
> > +#define CDNS_MAILBOX_FULL (CDNS_APB_CFG + 0x08)
> > +#define CDNS_MAILBOX_EMPTY (CDNS_APB_CFG + 0x0c)
> > +#define CDNS_MAILBOX_TX_DATA (CDNS_APB_CFG + 0x10)
> > +#define CDNS_MAILBOX_RX_DATA (CDNS_APB_CFG + 0x14)
> > +#define CDNS_KEEP_ALIVE (CDNS_APB_CFG + 0x18)
> > +#define CDNS_KEEP_ALIVE_MASK GENMASK(7, 0)
> > +
> > +#define CDNS_MB_INT_MASK (CDNS_APB_CFG + 0x34)
> > +
> > +#define CDNS_SW_CLK_L (CDNS_APB_CFG + 0x3c)
> > +#define CDNS_SW_CLK_H (CDNS_APB_CFG + 0x40)
> > +#define CDNS_SW_EVENT0 (CDNS_APB_CFG + 0x44)
> > +#define CDNS_DPTX_HPD BIT(0)
> > +
> > +#define CDNS_SW_EVENT1 (CDNS_APB_CFG + 0x48)
> > +#define CDNS_SW_EVENT2 (CDNS_APB_CFG + 0x4c)
> > +#define CDNS_SW_EVENT3 (CDNS_APB_CFG + 0x50)
> > +
> > +#define CDNS_APB_INT_MASK (CDNS_APB_CFG + 0x6C)
> > +#define CDNS_APB_INT_MASK_MAILBOX_INT BIT(0)
> > +#define CDNS_APB_INT_MASK_SW_EVENT_INT BIT(1)
> > +
> > +#define CDNS_DPTX_CAR (CDNS_APB_CFG + 0x904)
> > +#define CDNS_VIF_CLK_EN BIT(0)
> > +#define CDNS_VIF_CLK_RSTN BIT(1)
> > +
> > +#define CDNS_SOURCE_VIDEO_IF(s) (0x00b00 + (s * 0x20))
> > +#define CDNS_BND_HSYNC2VSYNC(s) (CDNS_SOURCE_VIDEO_IF(s) + \
> > + 0x00)
> > +#define CDNS_IP_DTCT_WIN GENMASK(11, 0)
> > +#define CDNS_IP_DET_INTERLACE_FORMAT BIT(12)
> > +#define CDNS_IP_BYPASS_V_INTERFACE BIT(13)
> > +
> > +#define CDNS_HSYNC2VSYNC_POL_CTRL(s) (CDNS_SOURCE_VIDEO_IF(s) + \
> > + 0x10)
> > +#define CDNS_H2V_HSYNC_POL_ACTIVE_LOW BIT(1)
> > +#define CDNS_H2V_VSYNC_POL_ACTIVE_LOW BIT(2)
> > +
> > +#define CDNS_DPTX_PHY_CONFIG 0x02000
> > +#define CDNS_PHY_TRAINING_EN BIT(0)
> > +#define CDNS_PHY_TRAINING_TYPE(x) (((x) & GENMASK(3, 0)) << 1)
> > +#define CDNS_PHY_SCRAMBLER_BYPASS BIT(5)
> > +#define CDNS_PHY_ENCODER_BYPASS BIT(6)
> > +#define CDNS_PHY_SKEW_BYPASS BIT(7)
> > +#define CDNS_PHY_TRAINING_AUTO BIT(8)
> > +#define CDNS_PHY_LANE0_SKEW(x) (((x) & GENMASK(2, 0)) << 9)
> > +#define CDNS_PHY_LANE1_SKEW(x) (((x) & GENMASK(2, 0)) << 12)
> > +#define CDNS_PHY_LANE2_SKEW(x) (((x) & GENMASK(2, 0)) << 15)
> > +#define CDNS_PHY_LANE3_SKEW(x) (((x) & GENMASK(2, 0)) << 18)
> > +#define CDNS_PHY_COMMON_CONFIG (CDNS_PHY_LANE1_SKEW(1) | \
> > + CDNS_PHY_LANE2_SKEW(2) | \
> > + CDNS_PHY_LANE3_SKEW(3))
> > +#define CDNS_PHY_10BIT_EN BIT(21)
> > +
> > +#define CDNS_DPTX_FRAMER 0x02200
> > +#define CDNS_DP_FRAMER_GLOBAL_CONFIG (CDNS_DPTX_FRAMER + 0x00)
> > +#define CDNS_DP_NUM_LANES(x) (x - 1)
> > +#define CDNS_DP_MST_EN BIT(2)
> > +#define CDNS_DP_FRAMER_EN BIT(3)
> > +#define CDNS_DP_RATE_GOVERNOR_EN BIT(4)
> > +#define CDNS_DP_NO_VIDEO_MODE BIT(5)
> > +#define CDNS_DP_DISABLE_PHY_RST BIT(6)
> > +#define CDNS_DP_WR_FAILING_EDGE_VSYNC BIT(7)
> > +
> > +#define CDNS_DP_SW_RESET (CDNS_DPTX_FRAMER + 0x04)
> > +#define CDNS_DP_FRAMER_TU (CDNS_DPTX_FRAMER + 0x08)
> > +#define CDNS_DP_FRAMER_TU_SIZE(x) (((x) & GENMASK(6, 0)) << 8)
> > +#define CDNS_DP_FRAMER_TU_VS(x) ((x) & GENMASK(5, 0))
> > +#define CDNS_DP_FRAMER_TU_CNT_RST_EN BIT(15)
> > +
> > +#define CDNS_DPTX_STREAM(s) (0x03000 + s * 0x80)
> > +#define CDNS_DP_MSA_HORIZONTAL_0(s) (CDNS_DPTX_STREAM(s) + 0x00)
> > +#define CDNS_DP_MSAH0_H_TOTAL(x) (x)
> > +#define CDNS_DP_MSAH0_HSYNC_START(x) ((x) << 16)
> > +
> > +#define CDNS_DP_MSA_HORIZONTAL_1(s) (CDNS_DPTX_STREAM(s) + 0x04)
> > +#define CDNS_DP_MSAH1_HSYNC_WIDTH(x) (x)
> > +#define CDNS_DP_MSAH1_HSYNC_POL_LOW BIT(15)
> > +#define CDNS_DP_MSAH1_HDISP_WIDTH(x) ((x) << 16)
> > +
> > +#define CDNS_DP_MSA_VERTICAL_0(s) (CDNS_DPTX_STREAM(s) + 0x08)
> > +#define CDNS_DP_MSAV0_V_TOTAL(x) (x)
> > +#define CDNS_DP_MSAV0_VSYNC_START(x) ((x) << 16)
> > +
> > +#define CDNS_DP_MSA_VERTICAL_1(s) (CDNS_DPTX_STREAM(s) + 0x0c)
> > +#define CDNS_DP_MSAV1_VSYNC_WIDTH(x) (x)
> > +#define CDNS_DP_MSAV1_VSYNC_POL_LOW BIT(15)
> > +#define CDNS_DP_MSAV1_VDISP_WIDTH(x) ((x) << 16)
> > +
> > +#define CDNS_DP_MSA_MISC(s) (CDNS_DPTX_STREAM(s) + 0x10)
> > +#define CDNS_DP_STREAM_CONFIGs(s) (CDNS_DPTX_STREAM(s) + 0x14)
> > +#define CDNS_DP_STREAM_CONFIG_2(s) (CDNS_DPTX_STREAM(s) + 0x2c)
> > +#define CDNS_DP_SC2_TU_VS_DIFF(x) ((x) << 8)
> > +
> > +#define CDNS_DP_HORIZONTAL(s) (CDNS_DPTX_STREAM(s) + 0x30)
> > +#define CDNS_DP_H_HSYNC_WIDTH(x) (x)
> > +#define CDNS_DP_H_H_TOTAL(x) ((x) << 16)
> > +
> > +#define CDNS_DP_VERTICAL_0(s) (CDNS_DPTX_STREAM(s) + 0x34)
> > +#define CDNS_DP_V0_VHEIGHT(x) (x)
> > +#define CDNS_DP_V0_VSTART(x) ((x) << 16)
> > +
> > +#define CDNS_DP_VERTICAL_1(s) (CDNS_DPTX_STREAM(s) + 0x38)
> > +#define CDNS_DP_V1_VTOTAL(x) (x)
> > +#define CDNS_DP_V1_VTOTAL_EVEN BIT(16)
> > +
> > +#define CDNS_DP_FRAMER_PXL_REPR(s) (CDNS_DPTX_STREAM(s) + 0x4c)
> > +#define CDNS_DP_FRAMER_6_BPC BIT(0)
> > +#define CDNS_DP_FRAMER_8_BPC BIT(1)
> > +#define CDNS_DP_FRAMER_10_BPC BIT(2)
> > +#define CDNS_DP_FRAMER_12_BPC BIT(3)
> > +#define CDNS_DP_FRAMER_16_BPC BIT(4)
> > +#define CDNS_DP_FRAMER_PXL_FORMAT 0x8
> > +#define CDNS_DP_FRAMER_RGB BIT(0)
> > +#define CDNS_DP_FRAMER_YCBCR444 BIT(1)
> > +#define CDNS_DP_FRAMER_YCBCR422 BIT(2)
> > +#define CDNS_DP_FRAMER_YCBCR420 BIT(3)
> > +#define CDNS_DP_FRAMER_Y_ONLY BIT(4)
> > +
> > +#define CDNS_DP_FRAMER_SP(s) (CDNS_DPTX_STREAM(s) + 0x10)
> > +#define CDNS_DP_FRAMER_VSYNC_POL_LOW BIT(0)
> > +#define CDNS_DP_FRAMER_HSYNC_POL_LOW BIT(1)
> > +#define CDNS_DP_FRAMER_INTERLACE BIT(2)
> > +
> > +#define CDNS_DP_LINE_THRESH(s) (CDNS_DPTX_STREAM(s) + 0x64)
> > +#define CDNS_DP_ACTIVE_LINE_THRESH(x) (x)
> > +
> > +#define CDNS_DP_VB_ID(s) (CDNS_DPTX_STREAM(s) + 0x68)
> > +#define CDNS_DP_VB_ID_INTERLACED BIT(2)
> > +#define CDNS_DP_VB_ID_COMPRESSED BIT(6)
> > +
> > +#define CDNS_DP_FRONT_BACK_PORCH(s) (CDNS_DPTX_STREAM(s) + 0x78)
> > +#define CDNS_DP_BACK_PORCH(x) (x)
> > +#define CDNS_DP_FRONT_PORCH(x) ((x) << 16)
> > +
> > +#define CDNS_DP_BYTE_COUNT(s) (CDNS_DPTX_STREAM(s) + 0x7c)
> > +#define CDNS_DP_BYTE_COUNT_BYTES_IN_CHUNK_SHIFT 16
> > +
> > +#define CDNS_DP_MST_STREAM_CONFIG(s) (CDNS_DPTX_STREAM(s) + 0x14)
> > +#define CDNS_DP_MST_STRM_CFG_STREAM_EN BIT(0)
> > +#define CDNS_DP_MST_STRM_CFG_NO_VIDEO BIT(1)
> > +
> > +#define CDNS_DP_MST_SLOT_ALLOCATE(s) (CDNS_DPTX_STREAM(s) + 0x44)
> > +#define CDNS_DP_S_ALLOC_START_SLOT(x) (x)
> > +#define CDNS_DP_S_ALLOC_END_SLOT(x) ((x) << 8)
> > +
> > +#define CDNS_DP_RATE_GOVERNING(s) (CDNS_DPTX_STREAM(s) + 0x48)
> > +#define CDNS_DP_RG_TARG_AV_SLOTS_Y(x) (x)
> > +#define CDNS_DP_RG_TARG_AV_SLOTS_X(x) (x << 4)
> > +#define CDNS_DP_RG_ENABLE BIT(10)
> > +
> > +#define CDNS_DP_MTPH_CONTROL 0x2264
> > +#define CDNS_DP_MTPH_ECF_EN BIT(0)
> > +#define CDNS_DP_MTPH_ACT_EN BIT(1)
> > +#define CDNS_DP_MTPH_LVP_EN BIT(2)
> > +
> > +#define CDNS_DP_MTPH_STATUS 0x226C
> > +#define CDNS_DP_MTPH_ACT_STATUS BIT(0)
> > +
> > +
> > +#define CDNS_DPTX_GLOBAL 0x02300
> > +#define CDNS_DP_LANE_EN (CDNS_DPTX_GLOBAL + 0x00)
> > +#define CDNS_DP_LANE_EN_LANES(x) GENMASK(x - 1, 0)
> > +#define CDNS_DP_ENHNCD (CDNS_DPTX_GLOBAL + 0x04)
> > +
> > +
> > +#define to_mhdp_connector(x) container_of(x, struct cdns_mhdp_connector, base)
> > +#define to_mhdp_bridge(x) container_of(x, struct cdns_mhdp_bridge, base)
> > +#define mgr_to_mhdp(x) container_of(x, struct cdns_mhdp_device, mst_mgr)
> > +
> > +#define CDNS_MHDP_MAX_STREAMS 4
> > +
> > +enum pixel_format {
> > + PIXEL_FORMAT_RGB = 1,
> > + PIXEL_FORMAT_YCBCR_444 = 2,
> > + PIXEL_FORMAT_YCBCR_422 = 4,
> > + PIXEL_FORMAT_YCBCR_420 = 8,
> > + PIXEL_FORMAT_Y_ONLY = 16,
> > +};
> > +
> > +
> > +int cdns_mhdp_mst_init(struct cdns_mhdp_device *mhdp);
> > +void cdns_mhdp_mst_deinit(struct cdns_mhdp_device *mhdp);
> > +bool cdns_mhdp_mst_probe(struct cdns_mhdp_device *mhdp);
> > +enum pixel_format cdns_mhdp_get_pxlfmt(u32 color_formats);
> > +u32 cdns_mhdp_get_bpp(u32 bpc, u32 color_formats);
> > +void cdns_mhdp_configure_video(struct drm_bridge *bridge);
> > +void cdns_mhdp_mst_enable(struct drm_bridge *bridge);
> > +void cdns_mhdp_mst_disable(struct drm_bridge *bridge);
> > +void cdns_mhdp_enable(struct drm_bridge *bridge);
> > +
> > +#endif
> > diff --git a/drivers/gpu/drm/rockchip/cdn-dp-core.c b/drivers/gpu/drm/rockchip/cdn-dp-core.c
> > index 343f381e3440..a5a668f1912b 100644
> > --- a/drivers/gpu/drm/rockchip/cdn-dp-core.c
> > +++ b/drivers/gpu/drm/rockchip/cdn-dp-core.c
> > @@ -34,7 +34,7 @@
> > #include "rockchip_drm_vop.h"
> >
> > #define connector_to_dp(c) \
> > - container_of(c, struct cdn_dp_device, mhdp.connector)
> > + container_of(c, struct cdn_dp_device, mhdp.connector.base)
> >
> > #define encoder_to_dp(c) \
> > container_of(c, struct cdn_dp_device, encoder)
> > @@ -291,7 +291,7 @@ static int cdn_dp_connector_mode_valid(struct drm_connector *connector,
> > {
> > struct cdn_dp_device *dp = connector_to_dp(connector);
> > struct drm_display_info *display_info =
> > - &dp->mhdp.connector.display_info;
> > + &dp->mhdp.connector.base.display_info;
> > u32 requested, actual, rate, sink_max, source_max = 0;
> > u8 lanes, bpc;
> >
> > @@ -387,7 +387,7 @@ static int cdn_dp_get_sink_capability(struct cdn_dp_device *dp)
> > }
> >
> > kfree(dp->edid);
> > - dp->edid = drm_do_get_edid(&dp->mhdp.connector,
> > + dp->edid = drm_do_get_edid(&dp->mhdp.connector.base,
> > cdns_mhdp_get_edid_block, &dp->mhdp);
> > return 0;
> > }
> > @@ -559,7 +559,7 @@ static void cdn_dp_encoder_mode_set(struct drm_encoder *encoder,
> > {
> > struct cdn_dp_device *dp = encoder_to_dp(encoder);
> > struct drm_display_info *display_info =
> > - &dp->mhdp.connector.display_info;
> > + &dp->mhdp.connector.base.display_info;
> > struct video_info *video = &dp->mhdp.video_info;
> >
> > switch (display_info->bpc) {
> > @@ -863,8 +863,8 @@ static int cdn_dp_audio_get_eld(struct device *dev, void *data,
> > {
> > struct cdn_dp_device *dp = dev_get_drvdata(dev);
> >
> > - memcpy(buf, dp->mhdp.connector.eld,
> > - min(sizeof(dp->mhdp.connector.eld), len));
> > + memcpy(buf, dp->mhdp.connector.base.eld,
> > + min(sizeof(dp->mhdp.connector.base.eld), len));
> >
> > return 0;
> > }
> > @@ -936,7 +936,7 @@ static void cdn_dp_pd_event_work(struct work_struct *work)
> > {
> > struct cdn_dp_device *dp = container_of(work, struct cdn_dp_device,
> > event_work);
> > - struct drm_connector *connector = &dp->mhdp.connector;
> > + struct drm_connector *connector = &dp->mhdp.connector.base;
> > enum drm_connector_status old_status;
> > struct device *dev = dp->mhdp.dev;
> >
> > @@ -1062,7 +1062,7 @@ static int cdn_dp_bind(struct device *dev, struct device *master, void *data)
> >
> > drm_encoder_helper_add(encoder, &cdn_dp_encoder_helper_funcs);
> >
> > - connector = &dp->mhdp.connector;
> > + connector = &dp->mhdp.connector.base;
> > connector->polled = DRM_CONNECTOR_POLL_HPD;
> > connector->dpms = DRM_MODE_DPMS_OFF;
> >
> > @@ -1113,7 +1113,7 @@ 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;
> > - struct drm_connector *connector = &dp->mhdp.connector;
> > + struct drm_connector *connector = &dp->mhdp.connector.base;
> >
> > cancel_work_sync(&dp->event_work);
> > cdn_dp_encoder_disable(encoder);
> > diff --git a/include/drm/bridge/cdns-mhdp-cbs.h b/include/drm/bridge/cdns-mhdp-cbs.h
> > new file mode 100644
> > index 000000000000..af07cbfcb729
> > --- /dev/null
> > +++ b/include/drm/bridge/cdns-mhdp-cbs.h
> > @@ -0,0 +1,27 @@
> > +/* SPDX-License-Identifier: GPL v2 */
> > +/*
> > + * Cadence MHDP DP bridge callbacks.
> > + *
> > + * Copyright: 2018 Cadence Design Systems, Inc.
> > + *
> > + * Author: Piotr Sroka <piotrs@cadence.com>
> > + */
> > +
> > +#ifndef CDNS_MHDP_CBS_H
> > +#define CDNS_MHDP_CBS_H
> > +
> > +struct cdns_mhdp_mst_cbs_funcs {
> > + struct drm_encoder *(*create_mst_encoder)(void *priv_data,
> > + struct drm_bridge *bridge);
> > + void (*destroy_mst_encoder)(void *priv_data, struct drm_bridge *bridge);
> > +};
> > +
> > +struct cdns_mhdp_mst_cbs {
> > + struct cdns_mhdp_mst_cbs_funcs funcs;
> > + void *priv_data;
> > +};
> > +
> > +int mhdp_bridge_attach_mst_cbs(struct drm_bridge *bridge,
> > + struct cdns_mhdp_mst_cbs *cbs);
> > +
> > +#endif
> > diff --git a/include/drm/bridge/cdns-mhdp-common.h b/include/drm/bridge/cdns-mhdp-common.h
> > index c5a5c4fa7fc4..d4711091ff2b 100644
> > --- a/include/drm/bridge/cdns-mhdp-common.h
> > +++ b/include/drm/bridge/cdns-mhdp-common.h
> > @@ -15,10 +15,12 @@
> > #ifndef CDNS_MHDP_COMMON_H_
> > #define CDNS_MHDP_COMMON_H_
> >
> > +#include <drm/drm_dp_mst_helper.h>
> > #include <linux/bitops.h>
> > #include <drm/drm_dp_helper.h>
> > #include <drm/drm_connector.h>
> > #include <drm/drm_bridge.h>
> > +#include <drm/bridge/cdns-mhdp-cbs.h>
> >
> > #define ADDR_IMEM 0x10000
> > #define ADDR_DMEM 0x20000
> > @@ -326,11 +328,11 @@
> > #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 GENERAL_REGISTER_READ 0x07
> > +#define GENERAL_MAIN_CONTROL 0x01
> > +#define GENERAL_TEST_ECHO 0x02
> > +#define GENERAL_BUS_SETTINGS 0x03
> > +#define GENERAL_TEST_ACCESS 0x04
> > +#define GENERAL_REGISTER_READ 0x07
> >
> > #define DPTX_SET_POWER_MNG 0x00
> > #define DPTX_SET_HOST_CAPABILITIES 0x01
> > @@ -512,13 +514,34 @@ struct cdns_mhdp_sink {
> > u8 enhanced;
> > };
> >
> > +struct cdns_mhdp_bridge;
> > +struct cdns_mhdp_connector;
> > +
> > +struct cdns_mhdp_bridge {
> > + struct cdns_mhdp_device *mhdp;
> > + struct drm_bridge base;
> > + int pbn;
> > + int8_t stream_id;
> > + struct cdns_mhdp_connector *connector;
> > + bool is_active;
> > +};
> > +
> > +
> > +struct cdns_mhdp_connector {
> > + struct drm_connector base;
> > + bool is_mst_connector;
> > + struct drm_dp_mst_port *port;
> > + struct cdns_mhdp_bridge *bridge;
> > +};
> > +
> > +
> > struct cdns_mhdp_device {
> > void __iomem *regs;
> >
> > struct device *dev;
> >
> > struct drm_dp_link link;
> > - struct drm_connector connector;
> > + struct cdns_mhdp_connector connector;
> > struct clk *spdif_clk;
> > struct reset_control *spdif_rst;
> >
> > @@ -528,13 +551,22 @@ struct cdns_mhdp_device {
> > struct drm_dp_aux aux;
> > struct cdns_mhdp_host host;
> > struct cdns_mhdp_sink sink;
> > - struct drm_bridge bridge;
> > + struct cdns_mhdp_bridge bridge;
> > struct phy *phy;
> > void __iomem *dbg_regs;
> >
> > struct video_info video_info;
> > struct drm_display_mode mode;
> > unsigned int fw_version;
> > +
> > + struct drm_dp_mst_topology_mgr mst_mgr;
> > + struct delayed_work hotplug_work;
> > +
> > + struct cdns_mhdp_mst_cbs cbs;
> > + bool is_mst;
> > + bool can_mst;
> > + bool link_up;
> > + bool plugged;
> > };
> >
> > void cdns_mhdp_clock_reset(struct cdns_mhdp_device *mhdp);
> > @@ -562,7 +594,7 @@ int cdns_mhdp_audio_config(struct cdns_mhdp_device *mhdp,
> > int cdns_mhdp_reg_read(struct cdns_mhdp_device *mhdp, u32 addr, u32 *value);
> > int cdns_mhdp_reg_write(struct cdns_mhdp_device *mhdp, u16 addr, u32 val);
> > int cdns_mhdp_reg_write_bit(struct cdns_mhdp_device *mhdp, u16 addr,
> > - u8 start_bit, u8 bits_no, u32 val);
> > + u8 start_bit, u8 bits_no, u32 val);
> > int cdns_mhdp_adjust_lt(struct cdns_mhdp_device *mhdp, u8 nlanes,
> > u16 udelay, u8 *lanes_data,
> > u8 *dpcd);
_______________________________________________
Linux-rockchip mailing list
Linux-rockchip@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-rockchip
^ permalink raw reply [flat|nested] 45+ messages in thread
* [PATCH v6 5/6] drm/bridge: add support for MST in mhdp8546 driver
@ 2018-11-08 14:53 ` Damian Kos
0 siblings, 0 replies; 45+ messages in thread
From: Damian Kos @ 2018-11-08 14:53 UTC (permalink / raw)
To: linux-arm-kernel
From: Andrzej Hajda <a.hajda@samsung.com>
Sent: Wednesday, November 7, 2018 12:40
To: Damian Kos <dkos@cadence.com>; David Airlie <airlied@linux.ie>; Rob Herring <robh+dt@kernel.org>; Mark Rutland <mark.rutland@arm.com>; Archit Taneja <architt@codeaurora.org>; Laurent Pinchart <Laurent.pinchart@ideasonboard.com>; Gustavo Padovan <gustavo@padovan.org>; Maarten Lankhorst <maarten.lankhorst@linux.intel.com>; Sean Paul <sean@poorly.run>; Sandy Huang <hjc@rock-chips.com>; Heiko St?bner <heiko@sntech.de>; Quentin Schulz <quentin.schulz@free-electrons.com>; Piotr Sroka <piotrs@cadence.com>; dri-devel at lists.freedesktop.org; devicetree at vger.kernel.org; linux-kernel at vger.kernel.org; linux-arm-kernel at lists.infradead.org; linux-rockchip at lists.infradead.org
Cc: Rafal Ciepiela <rafalc@cadence.com>; quentin.schulz at bootlin.com; jbergsagel at ti.com
Subject: Re: [PATCH v6 5/6] drm/bridge: add support for MST in mhdp8546 driver
> On 08.10.2018 23:42, Damian Kos wrote:
> > From: Piotr Sroka <piotrs@cadence.com>
> >
> > - add hot plug support to handle HDP IRQ interrupts in case sideband
> > message is ready to read.
> > - there is only one connector created at initialization stage. It is
> > used as SST connector when controller works in SST mode. If controller
> > works in MST mode then the SST connector status is disconnected all the
> > time. MST connectors are created/destroyed in runtime depends on what
> > devices are connected to the DP controller.
> > - add callbacks functions to be able to inform module managing encoders
> > objects to create or destroy an encoder in case new a MST connector is
> > created/destroyed
>
>
> I am not familiar with MST so I will stick to bike-shedding :) Reviewer
> with MST experience needed.
>
Nonetheless, thank you, Andrzej, for the feedback for this and the other
patches.
This will keep us busy for a while :)
>
> >
> > Signed-off-by: Piotr Sroka <piotrs@cadence.com>
> > Signed-off-by: Damian Kos <dkos@cadence.com>
> > ---
> > drivers/gpu/drm/bridge/Makefile | 2 +-
> > drivers/gpu/drm/bridge/cdns-mhdp-mst.c | 594 +++++++++++++++++++++++++
> > drivers/gpu/drm/bridge/cdns-mhdp.c | 560 ++++++++++++-----------
> > drivers/gpu/drm/bridge/cdns-mhdp.h | 209 +++++++++
> > drivers/gpu/drm/rockchip/cdn-dp-core.c | 18 +-
> > include/drm/bridge/cdns-mhdp-cbs.h | 27 ++
> > include/drm/bridge/cdns-mhdp-common.h | 48 +-
> > 7 files changed, 1189 insertions(+), 269 deletions(-)
> > create mode 100644 drivers/gpu/drm/bridge/cdns-mhdp-mst.c
> > create mode 100644 drivers/gpu/drm/bridge/cdns-mhdp.h
> > create mode 100644 include/drm/bridge/cdns-mhdp-cbs.h
> >
> > diff --git a/drivers/gpu/drm/bridge/Makefile b/drivers/gpu/drm/bridge/Makefile
> > index e802fdb85750..b80f3d6ed2a6 100644
> > --- a/drivers/gpu/drm/bridge/Makefile
> > +++ b/drivers/gpu/drm/bridge/Makefile
> > @@ -19,4 +19,4 @@ obj-$(CONFIG_DRM_TI_TFP410) += ti-tfp410.o
> > obj-$(CONFIG_DRM_CDNS_MHDP) += mhdp8546.o
> > obj-y += synopsys/
> >
> > -mhdp8546-objs := cdns-mhdp-common.o cdns-mhdp.o
> > +mhdp8546-objs := cdns-mhdp-common.o cdns-mhdp.o cdns-mhdp-mst.o
> > diff --git a/drivers/gpu/drm/bridge/cdns-mhdp-mst.c b/drivers/gpu/drm/bridge/cdns-mhdp-mst.c
> > new file mode 100644
> > index 000000000000..782d4bf9b667
> > --- /dev/null
> > +++ b/drivers/gpu/drm/bridge/cdns-mhdp-mst.c
> > @@ -0,0 +1,594 @@
> > +// SPDX-License-Identifier: GPL v2
> > +/*
> > + * Cadence MHDP DP MST bridge driver.
> > + *
> > + * Copyright: 2018 Cadence Design Systems, Inc.
> > + *
> > + * Author: Piotr Sroka <piotrs@cadence.com>
> > + */
> > +#include <drm/drm_print.h>
> > +#include <drm/drm_crtc_helper.h>
> > +#include <drm/drm_atomic_helper.h>
> > +#include <drm/drm_fixed.h>
> > +#include <drm/drm_connector.h>
> > +#include <linux/iopoll.h>
> > +
> > +#include <drm/bridge/cdns-mhdp-common.h>
>
>
> Alphabetic order.
>
>
> > +#include "cdns-mhdp.h"
> > +
> > +
> > +static void cdns_mhdp_mst_stream_enable(struct cdns_mhdp_bridge *mhdp_bridge,
> > + bool enable)
> > +{
> > + u32 reg;
> > + struct cdns_mhdp_device *mhdp = mhdp_bridge->mhdp;
> > + u8 stream_id = mhdp_bridge->stream_id;
> > +
> > + cdns_mhdp_reg_read(mhdp, CDNS_DP_MST_STREAM_CONFIG(stream_id), ®);
> > +
> > + if (enable) {
> > + reg |= CDNS_DP_MST_STRM_CFG_STREAM_EN;
> > + reg &= ~CDNS_DP_MST_STRM_CFG_NO_VIDEO;
> > + } else {
> > + reg &= ~CDNS_DP_MST_STRM_CFG_STREAM_EN;
> > + reg |= CDNS_DP_MST_STRM_CFG_NO_VIDEO;
> > + }
> > +
> > + cdns_mhdp_reg_write(mhdp, CDNS_DP_MST_STREAM_CONFIG(stream_id), reg);
> > +}
> > +
> > +static inline s64 calc_fixed_avg_slots(u32 pbn, u32 pbn_div)
> > +{
> > + s64 fixed_pbn, fixed_pbn_div, fixed_targ_avg_slots;
> > +
> > + fixed_pbn = drm_int2fixp(pbn);
> > + fixed_pbn_div = drm_int2fixp(pbn_div);
> > + fixed_targ_avg_slots = drm_fixp_div(fixed_pbn, fixed_pbn_div);
> > +
> > + return fixed_targ_avg_slots;
> > +}
> > +
> > +static void cdns_mhdp_mst_set_threshold(struct cdns_mhdp_bridge *bridge)
> > +{
> > + u32 threshold;
> > + u8 stream_id = bridge->stream_id;
> > + struct cdns_mhdp_device *mhdp = bridge->mhdp;
> > + s64 fixed_targ_avg_slots, fixed_thresh, fixed_targ_entries;
> > +
> > + fixed_targ_avg_slots = calc_fixed_avg_slots(bridge->pbn,
> > + mhdp->mst_mgr.pbn_div);
> > +
> > + fixed_targ_entries = drm_fixp_div(fixed_targ_avg_slots,
> > + drm_int2fixp(2));
> > + fixed_thresh = drm_fixp_mul(fixed_targ_entries, fixed_targ_entries);
> > + fixed_thresh = drm_fixp_div(fixed_thresh, drm_int2fixp(32));
> > + fixed_thresh = fixed_targ_entries - fixed_thresh;
> > + fixed_thresh = drm_fixp_mul(fixed_thresh,
> > + drm_int2fixp(mhdp->link.num_lanes));
> > + fixed_thresh = drm_fixp_div(fixed_thresh, drm_int2fixp(4));
> > +
> > + threshold = drm_fixp2int_ceil(fixed_thresh);
> > + if (threshold < 2)
> > + threshold = 2;
> > +
> > + cdns_mhdp_reg_write(mhdp, CDNS_DP_LINE_THRESH(stream_id),
> > + CDNS_DP_ACTIVE_LINE_THRESH(threshold));
>
>
> All this magic makes me think I am not a right person to review this
> code, or the code is overcomplicated. Lets try layman approach.
>
> Formula is as below:
>
> threshold = (pbn/pbn_div/2 - (pbn/pbn_div/2)^2 / 32)*num_lanes / 4
>
> plus round_up, and cap by 2.
>
> Please describe the formula in comment to increase readability and use
> some temporary variables instead of overusing fixed_thresh.
>
> Where this formula comes from? Document it.
>
> Moreover if there is no difference between drm_fixp_div(x,
> drm_int2fixp(const)) and div_s64(x, const) I guess the latter is better.
>
I've spoke with people behind this code and it turned out that some of it
might not be needed anymore as the HW can now calculate threshold value.
Need to double check and rework it.
>
> > +}
> > +
> > +static void cdns_mhdp_set_rate_governing(struct cdns_mhdp_bridge *bridge,
> > + bool enable)
> > +{
> > + struct cdns_mhdp_device *mhdp = bridge->mhdp;
> > + u8 stream_id = bridge->stream_id;
> > +
> > + if (enable) {
> > + s64 fixed_targ_avg_slots, fixed_y;
> > + u32 x, y;
> > +
> > + fixed_targ_avg_slots =
> > + calc_fixed_avg_slots(bridge->pbn,
> > + mhdp->mst_mgr.pbn_div);
> > +
> > + x = drm_fixp2int(fixed_targ_avg_slots);
> > +
> > + fixed_y = (fixed_targ_avg_slots - drm_int2fixp(x));
> > + fixed_y = drm_fixp_mul(fixed_y, drm_int2fixp(16));
>
> Again, maybe fixed_y *= 16;
>
>
> > + y = drm_fixp2int_ceil(fixed_y);
>
> Ok, at this point x is integer part of fixed_targ_avg_slots and y is
> fractional part of fixed_targ_avg_slots * 16.
>
> Looking at calc_fixed_avg_slots it means, that:
>
> x = bridge->pbn / mhdp->mst_mgr.pbn_div;
>
> y = bridge->pbn % mhdp->mst_mgr.pbn_div * 16 / mhdp->mst_mgr.pbn_div;
>
>
> Without using fixed arithmetic, more direct?
>
>
> > +
> > + cdns_mhdp_reg_write(mhdp, CDNS_DP_RATE_GOVERNING(stream_id),
> > + CDNS_DP_RG_TARG_AV_SLOTS_Y(y) |
> > + CDNS_DP_RG_TARG_AV_SLOTS_X(x) |
> > + CDNS_DP_RG_ENABLE);
> > + } else
> > + cdns_mhdp_reg_write(mhdp, CDNS_DP_RATE_GOVERNING(stream_id), 0);
> > +}
> > +
> > +
> > +static struct drm_dp_payload *
> > +cdns_mhdp_get_payload(struct cdns_mhdp_bridge *bridge)
> > +{
> > + int vcpi = bridge->connector->port->vcpi.vcpi, i;
> > + struct cdns_mhdp_device *mhdp = bridge->mhdp;
> > +
> > + for (i = 0; i < mhdp->mst_mgr.max_payloads; i++) {
> > + struct drm_dp_payload *payload = &mhdp->mst_mgr.payloads[i];
> > +
> > + if (payload->vcpi == vcpi)
> > + return payload;
> > + }
> > +
> > + return NULL;
> > +}
> > +
> > +
> > +static int
> > +cdns_mhdp_set_act_enable(struct cdns_mhdp_device *mhdp)
> > +{
> > + u32 reg;
> > + int ret;
> > +
> > + cdns_mhdp_reg_read(mhdp, CDNS_DP_MTPH_CONTROL, ®);
> > + cdns_mhdp_reg_write(mhdp, CDNS_DP_MTPH_CONTROL,
> > + reg | CDNS_DP_MTPH_ACT_EN);
> > +
> > + ret = readl_poll_timeout(mhdp->regs + CDNS_DP_MTPH_STATUS, reg,
> > + ((reg & CDNS_DP_MTPH_ACT_STATUS) == 0), 0,
> > + 30);
> > + if (ret) {
> > + dev_err(mhdp->dev,
> > + "ACT sequence cannot complete in 30us\n");
> > + return -EIO;
> > + }
> > +
> > + return drm_dp_check_act_status(&mhdp->mst_mgr);
> > +}
> > +
> > +
> > +static int
> > +cdns_mhdp_apply_slot_allocation(struct cdns_mhdp_bridge *mhdp_bridge)
> > +{
> > + struct drm_dp_payload *payload;
> > + struct cdns_mhdp_device *mhdp = mhdp_bridge->mhdp;
> > + u8 stream_id = mhdp_bridge->stream_id;
> > +
> > + payload = cdns_mhdp_get_payload(mhdp_bridge);
> > +
> > + if (!payload) {
> > + DRM_ERROR("payload is not found\n");
> > + return -EIO;
> > + }
> > +
> > + cdns_mhdp_reg_write(mhdp, CDNS_DP_MST_SLOT_ALLOCATE(stream_id),
> > + CDNS_DP_S_ALLOC_START_SLOT(payload->start_slot) |
> > + CDNS_DP_S_ALLOC_END_SLOT(payload->start_slot
> > + + payload->num_slots - 1));
> > +
> > + return 0;
> > +}
> > +
> > +static void
> > +cdns_mhdp_update_slot_allocation(struct cdns_mhdp_bridge *mhdp_bridge)
> > +{
> > + struct drm_device *dev = mhdp_bridge->base.dev;
> > + struct drm_connector *connector;
> > +
> > + list_for_each_entry(connector, &dev->mode_config.connector_list, head) {
> > + struct cdns_mhdp_connector *mhdp_connector;
> > +
> > + mhdp_connector = to_mhdp_connector(connector);
> > + if (!connector->encoder)
> > + continue;
> > + if (!mhdp_connector->is_mst_connector)
> > + continue;
> > +
> > + if (mhdp_connector->bridge->stream_id != -1)
> > + cdns_mhdp_apply_slot_allocation(mhdp_connector->bridge);
> > + }
> > +}
> > +
> > +static enum drm_connector_status
> > +cdns_dp_mst_detect(struct drm_connector *connector, bool force)
> > +{
> > + enum drm_connector_status stat;
> > + struct cdns_mhdp_connector *mhdp_connector;
> > + struct cdns_mhdp_device *mhdp;
> > +
> > + mhdp_connector = to_mhdp_connector(connector);
> > + mhdp = mhdp_connector->bridge->mhdp;
> > +
> > + stat = drm_dp_mst_detect_port(connector, &mhdp->mst_mgr,
> > + mhdp_connector->port);
> > + return stat;
> > +}
> > +
> > +static void
> > +cdns_dp_mst_connector_destroy(struct drm_connector *connector)
> > +{
> > + struct cdns_mhdp_connector *mhdp_connector;
> > + struct cdns_mhdp_bridge *mhdp_bridge;
> > +
> > + mhdp_connector = to_mhdp_connector(connector);
> > + mhdp_bridge = mhdp_connector->bridge;
> > +
> > + drm_connector_cleanup(&mhdp_connector->base);
> > + drm_bridge_remove(&mhdp_bridge->base);
> > + kfree(mhdp_connector);
> > + kfree(mhdp_bridge);
> > +}
> > +
> > +static const struct drm_connector_funcs cdns_mhdp_mst_connector_funcs = {
> > + .atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state,
> > + .atomic_destroy_state = drm_atomic_helper_connector_destroy_state,
> > + .reset = drm_atomic_helper_connector_reset,
> > + .dpms = drm_helper_connector_dpms,
> > + .detect = cdns_dp_mst_detect,
> > + .fill_modes = drm_helper_probe_single_connector_modes,
> > + .destroy = cdns_dp_mst_connector_destroy,
> > +};
> > +
> > +
> > +static int cdns_mhdp_mst_get_ddc_modes(struct drm_connector *connector)
> > +{
> > + struct cdns_mhdp_connector *mhdp_connector;
> > + struct cdns_mhdp_device *mhdp;
> > + struct edid *edid;
> > + int ret = 0;
> > +
> > + mhdp_connector = to_mhdp_connector(connector);
> > + mhdp = mhdp_connector->bridge->mhdp;
> > +
> > + edid = drm_dp_mst_get_edid(connector, &mhdp->mst_mgr,
> > + mhdp_connector->port);
> > +
> > + DRM_DEBUG_KMS("edid retrieved %p\n", edid);
> > + if (edid) {
> > + drm_connector_update_edid_property(connector, edid);
> > + ret = drm_add_edid_modes(connector, edid);
> > + return ret;
> > + }
> > + drm_connector_update_edid_property(connector, NULL);
> > +
> > + return ret;
>
>
> I suspect edid should be freed, but looking at other users of
> drm_dp_mst_get_edid it is not so obvious (only intel frees it) - memory
> leaks?
>
>
> > +}
> > +
> > +static int cdns_mhdp_mst_get_modes(struct drm_connector *connector)
> > +{
> > + return cdns_mhdp_mst_get_ddc_modes(connector);
> > +}
> > +
> > +
> > +static struct
> > +drm_encoder *cdns_mhdp_mst_best_encoder(struct drm_connector *connector)
> > +{
> > + struct cdns_mhdp_connector *mhdp_connector;
> > +
> > + mhdp_connector = to_mhdp_connector(connector);
> > +
> > + return mhdp_connector->bridge->base.encoder;
> > +}+
> > +static const struct drm_connector_helper_funcs cdns_mhdp_mst_conn_helper_fun = {
> > + .get_modes = cdns_mhdp_mst_get_modes,
> > + .best_encoder = cdns_mhdp_mst_best_encoder,
> > +};
> > +
> > +void cdns_mhdp_mst_enable(struct drm_bridge *bridge)
> > +{
> > + struct cdns_mhdp_bridge *mhdp_bridge = to_mhdp_bridge(bridge);
> > + struct cdns_mhdp_device *mhdp = mhdp_bridge->mhdp;
> > + struct drm_display_info *disp_info;
> > + struct drm_display_mode *mode;
> > + struct cdns_mhdp_connector *mhdp_connector;
> > + u32 bpp;
> > + enum pixel_format pxlfmt;
> > + int ret, slots, stream_id;
> > +
> > + disp_info = &mhdp_bridge->connector->base.display_info;
> > +
> > + pxlfmt = cdns_mhdp_get_pxlfmt(disp_info->color_formats);
> > + bpp = cdns_mhdp_get_bpp(disp_info->bpc, pxlfmt);
> > +
> > + mhdp_connector = mhdp_bridge->connector;
> > + if (mhdp_bridge->stream_id > -1) {
> > + DRM_ERROR("ERROR stream id is attached before bridge is enabled\n");
> > + return;
> > + }
> > +
> > + stream_id = bridge->encoder->crtc->index;
> > +
> > + mode = &bridge->encoder->crtc->state->adjusted_mode;
> > + mhdp_bridge->pbn = drm_dp_calc_pbn_mode(mode->clock, bpp);
> > +
> > + slots = drm_dp_find_vcpi_slots(&mhdp->mst_mgr, mhdp_bridge->pbn);
> > + ret = drm_dp_mst_allocate_vcpi(&mhdp->mst_mgr,
> > + mhdp_connector->port,
> > + mhdp_bridge->pbn, slots);
> > + if (ret == false) {
> > + DRM_ERROR("failed to allocate vcpi\n");
> > + return;
> > + }
> > + ret = drm_dp_update_payload_part1(&mhdp->mst_mgr);
> > + if (ret < 0)
> > + DRM_ERROR("failed update_payload_part1\n");
> > +
> > + mhdp_bridge->stream_id = stream_id;
> > + mhdp_bridge->is_active = true;
> > +
> > + cdns_mhdp_mst_stream_enable(mhdp_bridge, true);
> > + cdns_mhdp_configure_video(bridge);
> > +
> > + ret = cdns_mhdp_apply_slot_allocation(mhdp_bridge);
> > + if (ret < 0) {
> > + cdns_mhdp_mst_stream_enable(mhdp_bridge, false);
> > + mhdp_bridge->stream_id = -1;
> > + mhdp_bridge->is_active = false;
> > + return;
> > + }
> > +
> > + ret = cdns_mhdp_set_act_enable(mhdp);
> > + if (ret)
> > + DRM_ERROR("failed ACT sequence\n");
> > +
> > + cdns_mhdp_set_rate_governing(mhdp_bridge, true);
> > +
> > + cdns_mhdp_mst_set_threshold(mhdp_bridge);
> > +
> > + drm_dp_update_payload_part2(&mhdp->mst_mgr);
> > +}
> > +
> > +void cdns_mhdp_mst_disable(struct drm_bridge *bridge)
> > +{
> > + struct cdns_mhdp_bridge *mhdp_bridge = to_mhdp_bridge(bridge);
> > + struct cdns_mhdp_device *mhdp = mhdp_bridge->mhdp;
> > + struct cdns_mhdp_connector *connector = mhdp_bridge->connector;
> > +
> > + drm_dp_mst_reset_vcpi_slots(&mhdp->mst_mgr, connector->port);
> > + drm_dp_update_payload_part1(&mhdp->mst_mgr);
> > +
> > + cdns_mhdp_update_slot_allocation(mhdp_bridge);
> > +
> > + drm_dp_check_act_status(&mhdp->mst_mgr);
> > +
> > + drm_dp_update_payload_part2(&mhdp->mst_mgr);
> > +
> > + drm_dp_mst_deallocate_vcpi(&mhdp->mst_mgr, connector->port);
> > +
> > + cdns_mhdp_set_rate_governing(mhdp_bridge, false);
> > + cdns_mhdp_mst_stream_enable(mhdp_bridge, false);
> > + mhdp_bridge->stream_id = -1;
> > + mhdp_bridge->is_active = false;
> > +}
> > +
> > +static const struct drm_bridge_funcs cdns_mhdp_mst_bridge_funcs = {
> > + .enable = cdns_mhdp_enable,
> > + .disable = cdns_mhdp_mst_disable,
> > +};
> > +
> > +
> > +static struct cdns_mhdp_bridge*
> > +cdns_mhpd_create_fake_mst_bridge(struct cdns_mhdp_device *mhdp,
> > + struct cdns_mhdp_connector *mhdp_connector)
> > +{
> > + struct cdns_mhdp_bridge *mhdp_bridge;
> > + struct drm_encoder *encoder = NULL;
> > + struct cdns_mhdp_mst_cbs *cbs = &mhdp->cbs;
> > +
> > + mhdp_bridge = kzalloc(sizeof(*mhdp_bridge), GFP_KERNEL);
> > + if (!mhdp_bridge)
> > + return NULL;
> > +
> > + mhdp_bridge->mhdp = mhdp;
> > + mhdp_bridge->stream_id = -1;
> > + mhdp_bridge->connector = mhdp_connector;
> > + mhdp_bridge->is_active = false;
> > +
> > + mhdp_bridge->base.funcs = &cdns_mhdp_mst_bridge_funcs;
> > +
> > + drm_bridge_add(&mhdp_bridge->base);
> > +
> > + if (cbs->funcs.create_mst_encoder)
> > + encoder = cbs->funcs.create_mst_encoder(cbs->priv_data,
> > + &mhdp_bridge->base);
> > + if (encoder) {
> > + int ret;
> > + /* use the same drm device as is in the first encoder */
> > + encoder->dev = mhdp->bridge.base.encoder->dev;
> > + encoder->possible_crtcs &= ((1 << CDNS_MHDP_MAX_STREAMS) - 1);
> > + ret = drm_bridge_attach(encoder, &mhdp_bridge->base, NULL);
> > + if (ret) {
> > + dev_err(mhdp->dev, "bridge attaching error %d\n", ret);
> > + return NULL;
> > + }
> > +
> > + ret = drm_connector_attach_encoder(&mhdp_connector->base,
> > + encoder);
> > + if (ret) {
> > + dev_err(mhdp->dev, "failed to attach connector to encoder\n");
> > + return NULL;
> > + }
> > + }
> > +
> > + return mhdp_bridge;
> > +}
> > +
> > +static struct drm_connector *
> > +cdns_mhdp_mst_cbs_add_connector(struct drm_dp_mst_topology_mgr *mgr,
> > + struct drm_dp_mst_port *port,
> > + const char *pathprop)
> > +{
> > + struct cdns_mhdp_device *mhdp = mgr_to_mhdp(mgr);
> > + struct drm_device *dev = mhdp->bridge.base.dev;
> > + struct cdns_mhdp_connector *mhdp_connector;
> > + struct drm_connector *connector;
> > + struct drm_connector_state *conn_state;
> > + int ret;
> > +
> > + mhdp_connector = kzalloc(sizeof(struct cdns_mhdp_connector),
> > + GFP_KERNEL);
> > + if (!mhdp_connector)
> > + return NULL;
> > +
> > + mhdp_connector->is_mst_connector = true;
> > + connector = &mhdp_connector->base;
> > + mhdp_connector->port = port;
> > + DRM_DEBUG_KMS("\n");
> > +
> > + conn_state = kzalloc(sizeof(*conn_state), GFP_KERNEL);
> > + if (!conn_state)
> > + return NULL;
> > +
> > + __drm_atomic_helper_connector_reset(connector,
> > + conn_state);
> > +
> > + drm_connector_init(dev, connector, &cdns_mhdp_mst_connector_funcs,
> > + DRM_MODE_CONNECTOR_DisplayPort);
> > + drm_connector_helper_add(connector, &cdns_mhdp_mst_conn_helper_fun);
> > + mhdp_connector->bridge =
> > + cdns_mhpd_create_fake_mst_bridge(mhdp, mhdp_connector);
> > +
> > + drm_object_attach_property(&connector->base,
> > + dev->mode_config.path_property, 0);
> > + drm_object_attach_property(&connector->base,
> > + dev->mode_config.tile_property, 0);
> > + ret = drm_connector_set_path_property(connector, pathprop);
> > +
> > + if (ret)
> > + DRM_ERROR("ERROR set path propertty failed\n");
> > +
> > + return connector;
> > +}
> > +
> > +static void
> > +cdns_mhdp_mst_cbs_destroy_connector(struct drm_dp_mst_topology_mgr *mgr,
> > + struct drm_connector *connector)
> > +{
> > + struct cdns_mhdp_connector *mhdp_connector;
> > + struct cdns_mhdp_device *mhdp;
> > + struct cdns_mhdp_bridge *mhdp_bridge;
> > +
> > + mhdp_connector = to_mhdp_connector(connector);
> > + mhdp_bridge = mhdp_connector->bridge;
> > + mhdp = mhdp_bridge->mhdp;
> > +
> > + drm_connector_unregister(&mhdp_connector->base);
> > +
> > + if (mhdp->cbs.funcs.create_mst_encoder)
> > + mhdp->cbs.funcs.destroy_mst_encoder(mhdp->cbs.priv_data,
> > + &mhdp_bridge->base);
> > + drm_connector_unreference(&mhdp_connector->base);
> > +}
> > +
> > +static void cdns_mhdp_mst_cbs_hotplug(struct drm_dp_mst_topology_mgr *mgr)
> > +{
> > + struct cdns_mhdp_device *mhdp = mgr_to_mhdp(mgr);
> > + struct drm_device *dev = mhdp->bridge.base.encoder->dev;
> > +
> > + drm_kms_helper_hotplug_event(dev);
> > +}
> > +
> > +static void
> > +cdns_mhdp_mst_cbs_register_connector(struct drm_connector *connector)
> > +{
> > + int ret;
> > +
> > + ret = drm_connector_register(connector);
> > + if (ret)
> > + DRM_ERROR("Register connector failed\n");
> > +
> > +}
> > +
> > +static const struct drm_dp_mst_topology_cbs mst_cbs = {
> > + .add_connector = cdns_mhdp_mst_cbs_add_connector,
> > + .register_connector = cdns_mhdp_mst_cbs_register_connector,
> > + .destroy_connector = cdns_mhdp_mst_cbs_destroy_connector,
> > + .hotplug = cdns_mhdp_mst_cbs_hotplug,
> > +};
> > +
> > +
> > +static void cdns_mhdp_set_mst_enable(struct cdns_mhdp_device *mhdp, bool enable)
> > +{
> > + u32 reg_val;
> > +
> > + cdns_mhdp_reg_read(mhdp, CDNS_DP_FRAMER_GLOBAL_CONFIG, ®_val);
> > +
> > + if (enable)
> > + reg_val |= CDNS_DP_MST_EN;
> > + else
> > + reg_val &= ~CDNS_DP_MST_EN;
> > +
> > + cdns_mhdp_reg_write(mhdp, CDNS_DP_FRAMER_GLOBAL_CONFIG, reg_val);
> > +}
> > +
> > +bool cdns_mhdp_mst_probe(struct cdns_mhdp_device *mhdp)
> > +{
> > + u8 mstm_cap;
> > + u8 dpcd_cap[DP_RECEIVER_CAP_SIZE];
> > +
> > + bool is_mst;
> > +
> > + if (!mhdp->can_mst)
> > + return false;
> > +
> > + drm_dp_dpcd_read(&mhdp->aux, DP_DPCD_REV, dpcd_cap,
> > + DP_RECEIVER_CAP_SIZE);
> > +
> > + if (dpcd_cap[DP_DPCD_REV] < 0x12)
> > + return false;
> > +
> > + if (drm_dp_dpcd_readb(&mhdp->aux, DP_MSTM_CAP, &mstm_cap) != 1)
> > + return false;
> > +
> > + if (mstm_cap & DP_MST_CAP) {
> > + DRM_DEBUG_KMS("Sink is MST capable\n");
> > + is_mst = true;
> > + } else {
> > + DRM_DEBUG_KMS("Sink is not MST capable\n");
> > + is_mst = false;
> > + }
> > +
> > + if (is_mst != mhdp->is_mst) {
> > + mhdp->is_mst = is_mst;
> > + cdns_mhdp_set_mst_enable(mhdp, mhdp->is_mst);
> > +
> > + drm_dp_mst_topology_mgr_set_mst(&mhdp->mst_mgr,
> > + mhdp->is_mst);
> > + }
> > +
> > + return mhdp->is_mst;
> > +}
> > +
> > +int cdns_mhdp_mst_init(struct cdns_mhdp_device *mhdp)
> > +{
> > + struct cdns_mhdp_bridge *bridge = &mhdp->bridge;
> > + struct drm_device *dev = bridge->base.dev;
> > + struct cdns_mhdp_connector *connector = bridge->connector;
> > + int ret;
> > +
> > + mhdp->mst_mgr.cbs = &mst_cbs;
> > + ret = drm_dp_mst_topology_mgr_init(&mhdp->mst_mgr, dev,
> > + &mhdp->aux, 16,
> > + CDNS_MHDP_MAX_STREAMS,
> > + connector->base.base.id);
> > + if (ret)
> > + mhdp->can_mst = false;
> > + else
> > + mhdp->can_mst = true;
> > +
> > + mhdp->is_mst = false;
> > +
> > + bridge->stream_id = -1;
> > +
> > + return ret;
> > +}
> > +
> > +void cdns_mhdp_mst_deinit(struct cdns_mhdp_device *mhdp)
> > +{
> > + if (mhdp->is_mst) {
> > + mhdp->is_mst = false;
> > + drm_dp_mst_topology_mgr_set_mst(&mhdp->mst_mgr,
> > + mhdp->is_mst);
> > + }
> > +
> > + if (mhdp->can_mst)
> > + drm_dp_mst_topology_mgr_destroy(&mhdp->mst_mgr);
> > +}
> > diff --git a/drivers/gpu/drm/bridge/cdns-mhdp.c b/drivers/gpu/drm/bridge/cdns-mhdp.c
> > index a3bbc0e809a5..48ac5cf1e031 100644
> > --- a/drivers/gpu/drm/bridge/cdns-mhdp.c
> > +++ b/drivers/gpu/drm/bridge/cdns-mhdp.c
> > @@ -27,146 +27,15 @@
> > #include <drm/bridge/cdns-mhdp-common.h>
> >
> > #include <sound/hdmi-codec.h>
> > +#include <linux/irq.h>
> > +#include <linux/of_irq.h>
> >
> > +#include "cdns-mhdp.h"
> >
> > #define DEBUG_MSG
> >
> > #define FW_NAME "cadence/mhdp8546.bin"
> >
> > -#define CDNS_APB_CFG 0x00000
> > -#define CDNS_APB_CTRL (CDNS_APB_CFG + 0x00)
> > -#define CDNS_MAILBOX_FULL (CDNS_APB_CFG + 0x08)
> > -#define CDNS_MAILBOX_EMPTY (CDNS_APB_CFG + 0x0c)
> > -#define CDNS_MAILBOX_TX_DATA (CDNS_APB_CFG + 0x10)
> > -#define CDNS_MAILBOX_RX_DATA (CDNS_APB_CFG + 0x14)
> > -#define CDNS_KEEP_ALIVE (CDNS_APB_CFG + 0x18)
> > -#define CDNS_KEEP_ALIVE_MASK GENMASK(7, 0)
> > -
> > -#define CDNS_SW_CLK_L (CDNS_APB_CFG + 0x3c)
> > -#define CDNS_SW_CLK_H (CDNS_APB_CFG + 0x40)
> > -#define CDNS_SW_EVENT0 (CDNS_APB_CFG + 0x44)
> > -#define CDNS_DPTX_HPD BIT(0)
> > -
> > -#define CDNS_SW_EVENT1 (CDNS_APB_CFG + 0x48)
> > -#define CDNS_SW_EVENT2 (CDNS_APB_CFG + 0x4c)
> > -#define CDNS_SW_EVENT3 (CDNS_APB_CFG + 0x50)
> > -
> > -#define CDNS_DPTX_CAR (CDNS_APB_CFG + 0x904)
> > -#define CDNS_VIF_CLK_EN BIT(0)
> > -#define CDNS_VIF_CLK_RSTN BIT(1)
> > -
> > -#define CDNS_SOURCE_VIDEO_INTERFACE 0x00b00
> > -#define CDNS_BND_HSYNC2VSYNC (CDNS_SOURCE_VIDEO_INTERFACE + \
> > - 0x00)
> > -#define CDNS_IP_DTCT_WIN GENMASK(11, 0)
> > -#define CDNS_IP_DET_INTERLACE_FORMAT BIT(12)
> > -#define CDNS_IP_BYPASS_V_INTERFACE BIT(13)
> > -
> > -#define CDNS_HSYNC2VSYNC_POL_CTRL (CDNS_SOURCE_VIDEO_INTERFACE + \
> > - 0x10)
> > -#define CDNS_H2V_HSYNC_POL_ACTIVE_LOW BIT(1)
> > -#define CDNS_H2V_VSYNC_POL_ACTIVE_LOW BIT(2)
> > -
> > -#define CDNS_DPTX_PHY_CONFIG 0x02000
> > -#define CDNS_PHY_TRAINING_EN BIT(0)
> > -#define CDNS_PHY_TRAINING_TYPE(x) (((x) & GENMASK(3, 0)) << 1)
> > -#define CDNS_PHY_SCRAMBLER_BYPASS BIT(5)
> > -#define CDNS_PHY_ENCODER_BYPASS BIT(6)
> > -#define CDNS_PHY_SKEW_BYPASS BIT(7)
> > -#define CDNS_PHY_TRAINING_AUTO BIT(8)
> > -#define CDNS_PHY_LANE0_SKEW(x) (((x) & GENMASK(2, 0)) << 9)
> > -#define CDNS_PHY_LANE1_SKEW(x) (((x) & GENMASK(2, 0)) << 12)
> > -#define CDNS_PHY_LANE2_SKEW(x) (((x) & GENMASK(2, 0)) << 15)
> > -#define CDNS_PHY_LANE3_SKEW(x) (((x) & GENMASK(2, 0)) << 18)
> > -#define CDNS_PHY_COMMON_CONFIG (CDNS_PHY_LANE1_SKEW(1) | \
> > - CDNS_PHY_LANE2_SKEW(2) | \
> > - CDNS_PHY_LANE3_SKEW(3))
> > -#define CDNS_PHY_10BIT_EN BIT(21)
> > -
> > -#define CDNS_DPTX_FRAMER 0x02200
> > -#define CDNS_DP_FRAMER_GLOBAL_CONFIG (CDNS_DPTX_FRAMER + 0x00)
> > -#define CDNS_DP_NUM_LANES(x) (x - 1)
> > -#define CDNS_DP_FRAMER_EN BIT(3)
> > -#define CDNS_DP_RATE_GOVERNOR_EN BIT(4)
> > -#define CDNS_DP_NO_VIDEO_MODE BIT(5)
> > -#define CDNS_DP_DISABLE_PHY_RST BIT(6)
> > -#define CDNS_DP_WR_FAILING_EDGE_VSYNC BIT(7)
> > -
> > -#define CDNS_DP_SW_RESET (CDNS_DPTX_FRAMER + 0x04)
> > -#define CDNS_DP_FRAMER_TU (CDNS_DPTX_FRAMER + 0x08)
> > -#define CDNS_DP_FRAMER_TU_SIZE(x) (((x) & GENMASK(6, 0)) << 8)
> > -#define CDNS_DP_FRAMER_TU_VS(x) ((x) & GENMASK(5, 0))
> > -#define CDNS_DP_FRAMER_TU_CNT_RST_EN BIT(15)
> > -
> > -#define CDNS_DPTX_STREAM 0x03000
> > -#define CDNS_DP_MSA_HORIZONTAL_0 (CDNS_DPTX_STREAM + 0x00)
> > -#define CDNS_DP_MSAH0_H_TOTAL(x) (x)
> > -#define CDNS_DP_MSAH0_HSYNC_START(x) ((x) << 16)
> > -
> > -#define CDNS_DP_MSA_HORIZONTAL_1 (CDNS_DPTX_STREAM + 0x04)
> > -#define CDNS_DP_MSAH1_HSYNC_WIDTH(x) (x)
> > -#define CDNS_DP_MSAH1_HSYNC_POL_LOW BIT(15)
> > -#define CDNS_DP_MSAH1_HDISP_WIDTH(x) ((x) << 16)
> > -
> > -#define CDNS_DP_MSA_VERTICAL_0 (CDNS_DPTX_STREAM + 0x08)
> > -#define CDNS_DP_MSAV0_V_TOTAL(x) (x)
> > -#define CDNS_DP_MSAV0_VSYNC_START(x) ((x) << 16)
> > -
> > -#define CDNS_DP_MSA_VERTICAL_1 (CDNS_DPTX_STREAM + 0x0c)
> > -#define CDNS_DP_MSAV1_VSYNC_WIDTH(x) (x)
> > -#define CDNS_DP_MSAV1_VSYNC_POL_LOW BIT(15)
> > -#define CDNS_DP_MSAV1_VDISP_WIDTH(x) ((x) << 16)
> > -
> > -#define CDNS_DP_MSA_MISC (CDNS_DPTX_STREAM + 0x10)
> > -#define CDNS_DP_STREAM_CONFIG (CDNS_DPTX_STREAM + 0x14)
> > -#define CDNS_DP_RATE_GOVERNOR_STATUS (CDNS_DPTX_STREAM + 0x2c)
> > -#define CDNS_DP_RG_TU_VS_DIFF(x) ((x) << 8)
> > -
> > -#define CDNS_DP_HORIZONTAL (CDNS_DPTX_STREAM + 0x30)
> > -#define CDNS_DP_H_HSYNC_WIDTH(x) (x)
> > -#define CDNS_DP_H_H_TOTAL(x) ((x) << 16)
> > -
> > -#define CDNS_DP_VERTICAL_0 (CDNS_DPTX_STREAM + 0x34)
> > -#define CDNS_DP_V0_VHEIGHT(x) (x)
> > -#define CDNS_DP_V0_VSTART(x) ((x) << 16)
> > -
> > -#define CDNS_DP_VERTICAL_1 (CDNS_DPTX_STREAM + 0x38)
> > -#define CDNS_DP_V1_VTOTAL(x) (x)
> > -#define CDNS_DP_V1_VTOTAL_EVEN BIT(16)
> > -
> > -#define CDNS_DP_FRAMER_PXL_REPR (CDNS_DPTX_STREAM + 0x4c)
> > -#define CDNS_DP_FRAMER_6_BPC BIT(0)
> > -#define CDNS_DP_FRAMER_8_BPC BIT(1)
> > -#define CDNS_DP_FRAMER_10_BPC BIT(2)
> > -#define CDNS_DP_FRAMER_12_BPC BIT(3)
> > -#define CDNS_DP_FRAMER_16_BPC BIT(4)
> > -#define CDNS_DP_FRAMER_PXL_FORMAT 0x8
> > -#define CDNS_DP_FRAMER_RGB BIT(0)
> > -#define CDNS_DP_FRAMER_YCBCR444 BIT(1)
> > -#define CDNS_DP_FRAMER_YCBCR422 BIT(2)
> > -#define CDNS_DP_FRAMER_YCBCR420 BIT(3)
> > -#define CDNS_DP_FRAMER_Y_ONLY BIT(4)
> > -
> > -#define CDNS_DP_FRAMER_SP (CDNS_DPTX_STREAM + 0x10)
> > -#define CDNS_DP_FRAMER_VSYNC_POL_LOW BIT(0)
> > -#define CDNS_DP_FRAMER_HSYNC_POL_LOW BIT(1)
> > -#define CDNS_DP_FRAMER_INTERLACE BIT(2)
> > -
> > -#define CDNS_DP_LINE_THRESH (CDNS_DPTX_STREAM + 0x64)
> > -#define CDNS_DP_VB_ID (CDNS_DPTX_STREAM + 0x68)
> > -#define CDNS_DP_VB_ID_INTERLACED BIT(2)
> > -
> > -#define CDNS_DP_FRONT_BACK_PORCH (CDNS_DPTX_STREAM + 0x78)
> > -#define CDNS_DP_BACK_PORCH(x) (x)
> > -#define CDNS_DP_FRONT_PORCH(x) ((x) << 16)
> > -
> > -#define CDNS_DP_BYTE_COUNT (CDNS_DPTX_STREAM + 0x7c)
> > -
> > -#define CDNS_DPTX_GLOBAL 0x02300
> > -#define CDNS_DP_LANE_EN (CDNS_DPTX_GLOBAL + 0x00)
> > -#define CDNS_DP_LANE_EN_LANES(x) GENMASK(x - 1, 0)
> > -#define CDNS_DP_ENHNCD (CDNS_DPTX_GLOBAL + 0x04)
> > -
> > #define CDNS_MHDP_IMEM 0x10000
> > #define CDNS_MHDP_DMEM 0x20000
> >
> > @@ -216,13 +85,17 @@ MODULE_DEVICE_TABLE(of, mhdp_ids);
> > static inline struct cdns_mhdp_device *connector_to_mhdp(
> > struct drm_connector *conn)
> > {
> > - return container_of(conn, struct cdns_mhdp_device, connector);
> > + struct cdns_mhdp_connector *mhdp_connector = to_mhdp_connector(conn);
> > +
> > + return mhdp_connector->bridge->mhdp;
> > }
> >
> > static inline struct cdns_mhdp_device *bridge_to_mhdp(
> > struct drm_bridge *bridge)
> > {
> > - return container_of(bridge, struct cdns_mhdp_device, bridge);
> > + struct cdns_mhdp_bridge *mhdp_bridge = to_mhdp_bridge(bridge);
> > +
> > + return mhdp_bridge->mhdp;
> > }
> >
> > static unsigned int max_link_rate(struct cdns_mhdp_host host,
> > @@ -237,6 +110,62 @@ static u8 eq_training_pattern_supported(struct cdns_mhdp_host host,
> > return fls(host.pattern_supp & sink.pattern_supp);
> > }
> >
> > +static void mhdp_hotplug_work_func(struct work_struct *work)
> > +{
> > + struct cdns_mhdp_device *mhdp;
> > + int dret, retry;
> > + u8 esi[16] = { 0 };
> > + bool new_irq_handled;
> > + struct drm_connector *connector;
> > + bool old_plugged;
> > +
> > +
> > + mhdp = container_of(work, struct cdns_mhdp_device,
> > + hotplug_work.work);
> > + connector = &mhdp->connector.base;
> > +
> > + old_plugged = mhdp->plugged;
> > + connector->status = connector->funcs->detect(connector, false);
> > + if (old_plugged != mhdp->plugged) {
> > + drm_kms_helper_hotplug_event(mhdp->bridge.base.dev);
> > + return;
> > + }
> > +
> > + if (mhdp->plugged) {
> > + dret = drm_dp_dpcd_read(&mhdp->aux,
> > + DP_SINK_COUNT_ESI, esi, 8);
> > +
> > + if (dret == 8) {
> > + drm_dp_mst_hpd_irq(&mhdp->mst_mgr,
> > + esi,
> > + &new_irq_handled);
> > + }
> > +
> > + if (new_irq_handled) {
> > + for (retry = 0; retry < 3; retry++) {
> > + int wret;
> > +
> > + wret = drm_dp_dpcd_write(&mhdp->aux,
> > + DP_SINK_COUNT_ESI+1,
> > + &esi[1], 3);
> > + if (wret == 3)
> > + break;
> > + }
> > + }
> > + }
> > +
> > +}
> > +
> > +static irqreturn_t mhdp_irq_handler(int irq, void *data)
> > +{
> > + struct cdns_mhdp_device *mhdp = (struct cdns_mhdp_device *)data;
> > +
> > + if (readl(mhdp->regs + CDNS_SW_EVENT0) & CDNS_DPTX_HPD)
> > + schedule_delayed_work(&mhdp->hotplug_work, 0);
> > +
> > + return IRQ_HANDLED;
> > +}
> > +
> > static ssize_t mhdp_transfer(struct drm_dp_aux *aux,
> > struct drm_dp_aux_msg *msg)
> > {
> > @@ -300,10 +229,16 @@ static enum drm_connector_status cdns_mhdp_detect(struct drm_connector *conn,
> > int ret;
> >
> > ret = cdns_mhdp_get_hpd_status(mhdp);
> > - if (ret > 0)
> > - status = connector_status_connected;
> > - else if (ret < 0)
> > + if (ret > 0) {
> > + mhdp->plugged = true;
> > + cdns_mhdp_mst_probe(mhdp);
> > + // for MST mode this connector will be always disconnected
> > + if (!mhdp->is_mst)
> > + status = connector_status_connected;
> > + } else if (ret < 0)
> > dev_err(mhdp->dev, "Failed to obtain HPD state\n");
> > + else
> > + mhdp->plugged = false;
> >
> > return status;
> > }
> > @@ -321,11 +256,15 @@ static const struct drm_connector_funcs cdns_mhdp_conn_funcs = {
> > static int cdns_mhdp_attach(struct drm_bridge *bridge)
> > {
> > struct cdns_mhdp_device *mhdp = bridge_to_mhdp(bridge);
> > - struct drm_connector *conn = &mhdp->connector;
> > + struct drm_connector *conn = &mhdp->connector.base;
> > int ret;
> >
> > - conn->polled = DRM_CONNECTOR_POLL_CONNECT |
> > - DRM_CONNECTOR_POLL_DISCONNECT;
> > + if (&mhdp->bridge.base != bridge)
> > + return -ENODEV;
> > +
> > + cdns_mhdp_mst_init(mhdp);
> > +
> > + conn->polled = DRM_CONNECTOR_POLL_HPD;
> >
> > ret = drm_connector_init(bridge->dev, conn, &cdns_mhdp_conn_funcs,
> > DRM_MODE_CONNECTOR_DisplayPort);
> > @@ -342,17 +281,12 @@ static int cdns_mhdp_attach(struct drm_bridge *bridge)
> > return ret;
> > }
> >
> > + /* enable interrupts */
> > + writel(~CDNS_APB_INT_MASK_SW_EVENT_INT, mhdp->regs + CDNS_APB_INT_MASK);
> > +
> > return 0;
> > }
> >
> > -enum pixel_format {
> > - PIXEL_FORMAT_RGB = 1,
> > - PIXEL_FORMAT_YCBCR_444 = 2,
> > - PIXEL_FORMAT_YCBCR_422 = 4,
> > - PIXEL_FORMAT_YCBCR_420 = 8,
> > - PIXEL_FORMAT_Y_ONLY = 16,
> > -};
> > -
> > static void mhdp_link_training_init(struct cdns_mhdp_device *mhdp)
> > {
> > u32 reg32;
> > @@ -716,13 +650,11 @@ static int mhdp_link_training(struct cdns_mhdp_device *mhdp,
> > cdns_mhdp_reg_write(mhdp, CDNS_DP_SW_RESET, 1);
> > cdns_mhdp_reg_write(mhdp, CDNS_DP_SW_RESET, 0);
> >
> > - /* Enable framer */
> > - /* FIXME: update when MST supported, BIT(2) */
> > cdns_mhdp_reg_write(mhdp, CDNS_DP_FRAMER_GLOBAL_CONFIG,
> > - CDNS_DP_FRAMER_EN |
> > CDNS_DP_NUM_LANES(mhdp->link.num_lanes) |
> > CDNS_DP_DISABLE_PHY_RST |
> > CDNS_DP_WR_FAILING_EDGE_VSYNC |
> > + (mhdp->is_mst ? CDNS_DP_MST_EN : 0) |
> > (!video_mode ? CDNS_DP_NO_VIDEO_MODE : 0));
> >
> > /* Reset PHY config */
> > @@ -751,31 +683,20 @@ static void cdns_mhdp_disable(struct drm_bridge *bridge)
> >
> > cdns_mhdp_set_video_status(mhdp, 0);
> >
> > + mhdp->link_up = false;
> > +
> > drm_dp_link_power_down(&mhdp->aux, &mhdp->link);
> > + if (mhdp->is_mst)
> > + cdns_mhdp_mst_disable(bridge);
> > }
> >
> > -static void cdns_mhdp_enable(struct drm_bridge *bridge)
> > +static int cdns_mhdp_link_up(struct cdns_mhdp_device *mhdp)
> > {
> > - struct cdns_mhdp_device *mhdp = bridge_to_mhdp(bridge);
> > - struct drm_display_mode *mode;
> > - struct drm_display_info *disp_info = &mhdp->connector.display_info;
> > - enum pixel_format pxlfmt;
> > - int pxlclock;
> > - unsigned int rate, tu_size = 30, vs, vs_f, bpp, required_bandwidth,
> > - available_bandwidth, dp_framer_sp = 0, msa_horizontal_1,
> > - msa_vertical_1, bnd_hsync2vsync, hsync2vsync_pol_ctrl,
> > - misc0 = 0, misc1 = 0, line_thresh = 0, pxl_repr,
> > - front_porch, back_porch, msa_h0, msa_v0, hsync, vsync,
> > - dp_vertical_1, line_thresh1, line_thresh2;
> > u32 resp;
> > -
> > - unsigned int size = DP_RECEIVER_CAP_SIZE, dp_framer_global_config,
> > + u32 size = DP_RECEIVER_CAP_SIZE, dp_framer_global_config,
> > video_mode, training_interval_us;
> > u8 reg0[size], reg8, amp[2];
> >
> > - mode = &bridge->encoder->crtc->state->adjusted_mode;
> > - pxlclock = mode->crtc_clock;
> > -
> > /*
> > * Upon power-on reset/device disconnection: [2:0] bits should be 0b001
> > * and [7:5] bits 0b000.
> > @@ -824,13 +745,17 @@ static void cdns_mhdp_enable(struct drm_bridge *bridge)
> > default:
> > dev_err(mhdp->dev,
> > "wrong training interval returned by DPCD: %d\n", reg8);
> > - return;
> > + return -EIO;
> > }
> >
> > cdns_mhdp_reg_read(mhdp, CDNS_DP_FRAMER_GLOBAL_CONFIG, &resp);
> >
> > dp_framer_global_config = be32_to_cpu(resp);
> >
> > + cdns_mhdp_mst_probe(mhdp);
> > + if (mhdp->is_mst)
> > + dp_framer_global_config |= CDNS_DP_MST_EN;
> > +
> > video_mode = !(dp_framer_global_config & CDNS_DP_NO_VIDEO_MODE);
> >
> > if (dp_framer_global_config & CDNS_DP_FRAMER_EN)
> > @@ -850,50 +775,168 @@ static void cdns_mhdp_enable(struct drm_bridge *bridge)
> > if (mhdp_link_training(mhdp, video_mode,
> > training_interval_us)) {
> > dev_err(mhdp->dev, "Link training failed. Exiting.\n");
> > - return;
> > + return -EIO;
> > }
> > }
> >
> > + mhdp->link_up = true;
> > +
> > + return 0;
> > +}
> > +
> > +static int cdns_mhdp_sst_enable(struct drm_bridge *bridge)
> > +{
> > + struct cdns_mhdp_bridge *mhdp_bridge = to_mhdp_bridge(bridge);
> > + struct cdns_mhdp_device *mhdp = mhdp_bridge->mhdp;
> > + u32 rate, vs, vs_f, required_bandwidth, available_bandwidth;
> > + u32 bpp, tu_size = 30, line_thresh1, line_thresh2, line_thresh = 0;
> > + struct drm_display_mode *mode;
> > + int pxlclock;
> > + enum pixel_format pxlfmt;
> > + struct drm_display_info *disp_info = &mhdp->connector.base.display_info;
> > +
> > +
> > + mode = &bridge->encoder->crtc->state->adjusted_mode;
> > + pxlclock = mode->crtc_clock;
> > +
> > + mhdp_bridge->stream_id = 0;
> > +
> > rate = mhdp->link.rate / 1000;
> >
> > + pxlfmt = cdns_mhdp_get_pxlfmt(disp_info->color_formats);
> > + bpp = cdns_mhdp_get_bpp(disp_info->bpc, pxlfmt);
> > +
> > + /* find optimal tu_size */
> > + required_bandwidth = pxlclock * bpp / 8;
> > + available_bandwidth = mhdp->link.num_lanes * rate;
> > + do {
> > + tu_size += 2;
> > +
> > + vs_f = tu_size * required_bandwidth / available_bandwidth;
> > + vs = vs_f / 1000;
> > + vs_f = vs_f % 1000;
> > + /*
> > + * FIXME (CDNS): downspreading?
> > + * It's unused is what I've been told.
> > + */
> > + } while ((vs == 1 || ((vs_f > 850 || vs_f < 100) && vs_f != 0) ||
> > + tu_size - vs < 2) && tu_size < 64);
> > +
> > + if (vs > 64)
> > + return -EINVAL;
> > +
> > +
> > + cdns_mhdp_reg_write(mhdp, CDNS_DP_FRAMER_TU,
> > + CDNS_DP_FRAMER_TU_VS(vs) |
> > + CDNS_DP_FRAMER_TU_SIZE(tu_size) |
> > + CDNS_DP_FRAMER_TU_CNT_RST_EN);
> > +
> > + line_thresh1 = ((vs + 1) << 5) * 8 / bpp;
> > + line_thresh2 = (pxlclock << 5) / 1000 / rate * (vs + 1) - (1 << 5);
> > + line_thresh = line_thresh1 - line_thresh2 / mhdp->link.num_lanes;
> > + line_thresh = (line_thresh >> 5) + 2;
> > + cdns_mhdp_reg_write(mhdp, CDNS_DP_LINE_THRESH(0),
> > + line_thresh & GENMASK(5, 0));
> > +
> > + cdns_mhdp_reg_write(mhdp, CDNS_DP_STREAM_CONFIG_2(0),
> > + CDNS_DP_SC2_TU_VS_DIFF((tu_size - vs > 3) ?
> > + 0 : tu_size - vs));
> > +
> > + cdns_mhdp_configure_video(bridge);
> > +
> > + cdns_mhdp_set_video_status(mhdp, 1);
> > +
> > + return 0;
> > +}
> > +
> > +enum pixel_format cdns_mhdp_get_pxlfmt(u32 color_formats)
> > +{
> > + enum pixel_format pxlfmt;
> > +
> > /* FIXME: what about Y_ONLY? how is it handled in the kernel? */
> > - if (disp_info->color_formats & DRM_COLOR_FORMAT_YCRCB444)
> > + if (color_formats & DRM_COLOR_FORMAT_YCRCB444)
> > pxlfmt = PIXEL_FORMAT_YCBCR_444;
> > - else if (disp_info->color_formats & DRM_COLOR_FORMAT_YCRCB422)
> > + else if (color_formats & DRM_COLOR_FORMAT_YCRCB422)
> > pxlfmt = PIXEL_FORMAT_YCBCR_422;
> > - else if (disp_info->color_formats & DRM_COLOR_FORMAT_YCRCB420)
> > + else if (color_formats & DRM_COLOR_FORMAT_YCRCB420)
> > pxlfmt = PIXEL_FORMAT_YCBCR_420;
> > else
> > pxlfmt = PIXEL_FORMAT_RGB;
> >
> > + return pxlfmt;
> > +}
> > +
> > +
> > +u32 cdns_mhdp_get_bpp(u32 bpc, enum pixel_format pxlfmt)
> > +{
> > + u32 bpp;
> > +
> > + switch (pxlfmt) {
> > + case PIXEL_FORMAT_RGB:
> > + bpp = bpc * 3;
> > + break;
> > + case PIXEL_FORMAT_YCBCR_444:
> > + bpp = bpc * 3;
> > + break;
> > + case PIXEL_FORMAT_YCBCR_422:
> > + bpp = bpc * 2;
> > + break;
> > + case PIXEL_FORMAT_YCBCR_420:
> > + bpp = bpc * 3 / 2;
> > + break;
> > + default:
> > + bpp = bpc;
> > + }
> > + return bpp;
> > +}
> > +
> > +void cdns_mhdp_configure_video(struct drm_bridge *bridge)
> > +{
> > + struct cdns_mhdp_bridge *mhdp_bridge = to_mhdp_bridge(bridge);
> > + struct cdns_mhdp_device *mhdp = mhdp_bridge->mhdp;
> > + struct drm_display_info *disp_info;
> > + unsigned int bpp, dp_framer_sp = 0, msa_horizontal_1,
> > + msa_vertical_1, bnd_hsync2vsync, hsync2vsync_pol_ctrl,
> > + misc0 = 0, misc1 = 0, pxl_repr,
> > + front_porch, back_porch, msa_h0, msa_v0, hsync, vsync,
> > + dp_vertical_1;
> > + struct drm_display_mode *mode;
> > + enum pixel_format pxlfmt;
> > + int pxlclock;
> > + u32 tmp;
> > + u8 stream_id = mhdp_bridge->stream_id;
> > +
> > + mode = &bridge->encoder->crtc->state->adjusted_mode;
> > + pxlclock = mode->crtc_clock;
> > +
> > + disp_info = &mhdp_bridge->connector->base.display_info;
> > + pxlfmt = cdns_mhdp_get_pxlfmt(disp_info->color_formats);
> > +
> > /* if YCBCR supported and stream not SD, use ITU709 */
> > /* FIXME: handle ITU version with YCBCR420 when supported */
> > if ((pxlfmt == PIXEL_FORMAT_YCBCR_444 ||
> > pxlfmt == PIXEL_FORMAT_YCBCR_422) && mode->crtc_vdisplay >= 720)
> > misc0 = DP_YCBCR_COEFFICIENTS_ITU709;
> >
> > + bpp = cdns_mhdp_get_bpp(disp_info->bpc, pxlfmt);
> > +
> > switch (pxlfmt) {
> > case PIXEL_FORMAT_RGB:
> > - bpp = disp_info->bpc * 3;
> > pxl_repr = CDNS_DP_FRAMER_RGB << CDNS_DP_FRAMER_PXL_FORMAT;
> > misc0 |= DP_COLOR_FORMAT_RGB;
> > break;
> > case PIXEL_FORMAT_YCBCR_444:
> > - bpp = disp_info->bpc * 3;
> > pxl_repr = CDNS_DP_FRAMER_YCBCR444 << CDNS_DP_FRAMER_PXL_FORMAT;
> > misc0 |= DP_COLOR_FORMAT_YCbCr444 | DP_TEST_DYNAMIC_RANGE_CEA;
> > break;
> > case PIXEL_FORMAT_YCBCR_422:
> > - bpp = disp_info->bpc * 2;
> > pxl_repr = CDNS_DP_FRAMER_YCBCR422 << CDNS_DP_FRAMER_PXL_FORMAT;
> > misc0 |= DP_COLOR_FORMAT_YCbCr422 | DP_TEST_DYNAMIC_RANGE_CEA;
> > break;
> > case PIXEL_FORMAT_YCBCR_420:
> > - bpp = disp_info->bpc * 3 / 2;
> > pxl_repr = CDNS_DP_FRAMER_YCBCR420 << CDNS_DP_FRAMER_PXL_FORMAT;
> > break;
> > default:
> > - bpp = disp_info->bpc;
> > pxl_repr = CDNS_DP_FRAMER_Y_ONLY << CDNS_DP_FRAMER_PXL_FORMAT;
> > }
> >
> > @@ -920,30 +963,12 @@ static void cdns_mhdp_enable(struct drm_bridge *bridge)
> > break;
> > }
> >
> > - /* find optimal tu_size */
> > - required_bandwidth = pxlclock * bpp / 8;
> > - available_bandwidth = mhdp->link.num_lanes * rate;
> > - do {
> > - tu_size += 2;
> > -
> > - vs_f = tu_size * required_bandwidth / available_bandwidth;
> > - vs = vs_f / 1000;
> > - vs_f = vs_f % 1000;
> > - /*
> > - * FIXME (CDNS): downspreading?
> > - * It's unused is what I've been told.
> > - */
> > - } while ((vs == 1 || ((vs_f > 850 || vs_f < 100) && vs_f != 0) ||
> > - tu_size - vs < 2) && tu_size < 64);
> > -
> > - if (vs > 64)
> > - return;
> > -
> > bnd_hsync2vsync = CDNS_IP_BYPASS_V_INTERFACE;
> > if (mode->flags & DRM_MODE_FLAG_INTERLACE)
> > bnd_hsync2vsync |= CDNS_IP_DET_INTERLACE_FORMAT;
> >
> > - cdns_mhdp_reg_write(mhdp, CDNS_BND_HSYNC2VSYNC, bnd_hsync2vsync);
> > + cdns_mhdp_reg_write(mhdp, CDNS_BND_HSYNC2VSYNC(stream_id),
> > + bnd_hsync2vsync);
> >
> > if (mode->flags & DRM_MODE_FLAG_INTERLACE &&
> > mode->flags & DRM_MODE_FLAG_PHSYNC)
> > @@ -952,15 +977,10 @@ static void cdns_mhdp_enable(struct drm_bridge *bridge)
> > else
> > hsync2vsync_pol_ctrl = 0;
> >
> > - cdns_mhdp_reg_write(mhdp, CDNS_HSYNC2VSYNC_POL_CTRL,
> > + cdns_mhdp_reg_write(mhdp, CDNS_HSYNC2VSYNC_POL_CTRL(stream_id),
> > hsync2vsync_pol_ctrl);
> >
> > - cdns_mhdp_reg_write(mhdp, CDNS_DP_FRAMER_TU,
> > - CDNS_DP_FRAMER_TU_VS(vs) |
> > - CDNS_DP_FRAMER_TU_SIZE(tu_size) |
> > - CDNS_DP_FRAMER_TU_CNT_RST_EN);
> > -
> > - cdns_mhdp_reg_write(mhdp, CDNS_DP_FRAMER_PXL_REPR, pxl_repr);
> > + cdns_mhdp_reg_write(mhdp, CDNS_DP_FRAMER_PXL_REPR(stream_id), pxl_repr);
> >
> > if (mode->flags & DRM_MODE_FLAG_INTERLACE)
> > dp_framer_sp |= CDNS_DP_FRAMER_INTERLACE;
> > @@ -968,19 +988,19 @@ static void cdns_mhdp_enable(struct drm_bridge *bridge)
> > dp_framer_sp |= CDNS_DP_FRAMER_HSYNC_POL_LOW;
> > if (mode->flags & DRM_MODE_FLAG_NVSYNC)
> > dp_framer_sp |= CDNS_DP_FRAMER_VSYNC_POL_LOW;
> > - cdns_mhdp_reg_write(mhdp, CDNS_DP_FRAMER_SP, dp_framer_sp);
> > + cdns_mhdp_reg_write(mhdp, CDNS_DP_FRAMER_SP(stream_id), dp_framer_sp);
> >
> > front_porch = mode->crtc_hsync_start - mode->crtc_hdisplay;
> > back_porch = mode->crtc_htotal - mode->crtc_hsync_end;
> > - cdns_mhdp_reg_write(mhdp, CDNS_DP_FRONT_BACK_PORCH,
> > + cdns_mhdp_reg_write(mhdp, CDNS_DP_FRONT_BACK_PORCH(stream_id),
> > CDNS_DP_FRONT_PORCH(front_porch) |
> > CDNS_DP_BACK_PORCH(back_porch));
> >
> > - cdns_mhdp_reg_write(mhdp, CDNS_DP_BYTE_COUNT,
> > + cdns_mhdp_reg_write(mhdp, CDNS_DP_BYTE_COUNT(stream_id),
> > mode->crtc_hdisplay * bpp / 8);
> >
> > msa_h0 = mode->crtc_htotal - mode->crtc_hsync_start;
> > - cdns_mhdp_reg_write(mhdp, CDNS_DP_MSA_HORIZONTAL_0,
> > + cdns_mhdp_reg_write(mhdp, CDNS_DP_MSA_HORIZONTAL_0(stream_id),
> > CDNS_DP_MSAH0_H_TOTAL(mode->crtc_htotal) |
> > CDNS_DP_MSAH0_HSYNC_START(msa_h0));
> >
> > @@ -989,11 +1009,11 @@ static void cdns_mhdp_enable(struct drm_bridge *bridge)
> > CDNS_DP_MSAH1_HDISP_WIDTH(mode->crtc_hdisplay);
> > if (mode->flags & DRM_MODE_FLAG_NHSYNC)
> > msa_horizontal_1 |= CDNS_DP_MSAH1_HSYNC_POL_LOW;
> > - cdns_mhdp_reg_write(mhdp, CDNS_DP_MSA_HORIZONTAL_1,
> > + cdns_mhdp_reg_write(mhdp, CDNS_DP_MSA_HORIZONTAL_1(stream_id),
> > msa_horizontal_1);
> >
> > msa_v0 = mode->crtc_vtotal - mode->crtc_vsync_start;
> > - cdns_mhdp_reg_write(mhdp, CDNS_DP_MSA_VERTICAL_0,
> > + cdns_mhdp_reg_write(mhdp, CDNS_DP_MSA_VERTICAL_0(stream_id),
> > CDNS_DP_MSAV0_V_TOTAL(mode->crtc_vtotal) |
> > CDNS_DP_MSAV0_VSYNC_START(msa_v0));
> >
> > @@ -1002,7 +1022,8 @@ static void cdns_mhdp_enable(struct drm_bridge *bridge)
> > CDNS_DP_MSAV1_VDISP_WIDTH(mode->crtc_vdisplay);
> > if (mode->flags & DRM_MODE_FLAG_NVSYNC)
> > msa_vertical_1 |= CDNS_DP_MSAV1_VSYNC_POL_LOW;
> > - cdns_mhdp_reg_write(mhdp, CDNS_DP_MSA_VERTICAL_1, msa_vertical_1);
> > + cdns_mhdp_reg_write(mhdp, CDNS_DP_MSA_VERTICAL_1(stream_id),
> > + msa_vertical_1);
> >
> > if ((mode->flags & DRM_MODE_FLAG_INTERLACE) &&
> > mode->crtc_vtotal % 2 == 0)
> > @@ -1014,16 +1035,14 @@ static void cdns_mhdp_enable(struct drm_bridge *bridge)
> > if (pxlfmt == PIXEL_FORMAT_YCBCR_420)
> > misc1 = CDNS_DP_TEST_VSC_SDP;
> >
> > - cdns_mhdp_reg_write(mhdp, CDNS_DP_MSA_MISC, misc0 | (misc1 << 8));
> > + cdns_mhdp_reg_write(mhdp, CDNS_DP_MSA_MISC(stream_id),
> > + misc0 | (misc1 << 8));
> >
> > - /* FIXME: to be changed if MST mode */
> > - cdns_mhdp_reg_write(mhdp, CDNS_DP_STREAM_CONFIG, 1);
> > -
> > - cdns_mhdp_reg_write(mhdp, CDNS_DP_HORIZONTAL,
> > + cdns_mhdp_reg_write(mhdp, CDNS_DP_HORIZONTAL(stream_id),
> > CDNS_DP_H_HSYNC_WIDTH(hsync) |
> > CDNS_DP_H_H_TOTAL(mode->crtc_hdisplay));
> >
> > - cdns_mhdp_reg_write(mhdp, CDNS_DP_VERTICAL_0,
> > + cdns_mhdp_reg_write(mhdp, CDNS_DP_VERTICAL_0(stream_id),
> > CDNS_DP_V0_VHEIGHT(mode->crtc_vdisplay) |
> > CDNS_DP_V0_VSTART(msa_v0));
> >
> > @@ -1032,30 +1051,51 @@ static void cdns_mhdp_enable(struct drm_bridge *bridge)
> > mode->crtc_vtotal % 2 == 0)
> > dp_vertical_1 |= CDNS_DP_V1_VTOTAL_EVEN;
> >
> > - cdns_mhdp_reg_write(mhdp, CDNS_DP_VERTICAL_1, dp_vertical_1);
> > + cdns_mhdp_reg_write(mhdp, CDNS_DP_VERTICAL_1(stream_id), dp_vertical_1);
> >
> > - cdns_mhdp_reg_write_bit(mhdp, CDNS_DP_VB_ID, 2, 1,
> > + cdns_mhdp_reg_write_bit(mhdp, CDNS_DP_VB_ID(stream_id), 2, 1,
> > (mode->flags & DRM_MODE_FLAG_INTERLACE) ?
> > CDNS_DP_VB_ID_INTERLACED : 0);
> >
> > - line_thresh1 = ((vs + 1) << 5) * 8 / bpp;
> > - line_thresh2 = (pxlclock << 5) / 1000 / rate * (vs + 1) - (1 << 5);
> > - line_thresh = line_thresh1 - line_thresh2 / mhdp->link.num_lanes;
> > - line_thresh = (line_thresh >> 5) + 2;
> > - cdns_mhdp_reg_write(mhdp, CDNS_DP_LINE_THRESH,
> > - line_thresh & GENMASK(5, 0));
> >
> > - cdns_mhdp_reg_write(mhdp, CDNS_DP_RATE_GOVERNOR_STATUS,
> > - CDNS_DP_RG_TU_VS_DIFF((tu_size - vs > 3) ?
> > - 0 : tu_size - vs));
> > + cdns_mhdp_reg_read(mhdp, CDNS_DP_FRAMER_GLOBAL_CONFIG, &tmp);
> > + tmp |= CDNS_DP_FRAMER_EN;
> > + cdns_mhdp_reg_write(mhdp, CDNS_DP_FRAMER_GLOBAL_CONFIG, tmp);
> > +}
> >
> > - cdns_mhdp_set_video_status(mhdp, 1);
> > +void cdns_mhdp_enable(struct drm_bridge *bridge)
> > +{
> > + struct cdns_mhdp_bridge *mhdp_bridge = to_mhdp_bridge(bridge);
> > + struct cdns_mhdp_device *mhdp = mhdp_bridge->mhdp;
> > + int ret = 0;
> > +
> > + bool link_up = mhdp->link_up;
> > +
> > + if (!link_up)
> > + cdns_mhdp_link_up(mhdp);
> > +
> > +
> > + if (!mhdp->is_mst)
> > + ret = cdns_mhdp_sst_enable(bridge);
> > + else
> > + cdns_mhdp_mst_enable(bridge);
> > +
>
>
> ret unused, link_up not neccessary, requires cleanup.
>
>
>
> > +}
> > +
> > +static void cdns_mhdp_detach(struct drm_bridge *bridge)
> > +{
> > + struct cdns_mhdp_device *mhdp = bridge_to_mhdp(bridge);
> > + struct cdns_mhdp_mst_cbs cbs_null = {0};
> > +
> > + cdns_mhdp_mst_deinit(mhdp);
> > + mhdp->cbs = cbs_null;
> > }
> >
> > static const struct drm_bridge_funcs cdns_mhdp_bridge_funcs = {
> > .enable = cdns_mhdp_enable,
> > .disable = cdns_mhdp_disable,
> > .attach = cdns_mhdp_attach,
> > + .detach = cdns_mhdp_detach,
> > };
> >
> > static int load_firmware(struct cdns_mhdp_device *mhdp, const char *name,
> > @@ -1127,8 +1167,8 @@ static int cdns_mhdp_audio_get_eld(struct device *dev, void *data,
> > {
> > struct cdns_mhdp_device *mhdp = dev_get_drvdata(dev);
> >
> > - memcpy(buf, mhdp->connector.eld,
> > - min(sizeof(mhdp->connector.eld), len));
> > + memcpy(buf, mhdp->connector.base.eld,
> > + min(sizeof(mhdp->connector.base.eld), len));
> >
> > return 0;
> > }
> > @@ -1149,6 +1189,7 @@ static int mhdp_probe(struct platform_device *pdev)
> > unsigned int reg;
> > unsigned long rate;
> > u32 resp;
> > + int irq;
> >
> > struct hdmi_codec_pdata codec_data = {
> > .i2s = 1,
> > @@ -1192,6 +1233,14 @@ static int mhdp_probe(struct platform_device *pdev)
> > /* Leave debug mode */
> > writel(0, mhdp->regs + CDNS_APB_CTRL);
> >
> > + irq = platform_get_irq(pdev, 0);
> > + ret = request_irq(irq, mhdp_irq_handler, 0, "mhdp8546", mhdp);
>
>
> No free_irq, why dont you use devm_request_irq.
>
>
>
> > + if (ret) {
> > + dev_err(&pdev->dev,
> > + "cannot install IRQ %d\n", irq);
> > + return -EIO;
> > + }
> > +
> > /*
> > * Wait for the KEEP_ALIVE "message" on the first 8 bits.
> > * Updated each sched "tick" (~2ms)
> > @@ -1222,8 +1271,8 @@ static int mhdp_probe(struct platform_device *pdev)
> > mhdp->host.lane_mapping = CDNS_LANE_MAPPING_FLIPPED;
> > mhdp->host.enhanced = true;
> >
> > - mhdp->bridge.of_node = pdev->dev.of_node;
> > - mhdp->bridge.funcs = &cdns_mhdp_bridge_funcs;
> > + mhdp->bridge.base.of_node = pdev->dev.of_node;
> > + mhdp->bridge.base.funcs = &cdns_mhdp_bridge_funcs;
> >
> > /* Init events to 0 as it's not cleared by FW at boot but on read */
> > readl(mhdp->regs + CDNS_SW_EVENT0);
> > @@ -1247,21 +1296,14 @@ static int mhdp_probe(struct platform_device *pdev)
> > cdns_mhdp_reg_write(mhdp, CDNS_DPTX_CAR,
> > resp | CDNS_VIF_CLK_EN | CDNS_VIF_CLK_RSTN);
> >
> > - /* Loop over HDP change */
> > - /*
> > - * FIXME: does not work when put in mhdp_bridge_enable.
> > - * Where should we put it?
> > - */
> > - /* Is it still needed with use of mb message HPD STATUS? */
> > - ret = readl_poll_timeout(mhdp->regs + CDNS_SW_EVENT0, reg,
> > - reg & CDNS_DPTX_HPD, 500,
> > - CDNS_SW_EVENT0_TIMEOUT);
> > - if (ret) {
> > - dev_err(mhdp->dev, "no HPD received %d\n", reg);
> > - return -ENODEV;
> > - }
> > + INIT_DELAYED_WORK(&mhdp->hotplug_work, mhdp_hotplug_work_func);
>
>
> You are removing lot of the code introduced by previous patch, kinda ugly.
>
> I am not sure if merging both patches wouldn't be better, otherwise it
> would be better to split this big patch to smaller chunks - according to
> rule - one change per one patch.
>
>
> Regards
>
> Andrzej
>
>
>
>
> > +
> > + mhdp->bridge.connector = &mhdp->connector;
> > + mhdp->connector.bridge = &mhdp->bridge;
> > + mhdp->bridge.mhdp = mhdp;
> > + mhdp->bridge.is_active = false;
> >
> > - drm_bridge_add(&mhdp->bridge);
> > + drm_bridge_add(&mhdp->bridge.base);
> >
> > return 0;
> > }
> > @@ -1273,9 +1315,11 @@ static int mhdp_remove(struct platform_device *pdev)
> > struct cdns_mhdp_device *mhdp = dev_get_drvdata(&pdev->dev);
> > int ret;
> >
> > + flush_delayed_work(&mhdp->hotplug_work);
> > platform_device_unregister(mhdp->audio_pdev);
> >
> > - drm_bridge_remove(&mhdp->bridge);
> > + cdns_mhdp_mst_deinit(mhdp);
> > + drm_bridge_remove(&mhdp->bridge.base);
> >
> > ret = cdns_mhdp_set_firmware_active(mhdp, false);
> > if (ret) {
> > @@ -1288,6 +1332,17 @@ static int mhdp_remove(struct platform_device *pdev)
> > return 0;
> > }
> >
> > +int mhdp_bridge_attach_mst_cbs(struct drm_bridge *bridge,
> > + struct cdns_mhdp_mst_cbs *cbs)
> > +{
> > + struct cdns_mhdp_device *mhdp = bridge_to_mhdp(bridge);
> > +
> > + mhdp->cbs = *cbs;
> > +
> > + return 0;
> > +}
> > +EXPORT_SYMBOL_GPL(mhdp_bridge_attach_mst_cbs);
> > +
> > static struct platform_driver mhdp_driver = {
> > .driver = {
> > .name = "cdns-mhdp",
> > @@ -1299,6 +1354,9 @@ static struct platform_driver mhdp_driver = {
> > module_platform_driver(mhdp_driver);
> >
> > MODULE_AUTHOR("Quentin Schulz <quentin.schulz@free-electrons.com>");
> > +MODULE_AUTHOR("Przemyslaw Gaj <pgaj@cadence.com>");
> > +MODULE_AUTHOR("Damian Kos <dkos@cadence.com>");
> > +MODULE_AUTHOR("Piotr Sroka <piotrs@cadence.com>");
> > MODULE_DESCRIPTION("Cadence MHDP DP bridge driver");
> > MODULE_LICENSE("GPL");
> > MODULE_ALIAS("platform:cdns-mhdp");
> > diff --git a/drivers/gpu/drm/bridge/cdns-mhdp.h b/drivers/gpu/drm/bridge/cdns-mhdp.h
> > new file mode 100644
> > index 000000000000..abc1fa3f51a6
> > --- /dev/null
> > +++ b/drivers/gpu/drm/bridge/cdns-mhdp.h
> > @@ -0,0 +1,209 @@
> > +/* SPDX-License-Identifier: GPL v2 */
> > +/*
> > + * Cadence MHDP DP MST bridge driver.
> > + *
> > + * Copyright: 2018 Cadence Design Systems, Inc.
> > + *
> > + * Author: Quentin Schulz <quentin.schulz@free-electrons.com>
> > + */
> > +
> > +
> > +#ifndef CDNS_MHDP_H
> > +#define CDNS_MHDP_H
> > +
> > +#include <drm/drm_dp_mst_helper.h>
> > +
> > +#define CDNS_APB_CFG 0x00000
> > +#define CDNS_APB_CTRL (CDNS_APB_CFG + 0x00)
> > +#define CDNS_MAILBOX_FULL (CDNS_APB_CFG + 0x08)
> > +#define CDNS_MAILBOX_EMPTY (CDNS_APB_CFG + 0x0c)
> > +#define CDNS_MAILBOX_TX_DATA (CDNS_APB_CFG + 0x10)
> > +#define CDNS_MAILBOX_RX_DATA (CDNS_APB_CFG + 0x14)
> > +#define CDNS_KEEP_ALIVE (CDNS_APB_CFG + 0x18)
> > +#define CDNS_KEEP_ALIVE_MASK GENMASK(7, 0)
> > +
> > +#define CDNS_MB_INT_MASK (CDNS_APB_CFG + 0x34)
> > +
> > +#define CDNS_SW_CLK_L (CDNS_APB_CFG + 0x3c)
> > +#define CDNS_SW_CLK_H (CDNS_APB_CFG + 0x40)
> > +#define CDNS_SW_EVENT0 (CDNS_APB_CFG + 0x44)
> > +#define CDNS_DPTX_HPD BIT(0)
> > +
> > +#define CDNS_SW_EVENT1 (CDNS_APB_CFG + 0x48)
> > +#define CDNS_SW_EVENT2 (CDNS_APB_CFG + 0x4c)
> > +#define CDNS_SW_EVENT3 (CDNS_APB_CFG + 0x50)
> > +
> > +#define CDNS_APB_INT_MASK (CDNS_APB_CFG + 0x6C)
> > +#define CDNS_APB_INT_MASK_MAILBOX_INT BIT(0)
> > +#define CDNS_APB_INT_MASK_SW_EVENT_INT BIT(1)
> > +
> > +#define CDNS_DPTX_CAR (CDNS_APB_CFG + 0x904)
> > +#define CDNS_VIF_CLK_EN BIT(0)
> > +#define CDNS_VIF_CLK_RSTN BIT(1)
> > +
> > +#define CDNS_SOURCE_VIDEO_IF(s) (0x00b00 + (s * 0x20))
> > +#define CDNS_BND_HSYNC2VSYNC(s) (CDNS_SOURCE_VIDEO_IF(s) + \
> > + 0x00)
> > +#define CDNS_IP_DTCT_WIN GENMASK(11, 0)
> > +#define CDNS_IP_DET_INTERLACE_FORMAT BIT(12)
> > +#define CDNS_IP_BYPASS_V_INTERFACE BIT(13)
> > +
> > +#define CDNS_HSYNC2VSYNC_POL_CTRL(s) (CDNS_SOURCE_VIDEO_IF(s) + \
> > + 0x10)
> > +#define CDNS_H2V_HSYNC_POL_ACTIVE_LOW BIT(1)
> > +#define CDNS_H2V_VSYNC_POL_ACTIVE_LOW BIT(2)
> > +
> > +#define CDNS_DPTX_PHY_CONFIG 0x02000
> > +#define CDNS_PHY_TRAINING_EN BIT(0)
> > +#define CDNS_PHY_TRAINING_TYPE(x) (((x) & GENMASK(3, 0)) << 1)
> > +#define CDNS_PHY_SCRAMBLER_BYPASS BIT(5)
> > +#define CDNS_PHY_ENCODER_BYPASS BIT(6)
> > +#define CDNS_PHY_SKEW_BYPASS BIT(7)
> > +#define CDNS_PHY_TRAINING_AUTO BIT(8)
> > +#define CDNS_PHY_LANE0_SKEW(x) (((x) & GENMASK(2, 0)) << 9)
> > +#define CDNS_PHY_LANE1_SKEW(x) (((x) & GENMASK(2, 0)) << 12)
> > +#define CDNS_PHY_LANE2_SKEW(x) (((x) & GENMASK(2, 0)) << 15)
> > +#define CDNS_PHY_LANE3_SKEW(x) (((x) & GENMASK(2, 0)) << 18)
> > +#define CDNS_PHY_COMMON_CONFIG (CDNS_PHY_LANE1_SKEW(1) | \
> > + CDNS_PHY_LANE2_SKEW(2) | \
> > + CDNS_PHY_LANE3_SKEW(3))
> > +#define CDNS_PHY_10BIT_EN BIT(21)
> > +
> > +#define CDNS_DPTX_FRAMER 0x02200
> > +#define CDNS_DP_FRAMER_GLOBAL_CONFIG (CDNS_DPTX_FRAMER + 0x00)
> > +#define CDNS_DP_NUM_LANES(x) (x - 1)
> > +#define CDNS_DP_MST_EN BIT(2)
> > +#define CDNS_DP_FRAMER_EN BIT(3)
> > +#define CDNS_DP_RATE_GOVERNOR_EN BIT(4)
> > +#define CDNS_DP_NO_VIDEO_MODE BIT(5)
> > +#define CDNS_DP_DISABLE_PHY_RST BIT(6)
> > +#define CDNS_DP_WR_FAILING_EDGE_VSYNC BIT(7)
> > +
> > +#define CDNS_DP_SW_RESET (CDNS_DPTX_FRAMER + 0x04)
> > +#define CDNS_DP_FRAMER_TU (CDNS_DPTX_FRAMER + 0x08)
> > +#define CDNS_DP_FRAMER_TU_SIZE(x) (((x) & GENMASK(6, 0)) << 8)
> > +#define CDNS_DP_FRAMER_TU_VS(x) ((x) & GENMASK(5, 0))
> > +#define CDNS_DP_FRAMER_TU_CNT_RST_EN BIT(15)
> > +
> > +#define CDNS_DPTX_STREAM(s) (0x03000 + s * 0x80)
> > +#define CDNS_DP_MSA_HORIZONTAL_0(s) (CDNS_DPTX_STREAM(s) + 0x00)
> > +#define CDNS_DP_MSAH0_H_TOTAL(x) (x)
> > +#define CDNS_DP_MSAH0_HSYNC_START(x) ((x) << 16)
> > +
> > +#define CDNS_DP_MSA_HORIZONTAL_1(s) (CDNS_DPTX_STREAM(s) + 0x04)
> > +#define CDNS_DP_MSAH1_HSYNC_WIDTH(x) (x)
> > +#define CDNS_DP_MSAH1_HSYNC_POL_LOW BIT(15)
> > +#define CDNS_DP_MSAH1_HDISP_WIDTH(x) ((x) << 16)
> > +
> > +#define CDNS_DP_MSA_VERTICAL_0(s) (CDNS_DPTX_STREAM(s) + 0x08)
> > +#define CDNS_DP_MSAV0_V_TOTAL(x) (x)
> > +#define CDNS_DP_MSAV0_VSYNC_START(x) ((x) << 16)
> > +
> > +#define CDNS_DP_MSA_VERTICAL_1(s) (CDNS_DPTX_STREAM(s) + 0x0c)
> > +#define CDNS_DP_MSAV1_VSYNC_WIDTH(x) (x)
> > +#define CDNS_DP_MSAV1_VSYNC_POL_LOW BIT(15)
> > +#define CDNS_DP_MSAV1_VDISP_WIDTH(x) ((x) << 16)
> > +
> > +#define CDNS_DP_MSA_MISC(s) (CDNS_DPTX_STREAM(s) + 0x10)
> > +#define CDNS_DP_STREAM_CONFIGs(s) (CDNS_DPTX_STREAM(s) + 0x14)
> > +#define CDNS_DP_STREAM_CONFIG_2(s) (CDNS_DPTX_STREAM(s) + 0x2c)
> > +#define CDNS_DP_SC2_TU_VS_DIFF(x) ((x) << 8)
> > +
> > +#define CDNS_DP_HORIZONTAL(s) (CDNS_DPTX_STREAM(s) + 0x30)
> > +#define CDNS_DP_H_HSYNC_WIDTH(x) (x)
> > +#define CDNS_DP_H_H_TOTAL(x) ((x) << 16)
> > +
> > +#define CDNS_DP_VERTICAL_0(s) (CDNS_DPTX_STREAM(s) + 0x34)
> > +#define CDNS_DP_V0_VHEIGHT(x) (x)
> > +#define CDNS_DP_V0_VSTART(x) ((x) << 16)
> > +
> > +#define CDNS_DP_VERTICAL_1(s) (CDNS_DPTX_STREAM(s) + 0x38)
> > +#define CDNS_DP_V1_VTOTAL(x) (x)
> > +#define CDNS_DP_V1_VTOTAL_EVEN BIT(16)
> > +
> > +#define CDNS_DP_FRAMER_PXL_REPR(s) (CDNS_DPTX_STREAM(s) + 0x4c)
> > +#define CDNS_DP_FRAMER_6_BPC BIT(0)
> > +#define CDNS_DP_FRAMER_8_BPC BIT(1)
> > +#define CDNS_DP_FRAMER_10_BPC BIT(2)
> > +#define CDNS_DP_FRAMER_12_BPC BIT(3)
> > +#define CDNS_DP_FRAMER_16_BPC BIT(4)
> > +#define CDNS_DP_FRAMER_PXL_FORMAT 0x8
> > +#define CDNS_DP_FRAMER_RGB BIT(0)
> > +#define CDNS_DP_FRAMER_YCBCR444 BIT(1)
> > +#define CDNS_DP_FRAMER_YCBCR422 BIT(2)
> > +#define CDNS_DP_FRAMER_YCBCR420 BIT(3)
> > +#define CDNS_DP_FRAMER_Y_ONLY BIT(4)
> > +
> > +#define CDNS_DP_FRAMER_SP(s) (CDNS_DPTX_STREAM(s) + 0x10)
> > +#define CDNS_DP_FRAMER_VSYNC_POL_LOW BIT(0)
> > +#define CDNS_DP_FRAMER_HSYNC_POL_LOW BIT(1)
> > +#define CDNS_DP_FRAMER_INTERLACE BIT(2)
> > +
> > +#define CDNS_DP_LINE_THRESH(s) (CDNS_DPTX_STREAM(s) + 0x64)
> > +#define CDNS_DP_ACTIVE_LINE_THRESH(x) (x)
> > +
> > +#define CDNS_DP_VB_ID(s) (CDNS_DPTX_STREAM(s) + 0x68)
> > +#define CDNS_DP_VB_ID_INTERLACED BIT(2)
> > +#define CDNS_DP_VB_ID_COMPRESSED BIT(6)
> > +
> > +#define CDNS_DP_FRONT_BACK_PORCH(s) (CDNS_DPTX_STREAM(s) + 0x78)
> > +#define CDNS_DP_BACK_PORCH(x) (x)
> > +#define CDNS_DP_FRONT_PORCH(x) ((x) << 16)
> > +
> > +#define CDNS_DP_BYTE_COUNT(s) (CDNS_DPTX_STREAM(s) + 0x7c)
> > +#define CDNS_DP_BYTE_COUNT_BYTES_IN_CHUNK_SHIFT 16
> > +
> > +#define CDNS_DP_MST_STREAM_CONFIG(s) (CDNS_DPTX_STREAM(s) + 0x14)
> > +#define CDNS_DP_MST_STRM_CFG_STREAM_EN BIT(0)
> > +#define CDNS_DP_MST_STRM_CFG_NO_VIDEO BIT(1)
> > +
> > +#define CDNS_DP_MST_SLOT_ALLOCATE(s) (CDNS_DPTX_STREAM(s) + 0x44)
> > +#define CDNS_DP_S_ALLOC_START_SLOT(x) (x)
> > +#define CDNS_DP_S_ALLOC_END_SLOT(x) ((x) << 8)
> > +
> > +#define CDNS_DP_RATE_GOVERNING(s) (CDNS_DPTX_STREAM(s) + 0x48)
> > +#define CDNS_DP_RG_TARG_AV_SLOTS_Y(x) (x)
> > +#define CDNS_DP_RG_TARG_AV_SLOTS_X(x) (x << 4)
> > +#define CDNS_DP_RG_ENABLE BIT(10)
> > +
> > +#define CDNS_DP_MTPH_CONTROL 0x2264
> > +#define CDNS_DP_MTPH_ECF_EN BIT(0)
> > +#define CDNS_DP_MTPH_ACT_EN BIT(1)
> > +#define CDNS_DP_MTPH_LVP_EN BIT(2)
> > +
> > +#define CDNS_DP_MTPH_STATUS 0x226C
> > +#define CDNS_DP_MTPH_ACT_STATUS BIT(0)
> > +
> > +
> > +#define CDNS_DPTX_GLOBAL 0x02300
> > +#define CDNS_DP_LANE_EN (CDNS_DPTX_GLOBAL + 0x00)
> > +#define CDNS_DP_LANE_EN_LANES(x) GENMASK(x - 1, 0)
> > +#define CDNS_DP_ENHNCD (CDNS_DPTX_GLOBAL + 0x04)
> > +
> > +
> > +#define to_mhdp_connector(x) container_of(x, struct cdns_mhdp_connector, base)
> > +#define to_mhdp_bridge(x) container_of(x, struct cdns_mhdp_bridge, base)
> > +#define mgr_to_mhdp(x) container_of(x, struct cdns_mhdp_device, mst_mgr)
> > +
> > +#define CDNS_MHDP_MAX_STREAMS 4
> > +
> > +enum pixel_format {
> > + PIXEL_FORMAT_RGB = 1,
> > + PIXEL_FORMAT_YCBCR_444 = 2,
> > + PIXEL_FORMAT_YCBCR_422 = 4,
> > + PIXEL_FORMAT_YCBCR_420 = 8,
> > + PIXEL_FORMAT_Y_ONLY = 16,
> > +};
> > +
> > +
> > +int cdns_mhdp_mst_init(struct cdns_mhdp_device *mhdp);
> > +void cdns_mhdp_mst_deinit(struct cdns_mhdp_device *mhdp);
> > +bool cdns_mhdp_mst_probe(struct cdns_mhdp_device *mhdp);
> > +enum pixel_format cdns_mhdp_get_pxlfmt(u32 color_formats);
> > +u32 cdns_mhdp_get_bpp(u32 bpc, u32 color_formats);
> > +void cdns_mhdp_configure_video(struct drm_bridge *bridge);
> > +void cdns_mhdp_mst_enable(struct drm_bridge *bridge);
> > +void cdns_mhdp_mst_disable(struct drm_bridge *bridge);
> > +void cdns_mhdp_enable(struct drm_bridge *bridge);
> > +
> > +#endif
> > diff --git a/drivers/gpu/drm/rockchip/cdn-dp-core.c b/drivers/gpu/drm/rockchip/cdn-dp-core.c
> > index 343f381e3440..a5a668f1912b 100644
> > --- a/drivers/gpu/drm/rockchip/cdn-dp-core.c
> > +++ b/drivers/gpu/drm/rockchip/cdn-dp-core.c
> > @@ -34,7 +34,7 @@
> > #include "rockchip_drm_vop.h"
> >
> > #define connector_to_dp(c) \
> > - container_of(c, struct cdn_dp_device, mhdp.connector)
> > + container_of(c, struct cdn_dp_device, mhdp.connector.base)
> >
> > #define encoder_to_dp(c) \
> > container_of(c, struct cdn_dp_device, encoder)
> > @@ -291,7 +291,7 @@ static int cdn_dp_connector_mode_valid(struct drm_connector *connector,
> > {
> > struct cdn_dp_device *dp = connector_to_dp(connector);
> > struct drm_display_info *display_info =
> > - &dp->mhdp.connector.display_info;
> > + &dp->mhdp.connector.base.display_info;
> > u32 requested, actual, rate, sink_max, source_max = 0;
> > u8 lanes, bpc;
> >
> > @@ -387,7 +387,7 @@ static int cdn_dp_get_sink_capability(struct cdn_dp_device *dp)
> > }
> >
> > kfree(dp->edid);
> > - dp->edid = drm_do_get_edid(&dp->mhdp.connector,
> > + dp->edid = drm_do_get_edid(&dp->mhdp.connector.base,
> > cdns_mhdp_get_edid_block, &dp->mhdp);
> > return 0;
> > }
> > @@ -559,7 +559,7 @@ static void cdn_dp_encoder_mode_set(struct drm_encoder *encoder,
> > {
> > struct cdn_dp_device *dp = encoder_to_dp(encoder);
> > struct drm_display_info *display_info =
> > - &dp->mhdp.connector.display_info;
> > + &dp->mhdp.connector.base.display_info;
> > struct video_info *video = &dp->mhdp.video_info;
> >
> > switch (display_info->bpc) {
> > @@ -863,8 +863,8 @@ static int cdn_dp_audio_get_eld(struct device *dev, void *data,
> > {
> > struct cdn_dp_device *dp = dev_get_drvdata(dev);
> >
> > - memcpy(buf, dp->mhdp.connector.eld,
> > - min(sizeof(dp->mhdp.connector.eld), len));
> > + memcpy(buf, dp->mhdp.connector.base.eld,
> > + min(sizeof(dp->mhdp.connector.base.eld), len));
> >
> > return 0;
> > }
> > @@ -936,7 +936,7 @@ static void cdn_dp_pd_event_work(struct work_struct *work)
> > {
> > struct cdn_dp_device *dp = container_of(work, struct cdn_dp_device,
> > event_work);
> > - struct drm_connector *connector = &dp->mhdp.connector;
> > + struct drm_connector *connector = &dp->mhdp.connector.base;
> > enum drm_connector_status old_status;
> > struct device *dev = dp->mhdp.dev;
> >
> > @@ -1062,7 +1062,7 @@ static int cdn_dp_bind(struct device *dev, struct device *master, void *data)
> >
> > drm_encoder_helper_add(encoder, &cdn_dp_encoder_helper_funcs);
> >
> > - connector = &dp->mhdp.connector;
> > + connector = &dp->mhdp.connector.base;
> > connector->polled = DRM_CONNECTOR_POLL_HPD;
> > connector->dpms = DRM_MODE_DPMS_OFF;
> >
> > @@ -1113,7 +1113,7 @@ 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;
> > - struct drm_connector *connector = &dp->mhdp.connector;
> > + struct drm_connector *connector = &dp->mhdp.connector.base;
> >
> > cancel_work_sync(&dp->event_work);
> > cdn_dp_encoder_disable(encoder);
> > diff --git a/include/drm/bridge/cdns-mhdp-cbs.h b/include/drm/bridge/cdns-mhdp-cbs.h
> > new file mode 100644
> > index 000000000000..af07cbfcb729
> > --- /dev/null
> > +++ b/include/drm/bridge/cdns-mhdp-cbs.h
> > @@ -0,0 +1,27 @@
> > +/* SPDX-License-Identifier: GPL v2 */
> > +/*
> > + * Cadence MHDP DP bridge callbacks.
> > + *
> > + * Copyright: 2018 Cadence Design Systems, Inc.
> > + *
> > + * Author: Piotr Sroka <piotrs@cadence.com>
> > + */
> > +
> > +#ifndef CDNS_MHDP_CBS_H
> > +#define CDNS_MHDP_CBS_H
> > +
> > +struct cdns_mhdp_mst_cbs_funcs {
> > + struct drm_encoder *(*create_mst_encoder)(void *priv_data,
> > + struct drm_bridge *bridge);
> > + void (*destroy_mst_encoder)(void *priv_data, struct drm_bridge *bridge);
> > +};
> > +
> > +struct cdns_mhdp_mst_cbs {
> > + struct cdns_mhdp_mst_cbs_funcs funcs;
> > + void *priv_data;
> > +};
> > +
> > +int mhdp_bridge_attach_mst_cbs(struct drm_bridge *bridge,
> > + struct cdns_mhdp_mst_cbs *cbs);
> > +
> > +#endif
> > diff --git a/include/drm/bridge/cdns-mhdp-common.h b/include/drm/bridge/cdns-mhdp-common.h
> > index c5a5c4fa7fc4..d4711091ff2b 100644
> > --- a/include/drm/bridge/cdns-mhdp-common.h
> > +++ b/include/drm/bridge/cdns-mhdp-common.h
> > @@ -15,10 +15,12 @@
> > #ifndef CDNS_MHDP_COMMON_H_
> > #define CDNS_MHDP_COMMON_H_
> >
> > +#include <drm/drm_dp_mst_helper.h>
> > #include <linux/bitops.h>
> > #include <drm/drm_dp_helper.h>
> > #include <drm/drm_connector.h>
> > #include <drm/drm_bridge.h>
> > +#include <drm/bridge/cdns-mhdp-cbs.h>
> >
> > #define ADDR_IMEM 0x10000
> > #define ADDR_DMEM 0x20000
> > @@ -326,11 +328,11 @@
> > #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 GENERAL_REGISTER_READ 0x07
> > +#define GENERAL_MAIN_CONTROL 0x01
> > +#define GENERAL_TEST_ECHO 0x02
> > +#define GENERAL_BUS_SETTINGS 0x03
> > +#define GENERAL_TEST_ACCESS 0x04
> > +#define GENERAL_REGISTER_READ 0x07
> >
> > #define DPTX_SET_POWER_MNG 0x00
> > #define DPTX_SET_HOST_CAPABILITIES 0x01
> > @@ -512,13 +514,34 @@ struct cdns_mhdp_sink {
> > u8 enhanced;
> > };
> >
> > +struct cdns_mhdp_bridge;
> > +struct cdns_mhdp_connector;
> > +
> > +struct cdns_mhdp_bridge {
> > + struct cdns_mhdp_device *mhdp;
> > + struct drm_bridge base;
> > + int pbn;
> > + int8_t stream_id;
> > + struct cdns_mhdp_connector *connector;
> > + bool is_active;
> > +};
> > +
> > +
> > +struct cdns_mhdp_connector {
> > + struct drm_connector base;
> > + bool is_mst_connector;
> > + struct drm_dp_mst_port *port;
> > + struct cdns_mhdp_bridge *bridge;
> > +};
> > +
> > +
> > struct cdns_mhdp_device {
> > void __iomem *regs;
> >
> > struct device *dev;
> >
> > struct drm_dp_link link;
> > - struct drm_connector connector;
> > + struct cdns_mhdp_connector connector;
> > struct clk *spdif_clk;
> > struct reset_control *spdif_rst;
> >
> > @@ -528,13 +551,22 @@ struct cdns_mhdp_device {
> > struct drm_dp_aux aux;
> > struct cdns_mhdp_host host;
> > struct cdns_mhdp_sink sink;
> > - struct drm_bridge bridge;
> > + struct cdns_mhdp_bridge bridge;
> > struct phy *phy;
> > void __iomem *dbg_regs;
> >
> > struct video_info video_info;
> > struct drm_display_mode mode;
> > unsigned int fw_version;
> > +
> > + struct drm_dp_mst_topology_mgr mst_mgr;
> > + struct delayed_work hotplug_work;
> > +
> > + struct cdns_mhdp_mst_cbs cbs;
> > + bool is_mst;
> > + bool can_mst;
> > + bool link_up;
> > + bool plugged;
> > };
> >
> > void cdns_mhdp_clock_reset(struct cdns_mhdp_device *mhdp);
> > @@ -562,7 +594,7 @@ int cdns_mhdp_audio_config(struct cdns_mhdp_device *mhdp,
> > int cdns_mhdp_reg_read(struct cdns_mhdp_device *mhdp, u32 addr, u32 *value);
> > int cdns_mhdp_reg_write(struct cdns_mhdp_device *mhdp, u16 addr, u32 val);
> > int cdns_mhdp_reg_write_bit(struct cdns_mhdp_device *mhdp, u16 addr,
> > - u8 start_bit, u8 bits_no, u32 val);
> > + u8 start_bit, u8 bits_no, u32 val);
> > int cdns_mhdp_adjust_lt(struct cdns_mhdp_device *mhdp, u8 nlanes,
> > u16 udelay, u8 *lanes_data,
> > u8 *dpcd);
^ permalink raw reply [flat|nested] 45+ messages in thread
end of thread, other threads:[~2018-11-08 14:55 UTC | newest]
Thread overview: 45+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-10-08 21:42 [PATCH v6 0/6] drm: add support for Cadence MHDP DPI/DP bridge Damian Kos
2018-10-08 21:42 ` Damian Kos
2018-10-08 21:42 ` Damian Kos
2018-10-08 21:42 ` [PATCH v6 1/6] drm/rockchip: prepare common code for cdns and rk dpi/dp driver Damian Kos
2018-10-08 21:42 ` Damian Kos
2018-10-08 21:42 ` Damian Kos
2018-10-08 21:42 ` [PATCH v6 2/6] drm/dp: fix link probing for devices supporting DP 1.4+ Damian Kos
2018-10-08 21:42 ` Damian Kos
2018-10-08 21:42 ` Damian Kos
2018-10-08 21:42 ` [PATCH v6 3/6] dt-bindings: drm/bridge: Document Cadence MHDP bridge bindings Damian Kos
2018-10-08 21:42 ` Damian Kos
2018-10-08 21:42 ` Damian Kos
2018-10-08 21:42 ` [PATCH v6 4/6] drm: bridge: add support for Cadence MHDP DPI/DP bridge Damian Kos
2018-10-08 21:42 ` Damian Kos
2018-10-08 21:42 ` Damian Kos
2018-11-05 13:10 ` Andrzej Hajda
2018-11-05 13:10 ` Andrzej Hajda
2018-10-08 21:42 ` [PATCH v6 5/6] drm/bridge: add support for MST in mhdp8546 driver Damian Kos
2018-10-08 21:42 ` Damian Kos
2018-10-08 21:42 ` Damian Kos
2018-11-07 11:40 ` Andrzej Hajda
2018-11-07 11:40 ` Andrzej Hajda
2018-11-08 14:53 ` Damian Kos
2018-11-08 14:53 ` Damian Kos
2018-11-08 14:53 ` Damian Kos
2018-10-08 21:42 ` [PATCH v6 6/6] drm/bridge: add PHY initialization " Damian Kos
2018-10-08 21:42 ` Damian Kos
2018-10-08 21:42 ` Damian Kos
2018-11-07 11:49 ` Andrzej Hajda
2018-11-07 11:49 ` Andrzej Hajda
2018-11-05 9:44 ` [PATCH v6 0/6] drm: add support for Cadence MHDP DPI/DP bridge Damian Kos
2018-11-05 9:44 ` Damian Kos
2018-11-05 9:44 ` Damian Kos
2018-11-05 10:30 ` Laurent Pinchart
2018-11-05 10:30 ` Laurent Pinchart
2018-11-05 10:30 ` Laurent Pinchart
2018-11-05 10:33 ` Damian Kos
2018-11-05 10:33 ` Damian Kos
2018-11-05 10:33 ` Damian Kos
2018-11-05 11:09 ` Andrzej Hajda
2018-11-05 11:09 ` Andrzej Hajda
2018-11-05 11:09 ` Andrzej Hajda
2018-11-05 11:34 ` Damian Kos
2018-11-05 11:34 ` Damian Kos
2018-11-05 11:34 ` Damian Kos
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.