Module Name: src
Committed By: riastradh
Date: Sun Dec 19 11:18:09 UTC 2021
Modified Files:
src/sys/external/bsd/drm2/dist/drm/i915: i915_drv.c
Log Message:
Remove local diff
Author: Maya Rashish <m...@netbsd.org>
Committer: Taylor R Campbell <riastr...@netbsd.org>
To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.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/i915_drv.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.c:1.31 src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.c:1.32
--- src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.c:1.31 Sun Dec 19 11:18:00 2021
+++ src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.c Sun Dec 19 11:18:09 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: i915_drv.c,v 1.31 2021/12/19 11:18:00 riastradh Exp $ */
+/* $NetBSD: i915_drv.c,v 1.32 2021/12/19 11:18:09 riastradh Exp $ */
/* i915_drv.c -- i830,i845,i855,i865,i915 driver -*- linux-c -*-
*/
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: i915_drv.c,v 1.31 2021/12/19 11:18:00 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i915_drv.c,v 1.32 2021/12/19 11:18:09 riastradh Exp $");
#include <linux/acpi.h>
#include <linux/device.h>
@@ -2043,8 +2043,6 @@ int i915_drm_resume_early(struct drm_dev
enable_rpm_wakeref_asserts(&dev_priv->runtime_pm);
- i915_rc6_ctx_wa_resume(dev_priv);
-
return ret;
}
