diff options
| author | Sandor Yu <Sandor.yu@nxp.com> | 2020-07-21 15:13:46 +0800 |
|---|---|---|
| committer | Sandor Yu <Sandor.yu@nxp.com> | 2020-07-24 09:00:37 +0800 |
| commit | 110d5c01d3f73ef56cd4ff4eba74a45b6f2dfc63 (patch) | |
| tree | 711bd329fab5508bf8250ba3d07bfb7227d80114 /include/drm | |
| parent | e809dab89912d59a851141dface5582701971b86 (diff) | |
MLK-24427-3: drm: mhdp: Backporting code change from linux-nxp
Backporting code change from linux-nxp code base.
-Rename cdns-mhdp-common.h to cdns-mhdp.h
-Remove drm_dp_link_power_up/down functions.
-Remove cdns-mhdp-cbs.h
-Replace struct drm_dp_link with variable rate and num_lanes.
Signed-off-by: Sandor Yu <Sandor.yu@nxp.com>
Reviewed-by: Robby Cai <robby.cai@nxp.com>
Diffstat (limited to 'include/drm')
| -rw-r--r-- | include/drm/bridge/cdns-mhdp-cbs.h | 29 | ||||
| -rwxr-xr-x | include/drm/bridge/cdns-mhdp.h (renamed from include/drm/bridge/cdns-mhdp-common.h) | 14 |
2 files changed, 7 insertions, 36 deletions
diff --git a/include/drm/bridge/cdns-mhdp-cbs.h b/include/drm/bridge/cdns-mhdp-cbs.h deleted file mode 100644 index ed67e184d3ed..000000000000 --- a/include/drm/bridge/cdns-mhdp-cbs.h +++ /dev/null @@ -1,29 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -/* - * 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 - -#include <drm/drm_bridge.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.h index f05780c2fa33..1f8fd024cdfa 100755 --- a/include/drm/bridge/cdns-mhdp-common.h +++ b/include/drm/bridge/cdns-mhdp.h @@ -13,10 +13,9 @@ * GNU General Public License for more details. */ -#ifndef CDNS_MHDP_COMMON_H_ -#define CDNS_MHDP_COMMON_H_ +#ifndef CDNS_MHDP_H_ +#define CDNS_MHDP_H_ -#include <drm/bridge/cdns-mhdp-cbs.h> #include <drm/drm_bridge.h> #include <drm/drm_connector.h> #include <drm/drm_dp_helper.h> @@ -698,11 +697,12 @@ struct cdns_mhdp_device { union { struct _dp_data { - struct drm_dp_link link; + u8 dpcd[DP_RECEIVER_CAP_SIZE]; + u32 rate; + u8 num_lanes; struct drm_dp_aux aux; struct cdns_mhdp_host host; struct cdns_mhdp_sink sink; - struct cdns_mhdp_mst_cbs cbs; bool is_mst; bool can_mst; } dp; @@ -727,7 +727,6 @@ int cdns_mhdp_set_firmware_active(struct cdns_mhdp_device *mhdp, bool enable); int cdns_mhdp_set_host_cap(struct cdns_mhdp_device *mhdp); 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); @@ -789,6 +788,7 @@ int cdns_hdmi_bind(struct platform_device *pdev, void cdns_hdmi_set_sample_rate(struct cdns_mhdp_device *mhdp, unsigned int rate); void cdns_hdmi_audio_enable(struct cdns_mhdp_device *mhdp); void cdns_hdmi_audio_disable(struct cdns_mhdp_device *mhdp); + /* DP */ int cdns_dp_probe(struct platform_device *pdev, struct cdns_mhdp_device *mhdp); @@ -803,4 +803,4 @@ int cdns_mhdp_register_cec_driver(struct device *dev); int cdns_mhdp_unregister_cec_driver(struct device *dev); #endif -#endif /* CDNS_MHDP_COMMON_H_ */ +#endif /* CDNS_MHDP_H_ */ |