Module Name: src
Committed By: kamil
Date: Fri Sep 20 12:41:34 UTC 2019
Modified Files:
src/sys/external/bsd/drm2/dist/drm/i915: intel_display.c
intel_runtime_pm.c
Log Message:
Switch CTASSERT() to DRMCTASSERT() in two i915 functions
Fixes build with disabled optimization.
To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 \
src/sys/external/bsd/drm2/dist/drm/i915/intel_display.c
cvs rdiff -u -r1.6 -r1.7 \
src/sys/external/bsd/drm2/dist/drm/i915/intel_runtime_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_display.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/intel_display.c:1.26 src/sys/external/bsd/drm2/dist/drm/i915/intel_display.c:1.27
--- src/sys/external/bsd/drm2/dist/drm/i915/intel_display.c:1.26 Tue Feb 19 00:30:16 2019
+++ src/sys/external/bsd/drm2/dist/drm/i915/intel_display.c Fri Sep 20 12:41:33 2019
@@ -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 @@ void i915_disable_vga(struct drm_device
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,
Index: src/sys/external/bsd/drm2/dist/drm/i915/intel_runtime_pm.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/intel_runtime_pm.c:1.6 src/sys/external/bsd/drm2/dist/drm/i915/intel_runtime_pm.c:1.7
--- src/sys/external/bsd/drm2/dist/drm/i915/intel_runtime_pm.c:1.6 Thu Sep 13 08:25:55 2018
+++ src/sys/external/bsd/drm2/dist/drm/i915/intel_runtime_pm.c Fri Sep 20 12:41:33 2019
@@ -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 @@ touch_vga_msr(struct drm_device *dev)
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 @@ void intel_runtime_pm_enable(struct drm_
pm_runtime_put_autosuspend(device);
}
-
