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

Commit cc564849 authored by Yuan Zhao's avatar Yuan Zhao Committed by Gerrit - the friendly Code Review server
Browse files

disp: msm: dsi: remove dsi bus scaling setting 



DSI driver did not use msm bus scaling setting,
remove the code.

Change-Id: I71675c8f4e3e97f1ded72ecac3fa87bdc7fb3774
Signed-off-by: default avatarYuan Zhao <yzhao@codeaurora.org>
parent 6cb205cb

msm/dsi/dsi_clk.h

+0 −2
Original line number Diff line number Diff line
@@ -178,7 +178,6 @@ typedef int (*pre_clockon_cb)(void *priv, 
 * @c_clks[MAX_DSI_CTRL]     array of core clock configurations

 * @l_lp_clks[MAX_DSI_CTRL]  array of low power(esc) clock configurations

 * @l_hs_clks[MAX_DSI_CTRL]  array of high speed clock configurations

 * @bus_handle[MAX_DSI_CTRL] array of bus handles

 * @ctrl_index[MAX_DSI_CTRL] array of DSI controller indexes mapped

 *                           to core and link clock configurations

 * @pre_clkoff_cb            callback before clock is turned off
@@ -194,7 +193,6 @@ struct dsi_clk_info { 
	struct dsi_core_clk_info c_clks[MAX_DSI_CTRL];

	struct dsi_link_lp_clk_info l_lp_clks[MAX_DSI_CTRL];

	struct dsi_link_hs_clk_info l_hs_clks[MAX_DSI_CTRL];

	u32 bus_handle[MAX_DSI_CTRL];

	u32 ctrl_index[MAX_DSI_CTRL];

	pre_clockoff_cb pre_clkoff_cb;

	post_clockoff_cb post_clkoff_cb;

msm/dsi/dsi_clk_manager.c

+0 −21
Original line number Diff line number Diff line
@@ -6,14 +6,12 @@ 
#include <linux/of.h>

#include <linux/delay.h>

#include <linux/slab.h>

#include <linux/msm-bus.h>

#include <linux/pm_runtime.h>

#include "dsi_clk.h"

#include "dsi_defs.h"



struct dsi_core_clks {

	struct dsi_core_clk_info clks;

	u32 bus_handle;

};



struct dsi_link_clks {
@@ -265,19 +263,9 @@ int dsi_core_clk_start(struct dsi_core_clks *c_clks) 
		}

	}



	if (c_clks->bus_handle) {

		rc = msm_bus_scale_client_update_request(c_clks->bus_handle, 1);

		if (rc) {

			DSI_ERR("bus scale client enable failed, rc=%d\n", rc);

			goto error_disable_mmss_clk;

		}

	}



	return rc;



error_disable_mmss_clk:

	if (c_clks->clks.core_mmss_clk)

		clk_disable_unprepare(c_clks->clks.core_mmss_clk);

error_disable_bus_clk:

	if (c_clks->clks.bus_clk)

		clk_disable_unprepare(c_clks->clks.bus_clk);
@@ -298,14 +286,6 @@ int dsi_core_clk_stop(struct dsi_core_clks *c_clks) 
{

	int rc = 0;



	if (c_clks->bus_handle) {

		rc = msm_bus_scale_client_update_request(c_clks->bus_handle, 0);

		if (rc) {

			DSI_ERR("bus scale client disable failed, rc=%d\n", rc);

			return rc;

		}

	}



	if (c_clks->clks.core_mmss_clk)

		clk_disable_unprepare(c_clks->clks.core_mmss_clk);
@@ -1446,7 +1426,6 @@ void *dsi_display_clk_mngr_register(struct dsi_clk_info *info) 
			sizeof(struct dsi_link_hs_clk_info));

		memcpy(&mngr->link_clks[i].lp_clks, &info->l_lp_clks[i],

			sizeof(struct dsi_link_lp_clk_info));

		mngr->core_clks[i].bus_handle = info->bus_handle[i];

		mngr->ctrl_index[i] = info->ctrl_index[i];

	}

msm/dsi/dsi_ctrl.c

+0 −47
Original line number Diff line number Diff line
@@ -7,7 +7,6 @@ 
#include <linux/err.h>

#include <linux/regulator/consumer.h>

#include <linux/clk.h>

#include <linux/msm-bus.h>

#include <linux/of_irq.h>

#include <video/mipi_display.h>
@@ -812,43 +811,6 @@ static int dsi_ctrl_supplies_init(struct platform_device *pdev, 
	return rc;

}



