Re: kern/56561: cv_is_valid assertion failure in intel drm

[Taylor R Campbell <riastradh%NetBSD.org@localhost>]

The following reply was made to PR kern/56561; it has been noted by GNATS.

From: Taylor R Campbell <riastradh%NetBSD.org@localhost>
To: Patrick Welche <prlw1%cam.ac.uk@localhost>
Cc: gnats-bugs%NetBSD.org@localhost
Subject: Re: kern/56561: cv_is_valid assertion failure in intel drm
Date: Sun, 26 Dec 2021 19:35:46 +0000

 This is a multi-part message in MIME format.
 --=_iH22Mq8cEGadrlwrn55fhppMX7+AHtfW
 
 Can you try the attached patch?
 
 You might be able to accelerate testing by explicitly asking to blank
 the screen, maybe by screenblank(1), xset dpms, or xscreensaver.
 
 --=_iH22Mq8cEGadrlwrn55fhppMX7+AHtfW
 Content-Type: text/plain; charset="ISO-8859-1"; name="intelpanel"
 Content-Transfer-Encoding: quoted-printable
 Content-Disposition: attachment; filename="intelpanel.patch"
 
 From 26fda8a04b487a3a59e6940cbd02faf0fcc68a8a Mon Sep 17 00:00:00 2001
 From: Taylor R Campbell <riastradh%NetBSD.org@localhost>
 Date: Sun, 26 Dec 2021 19:33:15 +0000
 Subject: [PATCH] i915: Unifdef cnp_enable/disable_backlight.
 
 Not sure why this was ifdef'd out in the first place!  Appears to
 have been a mistake in merge.
 ---
  sys/external/bsd/drm2/dist/drm/i915/display/intel_panel.c | 6 ++----
  1 file changed, 2 insertions(+), 4 deletions(-)
 
 diff --git a/sys/external/bsd/drm2/dist/drm/i915/display/intel_panel.c b/sy=
 s/external/bsd/drm2/dist/drm/i915/display/intel_panel.c
 index a5204f61f3ab..c0f192e7bc73 100644
 --- a/sys/external/bsd/drm2/dist/drm/i915/display/intel_panel.c
 +++ b/sys/external/bsd/drm2/dist/drm/i915/display/intel_panel.c
 @@ -831,7 +831,6 @@ static void bxt_disable_backlight(const struct drm_conn=
 ector_state *old_conn_sta
  	}
  }
 =20
 -#ifndef __NetBSD__		/* XXX mipi */
  static void cnp_disable_backlight(const struct drm_connector_state *old_co=
 nn_state)
  {
  	struct intel_connector *connector =3D to_intel_connector(old_conn_state->=
 connector);
 @@ -846,6 +845,7 @@ static void cnp_disable_backlight(const struct drm_conn=
 ector_state *old_conn_sta
  		   tmp & ~BXT_BLC_PWM_ENABLE);
  }
 =20
 +#ifndef __NetBSD__		/* XXX mipi */
  static void pwm_disable_backlight(const struct drm_connector_state *old_co=
 nn_state)
  {
  	struct intel_connector *connector =3D to_intel_connector(old_conn_state->=
 connector);
 @@ -1138,7 +1138,6 @@ static void bxt_enable_backlight(const struct intel_c=
 rtc_state *crtc_state,
  			pwm_ctl | BXT_BLC_PWM_ENABLE);
  }
 =20
 -#ifndef __NetBSD__		/* XXX mipi */
  static void cnp_enable_backlight(const struct intel_crtc_state *crtc_state,
  				 const struct drm_connector_state *conn_state)
  {
 @@ -1170,6 +1169,7 @@ static void cnp_enable_backlight(const struct intel_c=
 rtc_state *crtc_state,
  		   pwm_ctl | BXT_BLC_PWM_ENABLE);
  }
 =20
 +#ifndef __NetBSD__		/* XXX mipi */
  static void pwm_enable_backlight(const struct intel_crtc_state *crtc_state,
  				 const struct drm_connector_state *conn_state)
  {
 @@ -2008,10 +2008,8 @@ intel_panel_init_backlight_funcs(struct intel_panel =
 *panel)
  		panel->backlight.hz_to_pwm =3D bxt_hz_to_pwm;
  	} else if (INTEL_PCH_TYPE(dev_priv) >=3D PCH_CNP) {
  		panel->backlight.setup =3D cnp_setup_backlight;
 -#ifndef __NetBSD__ /* XXX mipi */
  		panel->backlight.enable =3D cnp_enable_backlight;
  		panel->backlight.disable =3D cnp_disable_backlight;
 -#endif
  		panel->backlight.set =3D bxt_set_backlight;
  		panel->backlight.get =3D bxt_get_backlight;
  		panel->backlight.hz_to_pwm =3D cnp_hz_to_pwm;
 
 --=_iH22Mq8cEGadrlwrn55fhppMX7+AHtfW--