[src/trunk]: src/sys/external/bsd/drm2/dist/drm/i915 Switch CTASSERT() to DRM...

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

details:   https://anonhg.NetBSD.org/src/rev/cc4a609d73aa
branches:  trunk
changeset: 464025:cc4a609d73aa
user:      kamil <kamil%NetBSD.org@localhost>
date:      Fri Sep 20 12:41:33 2019 +0000

description:
Switch CTASSERT() to DRMCTASSERT() in two i915 functions

Fixes build with disabled optimization.

diffstat:

 sys/external/bsd/drm2/dist/drm/i915/intel_display.c    |  8 ++++----
 sys/external/bsd/drm2/dist/drm/i915/intel_runtime_pm.c |  7 +++----
 2 files changed, 7 insertions(+), 8 deletions(-)

diffs (61 lines):

diff -r cad44a5a16c5 -r cc4a609d73aa sys/external/bsd/drm2/dist/drm/i915/intel_display.c
--- a/sys/external/bsd/drm2/dist/drm/i915/intel_display.c       Fri Sep 20 12:40:23 2019 +0000
+++ b/sys/external/bsd/drm2/dist/drm/i915/intel_display.c       Fri Sep 20 12:41:33 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: intel_display.c,v 1.26 2019/02/19 00:30:16 christos Exp $      */
+/*     $NetBSD: intel_display.c,v 1.27 2019/09/20 12:41:33 kamil Exp $ */
 
 /*
  * Copyright © 2006-2007 Intel Corporation
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: intel_display.c,v 1.26 2019/02/19 00:30:16 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intel_display.c,v 1.27 2019/09/20 12:41:33 kamil Exp $");
 
 #include <linux/dmi.h>
 #include <linux/module.h>
@@ -14969,8 +14969,8 @@
                aprint_error_dev(dev->pdev->pd_dev,
                    "unable to map VGA registers: %d\n", error);
        } else {
-               CTASSERT(vgabase <= VGA_SR_INDEX);
-               CTASSERT(vgabase <= VGA_SR_DATA);
+               DRMCTASSERT(vgabase <= VGA_SR_INDEX);
+               DRMCTASSERT(vgabase <= VGA_SR_DATA);
                bus_space_write_1(iot, ioh, VGA_SR_INDEX - vgabase, SR01);
                sr1 = bus_space_read_1(iot, ioh, VGA_SR_DATA - vgabase);
                bus_space_write_1(iot, ioh, VGA_SR_DATA - vgabase,
diff -r cad44a5a16c5 -r cc4a609d73aa sys/external/bsd/drm2/dist/drm/i915/intel_runtime_pm.c
--- a/sys/external/bsd/drm2/dist/drm/i915/intel_runtime_pm.c    Fri Sep 20 12:40:23 2019 +0000
+++ b/sys/external/bsd/drm2/dist/drm/i915/intel_runtime_pm.c    Fri Sep 20 12:41:33 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: intel_runtime_pm.c,v 1.6 2018/09/13 08:25:55 mrg Exp $ */
+/*     $NetBSD: intel_runtime_pm.c,v 1.7 2019/09/20 12:41:33 kamil Exp $       */
 
 /*
  * Copyright © 2012-2014 Intel Corporation
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: intel_runtime_pm.c,v 1.6 2018/09/13 08:25:55 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intel_runtime_pm.c,v 1.7 2019/09/20 12:41:33 kamil Exp $");
 
 #include <linux/pm_runtime.h>
 #include <linux/vgaarb.h>
@@ -212,7 +212,7 @@
                device_printf(dev->pdev->pd_dev,
                    "unable to map VGA registers: %d\n", error);
        } else {
-               CTASSERT(vgabase <= VGA_MSR_READ);
+               DRMCTASSERT(vgabase <= VGA_MSR_READ);
                msr = bus_space_read_1(iot, ioh, VGA_MSR_READ - vgabase);
                bus_space_write_1(iot, ioh, VGA_MSR_READ - vgabase, msr);
                bus_space_unmap(iot, ioh, 0x10);
@@ -2211,4 +2211,3 @@
 
        pm_runtime_put_autosuspend(device);
 }
-