Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dec3fa20 authored by Alistair Delva's avatar Alistair Delva
Browse files

ANDROID: GKI: Add drm_dp_send_dpcd_{read,write} accessor functions 



Resolves an abi diff.

Bug: 152417756
Signed-off-by: default avatarAlistair Delva <adelva@google.com>
Change-Id: I36e093ddcc1e2645e05a2a683ac52bd2f629dc35
parent 35acc5c9

drivers/gpu/drm/drm_dp_mst_topology.c

+9 −15
Original line number Diff line number Diff line
@@ -51,10 +51,6 @@ static int drm_dp_dpcd_write_payload(struct drm_dp_mst_topology_mgr *mgr, 
				     int id,

				     struct drm_dp_payload *payload);



static int drm_dp_send_dpcd_write(struct drm_dp_mst_topology_mgr *mgr,

				  struct drm_dp_mst_port *port,

				  int offset, int size, u8 *bytes);



static void drm_dp_send_link_address(struct drm_dp_mst_topology_mgr *mgr,

				     struct drm_dp_mst_branch *mstb);

static int drm_dp_send_enum_path_resources(struct drm_dp_mst_topology_mgr *mgr,
@@ -1404,7 +1400,6 @@ static bool drm_dp_validate_guid(struct drm_dp_mst_topology_mgr *mgr, 
	return false;

}



#if 0

static int build_dpcd_read(struct drm_dp_sideband_msg_tx *msg, u8 port_num, u32 offset, u8 num_bytes)

{

	struct drm_dp_sideband_msg_req_body req;
@@ -1417,7 +1412,6 @@ static int build_dpcd_read(struct drm_dp_sideband_msg_tx *msg, u8 port_num, u32 


	return 0;

}

#endif



static int drm_dp_send_sideband_msg(struct drm_dp_mst_topology_mgr *mgr,

				    bool up, u8 *msg, int len)
@@ -2024,10 +2018,9 @@ int drm_dp_update_payload_part2(struct drm_dp_mst_topology_mgr *mgr) 
}

EXPORT_SYMBOL(drm_dp_update_payload_part2);



#if 0 /* unused as of yet */

static int drm_dp_send_dpcd_read(struct drm_dp_mst_topology_mgr *mgr,

int drm_dp_send_dpcd_read(struct drm_dp_mst_topology_mgr *mgr,

			  struct drm_dp_mst_port *port,

				 int offset, int size)

			  int offset, int size, u8 *bytes)

{

	int len;

	struct drm_dp_sideband_msg_tx *txmsg;
@@ -2036,16 +2029,16 @@ static int drm_dp_send_dpcd_read(struct drm_dp_mst_topology_mgr *mgr, 
	if (!txmsg)

		return -ENOMEM;



	len = build_dpcd_read(txmsg, port->port_num, 0, 8);

	len = build_dpcd_read(txmsg, port->port_num, offset, size);

	txmsg->dst = port->parent;



	drm_dp_queue_down_tx(mgr, txmsg);



	return 0;

}

#endif

EXPORT_SYMBOL_GPL(drm_dp_send_dpcd_read);



static int drm_dp_send_dpcd_write(struct drm_dp_mst_topology_mgr *mgr,

int drm_dp_send_dpcd_write(struct drm_dp_mst_topology_mgr *mgr,

			   struct drm_dp_mst_port *port,

			   int offset, int size, u8 *bytes)

{
@@ -2081,6 +2074,7 @@ static int drm_dp_send_dpcd_write(struct drm_dp_mst_topology_mgr *mgr, 
	drm_dp_put_mst_branch_device(mstb);

	return ret;

}

EXPORT_SYMBOL_GPL(drm_dp_send_dpcd_write);



int drm_dp_mst_get_max_sdp_streams_supported(

		struct drm_dp_mst_topology_mgr *mgr,

include/drm/drm_dp_mst_helper.h

+8 −0
Original line number Diff line number Diff line
@@ -664,6 +664,14 @@ int drm_dp_mst_update_dsc_info(struct drm_dp_mst_topology_mgr *mgr, 
			       struct drm_dp_mst_port *port,

			       struct drm_dp_mst_dsc_info *dsc_info);



int drm_dp_send_dpcd_write(struct drm_dp_mst_topology_mgr *mgr,

			   struct drm_dp_mst_port *port,

			   int offset, int size, u8 *bytes);



int drm_dp_send_dpcd_read(struct drm_dp_mst_topology_mgr *mgr,

			  struct drm_dp_mst_port *port,

			  int offset, int size, u8 *bytes);



int drm_dp_mst_get_max_sdp_streams_supported(

		struct drm_dp_mst_topology_mgr *mgr,

		struct drm_dp_mst_port *port);