[src/trunk]: src/sys/external/bsd/drm2/dist/drm/i915/display Do not try to ma...

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

details:   https://anonhg.NetBSD.org/src/rev/386efab8bb3d
branches:  trunk
changeset: 1028743:386efab8bb3d
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Sun Dec 19 11:54:48 2021 +0000

description:
Do not try to map VGA registers before intelfb is ready

double mapping fails


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

diffstat:

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

diffs (29 lines):

diff -r 795c245c683d -r 386efab8bb3d sys/external/bsd/drm2/dist/drm/i915/display/intel_display_power.c
--- a/sys/external/bsd/drm2/dist/drm/i915/display/intel_display_power.c Sun Dec 19 11:54:39 2021 +0000
+++ b/sys/external/bsd/drm2/dist/drm/i915/display/intel_display_power.c Sun Dec 19 11:54:48 2021 +0000
@@ -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 @@
 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);