[PATCH 02/16] drm/i915: Make skl_plane_relative_data_rate use passed CRTC state

Matt Roper
2016-04-01T01:47:47Z

At the moment the CRTC state passed to skl_plane_relative_data_rate() is
always the committed state so intel_crtc->config and cstate are
equivalent. However going forward, we'd like to be able to call this
function on in-flight state objects, so make sure we use the parameter.

Signed-off-by: Matt Roper <matthew.d.roper@intel.com>
---
drivers/gpu/drm/i915/intel_pm.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
index a04e499..8271b6c 100644
--- a/drivers/gpu/drm/i915/intel_pm.c
+++ b/drivers/gpu/drm/i915/intel_pm.c
@@ -2953,8 +2953,7 @@ skl_plane_relative_data_rate(const struct intel_crtc_state *cstate,
}

/* for packed formats */
- return intel_crtc->config->pipe_src_w *
- intel_crtc->config->pipe_src_h *
+ return cstate->pipe_src_w * cstate->pipe_src_h *
drm_format_plane_cpp(fb->pixel_format, 0);