samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Koodi Ongelmat Pull-pyynnöt Actions Paketit Projektit Julkaisut Wiki Toiminta

disp: msm: dsi: remove scratch register logic for cont-splash

Selaa lähdekoodia 
Continuous splash enabled displays are identified by reading
the MDP ctl registers. DSI cont-splash init settings are
called based on this. Additionally, DSI reads the DSI-CTL
scratch register set by bootloader  to detect cont-splash.
This change removes the redundant mechanism in DSI to
detect cont-splash.

Change-Id: Ic58be1e62eda239fcea5e82d9d356905dc552a73
Signed-off-by: Veera Sundaram Sankaran <veeras@codeaurora.org>
This commit is contained in:
Veera Sundaram Sankaran
2019-06-06 17:22:23 -07:00
vanhempi 90ae258727
commit 2e3e990101
5 muutettua tiedostoa jossa 1 lisäystä ja 65 poistoa
Download Patch File Download Diff File Expand all files Collapse all files

4
msm/dsi/dsi_catalog.c
Näytä tiedosto

@@ -77,7 +77,6 @@ static void dsi_catalog_cmn_init(struct dsi_ctrl_hw *ctrl,
ctrl->ops.reg_dump_to_buffer =
dsi_ctrl_hw_14_reg_dump_to_buffer;
ctrl->ops.schedule_dma_cmd = NULL;
ctrl->ops.get_cont_splash_status = NULL;
ctrl->ops.kickoff_command_non_embedded_mode = NULL;
ctrl->ops.config_clk_gating = NULL;
break;
@@ -93,7 +92,6 @@ static void dsi_catalog_cmn_init(struct dsi_ctrl_hw *ctrl,
ctrl->ops.clamp_enable = NULL;
ctrl->ops.clamp_disable = NULL;
ctrl->ops.schedule_dma_cmd = NULL;
ctrl->ops.get_cont_splash_status = NULL;
ctrl->ops.kickoff_command_non_embedded_mode = NULL;
ctrl->ops.config_clk_gating = NULL;
break;
@@ -102,8 +100,6 @@ static void dsi_catalog_cmn_init(struct dsi_ctrl_hw *ctrl,
case DSI_CTRL_VERSION_2_4:
ctrl->ops.phy_reset_config = dsi_ctrl_hw_22_phy_reset_config;
ctrl->ops.config_clk_gating = dsi_ctrl_hw_22_config_clk_gating;
ctrl->ops.get_cont_splash_status =
dsi_ctrl_hw_22_get_cont_splash_status;
ctrl->ops.setup_lane_map = dsi_ctrl_hw_20_setup_lane_map;
ctrl->ops.wait_for_lane_idle =
dsi_ctrl_hw_20_wait_for_lane_idle;

1
msm/dsi/dsi_catalog.h
Näytä tiedosto

@@ -233,7 +233,6 @@ void dsi_ctrl_hw_kickoff_non_embedded_mode(struct dsi_ctrl_hw *ctrl,
u32 flags);
/* Definitions specific to 2.2 DSI controller hardware */
bool dsi_ctrl_hw_22_get_cont_splash_status(struct dsi_ctrl_hw *ctrl);
void dsi_ctrl_hw_22_config_clk_gating(struct dsi_ctrl_hw *ctrl, bool enable,
enum dsi_clk_gate_type clk_selection);

6
msm/dsi/dsi_ctrl_hw.h
Näytä tiedosto

@@ -572,12 +572,6 @@ struct dsi_ctrl_hw_ops {
u32 pkt_size,
u32 *hw_read_cnt);
/**
* get_cont_splash_status() - get continuous splash status
* @ctrl: Pointer to the controller host hardware.
*/
bool (*get_cont_splash_status)(struct dsi_ctrl_hw *ctrl);
/**
* wait_for_lane_idle() - wait for DSI lanes to go to idle state
* @ctrl: Pointer to the controller host hardware.

19
msm/dsi/dsi_ctrl_hw_2_2.c
Näytä tiedosto

@@ -51,25 +51,6 @@ void dsi_ctrl_hw_22_schedule_dma_cmd(struct dsi_ctrl_hw *ctrl, int line_no)
DSI_W32(ctrl, DSI_DMA_SCHEDULE_CTRL, reg);
}
/*
* dsi_ctrl_hw_22_get_cont_splash_status() - to verify whether continuous
* splash is enabled or not
* @ctrl: Pointer to the controller host hardware.
*
* Return: Return Continuous splash status
*/
bool dsi_ctrl_hw_22_get_cont_splash_status(struct dsi_ctrl_hw *ctrl)
{
u32 reg = 0;
/**
* DSI scratch register 1 is used to notify whether continuous
* splash is enabled or not by bootloader
*/
reg = DSI_R32(ctrl, DSI_SCRATCH_REGISTER_1);
return reg == 0x1;
}
/*
* dsi_ctrl_hw_kickoff_non_embedded_mode()-Kickoff cmd in non-embedded mode
* @ctrl: - Pointer to the controller host hardware.

36
msm/dsi/dsi_display.c
Näytä tiedosto

@@ -1029,32 +1029,6 @@ static void _dsi_display_setup_misr(struct dsi_display *display)
}
}
/**
* dsi_display_get_cont_splash_status - Get continuous splash status.
* @dsi_display: DSI display handle.
*
* Return: boolean to signify whether continuous splash is enabled.
*/
static bool dsi_display_get_cont_splash_status(struct dsi_display *display)
{
u32 val = 0;
int i;
struct dsi_display_ctrl *ctrl;
struct dsi_ctrl_hw *hw;
display_for_each_ctrl(i, display) {
ctrl = &(display->ctrl[i]);
if (!ctrl || !ctrl->ctrl)
continue;
hw = &(ctrl->ctrl->hw);
val = hw->ops.get_cont_splash_status(hw);
if (!val)
return false;
}
return true;
}
int dsi_display_set_power(struct drm_connector *connector,
int power_mode, void *disp)
{
@@ -4155,13 +4129,7 @@ int dsi_display_cont_splash_config(void *dsi_display)
mutex_lock(&display->display_lock);
/* Verify whether continuous splash is enabled or not */
display->is_cont_splash_enabled =
dsi_display_get_cont_splash_status(display);
if (!display->is_cont_splash_enabled) {
pr_err("Continuous splash is not enabled\n");
goto splash_disabled;
}
display->is_cont_splash_enabled = true;
/* Update splash status for clock manager */
dsi_display_clk_mngr_update_splash_status(display->clk_mngr,
@@ -4206,8 +4174,6 @@ clk_manager_update:
/* Update splash status for clock manager */
dsi_display_clk_mngr_update_splash_status(display->clk_mngr,
false);
splash_disabled:
pm_runtime_put_sync(display->drm_dev->dev);
display->is_cont_splash_enabled = false;
mutex_unlock(&display->display_lock);