xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

usb: typec: altmodes/displayport: Notify drm subsys of hotplug events

Browse Source 
[ Upstream commit 7f811394878535ed9a6849717de8c2959ae38899 ]

Use the new drm_connector_oob_hotplug_event() functions to let drm/kms
drivers know about DisplayPort over Type-C hotplug events.

Reviewed-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
Tested-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Reviewed-by: Lyude Paul <lyude@redhat.com>
Link: https://lore.kernel.org/r/20210817215201.795062-9-hdegoede@redhat.com
Stable-dep-of: 89434b069e46 ("usb: typec: altmodes/displayport: Signal hpd low when exiting mode")
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Hans de Goede
2021-08-17 23:52:01 +02:00
committed by Greg Kroah-Hartman
parent 2ea6a14e8a
commit f25a13d318
2 changed files with 24 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/usb/typec/altmodes/Kconfig
View File

@@ -4,6 +4,7 @@ menu "USB Type-C Alternate Mode drivers"
config TYPEC_DP_ALTMODE config TYPEC_DP_ALTMODE
tristate "DisplayPort Alternate Mode driver" tristate "DisplayPort Alternate Mode driver"
depends on DRM
help help
DisplayPort USB Type-C Alternate Mode allows DisplayPort DisplayPort USB Type-C Alternate Mode allows DisplayPort
displays and adapters to be attached to the USB Type-C displays and adapters to be attached to the USB Type-C

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

@@ -11,8 +11,10 @@
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/mutex.h> #include <linux/mutex.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/property.h>
#include <linux/usb/pd_vdo.h> #include <linux/usb/pd_vdo.h>
#include <linux/usb/typec_dp.h> #include <linux/usb/typec_dp.h>
#include <drm/drm_connector.h>
#include "displayport.h" #include "displayport.h"
#define DP_HEADER(_dp, cmd) (VDO((_dp)->alt->svid, 1, cmd) | \ #define DP_HEADER(_dp, cmd) (VDO((_dp)->alt->svid, 1, cmd) | \
@@ -57,11 +59,13 @@ struct dp_altmode {
struct typec_displayport_data data; struct typec_displayport_data data;
enum dp_state state; enum dp_state state;
bool hpd;
struct mutex lock; /* device lock */ struct mutex lock; /* device lock */
struct work_struct work; struct work_struct work;
struct typec_altmode *alt; struct typec_altmode *alt;
const struct typec_altmode *port; const struct typec_altmode *port;
struct fwnode_handle *connector_fwnode;
}; };
static int dp_altmode_notify(struct dp_altmode *dp) static int dp_altmode_notify(struct dp_altmode *dp)
@@ -122,6 +126,7 @@ static int dp_altmode_configure(struct dp_altmode *dp, u8 con)
static int dp_altmode_status_update(struct dp_altmode *dp) static int dp_altmode_status_update(struct dp_altmode *dp)
{ {
bool configured = !!DP_CONF_GET_PIN_ASSIGN(dp->data.conf); bool configured = !!DP_CONF_GET_PIN_ASSIGN(dp->data.conf);
bool hpd = !!(dp->data.status & DP_STATUS_HPD_STATE);
u8 con = DP_STATUS_CONNECTION(dp->data.status); u8 con = DP_STATUS_CONNECTION(dp->data.status);
int ret = 0; int ret = 0;
@@ -134,6 +139,11 @@ static int dp_altmode_status_update(struct dp_altmode *dp)
ret = dp_altmode_configure(dp, con); ret = dp_altmode_configure(dp, con);
if (!ret) if (!ret)
dp->state = DP_STATE_CONFIGURE; dp->state = DP_STATE_CONFIGURE;
} else {
if (dp->hpd != hpd) {
drm_connector_oob_hotplug_event(dp->connector_fwnode);
dp->hpd = hpd;
}
} }
return ret; return ret;
@@ -526,6 +536,7 @@ static const struct attribute_group dp_altmode_group = {
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 fwnode_handle *fwnode;
struct dp_altmode *dp; struct dp_altmode *dp;
int ret; int ret;
@@ -554,6 +565,11 @@ int dp_altmode_probe(struct typec_altmode *alt)
alt->desc = "DisplayPort"; alt->desc = "DisplayPort";
alt->ops = &dp_altmode_ops; alt->ops = &dp_altmode_ops;
fwnode = dev_fwnode(alt->dev.parent->parent); /* typec_port fwnode */
dp->connector_fwnode = fwnode_find_reference(fwnode, "displayport", 0);
if (IS_ERR(dp->connector_fwnode))
dp->connector_fwnode = NULL;
typec_altmode_set_drvdata(alt, dp); typec_altmode_set_drvdata(alt, dp);
dp->state = DP_STATE_ENTER; dp->state = DP_STATE_ENTER;
@@ -569,6 +585,13 @@ void dp_altmode_remove(struct typec_altmode *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);
if (dp->connector_fwnode) {
if (dp->hpd)
drm_connector_oob_hotplug_event(dp->connector_fwnode);
fwnode_handle_put(dp->connector_fwnode);
}
} }
EXPORT_SYMBOL_GPL(dp_altmode_remove); EXPORT_SYMBOL_GPL(dp_altmode_remove);