[src/trunk]: src/sys/external/bsd/drm2/dist/drm/i915/display i915: Unifdef cn...

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

details:   https://anonhg.NetBSD.org/src/rev/d83170fd683a
branches:  trunk
changeset: 1029197:d83170fd683a
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Sun Dec 26 21:00:51 2021 +0000

description:
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.

diffstat:

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

diffs (61 lines):

diff -r a07d82d4bb3a -r d83170fd683a sys/external/bsd/drm2/dist/drm/i915/display/intel_panel.c
--- a/sys/external/bsd/drm2/dist/drm/i915/display/intel_panel.c Sun Dec 26 21:00:14 2021 +0000
+++ b/sys/external/bsd/drm2/dist/drm/i915/display/intel_panel.c Sun Dec 26 21:00:51 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: intel_panel.c,v 1.4 2021/12/19 11:48:11 riastradh Exp $        */
+/*     $NetBSD: intel_panel.c,v 1.5 2021/12/26 21:00:51 riastradh Exp $        */
 
 /*
  * Copyright © 2006-2010 Intel Corporation
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: intel_panel.c,v 1.4 2021/12/19 11:48:11 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intel_panel.c,v 1.5 2021/12/26 21:00:51 riastradh Exp $");
 
 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
 
@@ -831,7 +831,6 @@
        }
 }
 
-#ifndef __NetBSD__             /* XXX mipi */
 static void cnp_disable_backlight(const struct drm_connector_state *old_conn_state)
 {
        struct intel_connector *connector = to_intel_connector(old_conn_state->connector);
@@ -846,6 +845,7 @@
                   tmp & ~BXT_BLC_PWM_ENABLE);
 }
 
+#ifndef __NetBSD__             /* XXX mipi */
 static void pwm_disable_backlight(const struct drm_connector_state *old_conn_state)
 {
        struct intel_connector *connector = to_intel_connector(old_conn_state->connector);
@@ -1138,7 +1138,6 @@
                        pwm_ctl | BXT_BLC_PWM_ENABLE);
 }
 
-#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 @@
                   pwm_ctl | BXT_BLC_PWM_ENABLE);
 }
 
+#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 @@
                panel->backlight.hz_to_pwm = bxt_hz_to_pwm;
        } else if (INTEL_PCH_TYPE(dev_priv) >= PCH_CNP) {
                panel->backlight.setup = cnp_setup_backlight;
-#ifndef __NetBSD__ /* XXX mipi */
                panel->backlight.enable = cnp_enable_backlight;
                panel->backlight.disable = cnp_disable_backlight;
-#endif
                panel->backlight.set = bxt_set_backlight;
                panel->backlight.get = bxt_get_backlight;
                panel->backlight.hz_to_pwm = cnp_hz_to_pwm;