Commit 1c5f6051 authored by Dmitry Baryshkov's avatar Dmitry Baryshkov
Browse files

drm/msm/dp: remove most of usbpd-related remains 



Remove most of remains of downstream usbpd code. Mainline kernel uses
different approach for managing Type-C / USB-PD, so this remains unused.

Signed-off-by: default avatarDmitry Baryshkov <dmitry.baryshkov@linaro.org>
Reviewed-by: default avatarBjorn Andersson <andersson@kernel.org>
Patchwork: https://patchwork.freedesktop.org/patch/538270/
Link: https://lore.kernel.org/r/20230520182050.4014143-1-dmitry.baryshkov@linaro.org


Signed-off-by: default avatarDmitry Baryshkov <dmitry.baryshkov@linaro.org>
parent 5c054db5

drivers/gpu/drm/msm/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -122,7 +122,6 @@ msm-$(CONFIG_DRM_MSM_DP)+= dp/dp_aux.o \ 
	dp/dp_ctrl.o \

	dp/dp_display.o \

	dp/dp_drm.o \

	dp/dp_hpd.o \

	dp/dp_link.o \

	dp/dp_panel.o \

	dp/dp_parser.o \

drivers/gpu/drm/msm/dp/dp_ctrl.h

+0 −1
Original line number Diff line number Diff line
@@ -14,7 +14,6 @@ 
#include "dp_catalog.h"



struct dp_ctrl {

	bool orientation;

	atomic_t aborted;

	bool wide_bus_en;

};

drivers/gpu/drm/msm/dp/dp_debug.c

+2 −4
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ 
struct dp_debug_private {

	struct dentry *root;



	struct dp_usbpd *usbpd;

	struct dp_link *link;

	struct dp_panel *panel;

	struct drm_connector *connector;
@@ -232,14 +231,14 @@ static void dp_debug_init(struct dp_debug *dp_debug, struct drm_minor *minor) 
}



struct dp_debug *dp_debug_get(struct device *dev, struct dp_panel *panel,

		struct dp_usbpd *usbpd, struct dp_link *link,

		struct dp_link *link,

		struct drm_connector *connector, struct drm_minor *minor)

{

	struct dp_debug_private *debug;

	struct dp_debug *dp_debug;

	int rc;



