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

Commit 11f17713 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "drm/msm/dsi-staging: add support for dsi null packet insertion"

parents 13ec9780 d8809323

Documentation/devicetree/bindings/drm/msm/sde-dsi.txt

+1 −0
Original line number Diff line number Diff line
@@ -100,3 +100,4 @@ Optional properties: 
					controller. This must be enabled for debugging purpose

					only with simulator panel. It should not be enabled for

					normal DSI panels.

- - qcom,null-insertion-enabled:	A boolean to enable NULL packet insertion feature for DSI controller.

drivers/gpu/drm/msm/dsi-staging/dsi_catalog.c

+3 −1
Original line number Diff line number Diff line
@@ -120,6 +120,7 @@ static void dsi_catalog_cmn_init(struct dsi_ctrl_hw *ctrl, 
 * @version:     DSI controller version.

 * @index:       DSI controller instance ID.

 * @phy_isolation_enabled:       DSI controller works isolated from phy.

 * @null_insertion_enabled:      DSI controller inserts null packet.

 *

 * This function setups the catalog information in the dsi_ctrl_hw object.

 *
@@ -127,7 +128,7 @@ static void dsi_catalog_cmn_init(struct dsi_ctrl_hw *ctrl, 
 */

int dsi_catalog_ctrl_setup(struct dsi_ctrl_hw *ctrl,

		   enum dsi_ctrl_version version, u32 index,

		   bool phy_isolation_enabled)

		   bool phy_isolation_enabled, bool null_insertion_enabled)

{

	int rc = 0;
@@ -138,6 +139,7 @@ int dsi_catalog_ctrl_setup(struct dsi_ctrl_hw *ctrl, 
	}



	ctrl->index = index;

	ctrl->null_insertion_enabled = null_insertion_enabled;

	set_bit(DSI_CTRL_VIDEO_TPG, ctrl->feature_map);

	set_bit(DSI_CTRL_CMD_TPG, ctrl->feature_map);

	set_bit(DSI_CTRL_VARIABLE_REFRESH_RATE, ctrl->feature_map);

drivers/gpu/drm/msm/dsi-staging/dsi_catalog.h

+2 −1
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 
 * @version:     DSI controller version.

 * @index:       DSI controller instance ID.

 * @phy_isolation_enabled:       DSI controller works isolated from phy.

 * @null_insertion_enabled:      DSI controller inserts null packet.

 *

 * This function setups the catalog information in the dsi_ctrl_hw object.

 *
@@ -31,7 +32,7 @@ 
 */

int dsi_catalog_ctrl_setup(struct dsi_ctrl_hw *ctrl,

		   enum dsi_ctrl_version version, u32 index,

		   bool phy_isolation_enabled);

		   bool phy_isolation_enabled, bool null_insertion_enabled);



/**

 * dsi_catalog_phy_setup() - return catalog info for dsi phy hardware

drivers/gpu/drm/msm/dsi-staging/dsi_ctrl.c

+5 −1
Original line number Diff line number Diff line
@@ -1469,6 +1469,9 @@ static int dsi_ctrl_dts_parse(struct dsi_ctrl *dsi_ctrl, 
	dsi_ctrl->phy_isolation_enabled = of_property_read_bool(of_node,

				    "qcom,dsi-phy-isolation-enabled");



	dsi_ctrl->null_insertion_enabled = of_property_read_bool(of_node,

					"qcom,null-insertion-enabled");



	return 0;

}
@@ -1526,7 +1529,8 @@ static int dsi_ctrl_dev_probe(struct platform_device *pdev) 
	}



	rc = dsi_catalog_ctrl_setup(&dsi_ctrl->hw, dsi_ctrl->version,

		    dsi_ctrl->cell_index, dsi_ctrl->phy_isolation_enabled);

		dsi_ctrl->cell_index, dsi_ctrl->phy_isolation_enabled,

		dsi_ctrl->null_insertion_enabled);

	if (rc) {

		pr_err("Catalog does not support version (%d)\n",

		       dsi_ctrl->version);

drivers/gpu/drm/msm/dsi-staging/dsi_ctrl.h

+3 −0
Original line number Diff line number Diff line
@@ -195,6 +195,8 @@ struct dsi_ctrl_interrupts { 
 * @misr_cache:          Cached Frame MISR value

 * @phy_isolation_enabled:    A boolean property allows to isolate the phy from

 *                          dsi controller and run only dsi controller.

 * @null_insertion_enabled:  A boolean property to allow dsi controller to

 *                           insert null packet.

 */

struct dsi_ctrl {

	struct platform_device *pdev;
@@ -239,6 +241,7 @@ struct dsi_ctrl { 
	u32 misr_cache;



	bool phy_isolation_enabled;

	bool null_insertion_enabled;

};



/**