iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

drm/i915: Pass crtc state to vlv_compute_wm_level()

Browse Source 
Rather than accessing crtc->config in vlv_compute_wm_level() let's
pass in the crtc state explicitly. One step closer to atomic.

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1480354637-14209-16-git-send-email-ville.syrjala@linux.intel.com
Reviewed-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
This commit is contained in:
Ville Syrjälä 2016-11-28 19:37:17 +02:00
parent fa292a4be9
commit e339d67eeb
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -978,24 +978,26 @@ static void vlv_setup_wm_latency(struct drm_i915_private *dev_priv)
} }
} }
static uint16_t vlv_compute_wm_level(struct intel_plane *plane, static uint16_t vlv_compute_wm_level(const struct intel_crtc_state *crtc_state,
struct intel_crtc *crtc, const struct intel_plane_state *plane_state,
const struct intel_plane_state *state,
int level) int level)
{ {
struct intel_plane *plane = to_intel_plane(plane_state->base.plane);
struct drm_i915_private *dev_priv = to_i915(plane->base.dev); struct drm_i915_private *dev_priv = to_i915(plane->base.dev);
const struct drm_display_mode *adjusted_mode =
&crtc_state->base.adjusted_mode;
int clock, htotal, cpp, width, wm; int clock, htotal, cpp, width, wm;
if (dev_priv->wm.pri_latency[level] == 0) if (dev_priv->wm.pri_latency[level] == 0)
return USHRT_MAX; return USHRT_MAX;
if (!state->base.visible) if (!plane_state->base.visible)
return 0; return 0;
cpp = drm_format_plane_cpp(state->base.fb->pixel_format, 0); cpp = drm_format_plane_cpp(plane_state->base.fb->pixel_format, 0);
clock = crtc->config->base.adjusted_mode.crtc_clock; clock = adjusted_mode->crtc_clock;
htotal = crtc->config->base.adjusted_mode.crtc_htotal; htotal = adjusted_mode->crtc_htotal;
width = crtc->config->pipe_src_w; width = crtc_state->pipe_src_w;
if (WARN_ON(htotal == 0)) if (WARN_ON(htotal == 0))
htotal = 1; htotal = 1;
@ -1145,7 +1147,7 @@ static void vlv_compute_wm(struct intel_crtc *crtc)
/* normal watermarks */ /* normal watermarks */
for (level = 0; level < wm_state->num_levels; level++) { for (level = 0; level < wm_state->num_levels; level++) {
int wm = vlv_compute_wm_level(plane, crtc, state, level); int wm = vlv_compute_wm_level(crtc->config, state, level);
int max_wm = plane->wm.fifo_size; int max_wm = plane->wm.fifo_size;
/* hack */ /* hack */