]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commit - drivers/gpu/drm/i915/intel_pm.c
drm/i915: Use the active wm config for merging on ILK-BDW
authorVille Syrjälä <ville.syrjala@linux.intel.com>
Thu, 14 Jan 2016 12:53:35 +0000 (14:53 +0200)
committerMatt Roper <matthew.d.roper@intel.com>
Fri, 15 Jan 2016 02:34:37 +0000 (18:34 -0800)
commitd890565c44447db08fd9d07f5b02928a07a88c7e
tree023454c59748c1d0d509702e31bced3ab36ed1c9
parentf1ecaf8f9c9924badd4c8f690e39632d31edb500
drm/i915: Use the active wm config for merging on ILK-BDW

ilk_program_watermarks() is supposed to merge the active watermarks from
all pipes. Thus we need to use the active config too instead of some
precomputed stuff.

Fixes: aa363136866c ("drm/i915: Calculate watermark configuration during atomic check (v2)")
Cc: Matt Roper <matthew.d.roper@intel.com>
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Matt Roper <matthew.d.roper@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1452776015-22076-2-git-send-email-ville.syrjala@linux.intel.com
drivers/gpu/drm/i915/intel_pm.c