	if (!dev || !panel || !usbpd || !link) {

	if (!dev || !panel || !link) {

		DRM_ERROR("invalid input\n");

		rc = -EINVAL;

		goto error;
@@ -252,7 +251,6 @@ struct dp_debug *dp_debug_get(struct device *dev, struct dp_panel *panel, 
	}



	debug->dp_debug.debug_en = false;

	debug->usbpd = usbpd;

	debug->link = link;

	debug->panel = panel;

	debug->dev = dev;

drivers/gpu/drm/msm/dp/dp_debug.h

+2 −3
Original line number Diff line number Diff line
@@ -32,7 +32,6 @@ struct dp_debug { 
 *

 * @dev: device instance of the caller

 * @panel: instance of panel module

 * @usbpd: instance of usbpd module

 * @link: instance of link module

 * @connector: double pointer to display connector

 * @minor: pointer to drm minor number after device registration
@@ -42,7 +41,7 @@ struct dp_debug { 
 * for debugfs input to be communicated with existing modules

 */

struct dp_debug *dp_debug_get(struct device *dev, struct dp_panel *panel,

		struct dp_usbpd *usbpd, struct dp_link *link,

		struct dp_link *link,

		struct drm_connector *connector,

		struct drm_minor *minor);
@@ -59,7 +58,7 @@ void dp_debug_put(struct dp_debug *dp_debug); 


static inline

struct dp_debug *dp_debug_get(struct device *dev, struct dp_panel *panel,

		struct dp_usbpd *usbpd, struct dp_link *link,

		struct dp_link *link,

		struct drm_connector *connector, struct drm_minor *minor)

{

	return ERR_PTR(-EINVAL);

drivers/gpu/drm/msm/dp/dp_display.c

+2 −32
Original line number Diff line number Diff line
@@ -14,7 +14,6 @@ 


#include "msm_drv.h"

#include "msm_kms.h"

#include "dp_hpd.h"

#include "dp_parser.h"

#include "dp_power.h"

#include "dp_catalog.h"
@@ -88,7 +87,6 @@ struct dp_display_private { 
	struct platform_device *pdev;

	struct dentry *root;



	struct dp_usbpd   *usbpd;

	struct dp_parser  *parser;

	struct dp_power   *power;

	struct dp_catalog *catalog;
@@ -98,7 +96,6 @@ struct dp_display_private { 
	struct dp_ctrl    *ctrl;

	struct dp_debug   *debug;



	struct dp_usbpd_cb usbpd_cb;

	struct dp_display_mode dp_mode;

	struct msm_dp dp_display;
@@ -463,7 +460,7 @@ static void dp_display_host_init(struct dp_display_private *dp) 
		dp->dp_display.connector_type, dp->core_initialized,

		dp->phy_initialized);



	dp_power_init(dp->power, false);

	dp_power_init(dp->power);

	dp_ctrl_reset_irq_ctrl(dp->ctrl, true);

	dp_aux_init(dp->aux);

	dp->core_initialized = true;
@@ -490,11 +487,6 @@ static int dp_display_usbpd_configure_cb(struct device *dev) 
	return dp_display_process_hpd_high(dp);

}



static int dp_display_usbpd_disconnect_cb(struct device *dev)

{

	return 0;

}



static int dp_display_notify_disconnect(struct device *dev)

{

	struct dp_display_private *dp = dev_get_dp_display_private(dev);
@@ -579,13 +571,9 @@ static int dp_display_usbpd_attention_cb(struct device *dev) 


static int dp_hpd_plug_handle(struct dp_display_private *dp, u32 data)

{

	struct dp_usbpd *hpd = dp->usbpd;

	u32 state;

	int ret;



	if (!hpd)

		return 0;



	mutex_lock(&dp->event_mutex);



	state =  dp->hpd_state;
@@ -646,12 +634,8 @@ static void dp_display_handle_plugged_change(struct msm_dp *dp_display, 


static int dp_hpd_unplug_handle(struct dp_display_private *dp, u32 data)

{

	struct dp_usbpd *hpd = dp->usbpd;

	u32 state;



	if (!hpd)

		return 0;



	mutex_lock(&dp->event_mutex);



	state = dp->hpd_state;
@@ -764,24 +748,10 @@ static int dp_init_sub_modules(struct dp_display_private *dp) 
{

	int rc = 0;

	struct device *dev = &dp->pdev->dev;

	struct dp_usbpd_cb *cb = &dp->usbpd_cb;

	struct dp_panel_in panel_in = {

		.dev = dev,

	};



	/* Callback APIs used for cable status change event */

	cb->configure  = dp_display_usbpd_configure_cb;

	cb->disconnect = dp_display_usbpd_disconnect_cb;

	cb->attention  = dp_display_usbpd_attention_cb;



	dp->usbpd = dp_hpd_get(dev, cb);

	if (IS_ERR(dp->usbpd)) {

		rc = PTR_ERR(dp->usbpd);

		DRM_ERROR("failed to initialize hpd, rc = %d\n", rc);

		dp->usbpd = NULL;

		goto error;

	}



	dp->parser = dp_parser_get(dp->pdev);

	if (IS_ERR(dp->parser)) {

		rc = PTR_ERR(dp->parser);
@@ -1541,7 +1511,7 @@ void msm_dp_debugfs_init(struct msm_dp *dp_display, struct drm_minor *minor) 
	dp = container_of(dp_display, struct dp_display_private, dp_display);

	dev = &dp->pdev->dev;



	dp->debug = dp_debug_get(dev, dp->panel, dp->usbpd,

	dp->debug = dp_debug_get(dev, dp->panel,

					dp->link, dp->dp_display.connector,

					minor);

	if (IS_ERR(dp->debug)) {