Module Name: src Committed By: riastradh Date: Sun Dec 26 21:00:51 UTC 2021
Modified Files: src/sys/external/bsd/drm2/dist/drm/i915/display: intel_panel.c Log Message: 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. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 \ src/sys/external/bsd/drm2/dist/drm/i915/display/intel_panel.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_panel.c diff -u src/sys/external/bsd/drm2/dist/drm/i915/display/intel_panel.c:1.4 src/sys/external/bsd/drm2/dist/drm/i915/display/intel_panel.c:1.5 --- src/sys/external/bsd/drm2/dist/drm/i915/display/intel_panel.c:1.4 Sun Dec 19 11:48:11 2021 +++ src/sys/external/bsd/drm2/dist/drm/i915/display/intel_panel.c Sun Dec 26 21:00:51 2021 @@ -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 @@ static void bxt_disable_backlight(const } } -#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 @@ static void cnp_disable_backlight(const 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 @@ static void bxt_enable_backlight(const s 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 @@ static void cnp_enable_backlight(const s 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 @@ intel_panel_init_backlight_funcs(struct 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;