static int dsi_ctrl_axi_bus_client_init(struct platform_device *pdev,

					struct dsi_ctrl *ctrl)

{

	int rc = 0;

	struct dsi_ctrl_bus_scale_info *bus = &ctrl->axi_bus_info;



	bus->bus_scale_table = msm_bus_cl_get_pdata(pdev);

	if (IS_ERR_OR_NULL(bus->bus_scale_table)) {

		rc = PTR_ERR(bus->bus_scale_table);

		DSI_CTRL_DEBUG(ctrl, "msm_bus_cl_get_pdata() failed, rc = %d\n",

				rc);

		bus->bus_scale_table = NULL;

		return rc;

	}



	bus->bus_handle = msm_bus_scale_register_client(bus->bus_scale_table);

	if (!bus->bus_handle) {

		rc = -EINVAL;

		DSI_CTRL_ERR(ctrl, "failed to register axi bus client\n");

	}



	return rc;

}



static int dsi_ctrl_axi_bus_client_deinit(struct dsi_ctrl *ctrl)

{

	struct dsi_ctrl_bus_scale_info *bus = &ctrl->axi_bus_info;



	if (bus->bus_handle) {

		msm_bus_scale_unregister_client(bus->bus_handle);



		bus->bus_handle = 0;

	}



	return 0;

}



static int dsi_ctrl_validate_panel_info(struct dsi_ctrl *dsi_ctrl,

					struct dsi_host_config *config)

{
@@ -1928,11 +1890,6 @@ static int dsi_ctrl_dev_probe(struct platform_device *pdev) 
		goto fail_supplies;

	}



	rc = dsi_ctrl_axi_bus_client_init(pdev, dsi_ctrl);

	if (rc)

		DSI_CTRL_DEBUG(dsi_ctrl, "failed to init axi bus client, rc = %d\n",

				rc);



	item->ctrl = dsi_ctrl;



	mutex_lock(&dsi_ctrl_list_lock);
@@ -1977,10 +1934,6 @@ static int dsi_ctrl_dev_remove(struct platform_device *pdev) 
	mutex_unlock(&dsi_ctrl_list_lock);



	mutex_lock(&dsi_ctrl->ctrl_lock);

	rc = dsi_ctrl_axi_bus_client_deinit(dsi_ctrl);

	if (rc)

		DSI_CTRL_ERR(dsi_ctrl, "failed to deinitialize axi bus client, rc = %d\n",

				rc);



	rc = dsi_ctrl_supplies_deinit(dsi_ctrl);

	if (rc)

msm/dsi/dsi_ctrl.h

+0 −12
Original line number Diff line number Diff line
@@ -136,16 +136,6 @@ struct dsi_ctrl_clk_info { 
	struct dsi_clk_link_set shadow_clks;

};



/**

 * struct dsi_ctrl_bus_scale_info - Bus scale info for msm-bus bandwidth voting

 * @bus_scale_table:        Bus scale voting usecases.

 * @bus_handle:             Handle used for voting bandwidth.

 */

struct dsi_ctrl_bus_scale_info {

	struct msm_bus_scale_pdata *bus_scale_table;

	u32 bus_handle;

};



/**

 * struct dsi_ctrl_state_info - current driver state information

 * @power_state:        Status of power states on DSI controller.
@@ -208,7 +198,6 @@ struct dsi_ctrl_interrupts { 
 * @clk_info:            Clock information.

 * @clk_freq:            DSi Link clock frequency information.

 * @pwr_info:            Power information.

 * @axi_bus_info:        AXI bus information.

 * @host_config:         Current host configuration.

 * @mode_bounds:         Boundaries of the default mode ROI.

 *                       Origin is at top left of all CTRLs.
@@ -263,7 +252,6 @@ struct dsi_ctrl { 
	struct dsi_ctrl_clk_info clk_info;

	struct link_clk_freq clk_freq;

	struct dsi_ctrl_power_info pwr_info;

	struct dsi_ctrl_bus_scale_info axi_bus_info;



	struct dsi_host_config host_config;

	struct dsi_rect mode_bounds;

msm/dsi/dsi_display.c

+0 −2
Original line number Diff line number Diff line
@@ -4874,8 +4874,6 @@ static int dsi_display_bind(struct device *dev, 
				sizeof(struct dsi_link_lp_clk_info));



		info.c_clks[i].drm = drm;

		info.bus_handle[i] =

			display_ctrl->ctrl->axi_bus_info.bus_handle;

		info.ctrl_index[i] = display_ctrl->ctrl->cell_index;

	}