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

Commit 9d87e36a authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "disp: msm: add changes missing during snapshots"

parents 90ae2587 1ab07a4d

msm/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -69,6 +69,7 @@ msm_drm-$(CONFIG_DRM_MSM_SDE) += sde/sde_crtc.o \ 
	sde/sde_hw_dsc.o \

	sde/sde_hw_ds.o \

	sde/sde_fence.o \

	sde/sde_hw_qdss.o \



msm_drm-$(CONFIG_DRM_SDE_WB) += sde/sde_wb.o \

	sde/sde_encoder_phys_wb.o \

msm/dsi/dsi_defs.h

+14 −0
Original line number Diff line number Diff line
@@ -417,6 +417,18 @@ struct dsi_mode_info { 
	struct msm_roi_caps roi_caps;

};



/**

 * struct dsi_split_link_config - Split Link Configuration

 * @split_link_enabled:  Split Link Enabled.

 * @num_sublinks:     Number of sublinks.

 * @lanes_per_sublink:   Number of lanes per sublink.

 */

struct dsi_split_link_config {

	bool split_link_enabled;

	u32 num_sublinks;

	u32 lanes_per_sublink;

};



/**

 * struct dsi_host_common_cfg - Host configuration common to video and cmd mode

 * @dst_format:          Destination pixel format.
@@ -444,6 +456,7 @@ struct dsi_mode_info { 
 *                       true.

 * @ext_bridge_mode:     External bridge is connected.

 * @force_hs_clk_lane:   Send continuous clock to the panel.

 * @dsi_split_link_config:  Split Link Configuration.

 */

struct dsi_host_common_cfg {

	enum dsi_pixel_format dst_format;
@@ -466,6 +479,7 @@ struct dsi_host_common_cfg { 
	bool append_tx_eot;

	bool ext_bridge_mode;

	bool force_hs_clk_lane;

	struct dsi_split_link_config split_link;

};



/**

msm/dsi/dsi_display.c

+4 −0
Original line number Diff line number Diff line
@@ -5403,6 +5403,7 @@ int dsi_display_get_info(struct drm_connector *connector, 
{

	struct dsi_display *display;

	struct dsi_panel_phy_props phy_props;

	struct dsi_host_common_cfg *host;

	int i, rc;



	if (!info || !disp) {
@@ -5471,6 +5472,9 @@ int dsi_display_get_info(struct drm_connector *connector, 


	info->te_source = display->te_source;



	host = &display->panel->host_config;

	if (host->split_link.split_link_enabled)

		info->capabilities |= MSM_DISPLAY_SPLIT_LINK;

error:

	mutex_unlock(&display->display_lock);

	return rc;

msm/msm_drv.h

+2 −0
Original line number Diff line number Diff line
@@ -238,6 +238,7 @@ enum msm_display_compression_ratio { 
 * @MSM_DISPLAY_CAP_EDID:               EDID supported

 * @MSM_DISPLAY_ESD_ENABLED:            ESD feature enabled

 * @MSM_DISPLAY_CAP_MST_MODE:           Display with MST support

 * @MSM_DISPLAY_SPLIT_LINK:             Split Link enabled

 */

enum msm_display_caps {

	MSM_DISPLAY_CAP_VID_MODE	= BIT(0),
@@ -246,6 +247,7 @@ enum msm_display_caps { 
	MSM_DISPLAY_CAP_EDID		= BIT(3),

	MSM_DISPLAY_ESD_ENABLED		= BIT(4),

	MSM_DISPLAY_CAP_MST_MODE	= BIT(5),

	MSM_DISPLAY_SPLIT_LINK		= BIT(6),

};



/**

msm/msm_gem_vma.c

+2 −0
Original line number Diff line number Diff line
@@ -69,6 +69,7 @@ static void smmu_aspace_add_to_active( 
{

	WARN_ON(!mutex_is_locked(&aspace->list_lock));

	list_move_tail(&msm_obj->iova_list, &aspace->active_list);

	msm_obj->in_active_list = true;

}



static void smmu_aspace_remove_from_active(
@@ -82,6 +83,7 @@ static void smmu_aspace_remove_from_active( 
	list_for_each_entry_safe(msm_obj, next, &aspace->active_list,

			iova_list) {

		if (msm_obj == obj) {

			msm_obj->in_active_list = false;

			list_del(&msm_obj->iova_list);

			break;

		}