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

Merge "disp: msm: sde: update danger/safe QoS LUTs for landscape panels"

Browse Source
This commit is contained in:
qctecmdr
2022-01-10 17:38:19 -08:00
committed by Gerrit - the friendly Code Review server
parent 2d519071e8 689d2cd473
commit a33fefe00b
4 changed files with 56 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
msm/sde/sde_plane.c
View File

@@ -258,10 +258,11 @@ static void _sde_plane_set_qos_lut(struct drm_plane *plane,
{
struct sde_plane *psde;
const struct sde_format *fmt = NULL;
u32 frame_rate, qos_count, fps_index = 0, lut_index, creq_lut_index, index;
u32 frame_rate, qos_count, fps_index = 0, lut_index, creq_lut_index, ds_lut_index;
struct sde_perf_cfg *perf;
struct sde_plane_state *pstate;
bool inline_rot = false;
bool inline_rot = false, landscape = false;
struct drm_display_mode *mode;
if (!plane || !fb) {
SDE_ERROR("invalid arguments\n");
@@ -278,6 +279,9 @@ static void _sde_plane_set_qos_lut(struct drm_plane *plane,
return;
}
mode = &crtc->state->adjusted_mode;
landscape = mode->hdisplay > mode->vdisplay ? true : false;
frame_rate = drm_mode_vrefresh(&crtc->mode);
perf = &psde->catalog->perf;
qos_count = perf->qos_refresh_count;
@@ -300,38 +304,32 @@ static void _sde_plane_set_qos_lut(struct drm_plane *plane,
lut_index = SDE_QOS_LUT_USAGE_LINEAR;
else
lut_index = SDE_QOS_LUT_USAGE_MACROTILE;
creq_lut_index = lut_index * SDE_CREQ_LUT_TYPE_MAX;
if (psde->scaler3_cfg.enable)
creq_lut_index += SDE_CREQ_LUT_TYPE_QSEED;
} else {
lut_index = SDE_QOS_LUT_USAGE_NRT;
creq_lut_index = lut_index * SDE_CREQ_LUT_TYPE_MAX;
}
index = (fps_index * SDE_QOS_LUT_USAGE_MAX) + lut_index;
psde->pipe_qos_cfg.danger_lut = perf->danger_lut[index];
psde->pipe_qos_cfg.safe_lut = perf->safe_lut[index];
creq_lut_index = lut_index * SDE_CREQ_LUT_TYPE_MAX;
if (psde->scaler3_cfg.enable)
creq_lut_index += SDE_CREQ_LUT_TYPE_QSEED;
creq_lut_index += (fps_index * SDE_QOS_LUT_USAGE_MAX * SDE_CREQ_LUT_TYPE_MAX);
psde->pipe_qos_cfg.creq_lut = perf->creq_lut[creq_lut_index];
trace_sde_perf_set_qos_luts(psde->pipe - SSPP_VIG0,
(fmt) ? fmt->base.pixel_format : 0,
(fmt) ? fmt->fetch_mode : 0,
psde->pipe_qos_cfg.danger_lut,
psde->pipe_qos_cfg.safe_lut,
psde->pipe_qos_cfg.creq_lut);
ds_lut_index = lut_index * SDE_DANGER_SAFE_LUT_TYPE_MAX;
if (landscape)
ds_lut_index += SDE_DANGER_SAFE_LUT_TYPE_LANDSCAPE;
ds_lut_index += (fps_index * SDE_QOS_LUT_USAGE_MAX * SDE_DANGER_SAFE_LUT_TYPE_MAX);
psde->pipe_qos_cfg.danger_lut = perf->danger_lut[ds_lut_index];
psde->pipe_qos_cfg.safe_lut = perf->safe_lut[ds_lut_index];
SDE_DEBUG(
"plane%u: pnum:%d fmt:%4.4s fps:%d mode:%d luts[0x%x,0x%x 0x%llx]\n",
plane->base.id,
psde->pipe - SSPP_VIG0,
trace_sde_perf_set_qos_luts(psde->pipe - SSPP_VIG0, (fmt) ? fmt->base.pixel_format : 0,
(fmt) ? fmt->fetch_mode : 0, psde->pipe_qos_cfg.danger_lut,
psde->pipe_qos_cfg.safe_lut, psde->pipe_qos_cfg.creq_lut);
SDE_DEBUG("plane%u: pnum:%d fmt:%4.4s fps:%d mode:%d luts[0x%x,0x%x 0x%llx]\n",
plane->base.id, psde->pipe - SSPP_VIG0,
fmt ? (char *)&fmt->base.pixel_format : NULL, frame_rate,
fmt ? fmt->fetch_mode : -1,
psde->pipe_qos_cfg.danger_lut,
psde->pipe_qos_cfg.safe_lut,
psde->pipe_qos_cfg.creq_lut);
fmt ? fmt->fetch_mode : -1, psde->pipe_qos_cfg.danger_lut,
psde->pipe_qos_cfg.safe_lut, psde->pipe_qos_cfg.creq_lut);
psde->pipe_hw->ops.setup_qos_lut(psde->pipe_hw, &psde->pipe_qos_cfg);
}
@@ -372,6 +370,7 @@ static void _sde_plane_set_qos_ctrl(struct drm_plane *plane,
/* this feature overrules previous VBLANK_CTRL */
psde->pipe_qos_cfg.vblank_en = false;
psde->pipe_qos_cfg.creq_vblank = 0; /* clear vblank bits */
psde->pipe_qos_cfg.danger_vblank = 0;
}
if (flags & SDE_PLANE_QOS_PANIC_CTRL)