xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

drm/i915: Pass the entire skl_plane_wm to skl_compute_transition_wm()

Browse Source 
We have to pass both level 0 watermark struct and the transition
watermark struct to skl_compute_transition_wm(). Make life less
confusing by just passing the entire plane watermark struct that
contains both aforementioned structures.

Cc: Matt Roper <matthew.d.roper@intel.com>
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20181114210729.16185-8-ville.syrjala@linux.intel.com
Reviewed-by: Matt Roper <matthew.d.roper@intel.com>
Reviewed-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
This commit is contained in:
Ville Syrjälä
2018-11-14 23:07:23 +02:00
parent 14a43062b9
commit 6a3c910b08
1 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/gpu/drm/i915/intel_pm.c
View File

@@ -4933,10 +4933,9 @@ skl_compute_linetime_wm(const struct intel_crtc_state *cstate)
} }
static void skl_compute_transition_wm(const struct intel_crtc_state *cstate, static void skl_compute_transition_wm(const struct intel_crtc_state *cstate,
struct skl_wm_params *wp, const struct skl_wm_params *wp,
struct skl_wm_level *wm_l0, struct skl_plane_wm *wm,
uint16_t ddb_allocation, uint16_t ddb_allocation)
struct skl_wm_level *trans_wm /* out */)
{ {
struct drm_device *dev = cstate->base.crtc->dev; struct drm_device *dev = cstate->base.crtc->dev;
const struct drm_i915_private *dev_priv = to_i915(dev); const struct drm_i915_private *dev_priv = to_i915(dev);
@@ -4971,7 +4970,7 @@ static void skl_compute_transition_wm(const struct intel_crtc_state *cstate,
* Result Blocks is Result Blocks minus 1 and it should work for the * Result Blocks is Result Blocks minus 1 and it should work for the
* current platforms. * current platforms.
*/ */
wm0_sel_res_b = wm_l0->plane_res_b - 1; wm0_sel_res_b = wm->wm[0].plane_res_b - 1;
if (wp->y_tiled) { if (wp->y_tiled) {
trans_y_tile_min = (uint16_t) mul_round_up_u32_fixed16(2, trans_y_tile_min = (uint16_t) mul_round_up_u32_fixed16(2,
@@ -4990,8 +4989,8 @@ static void skl_compute_transition_wm(const struct intel_crtc_state *cstate,
res_blocks += 1; res_blocks += 1;
if (res_blocks < ddb_allocation) { if (res_blocks < ddb_allocation) {
trans_wm->plane_res_b = res_blocks; wm->trans_wm.plane_res_b = res_blocks;
trans_wm->plane_en = true; wm->trans_wm.plane_en = true;
} }
} }
@@ -5020,8 +5019,7 @@ static int __skl_build_plane_wm_single(struct skl_ddb_allocation *ddb,
if (ret) if (ret)
return ret; return ret;
skl_compute_transition_wm(cstate, &wm_params, &wm->wm[0], skl_compute_transition_wm(cstate, &wm_params, wm, ddb_blocks);
ddb_blocks, &wm->trans_wm);
return 0; return 0;
} }