CHROMIUM: Disable watermarks by default in multi-screen configuration.

Disable watermarks in multi-screen configuration by default. In single
pipe configuration the watermarks are enabled.

BUG=chrome-os-partner:45364,chrome-os-partner:48749,chrome-os-partner:50117
TEST=Check the wm registers running "intel_reg dump | grep WM"

Original-Change-Id: I23479faf0841a7e25e955a7dd3292c79a5889bfa
Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com>
Signed-off-by: Todd Broch <tbroch@chromium.org>
(cherry picked from commit 47b65a3e7cd9a8ab6ca4601939a6e12382193a9c)

Change-Id: Ief5fd45f97de46207dd3595927f7ee4f609935d4
Reviewed-on: https://chromium-review.googlesource.com/337334
Reviewed-by: Benson Leung <bleung@chromium.org>
Commit-Queue: Todd Broch <tbroch@chromium.org>
Tested-by: Todd Broch <tbroch@chromium.org>
diff --git a/drivers/gpu/drm/i915/i915_params.c b/drivers/gpu/drm/i915/i915_params.c
index 6b03b60..e06b0f6 100644
--- a/drivers/gpu/drm/i915/i915_params.c
+++ b/drivers/gpu/drm/i915/i915_params.c
@@ -41,7 +41,7 @@
 	.preliminary_hw_support = IS_ENABLED(CONFIG_DRM_I915_PRELIMINARY_HW_SUPPORT),
 	.disable_power_well = -1,
 	.enable_ips = 1,
-	.enable_watermark = 1,
+	.enable_watermark = 2,
 	.fastboot = 0,
 	.prefault_disable = 0,
 	.load_detect_test = 0,