[src/trunk]: src/sys/external/bsd/drm2/dist/drm/i915 Forgot to nix conflicts ...

[riastradh <riastradh%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/36f21b7c0186
branches:  trunk
changeset: 834809:36f21b7c0186
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Mon Aug 27 06:25:18 2018 +0000

description:
Forgot to nix conflicts after moving change to intel_runtime_pm.c.

diffstat:

 sys/external/bsd/drm2/dist/drm/i915/intel_pm.c |  14 ++------------
 1 files changed, 2 insertions(+), 12 deletions(-)

diffs (36 lines):

diff -r ce502e4a0ba6 -r 36f21b7c0186 sys/external/bsd/drm2/dist/drm/i915/intel_pm.c
--- a/sys/external/bsd/drm2/dist/drm/i915/intel_pm.c    Mon Aug 27 06:25:06 2018 +0000
+++ b/sys/external/bsd/drm2/dist/drm/i915/intel_pm.c    Mon Aug 27 06:25:18 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: intel_pm.c,v 1.10 2018/08/27 04:58:24 riastradh Exp $  */
+/*     $NetBSD: intel_pm.c,v 1.11 2018/08/27 06:25:18 riastradh Exp $  */
 
 /*
  * Copyright © 2012 Intel Corporation
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: intel_pm.c,v 1.10 2018/08/27 04:58:24 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intel_pm.c,v 1.11 2018/08/27 06:25:18 riastradh Exp $");
 
 #include <linux/bitops.h>
 #include <linux/cpufreq.h>
@@ -7002,17 +7002,7 @@
 
 static void crestline_init_clock_gating(struct drm_device *dev)
 {
-<<<<<<< HEAD
-       struct i915_power_domains *power_domains = &dev_priv->power_domains;
-
-#ifdef __NetBSD__
-       linux_mutex_init(&power_domains->lock);
-#else
-       mutex_init(&power_domains->lock);
-#endif
-=======
        struct drm_i915_private *dev_priv = dev->dev_private;
->>>>>>> vendor/linux-drm-v4.4.143
 
        I915_WRITE(RENCLK_GATE_D1, I965_RCC_CLOCK_GATE_DISABLE);
        I915_WRITE(RENCLK_GATE_D2, 0);