drm/i915: Add missing NULL check before calling initial_watermarks
authorImre Deak <imre.deak@intel.com>
Mon, 29 Feb 2016 20:10:33 +0000 (22:10 +0200)
committerImre Deak <imre.deak@intel.com>
Tue, 1 Mar 2016 10:40:08 +0000 (12:40 +0200)
commit1d5bf5d9d9ef0c1e639d36178a224d83888c5a29
treec130a56bcd2f15b75940f395d820b83cb716c7a1
parentc6a2ac712d7dee13c13e44c4c4184478853dcb37
drm/i915: Add missing NULL check before calling initial_watermarks

Not all platforms set this callback, so NULL check it before calling it.

v2:
- Call intel_update_watermarks() on HSW+ where the callback is not set.
  (Matt)

CC: Matt Roper <matthew.d.roper@intel.com>
Fixes: commit ed4a6a7ca853 ("drm/i915: Add two-stage ILK-style watermark programming (v11)")
Signed-off-by: Imre Deak <imre.deak@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1456776633-3401-1-git-send-email-imre.deak@intel.com
Reviewed-by: Matt Roper <matthew.d.roper@intel.com>
drivers/gpu/drm/i915/intel_display.c