Module Name: src
Committed By: riastradh
Date: Mon Aug 27 06:25:18 UTC 2018
Modified Files:
src/sys/external/bsd/drm2/dist/drm/i915: intel_pm.c
Log Message:
Forgot to nix conflicts after moving change to intel_runtime_pm.c.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/sys/external/bsd/drm2/dist/drm/i915/intel_pm.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/drm2/dist/drm/i915/intel_pm.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/intel_pm.c:1.10 src/sys/external/bsd/drm2/dist/drm/i915/intel_pm.c:1.11
--- src/sys/external/bsd/drm2/dist/drm/i915/intel_pm.c:1.10 Mon Aug 27 04:58:24 2018
+++ src/sys/external/bsd/drm2/dist/drm/i915/intel_pm.c Mon Aug 27 06:25:18 2018
@@ -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 g4x_init_clock_gating(struct
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);
