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

Merge "disp: msm: dsi: use single mode for RFI feature"

Browse Source
This commit is contained in:
qctecmdr
2021-03-24 14:16:57 -07:00
committed by Gerrit - the friendly Code Review server
parent ee2a505703 50de265951
commit b2c440bffe
3 changed files with 12 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
msm/dsi/dsi_display.c
View File

@@ -6642,17 +6642,14 @@ void dsi_display_adjust_mode_timing(struct dsi_display *display,
}
}
static void _dsi_display_populate_bit_clks(struct dsi_display *display,
int start, int end, u32 *mode_idx)
static void _dsi_display_populate_bit_clks(struct dsi_display *display, int start, int end)
{
struct dsi_dyn_clk_caps *dyn_clk_caps;
struct dsi_display_mode *src, *dst;
struct dsi_display_mode *src;
struct dsi_host_common_cfg *cfg;
struct dsi_display_mode_priv_info *priv_info;
int i, j, total_modes, bpp, lanes = 0;
size_t size = 0;
int i, bpp, lanes = 0;
if (!display || !mode_idx)
if (!display)
return;
dyn_clk_caps = &(display->panel->dyn_clk_caps);
@@ -6671,8 +6668,6 @@ static void _dsi_display_populate_bit_clks(struct dsi_display *display,
if (cfg->data_lanes & DSI_DATA_LANE_3)
lanes++;
total_modes = display->panel->num_display_modes;
for (i = start; i < end; i++) {
src = &display->modes[i];
if (!src)
@@ -6685,43 +6680,10 @@ static void _dsi_display_populate_bit_clks(struct dsi_display *display,
dsi_display_adjust_mode_timing(display, src, lanes, bpp);
src->pixel_clk_khz =
div_u64(src->timing.clk_rate_hz * lanes, bpp);
src->pixel_clk_khz = div_u64(src->timing.clk_rate_hz * lanes, bpp);
src->pixel_clk_khz /= 1000;
src->pixel_clk_khz *= display->ctrl_count;
}
for (i = 1; i < dyn_clk_caps->bit_clk_list_len; i++) {
if (*mode_idx >= total_modes)
return;
for (j = start; j < end; j++) {
src = &display->modes[j];
dst = &display->modes[*mode_idx];
if (!src || !dst) {
DSI_ERR("invalid mode index\n");
return;
}
memcpy(dst, src, sizeof(struct dsi_display_mode));
size = sizeof(struct dsi_display_mode_priv_info);
priv_info = kzalloc(size, GFP_KERNEL);
dst->priv_info = priv_info;
if (dst->priv_info)
memcpy(dst->priv_info, src->priv_info, size);
dst->timing.clk_rate_hz = dyn_clk_caps->bit_clk_list[i];
dsi_display_adjust_mode_timing(display, dst, lanes,
bpp);
dst->panel_mode_caps = DSI_OP_VIDEO_MODE;
dst->pixel_clk_khz =
div_u64(dst->timing.clk_rate_hz * lanes, bpp);
dst->pixel_clk_khz /= 1000;
dst->pixel_clk_khz *= display->ctrl_count;
(*mode_idx)++;
}
}
}
int dsi_display_restore_bit_clk(struct dsi_display *display, struct dsi_display_mode *mode)
@@ -6904,7 +6866,8 @@ int dsi_display_get_modes(struct dsi_display *display,
}
end = array_idx;
_dsi_display_populate_bit_clks(display, start, end, &array_idx);
_dsi_display_populate_bit_clks(display, start, end);
if (is_preferred) {
/* Set first timing sub mode as preferred mode */
display->modes[start].is_preferred = true;

5
msm/dsi/dsi_drm.c
View File

@@ -130,10 +130,9 @@ void dsi_convert_to_drm_mode(const struct dsi_display_mode *dsi_mode,
drm_mode->flags |= DRM_MODE_FLAG_PVSYNC;
/* set mode name */
snprintf(drm_mode->name, DRM_DISPLAY_MODE_LEN, "%dx%dx%dx%u%s",
snprintf(drm_mode->name, DRM_DISPLAY_MODE_LEN, "%dx%dx%d%s",
drm_mode->hdisplay, drm_mode->vdisplay,
drm_mode_vrefresh(drm_mode), dsi_mode->pixel_clk_khz,
panel_caps);
drm_mode_vrefresh(drm_mode), panel_caps);
}
static void dsi_convert_to_msm_mode(const struct dsi_display_mode *dsi_mode,

11
msm/dsi/dsi_panel.c
View File

@@ -3741,7 +3741,7 @@ int dsi_panel_get_mode_count(struct dsi_panel *panel)
const u32 SINGLE_MODE_SUPPORT = 1;
struct dsi_parser_utils *utils;
struct device_node *timings_np, *child_np;
int num_dfps_rates, num_bit_clks;
int num_dfps_rates;
int num_video_modes = 0, num_cmd_modes = 0;
int count, rc = 0;
u32 dsc_count = 0, lm_count = 0;
@@ -3800,21 +3800,16 @@ int dsi_panel_get_mode_count(struct dsi_panel *panel)
num_dfps_rates = !panel->dfps_caps.dfps_support ? 1 :
panel->dfps_caps.dfps_list_len;
num_bit_clks = !panel->dyn_clk_caps.dyn_clk_support ? 1 :
panel->dyn_clk_caps.bit_clk_list_len;
/*
* Inflate num_of_modes by fps and bit clks in dfps.
* Inflate num_of_modes by fps in dfps.
* Single command mode for video mode panels supporting
* panel operating mode switch.
*/
num_video_modes = num_video_modes * num_bit_clks * num_dfps_rates;
num_video_modes = num_video_modes * num_dfps_rates;
if ((panel->panel_mode == DSI_OP_VIDEO_MODE) &&
(panel->panel_mode_switch_enabled))
num_cmd_modes = 1;
else
num_cmd_modes = num_cmd_modes * num_bit_clks;
panel->num_display_modes = num_video_modes + num_cmd_modes;