Skip to content

Commit

Permalink
drm/i915/gen9: don't call ilk_pipe_pixel_rate() twice on the same fun…
Browse files Browse the repository at this point in the history
…ction

We used to call skl_pipe_pixel_rate(), which used to be a single
one-line return, but now we're  calling ilk_pipe_pixel_rate() which is
not as simple, so it's better to just call it once and store the
computed value for reuse.

Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
Reviewed-by: Matt Roper <matthew.d.roper@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1475872138-16194-2-git-send-email-paulo.r.zanoni@intel.com
  • Loading branch information
Paulo Zanoni committed Oct 18, 2016
1 parent cfd7e3a commit 30d1b5f
Showing 1 changed file with 6 additions and 2 deletions.
8 changes: 6 additions & 2 deletions drivers/gpu/drm/i915/intel_pm.c
Original file line number Diff line number Diff line change
Expand Up @@ -3754,14 +3754,18 @@ skl_compute_wm_level(const struct drm_i915_private *dev_priv,
static uint32_t
skl_compute_linetime_wm(struct intel_crtc_state *cstate)
{
uint32_t pixel_rate;

if (!cstate->base.active)
return 0;

if (WARN_ON(ilk_pipe_pixel_rate(cstate) == 0))
pixel_rate = ilk_pipe_pixel_rate(cstate);

if (WARN_ON(pixel_rate == 0))
return 0;

return DIV_ROUND_UP(8 * cstate->base.adjusted_mode.crtc_htotal * 1000,
ilk_pipe_pixel_rate(cstate));
pixel_rate);
}

static void skl_compute_transition_wm(struct intel_crtc_state *cstate,
Expand Down

0 comments on commit 30d1b5f

Please sign in to comment.