samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

disp: msm: dsi: reuse continuous splash path for trusted vm

Browse Source 
Display in trusted VM works in a handover mode i.e, all
display components need to be initialized by the primary VM
before switching to trusted VM on the usecase boundary.
That makes it a hard requirement for the trusted VM not to
re-program any of the display configuration registers before
it could hand the HW back to the primary VM.

Also, most of the linux framework drivers including pintrl, clocks
are not enabled in the trusted VM.

In order to address the above two limitations and to control the
probe/commit sequences, this change adapts the same path as that
of continuous splash to bypass some of the critical functions
which are identified to be HW intrusive. Based on the DT property
read from SDE handle, dsi drivers will choose to bypass
enable/disable HW state updates when executing in the vm environment.

Change-Id: Ica71c924d189ab65fe3be5b0ac870633e3b749e1
Signed-off-by: Jeykumar Sankaran <jsanka@codeaurora.org>
Signed-off-by: Veera Sundaram Sankaran <veeras@codeaurora.org>
This commit is contained in:
Jeykumar Sankaran
2020-05-03 19:49:09 -07:00
parent ea2fdb01f7
commit 4b27380f07
8 changed files with 302 additions and 238 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
msm/dsi/dsi_panel.c
View File

@@ -291,6 +291,9 @@ static int dsi_panel_set_pinctrl_state(struct dsi_panel *panel, bool enable)
if (panel->host_config.ext_bridge_mode)
return 0;
if (!panel->pinctrl.pinctrl)
return 0;
if (enable)
state = panel->pinctrl.active;
else
@@ -2423,14 +2426,14 @@ static int dsi_panel_parse_dsc_params(struct dsi_display_mode *mode,
rc = sde_dsc_populate_dsc_config(&priv_info->dsc.config,
priv_info->dsc.scr_rev);
if (rc) {
DSI_DEBUG("failed populating dsc params \n");
DSI_DEBUG("failed populating dsc params\n");
rc = -EINVAL;
goto error;
}
rc = sde_dsc_populate_dsc_private_params(&priv_info->dsc, intf_width);
if (rc) {
DSI_DEBUG("failed populating other dsc params \n");
DSI_DEBUG("failed populating other dsc params\n");
rc = -EINVAL;
goto error;
}
@@ -3182,11 +3185,38 @@ end:
utils->node = panel->panel_of_node;
}
static int dsi_panel_vm_stub(struct dsi_panel *panel)
{
return 0;
}
static void dsi_panel_setup_vm_ops(struct dsi_panel *panel, bool trusted_vm_env)
{
if (trusted_vm_env) {
panel->panel_ops.pinctrl_init = dsi_panel_vm_stub;
panel->panel_ops.gpio_request = dsi_panel_vm_stub;
panel->panel_ops.pinctrl_deinit = dsi_panel_vm_stub;
panel->panel_ops.gpio_release = dsi_panel_vm_stub;
panel->panel_ops.bl_register = dsi_panel_vm_stub;
panel->panel_ops.bl_unregister = dsi_panel_vm_stub;
panel->panel_ops.parse_gpios = dsi_panel_vm_stub;
} else {
panel->panel_ops.pinctrl_init = dsi_panel_pinctrl_init;
panel->panel_ops.gpio_request = dsi_panel_gpio_request;
panel->panel_ops.pinctrl_deinit = dsi_panel_pinctrl_deinit;
panel->panel_ops.gpio_release = dsi_panel_gpio_release;
panel->panel_ops.bl_register = dsi_panel_bl_register;
panel->panel_ops.bl_unregister = dsi_panel_bl_unregister;
panel->panel_ops.parse_gpios = dsi_panel_parse_gpios;
}
}
struct dsi_panel *dsi_panel_get(struct device *parent,
struct device_node *of_node,
struct device_node *parser_node,
const char *type,
int topology_override)
int topology_override,
bool trusted_vm_env)
{
struct dsi_panel *panel;
struct dsi_parser_utils *utils;
@@ -3197,6 +3227,8 @@ struct dsi_panel *dsi_panel_get(struct device *parent,
if (!panel)
return ERR_PTR(-ENOMEM);
dsi_panel_setup_vm_ops(panel, trusted_vm_env);
panel->panel_of_node = of_node;
panel->parent = parent;
panel->type = type;
@@ -3255,7 +3287,7 @@ struct dsi_panel *dsi_panel_get(struct device *parent,
goto error;
}
rc = dsi_panel_parse_gpios(panel);
rc = panel->panel_ops.parse_gpios(panel);
if (rc) {
DSI_ERR("failed to parse panel gpios, rc=%d\n", rc);
goto error;
@@ -3355,21 +3387,22 @@ int dsi_panel_drv_init(struct dsi_panel *panel,
dev->lanes = 4;
panel->host = host;
rc = dsi_panel_pinctrl_init(panel);
rc = panel->panel_ops.pinctrl_init(panel);
if (rc) {
DSI_ERR("[%s] failed to init pinctrl, rc=%d\n",
panel->name, rc);
goto exit;
}
rc = dsi_panel_gpio_request(panel);
rc = panel->panel_ops.gpio_request(panel);
if (rc) {
DSI_ERR("[%s] failed to request gpios, rc=%d\n", panel->name,
rc);
goto error_pinctrl_deinit;
}
rc = dsi_panel_bl_register(panel);
rc = panel->panel_ops.bl_register(panel);
if (rc) {
if (rc != -EPROBE_DEFER)
DSI_ERR("[%s] failed to register backlight, rc=%d\n",
@@ -3399,17 +3432,17 @@ int dsi_panel_drv_deinit(struct dsi_panel *panel)
mutex_lock(&panel->panel_lock);
rc = dsi_panel_bl_unregister(panel);
rc = panel->panel_ops.bl_unregister(panel);
if (rc)
DSI_ERR("[%s] failed to unregister backlight, rc=%d\n",
panel->name, rc);
rc = dsi_panel_gpio_release(panel);
rc = panel->panel_ops.gpio_release(panel);
if (rc)
DSI_ERR("[%s] failed to release gpios, rc=%d\n", panel->name,
rc);
rc = dsi_panel_pinctrl_deinit(panel);
rc = panel->panel_ops.pinctrl_deinit(panel);
if (rc)
DSI_ERR("[%s] failed to deinit gpios, rc=%d\n", panel->name,
rc);
@@ -3606,7 +3639,7 @@ void dsi_panel_put_mode(struct dsi_display_mode *mode)
void dsi_panel_calc_dsi_transfer_time(struct dsi_host_common_cfg *config,
struct dsi_display_mode *mode, u32 frame_threshold_us)
{
u32 frame_time_us,nslices;
u32 frame_time_us, nslices;
u64 min_bitclk_hz, total_active_pixels, bits_per_line, pclk_rate_hz,
dsi_transfer_time_us, pixel_clk_khz;
struct msm_display_dsc_info *dsc = mode->timing.dsc;
@@ -3618,7 +3651,7 @@ void dsi_panel_calc_dsi_transfer_time(struct dsi_host_common_cfg *config,
/* Packet overlead in bits,2 bytes header + 2 bytes checksum
* + 1 byte dcs data command.
*/
*/
const u32 packet_overhead = 56;
display_mode = container_of(timing, struct dsi_display_mode, timing);