linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Kyle Tso <kyletso@google.com>
To: linux@roeck-us.net, heikki.krogerus@linux.intel.com,
	gregkh@linuxfoundation.org, hdegoede@redhat.com,
	robh+dt@kernel.org
Cc: badhri@google.com, linux-usb@vger.kernel.org,
	linux-kernel@vger.kernel.org, devicetree@vger.kernel.org,
	Kyle Tso <kyletso@google.com>
Subject: [PATCH v5 6/8] usb: typec: displayport: Fill the negotiated SVDM Version in the header
Date: Wed,  3 Feb 2021 00:17:31 +0800	[thread overview]
Message-ID: <20210202161733.932215-7-kyletso@google.com> (raw)
In-Reply-To: <20210202161733.932215-1-kyletso@google.com>

VDM header now requires SVDM Version. Get it from typec_port.

Signed-off-by: Kyle Tso <kyletso@google.com>
---
 drivers/usb/typec/altmodes/displayport.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/drivers/usb/typec/altmodes/displayport.c b/drivers/usb/typec/altmodes/displayport.c
index 0abc3121238f..7b47dd4ea531 100644
--- a/drivers/usb/typec/altmodes/displayport.c
+++ b/drivers/usb/typec/altmodes/displayport.c
@@ -15,8 +15,10 @@
 #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, cmd)		(VDO((_dp)->alt->svid, 1,			\
+					     typec_get_svdm_version((_dp)->typec),	\
+					     cmd)					\
+					 | VDO_OPOS(USB_TYPEC_DP_MODE))
 
 enum {
 	DP_CONF_USB,
@@ -62,6 +64,7 @@ struct dp_altmode {
 	struct work_struct work;
 	struct typec_altmode *alt;
 	const struct typec_altmode *port;
+	struct typec_port *typec;
 };
 
 static int dp_altmode_notify(struct dp_altmode *dp)
@@ -536,6 +539,7 @@ int dp_altmode_probe(struct typec_altmode *alt)
 	mutex_init(&dp->lock);
 	dp->port = port;
 	dp->alt = alt;
+	dp->typec = typec_altmode2port(alt);
 
 	alt->desc = "DisplayPort";
 	alt->ops = &dp_altmode_ops;
-- 
2.30.0.365.g02bc693789-goog


  parent reply	other threads:[~2021-02-02 17:15 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-02-02 16:17 [PATCH v5 0/8] common SVDM version and VDO from dt Kyle Tso
2021-02-02 16:17 ` [PATCH v5 1/8] usb: typec: Manage SVDM version Kyle Tso
2021-02-03 12:47   ` Heikki Krogerus
2021-02-03 13:34     ` Heikki Krogerus
2021-02-03 14:51     ` Guenter Roeck
2021-02-03 15:01       ` Heikki Krogerus
2021-02-03 15:04         ` Heikki Krogerus
2021-02-03 15:42           ` Kyle Tso
2021-02-03 17:07           ` Guenter Roeck
2021-02-02 16:17 ` [PATCH v5 2/8] usb: pd: Update VDO definitions Kyle Tso
2021-02-03 12:48   ` Heikki Krogerus
2021-02-03 13:09     ` Greg KH
2021-02-03 16:54   ` Benson Leung
2021-02-04  2:24     ` Kyle Tso
2021-02-02 16:17 ` [PATCH v5 3/8] usb: pd: Make SVDM Version configurable in VDM header Kyle Tso
2021-02-02 16:17 ` [PATCH v5 4/8] usb: typec: tcpm: Detemine common SVDM Version Kyle Tso
2021-02-02 16:17 ` [PATCH v5 5/8] usb: typec: ucsi: " Kyle Tso
2021-02-02 16:17 ` Kyle Tso [this message]
2021-02-02 16:17 ` [PATCH v5 7/8] dt-bindings: connector: Add SVDM VDO properties Kyle Tso
2021-02-02 16:17 ` [PATCH v5 8/8] usb: typec: tcpm: Get Sink VDO from fwnode Kyle Tso

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210202161733.932215-7-kyletso@google.com \
    --to=kyletso@google.com \
    --cc=badhri@google.com \
    --cc=devicetree@vger.kernel.org \
    --cc=gregkh@linuxfoundation.org \
    --cc=hdegoede@redhat.com \
    --cc=heikki.krogerus@linux.intel.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-usb@vger.kernel.org \
    --cc=linux@roeck-us.net \
    --cc=robh+dt@kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).