mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-12-16 15:34:48 +08:00
usb: typec: displayport: Export probe and remove functions
VirtualLink standard extends the DisplayPort Alt Mode by utilizing also the USB 2 pins on the USB Type-C connector. It uses the same messages as DisplayPort, but not the DP SVID. At the time of writing, USB IF has not assigned a Standard ID (SID) for VirtualLink, so the manufacturers of VirtualLink adapters use their Vendor IDs as the SVID. Since the SVID specific communication is exactly the same as with DisplayPort alternate mode, there is no need to implement separate driver for VirtualLink. We'll handle the current VirtualLink adapters with probe drivers, and once there is SVID assigned for it, we add it to the displayport alt mode driver. To support probing drivers, exporting the probe and remove functions, and also changing the DP_HEADER helper macro to use the SVID of the alternate mode device instead of the DisplayPort alt mode SVID. Suggested-by: Heikki Krogerus <heikki.krogerus@linux.intel.com> Signed-off-by: Ajay Gupta <ajayg@nvidia.com> Signed-off-by: Heikki Krogerus <heikki.krogerus@linux.intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
af8622f6a5
commit
d266e96820
@ -14,7 +14,7 @@
|
|||||||
#include <linux/usb/pd_vdo.h>
|
#include <linux/usb/pd_vdo.h>
|
||||||
#include <linux/usb/typec_dp.h>
|
#include <linux/usb/typec_dp.h>
|
||||||
|
|
||||||
#define DP_HEADER(cmd) (VDO(USB_TYPEC_DP_SID, 1, cmd) | \
|
#define DP_HEADER(_dp, cmd) (VDO((_dp)->alt->svid, 1, cmd) | \
|
||||||
VDO_OPOS(USB_TYPEC_DP_MODE))
|
VDO_OPOS(USB_TYPEC_DP_MODE))
|
||||||
|
|
||||||
enum {
|
enum {
|
||||||
@ -155,7 +155,7 @@ static int dp_altmode_configured(struct dp_altmode *dp)
|
|||||||
|
|
||||||
static int dp_altmode_configure_vdm(struct dp_altmode *dp, u32 conf)
|
static int dp_altmode_configure_vdm(struct dp_altmode *dp, u32 conf)
|
||||||
{
|
{
|
||||||
u32 header = DP_HEADER(DP_CMD_CONFIGURE);
|
u32 header = DP_HEADER(dp, DP_CMD_CONFIGURE);
|
||||||
int ret;
|
int ret;
|
||||||
|
|
||||||
ret = typec_altmode_notify(dp->alt, TYPEC_STATE_SAFE, &dp->data);
|
ret = typec_altmode_notify(dp->alt, TYPEC_STATE_SAFE, &dp->data);
|
||||||
@ -193,7 +193,7 @@ static void dp_altmode_work(struct work_struct *work)
|
|||||||
dev_err(&dp->alt->dev, "failed to enter mode\n");
|
dev_err(&dp->alt->dev, "failed to enter mode\n");
|
||||||
break;
|
break;
|
||||||
case DP_STATE_UPDATE:
|
case DP_STATE_UPDATE:
|
||||||
header = DP_HEADER(DP_CMD_STATUS_UPDATE);
|
header = DP_HEADER(dp, DP_CMD_STATUS_UPDATE);
|
||||||
vdo = 1;
|
vdo = 1;
|
||||||
ret = typec_altmode_vdm(dp->alt, header, &vdo, 2);
|
ret = typec_altmode_vdm(dp->alt, header, &vdo, 2);
|
||||||
if (ret)
|
if (ret)
|
||||||
@ -507,7 +507,7 @@ static const struct attribute_group dp_altmode_group = {
|
|||||||
.attrs = dp_altmode_attrs,
|
.attrs = dp_altmode_attrs,
|
||||||
};
|
};
|
||||||
|
|
||||||
static int dp_altmode_probe(struct typec_altmode *alt)
|
int dp_altmode_probe(struct typec_altmode *alt)
|
||||||
{
|
{
|
||||||
const struct typec_altmode *port = typec_altmode_get_partner(alt);
|
const struct typec_altmode *port = typec_altmode_get_partner(alt);
|
||||||
struct dp_altmode *dp;
|
struct dp_altmode *dp;
|
||||||
@ -545,14 +545,16 @@ static int dp_altmode_probe(struct typec_altmode *alt)
|
|||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
EXPORT_SYMBOL_GPL(dp_altmode_probe);
|
||||||
|
|
||||||
static void dp_altmode_remove(struct typec_altmode *alt)
|
void dp_altmode_remove(struct typec_altmode *alt)
|
||||||
{
|
{
|
||||||
struct dp_altmode *dp = typec_altmode_get_drvdata(alt);
|
struct dp_altmode *dp = typec_altmode_get_drvdata(alt);
|
||||||
|
|
||||||
sysfs_remove_group(&alt->dev.kobj, &dp_altmode_group);
|
sysfs_remove_group(&alt->dev.kobj, &dp_altmode_group);
|
||||||
cancel_work_sync(&dp->work);
|
cancel_work_sync(&dp->work);
|
||||||
}
|
}
|
||||||
|
EXPORT_SYMBOL_GPL(dp_altmode_remove);
|
||||||
|
|
||||||
static const struct typec_device_id dp_typec_id[] = {
|
static const struct typec_device_id dp_typec_id[] = {
|
||||||
{ USB_TYPEC_DP_SID, USB_TYPEC_DP_MODE },
|
{ USB_TYPEC_DP_SID, USB_TYPEC_DP_MODE },
|
||||||
|
8
drivers/usb/typec/altmodes/displayport.h
Normal file
8
drivers/usb/typec/altmodes/displayport.h
Normal file
@ -0,0 +1,8 @@
|
|||||||
|
/* SPDX-License-Identifier: GPL-2.0 */
|
||||||
|
#if IS_ENABLED(CONFIG_TYPEC_DP_ALTMODE)
|
||||||
|
int dp_altmode_probe(struct typec_altmode *alt);
|
||||||
|
void dp_altmode_remove(struct typec_altmode *alt);
|
||||||
|
#else
|
||||||
|
int dp_altmode_probe(struct typec_altmode *alt) { return -ENOTSUPP; }
|
||||||
|
void dp_altmode_remove(struct typec_altmode *alt) { }
|
||||||
|
#endif /* CONFIG_TYPEC_DP_ALTMODE */
|
Loading…
Reference in New Issue
Block a user