leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

usb: typec: displayport: Fill the negotiated SVDM Version in the header

Browse Source 
VDM header now requires SVDM Version. Get it from typec_partner.

Acked-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
Signed-off-by: Kyle Tso <kyletso@google.com>
Link: https://lore.kernel.org/r/20210205033415.3320439-6-kyletso@google.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Kyle Tso 2021-02-05 11:34:13 +08:00 committed by Greg Kroah-Hartman
parent 372adf075a
commit 4c93cad8cc
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
drivers/usb/typec/altmodes/displayport.c
View File

@ -15,8 +15,8 @@
#include <linux/usb/typec_dp.h> #include <linux/usb/typec_dp.h>
#include "displayport.h" #include "displayport.h"
#define DP_HEADER(_dp, cmd) (VDO((_dp)->alt->svid, 1, SVDM_VER_1_0, cmd) | \ #define DP_HEADER(_dp, ver, cmd) (VDO((_dp)->alt->svid, 1, ver, cmd) \
VDO_OPOS(USB_TYPEC_DP_MODE)) | VDO_OPOS(USB_TYPEC_DP_MODE))
enum { enum {
DP_CONF_USB, 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) 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; 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); ret = typec_altmode_notify(dp->alt, TYPEC_STATE_SAFE, &dp->data);
if (ret) { if (ret) {
dev_err(&dp->alt->dev, 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) static void dp_altmode_work(struct work_struct *work)
{ {
struct dp_altmode *dp = container_of(work, struct dp_altmode, work); struct dp_altmode *dp = container_of(work, struct dp_altmode, work);
int svdm_version;
u32 header; u32 header;
u32 vdo; u32 vdo;
int ret; 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"); dev_err(&dp->alt->dev, "failed to enter mode\n");
break; break;
case DP_STATE_UPDATE: 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; vdo = 1;
ret = typec_altmode_vdm(dp->alt, header, &vdo, 2); ret = typec_altmode_vdm(dp->alt, header, &vdo, 2);
if (ret) if (ret)