diff options
| author | Kumar, Mahesh <mahesh1.kumar@intel.com> | 2017-07-05 20:01:49 +0530 |
|---|---|---|
| committer | Maarten Lankhorst <maarten.lankhorst@linux.intel.com> | 2017-07-13 16:39:09 +0200 |
| commit | b064be0784530d2a98b589b40793e3d421fb93ba (patch) | |
| tree | 75ee17564e45a100a9fd4fc7b449fc53bad5c9a3 /drivers/gpu/drm/i915/intel_pm.c | |
| parent | 129eaa957dd5a717edd70cfaf0626c143c03e54e (diff) | |
| download | op-kernel-dev-b064be0784530d2a98b589b40793e3d421fb93ba.zip op-kernel-dev-b064be0784530d2a98b589b40793e3d421fb93ba.tar.gz | |
drm/i915/skl+: unify cpp value in WM calculation
use same cpp value in different phase of plane WM caluclation.
Signed-off-by: Mahesh Kumar <mahesh1.kumar@intel.com>
Reviewed-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20170705143154.32132-7-mahesh1.kumar@intel.com
Diffstat (limited to 'drivers/gpu/drm/i915/intel_pm.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_pm.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c index 81e77f0..ee2a349 100644 --- a/drivers/gpu/drm/i915/intel_pm.c +++ b/drivers/gpu/drm/i915/intel_pm.c @@ -4399,13 +4399,11 @@ static int skl_compute_plane_wm(const struct drm_i915_private *dev_priv, width = drm_rect_width(&intel_pstate->base.src) >> 16; } - cpp = fb->format->cpp[0]; + cpp = (fb->format->format == DRM_FORMAT_NV12) ? fb->format->cpp[1] : + fb->format->cpp[0]; plane_pixel_rate = skl_adjusted_plane_pixel_rate(cstate, intel_pstate); if (drm_rotation_90_or_270(pstate->rotation)) { - int cpp = (fb->format->format == DRM_FORMAT_NV12) ? - fb->format->cpp[1] : - fb->format->cpp[0]; switch (cpp) { case 1: |
