Module Name: src
Committed By: riastradh
Date: Sun Dec 19 11:54:48 UTC 2021
Modified Files:
src/sys/external/bsd/drm2/dist/drm/i915/display: intel_display_power.c
Log Message:
Do not try to map VGA registers before intelfb is ready
double mapping fails
Author: Maya Rashish <[email protected]>
Committer: Taylor R Campbell <[email protected]>
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
src/sys/external/bsd/drm2/dist/drm/i915/display/intel_display_power.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/display/intel_display_power.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/display/intel_display_power.c:1.3 src/sys/external/bsd/drm2/dist/drm/i915/display/intel_display_power.c:1.4
--- src/sys/external/bsd/drm2/dist/drm/i915/display/intel_display_power.c:1.3 Sun Dec 19 11:38:03 2021
+++ src/sys/external/bsd/drm2/dist/drm/i915/display/intel_display_power.c Sun Dec 19 11:54:48 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: intel_display_power.c,v 1.3 2021/12/19 11:38:03 riastradh Exp $ */
+/* $NetBSD: intel_display_power.c,v 1.4 2021/12/19 11:54:48 riastradh Exp $ */
/* SPDX-License-Identifier: MIT */
/*
@@ -6,7 +6,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: intel_display_power.c,v 1.3 2021/12/19 11:38:03 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intel_display_power.c,v 1.4 2021/12/19 11:54:48 riastradh Exp $");
#include "display/intel_crt.h"
#include "display/intel_dp.h"
@@ -273,8 +273,10 @@ bool intel_display_power_is_enabled(stru
static void hsw_power_well_post_enable(struct drm_i915_private *dev_priv,
u8 irq_pipe_mask, bool has_vga)
{
+#ifndef __NetBSD__ /* XXX We wait until intelfb is ready. */
if (has_vga)
intel_vga_reset_io_mem(dev_priv);
+#endif
if (irq_pipe_mask)
gen8_irq_power_well_post_enable(dev_priv, irq_pipe_mask);
