[src/trunk]: src/sys/external/bsd/drm2/dist/drm/i915 Remove local diff

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

details:   https://anonhg.NetBSD.org/src/rev/ec4630953a69
branches:  trunk
changeset: 1028549:ec4630953a69
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Sun Dec 19 11:18:09 2021 +0000

description:
Remove local diff


Author: Maya Rashish <maya%NetBSD.org@localhost>
Committer: Taylor R Campbell <riastradh%NetBSD.org@localhost>

diffstat:

 sys/external/bsd/drm2/dist/drm/i915/i915_drv.c |  6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

diffs (27 lines):

diff -r ff617bfd5e02 -r ec4630953a69 sys/external/bsd/drm2/dist/drm/i915/i915_drv.c
--- a/sys/external/bsd/drm2/dist/drm/i915/i915_drv.c    Sun Dec 19 11:18:00 2021 +0000
+++ b/sys/external/bsd/drm2/dist/drm/i915/i915_drv.c    Sun Dec 19 11:18:09 2021 +0000
@@ -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 @@
 
        enable_rpm_wakeref_asserts(&dev_priv->runtime_pm);
 
-       i915_rc6_ctx_wa_resume(dev_priv);
-
        return ret;
 }