| Message ID | 20210205033415.3320439-6-kyletso@google.com |
|---|---|
| State | New |
| Headers | show |
| Series | common SVDM version and VDO from dt | expand |
On Fri, Feb 05, 2021 at 11:34:13AM +0800, Kyle Tso wrote: > VDM header now requires SVDM Version. Get it from typec_partner. > > Signed-off-by: Kyle Tso <kyletso@google.com> Reviewed-by: Guenter Roeck <linux@roeck-us.net> > --- > Changes since v5: > - follow the changes of "usb: typec: Manage SVDM version" > > drivers/usb/typec/altmodes/displayport.c | 17 +++++++++++++---- > 1 file changed, 13 insertions(+), 4 deletions(-) > > diff --git a/drivers/usb/typec/altmodes/displayport.c b/drivers/usb/typec/altmodes/displayport.c > index 0abc3121238f..b7f094435b00 100644 > --- a/drivers/usb/typec/altmodes/displayport.c > +++ b/drivers/usb/typec/altmodes/displayport.c > @@ -15,8 +15,8 @@ > #include <linux/usb/typec_dp.h> > #include "displayport.h" > > -#define DP_HEADER(_dp, cmd) (VDO((_dp)->alt->svid, 1, SVDM_VER_1_0, cmd) | \ > - VDO_OPOS(USB_TYPEC_DP_MODE)) > +#define DP_HEADER(_dp, ver, cmd) (VDO((_dp)->alt->svid, 1, ver, cmd) \ > + | VDO_OPOS(USB_TYPEC_DP_MODE)) > > enum { > DP_CONF_USB, > @@ -156,9 +156,14 @@ static int dp_altmode_configured(struct dp_altmode *dp) > > static int dp_altmode_configure_vdm(struct dp_altmode *dp, u32 conf) > { > - u32 header = DP_HEADER(dp, DP_CMD_CONFIGURE); > + int svdm_version = typec_altmode_get_svdm_version(dp->alt); > + u32 header; > int ret; > > + if (svdm_version < 0) > + return svdm_version; > + > + header = DP_HEADER(dp, svdm_version, DP_CMD_CONFIGURE); > ret = typec_altmode_notify(dp->alt, TYPEC_STATE_SAFE, &dp->data); > if (ret) { > dev_err(&dp->alt->dev, > @@ -181,6 +186,7 @@ static int dp_altmode_configure_vdm(struct dp_altmode *dp, u32 conf) > static void dp_altmode_work(struct work_struct *work) > { > struct dp_altmode *dp = container_of(work, struct dp_altmode, work); > + int svdm_version; > u32 header; > u32 vdo; > int ret; > @@ -194,7 +200,10 @@ static void dp_altmode_work(struct work_struct *work) > dev_err(&dp->alt->dev, "failed to enter mode\n"); > break; > case DP_STATE_UPDATE: > - header = DP_HEADER(dp, DP_CMD_STATUS_UPDATE); > + svdm_version = typec_altmode_get_svdm_version(dp->alt); > + if (svdm_version < 0) > + break; > + header = DP_HEADER(dp, svdm_version, DP_CMD_STATUS_UPDATE); > vdo = 1; > ret = typec_altmode_vdm(dp->alt, header, &vdo, 2); > if (ret) > -- > 2.30.0.365.g02bc693789-goog >
diff --git a/drivers/usb/typec/altmodes/displayport.c b/drivers/usb/typec/altmodes/displayport.c index 0abc3121238f..b7f094435b00 100644 --- a/drivers/usb/typec/altmodes/displayport.c +++ b/drivers/usb/typec/altmodes/displayport.c @@ -15,8 +15,8 @@ #include <linux/usb/typec_dp.h> #include "displayport.h" -#define DP_HEADER(_dp, cmd) (VDO((_dp)->alt->svid, 1, SVDM_VER_1_0, cmd) | \ - VDO_OPOS(USB_TYPEC_DP_MODE)) +#define DP_HEADER(_dp, ver, cmd) (VDO((_dp)->alt->svid, 1, ver, cmd) \ + | VDO_OPOS(USB_TYPEC_DP_MODE)) enum { DP_CONF_USB, @@ -156,9 +156,14 @@ static int dp_altmode_configured(struct dp_altmode *dp) static int dp_altmode_configure_vdm(struct dp_altmode *dp, u32 conf) { - u32 header = DP_HEADER(dp, DP_CMD_CONFIGURE); + int svdm_version = typec_altmode_get_svdm_version(dp->alt); + u32 header; int ret; + if (svdm_version < 0) + return svdm_version; + + header = DP_HEADER(dp, svdm_version, DP_CMD_CONFIGURE); ret = typec_altmode_notify(dp->alt, TYPEC_STATE_SAFE, &dp->data); if (ret) { dev_err(&dp->alt->dev, @@ -181,6 +186,7 @@ static int dp_altmode_configure_vdm(struct dp_altmode *dp, u32 conf) static void dp_altmode_work(struct work_struct *work) { struct dp_altmode *dp = container_of(work, struct dp_altmode, work); + int svdm_version; u32 header; u32 vdo; int ret; @@ -194,7 +200,10 @@ static void dp_altmode_work(struct work_struct *work) dev_err(&dp->alt->dev, "failed to enter mode\n"); break; case DP_STATE_UPDATE: - header = DP_HEADER(dp, DP_CMD_STATUS_UPDATE); + svdm_version = typec_altmode_get_svdm_version(dp->alt); + if (svdm_version < 0) + break; + header = DP_HEADER(dp, svdm_version, DP_CMD_STATUS_UPDATE); vdo = 1; ret = typec_altmode_vdm(dp->alt, header, &vdo, 2); if (ret)
VDM header now requires SVDM Version. Get it from typec_partner. Signed-off-by: Kyle Tso <kyletso@google.com> --- Changes since v5: - follow the changes of "usb: typec: Manage SVDM version" drivers/usb/typec/altmodes/displayport.c | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-)