Module Name: src Committed By: riastradh Date: Fri Feb 14 04:36:12 UTC 2020
Modified Files: src/sys/external/bsd/drm2/dist/drm/i915: i915_debugfs.c i915_dma.c i915_drv.h i915_irq.c intel_audio.c intel_crt.c intel_ddi.c intel_display.c intel_dp.c intel_dp_mst.c intel_drv.h intel_dsi.c intel_dvo.c intel_fbc.c intel_fifo_underrun.c intel_hdmi.c intel_lvds.c intel_overlay.c intel_panel.c intel_pm.c intel_psr.c intel_runtime_pm.c intel_sdvo.c intel_sideband.c intel_sprite.c intel_tv.c Log Message: Undo the `enum pipe' -> `enum i915_pipe' rename. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 \ src/sys/external/bsd/drm2/dist/drm/i915/i915_debugfs.c \ src/sys/external/bsd/drm2/dist/drm/i915/intel_dp_mst.c \ src/sys/external/bsd/drm2/dist/drm/i915/intel_sideband.c cvs rdiff -u -r1.29 -r1.30 src/sys/external/bsd/drm2/dist/drm/i915/i915_dma.c \ src/sys/external/bsd/drm2/dist/drm/i915/intel_display.c cvs rdiff -u -r1.30 -r1.31 src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.h cvs rdiff -u -r1.17 -r1.18 src/sys/external/bsd/drm2/dist/drm/i915/i915_irq.c cvs rdiff -u -r1.5 -r1.6 \ src/sys/external/bsd/drm2/dist/drm/i915/intel_audio.c \ src/sys/external/bsd/drm2/dist/drm/i915/intel_fbc.c cvs rdiff -u -r1.6 -r1.7 src/sys/external/bsd/drm2/dist/drm/i915/intel_crt.c cvs rdiff -u -r1.10 -r1.11 \ src/sys/external/bsd/drm2/dist/drm/i915/intel_ddi.c cvs rdiff -u -r1.20 -r1.21 src/sys/external/bsd/drm2/dist/drm/i915/intel_dp.c cvs rdiff -u -r1.11 -r1.12 \ src/sys/external/bsd/drm2/dist/drm/i915/intel_drv.h cvs rdiff -u -r1.4 -r1.5 src/sys/external/bsd/drm2/dist/drm/i915/intel_dsi.c \ src/sys/external/bsd/drm2/dist/drm/i915/intel_dvo.c cvs rdiff -u -r1.2 -r1.3 \ src/sys/external/bsd/drm2/dist/drm/i915/intel_fifo_underrun.c cvs rdiff -u -r1.7 -r1.8 src/sys/external/bsd/drm2/dist/drm/i915/intel_hdmi.c \ src/sys/external/bsd/drm2/dist/drm/i915/intel_lvds.c \ src/sys/external/bsd/drm2/dist/drm/i915/intel_psr.c \ src/sys/external/bsd/drm2/dist/drm/i915/intel_tv.c cvs rdiff -u -r1.8 -r1.9 \ src/sys/external/bsd/drm2/dist/drm/i915/intel_overlay.c \ src/sys/external/bsd/drm2/dist/drm/i915/intel_runtime_pm.c cvs rdiff -u -r1.12 -r1.13 \ src/sys/external/bsd/drm2/dist/drm/i915/intel_panel.c \ src/sys/external/bsd/drm2/dist/drm/i915/intel_sdvo.c cvs rdiff -u -r1.21 -r1.22 src/sys/external/bsd/drm2/dist/drm/i915/intel_pm.c cvs rdiff -u -r1.9 -r1.10 \ src/sys/external/bsd/drm2/dist/drm/i915/intel_sprite.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/i915_debugfs.c diff -u src/sys/external/bsd/drm2/dist/drm/i915/i915_debugfs.c:1.3 src/sys/external/bsd/drm2/dist/drm/i915/i915_debugfs.c:1.4 --- src/sys/external/bsd/drm2/dist/drm/i915/i915_debugfs.c:1.3 Mon Aug 27 04:58:23 2018 +++ src/sys/external/bsd/drm2/dist/drm/i915/i915_debugfs.c Fri Feb 14 04:36:11 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: i915_debugfs.c,v 1.3 2018/08/27 04:58:23 riastradh Exp $ */ +/* $NetBSD: i915_debugfs.c,v 1.4 2020/02/14 04:36:11 riastradh Exp $ */ /* * Copyright © 2008 Intel Corporation @@ -29,7 +29,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: i915_debugfs.c,v 1.3 2018/08/27 04:58:23 riastradh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: i915_debugfs.c,v 1.4 2020/02/14 04:36:11 riastradh Exp $"); #include <linux/seq_file.h> #include <linux/circ_buf.h> @@ -3286,7 +3286,7 @@ static int i915_drrs_status(struct seq_f struct pipe_crc_info { const char *name; struct drm_device *dev; - enum i915_pipe pipe; + enum pipe pipe; }; static int i915_dp_mst_info(struct seq_file *m, void *unused) @@ -3462,7 +3462,7 @@ static struct pipe_crc_info i915_pipe_cr }; static int i915_pipe_crc_create(struct dentry *root, struct drm_minor *minor, - enum i915_pipe pipe) + enum pipe pipe) { struct drm_device *dev = minor->dev; struct dentry *ent; @@ -3536,7 +3536,7 @@ static int i8xx_pipe_crc_ctl_reg(enum in return 0; } -static int i9xx_pipe_crc_auto_source(struct drm_device *dev, enum i915_pipe pipe, +static int i9xx_pipe_crc_auto_source(struct drm_device *dev, enum pipe pipe, enum intel_pipe_crc_source *source) { struct intel_encoder *encoder; @@ -3589,7 +3589,7 @@ static int i9xx_pipe_crc_auto_source(str } static int vlv_pipe_crc_ctl_reg(struct drm_device *dev, - enum i915_pipe pipe, + enum pipe pipe, enum intel_pipe_crc_source *source, uint32_t *val) { @@ -3660,7 +3660,7 @@ static int vlv_pipe_crc_ctl_reg(struct d } static int i9xx_pipe_crc_ctl_reg(struct drm_device *dev, - enum i915_pipe pipe, + enum pipe pipe, enum intel_pipe_crc_source *source, uint32_t *val) { @@ -3736,7 +3736,7 @@ static int i9xx_pipe_crc_ctl_reg(struct } static void vlv_undo_pipe_scramble_reset(struct drm_device *dev, - enum i915_pipe pipe) + enum pipe pipe) { struct drm_i915_private *dev_priv = dev->dev_private; uint32_t tmp = I915_READ(PORT_DFT2_G4X); @@ -3761,7 +3761,7 @@ static void vlv_undo_pipe_scramble_reset } static void g4x_undo_pipe_scramble_reset(struct drm_device *dev, - enum i915_pipe pipe) + enum pipe pipe) { struct drm_i915_private *dev_priv = dev->dev_private; uint32_t tmp = I915_READ(PORT_DFT2_G4X); @@ -3871,7 +3871,7 @@ static int ivb_pipe_crc_ctl_reg(struct d return 0; } -static int pipe_crc_set_source(struct drm_device *dev, enum i915_pipe pipe, +static int pipe_crc_set_source(struct drm_device *dev, enum pipe pipe, enum intel_pipe_crc_source source) { struct drm_i915_private *dev_priv = dev->dev_private; @@ -4042,7 +4042,7 @@ display_crc_ctl_parse_object(const char return -EINVAL; } -static int display_crc_ctl_parse_pipe(const char *buf, enum i915_pipe *pipe) +static int display_crc_ctl_parse_pipe(const char *buf, enum pipe *pipe) { const char name = buf[0]; @@ -4073,7 +4073,7 @@ static int display_crc_ctl_parse(struct #define N_WORDS 3 int n_words; char *words[N_WORDS]; - enum i915_pipe pipe; + enum pipe pipe; enum intel_pipe_crc_object object; enum intel_pipe_crc_source source; @@ -5282,7 +5282,7 @@ static const struct i915_debugfs_files { void intel_display_crc_init(struct drm_device *dev) { struct drm_i915_private *dev_priv = dev->dev_private; - enum i915_pipe pipe; + enum pipe pipe; for_each_pipe(dev_priv, pipe) { struct intel_pipe_crc *pipe_crc = &dev_priv->pipe_crc[pipe]; Index: src/sys/external/bsd/drm2/dist/drm/i915/intel_dp_mst.c diff -u src/sys/external/bsd/drm2/dist/drm/i915/intel_dp_mst.c:1.3 src/sys/external/bsd/drm2/dist/drm/i915/intel_dp_mst.c:1.4 --- src/sys/external/bsd/drm2/dist/drm/i915/intel_dp_mst.c:1.3 Mon Aug 27 07:22:08 2018 +++ src/sys/external/bsd/drm2/dist/drm/i915/intel_dp_mst.c Fri Feb 14 04:36:11 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: intel_dp_mst.c,v 1.3 2018/08/27 07:22:08 riastradh Exp $ */ +/* $NetBSD: intel_dp_mst.c,v 1.4 2020/02/14 04:36:11 riastradh Exp $ */ /* * Copyright © 2008 Intel Corporation @@ -26,7 +26,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: intel_dp_mst.c,v 1.3 2018/08/27 07:22:08 riastradh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: intel_dp_mst.c,v 1.4 2020/02/14 04:36:11 riastradh Exp $"); #include <drm/drmP.h> #include "i915_drv.h" @@ -234,7 +234,7 @@ static void intel_mst_enable_dp(struct i } static bool intel_dp_mst_enc_get_hw_state(struct intel_encoder *encoder, - enum i915_pipe *pipe) + enum pipe *pipe) { struct intel_dp_mst_encoder *intel_mst = enc_to_mst(&encoder->base); *pipe = intel_mst->pipe; @@ -407,7 +407,7 @@ static const struct drm_encoder_funcs in static bool intel_dp_mst_get_hw_state(struct intel_connector *connector) { if (connector->encoder && connector->base.state->crtc) { - enum i915_pipe pipe; + enum pipe pipe; if (!connector->encoder->get_hw_state(connector->encoder, &pipe)) return false; return true; @@ -523,7 +523,7 @@ static struct drm_dp_mst_topology_cbs ms }; static struct intel_dp_mst_encoder * -intel_dp_create_fake_mst_encoder(struct intel_digital_port *intel_dig_port, enum i915_pipe pipe) +intel_dp_create_fake_mst_encoder(struct intel_digital_port *intel_dig_port, enum pipe pipe) { struct intel_dp_mst_encoder *intel_mst; struct intel_encoder *intel_encoder; Index: src/sys/external/bsd/drm2/dist/drm/i915/intel_sideband.c diff -u src/sys/external/bsd/drm2/dist/drm/i915/intel_sideband.c:1.3 src/sys/external/bsd/drm2/dist/drm/i915/intel_sideband.c:1.4 --- src/sys/external/bsd/drm2/dist/drm/i915/intel_sideband.c:1.3 Mon Aug 27 04:58:24 2018 +++ src/sys/external/bsd/drm2/dist/drm/i915/intel_sideband.c Fri Feb 14 04:36:12 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: intel_sideband.c,v 1.3 2018/08/27 04:58:24 riastradh Exp $ */ +/* $NetBSD: intel_sideband.c,v 1.4 2020/02/14 04:36:12 riastradh Exp $ */ /* * Copyright © 2013 Intel Corporation @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: intel_sideband.c,v 1.3 2018/08/27 04:58:24 riastradh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: intel_sideband.c,v 1.4 2020/02/14 04:36:12 riastradh Exp $"); #include "i915_drv.h" #include "intel_drv.h" @@ -190,7 +190,7 @@ void vlv_gps_core_write(struct drm_i915_ SB_CRWRDA_NP, reg, &val); } -u32 vlv_dpio_read(struct drm_i915_private *dev_priv, enum i915_pipe pipe, int reg) +u32 vlv_dpio_read(struct drm_i915_private *dev_priv, enum pipe pipe, int reg) { u32 val = 0; @@ -207,7 +207,7 @@ u32 vlv_dpio_read(struct drm_i915_privat return val; } -void vlv_dpio_write(struct drm_i915_private *dev_priv, enum i915_pipe pipe, int reg, u32 val) +void vlv_dpio_write(struct drm_i915_private *dev_priv, enum pipe pipe, int reg, u32 val) { vlv_sideband_rw(dev_priv, DPIO_DEVFN, DPIO_PHY_IOSF_PORT(DPIO_PHY(pipe)), SB_MWR_NP, reg, &val); Index: src/sys/external/bsd/drm2/dist/drm/i915/i915_dma.c diff -u src/sys/external/bsd/drm2/dist/drm/i915/i915_dma.c:1.29 src/sys/external/bsd/drm2/dist/drm/i915/i915_dma.c:1.30 --- src/sys/external/bsd/drm2/dist/drm/i915/i915_dma.c:1.29 Fri Feb 14 04:35:19 2020 +++ src/sys/external/bsd/drm2/dist/drm/i915/i915_dma.c Fri Feb 14 04:36:11 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: i915_dma.c,v 1.29 2020/02/14 04:35:19 riastradh Exp $ */ +/* $NetBSD: i915_dma.c,v 1.30 2020/02/14 04:36:11 riastradh Exp $ */ /* i915_dma.c -- DMA support for the I915 -*- linux-c -*- */ @@ -29,7 +29,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: i915_dma.c,v 1.29 2020/02/14 04:35:19 riastradh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: i915_dma.c,v 1.30 2020/02/14 04:36:11 riastradh Exp $"); #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt @@ -793,7 +793,7 @@ static void intel_device_info_runtime_in { struct drm_i915_private *dev_priv = dev->dev_private; struct intel_device_info *info; - enum i915_pipe pipe; + enum pipe pipe; info = (struct intel_device_info *)&dev_priv->info; Index: src/sys/external/bsd/drm2/dist/drm/i915/intel_display.c diff -u src/sys/external/bsd/drm2/dist/drm/i915/intel_display.c:1.29 src/sys/external/bsd/drm2/dist/drm/i915/intel_display.c:1.30 --- src/sys/external/bsd/drm2/dist/drm/i915/intel_display.c:1.29 Fri Feb 14 04:35:19 2020 +++ src/sys/external/bsd/drm2/dist/drm/i915/intel_display.c Fri Feb 14 04:36:11 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: intel_display.c,v 1.29 2020/02/14 04:35:19 riastradh Exp $ */ +/* $NetBSD: intel_display.c,v 1.30 2020/02/14 04:36:11 riastradh Exp $ */ /* * Copyright © 2006-2007 Intel Corporation @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: intel_display.c,v 1.29 2020/02/14 04:35:19 riastradh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: intel_display.c,v 1.30 2020/02/14 04:36:11 riastradh Exp $"); #include <linux/dmi.h> #include <linux/module.h> @@ -1099,7 +1099,7 @@ bool intel_crtc_active(struct drm_crtc * } enum transcoder intel_pipe_to_cpu_transcoder(struct drm_i915_private *dev_priv, - enum i915_pipe pipe) + enum pipe pipe) { struct drm_crtc *crtc = dev_priv->pipe_to_crtc_mapping[pipe]; struct intel_crtc *intel_crtc = to_intel_crtc(crtc); @@ -1107,7 +1107,7 @@ enum transcoder intel_pipe_to_cpu_transc return intel_crtc->config->cpu_transcoder; } -static bool pipe_dsl_stopped(struct drm_device *dev, enum i915_pipe pipe) +static bool pipe_dsl_stopped(struct drm_device *dev, enum pipe pipe) { struct drm_i915_private *dev_priv = dev->dev_private; u32 reg = PIPEDSL(pipe); @@ -1147,7 +1147,7 @@ static void intel_wait_for_pipe_off(stru struct drm_device *dev = crtc->base.dev; struct drm_i915_private *dev_priv = dev->dev_private; enum transcoder cpu_transcoder = crtc->config->cpu_transcoder; - enum i915_pipe pipe = crtc->pipe; + enum pipe pipe = crtc->pipe; if (INTEL_INFO(dev)->gen >= 4) { int reg = PIPECONF(cpu_transcoder); @@ -1170,7 +1170,7 @@ static const char *state_string(bool ena /* Only for pre-ILK configs */ void assert_pll(struct drm_i915_private *dev_priv, - enum i915_pipe pipe, bool state) + enum pipe pipe, bool state) { u32 val; bool cur_state; @@ -1230,7 +1230,7 @@ void assert_shared_dpll(struct drm_i915_ } static void assert_fdi_tx(struct drm_i915_private *dev_priv, - enum i915_pipe pipe, bool state) + enum pipe pipe, bool state) { bool cur_state; enum transcoder cpu_transcoder = intel_pipe_to_cpu_transcoder(dev_priv, @@ -1252,7 +1252,7 @@ static void assert_fdi_tx(struct drm_i91 #define assert_fdi_tx_disabled(d, p) assert_fdi_tx(d, p, false) static void assert_fdi_rx(struct drm_i915_private *dev_priv, - enum i915_pipe pipe, bool state) + enum pipe pipe, bool state) { u32 val; bool cur_state; @@ -1267,7 +1267,7 @@ static void assert_fdi_rx(struct drm_i91 #define assert_fdi_rx_disabled(d, p) assert_fdi_rx(d, p, false) static void assert_fdi_tx_pll_enabled(struct drm_i915_private *dev_priv, - enum i915_pipe pipe) + enum pipe pipe) { u32 val; @@ -1284,7 +1284,7 @@ static void assert_fdi_tx_pll_enabled(st } void assert_fdi_rx_pll(struct drm_i915_private *dev_priv, - enum i915_pipe pipe, bool state) + enum pipe pipe, bool state) { u32 val; bool cur_state; @@ -1297,12 +1297,12 @@ void assert_fdi_rx_pll(struct drm_i915_p } void assert_panel_unlocked(struct drm_i915_private *dev_priv, - enum i915_pipe pipe) + enum pipe pipe) { struct drm_device *dev = dev_priv->dev; int pp_reg; u32 val; - enum i915_pipe panel_pipe = PIPE_A; + enum pipe panel_pipe = PIPE_A; bool locked = true; if (WARN_ON(HAS_DDI(dev))) @@ -1339,7 +1339,7 @@ void assert_panel_unlocked(struct drm_i9 } static void assert_cursor(struct drm_i915_private *dev_priv, - enum i915_pipe pipe, bool state) + enum pipe pipe, bool state) { struct drm_device *dev = dev_priv->dev; bool cur_state; @@ -1357,7 +1357,7 @@ static void assert_cursor(struct drm_i91 #define assert_cursor_disabled(d, p) assert_cursor(d, p, false) void assert_pipe(struct drm_i915_private *dev_priv, - enum i915_pipe pipe, bool state) + enum pipe pipe, bool state) { bool cur_state; enum transcoder cpu_transcoder = intel_pipe_to_cpu_transcoder(dev_priv, @@ -1398,7 +1398,7 @@ static void assert_plane(struct drm_i915 #define assert_plane_disabled(d, p) assert_plane(d, p, false) static void assert_planes_disabled(struct drm_i915_private *dev_priv, - enum i915_pipe pipe) + enum pipe pipe) { struct drm_device *dev = dev_priv->dev; int i; @@ -1415,7 +1415,7 @@ static void assert_planes_disabled(struc /* Need to check both planes against the pipe */ for_each_pipe(dev_priv, i) { u32 val = I915_READ(DSPCNTR(i)); - enum i915_pipe cur_pipe = (val & DISPPLANE_SEL_PIPE_MASK) >> + enum pipe cur_pipe = (val & DISPPLANE_SEL_PIPE_MASK) >> DISPPLANE_SEL_PIPE_SHIFT; I915_STATE_WARN((val & DISPLAY_PLANE_ENABLE) && pipe == cur_pipe, "plane %c assertion failure, should be off on pipe %c but is still active\n", @@ -1424,7 +1424,7 @@ static void assert_planes_disabled(struc } static void assert_sprites_disabled(struct drm_i915_private *dev_priv, - enum i915_pipe pipe) + enum pipe pipe) { struct drm_device *dev = dev_priv->dev; int sprite; @@ -1476,7 +1476,7 @@ static void ibx_assert_pch_refclk_enable } static void assert_pch_transcoder_disabled(struct drm_i915_private *dev_priv, - enum i915_pipe pipe) + enum pipe pipe) { u32 val; bool enabled; @@ -1489,7 +1489,7 @@ static void assert_pch_transcoder_disabl } static bool dp_pipe_enabled(struct drm_i915_private *dev_priv, - enum i915_pipe pipe, u32 port_sel, u32 val) + enum pipe pipe, u32 port_sel, u32 val) { if ((val & DP_PORT_EN) == 0) return false; @@ -1510,7 +1510,7 @@ static bool dp_pipe_enabled(struct drm_i } static bool hdmi_pipe_enabled(struct drm_i915_private *dev_priv, - enum i915_pipe pipe, u32 val) + enum pipe pipe, u32 val) { if ((val & SDVO_ENABLE) == 0) return false; @@ -1529,7 +1529,7 @@ static bool hdmi_pipe_enabled(struct drm } static bool lvds_pipe_enabled(struct drm_i915_private *dev_priv, - enum i915_pipe pipe, u32 val) + enum pipe pipe, u32 val) { if ((val & LVDS_PORT_EN) == 0) return false; @@ -1545,7 +1545,7 @@ static bool lvds_pipe_enabled(struct drm } static bool adpa_pipe_enabled(struct drm_i915_private *dev_priv, - enum i915_pipe pipe, u32 val) + enum pipe pipe, u32 val) { if ((val & ADPA_DAC_ENABLE) == 0) return false; @@ -1560,7 +1560,7 @@ static bool adpa_pipe_enabled(struct drm } static void assert_pch_dp_disabled(struct drm_i915_private *dev_priv, - enum i915_pipe pipe, int reg, u32 port_sel) + enum pipe pipe, int reg, u32 port_sel) { u32 val = I915_READ(reg); I915_STATE_WARN(dp_pipe_enabled(dev_priv, pipe, port_sel, val), @@ -1573,7 +1573,7 @@ static void assert_pch_dp_disabled(struc } static void assert_pch_hdmi_disabled(struct drm_i915_private *dev_priv, - enum i915_pipe pipe, int reg) + enum pipe pipe, int reg) { u32 val = I915_READ(reg); I915_STATE_WARN(hdmi_pipe_enabled(dev_priv, pipe, val), @@ -1586,7 +1586,7 @@ static void assert_pch_hdmi_disabled(str } static void assert_pch_ports_disabled(struct drm_i915_private *dev_priv, - enum i915_pipe pipe) + enum pipe pipe) { u32 val; @@ -1778,7 +1778,7 @@ static void i9xx_disable_pll(struct inte { struct drm_device *dev = crtc->base.dev; struct drm_i915_private *dev_priv = dev->dev_private; - enum i915_pipe pipe = crtc->pipe; + enum pipe pipe = crtc->pipe; /* Disable DVO 2x clock on both PLLs if necessary */ if (IS_I830(dev) && @@ -1802,7 +1802,7 @@ static void i9xx_disable_pll(struct inte POSTING_READ(DPLL(pipe)); } -static void vlv_disable_pll(struct drm_i915_private *dev_priv, enum i915_pipe pipe) +static void vlv_disable_pll(struct drm_i915_private *dev_priv, enum pipe pipe) { u32 val; @@ -1821,7 +1821,7 @@ static void vlv_disable_pll(struct drm_i } -static void chv_disable_pll(struct drm_i915_private *dev_priv, enum i915_pipe pipe) +static void chv_disable_pll(struct drm_i915_private *dev_priv, enum pipe pipe) { enum dpio_channel port = vlv_pipe_to_channel(pipe); u32 val; @@ -1972,7 +1972,7 @@ static void intel_disable_shared_dpll(st } static void ironlake_enable_pch_transcoder(struct drm_i915_private *dev_priv, - enum i915_pipe pipe) + enum pipe pipe) { struct drm_device *dev = dev_priv->dev; struct drm_crtc *crtc = dev_priv->pipe_to_crtc_mapping[pipe]; @@ -2040,8 +2040,8 @@ static void lpt_enable_pch_transcoder(st BUG_ON(!HAS_PCH_SPLIT(dev_priv->dev)); /* FDI must be feeding us bits for PCH ports */ - assert_fdi_tx_enabled(dev_priv, (enum i915_pipe) cpu_transcoder); - assert_fdi_rx_enabled(dev_priv, (enum i915_pipe) TRANSCODER_A); + assert_fdi_tx_enabled(dev_priv, (enum pipe) cpu_transcoder); + assert_fdi_rx_enabled(dev_priv, (enum pipe) TRANSCODER_A); /* Workaround: set timing override bit. */ val = I915_READ(TRANS_CHICKEN2(PIPE_A)); @@ -2063,7 +2063,7 @@ static void lpt_enable_pch_transcoder(st } static void ironlake_disable_pch_transcoder(struct drm_i915_private *dev_priv, - enum i915_pipe pipe) + enum pipe pipe) { struct drm_device *dev = dev_priv->dev; uint32_t reg, val; @@ -2120,10 +2120,10 @@ static void intel_enable_pipe(struct int { struct drm_device *dev = crtc->base.dev; struct drm_i915_private *dev_priv = dev->dev_private; - enum i915_pipe pipe = crtc->pipe; + enum pipe pipe = crtc->pipe; enum transcoder cpu_transcoder = intel_pipe_to_cpu_transcoder(dev_priv, pipe); - enum i915_pipe pch_transcoder; + enum pipe pch_transcoder; int reg; u32 val; @@ -2134,7 +2134,7 @@ static void intel_enable_pipe(struct int assert_sprites_disabled(dev_priv, pipe); if (HAS_PCH_LPT(dev_priv->dev)) - pch_transcoder = (enum i915_pipe)TRANSCODER_A; + pch_transcoder = (enum pipe)TRANSCODER_A; else pch_transcoder = pipe; @@ -2153,7 +2153,7 @@ static void intel_enable_pipe(struct int /* if driving the PCH, we need FDI enabled */ assert_fdi_rx_pll_enabled(dev_priv, pch_transcoder); assert_fdi_tx_pll_enabled(dev_priv, - (enum i915_pipe) cpu_transcoder); + (enum pipe) cpu_transcoder); } /* FIXME: assert CPU port conditions for SNB+ */ } @@ -2184,7 +2184,7 @@ static void intel_disable_pipe(struct in { struct drm_i915_private *dev_priv = crtc->base.dev->dev_private; enum transcoder cpu_transcoder = crtc->config->cpu_transcoder; - enum i915_pipe pipe = crtc->pipe; + enum pipe pipe = crtc->pipe; int reg; u32 val; @@ -4135,7 +4135,7 @@ static void lpt_program_iclkip(struct dr } static void ironlake_pch_transcoder_set_timings(struct intel_crtc *crtc, - enum i915_pipe pch_transcoder) + enum pipe pch_transcoder) { struct drm_device *dev = crtc->base.dev; struct drm_i915_private *dev_priv = dev->dev_private; @@ -4304,7 +4304,7 @@ static void lpt_pch_enable(struct drm_cr struct intel_crtc *intel_crtc = to_intel_crtc(crtc); enum transcoder cpu_transcoder = intel_crtc->config->cpu_transcoder; - assert_pch_transcoder_disabled(dev_priv, (enum i915_pipe) TRANSCODER_A); + assert_pch_transcoder_disabled(dev_priv, (enum pipe) TRANSCODER_A); lpt_program_iclkip(crtc); @@ -4708,7 +4708,7 @@ static void intel_crtc_load_lut(struct d struct drm_device *dev = crtc->dev; struct drm_i915_private *dev_priv = dev->dev_private; struct intel_crtc *intel_crtc = to_intel_crtc(crtc); - enum i915_pipe pipe = intel_crtc->pipe; + enum pipe pipe = intel_crtc->pipe; int i; bool reenable_ips = false; @@ -5367,7 +5367,7 @@ static unsigned long get_crtc_power_doma struct drm_device *dev = crtc->dev; struct intel_encoder *intel_encoder; struct intel_crtc *intel_crtc = to_intel_crtc(crtc); - enum i915_pipe pipe = intel_crtc->pipe; + enum pipe pipe = intel_crtc->pipe; unsigned long mask; enum transcoder transcoder; @@ -6545,7 +6545,7 @@ struct intel_connector *intel_connector_ * of the connector. */ bool intel_connector_get_hw_state(struct intel_connector *connector) { - enum i915_pipe pipe = 0; + enum pipe pipe = 0; struct intel_encoder *encoder = connector->encoder; return encoder->get_hw_state(encoder, &pipe); @@ -6559,7 +6559,7 @@ static int pipe_required_fdi_lanes(struc return 0; } -static int ironlake_check_fdi_lanes(struct drm_device *dev, enum i915_pipe pipe, +static int ironlake_check_fdi_lanes(struct drm_device *dev, enum pipe pipe, struct intel_crtc_state *pipe_config) { struct drm_atomic_state *state = pipe_config->base.state; @@ -7265,7 +7265,7 @@ static void i9xx_update_pll_dividers(str } } -static void vlv_pllb_recal_opamp(struct drm_i915_private *dev_priv, enum i915_pipe +static void vlv_pllb_recal_opamp(struct drm_i915_private *dev_priv, enum pipe pipe) { u32 reg_val; @@ -7607,7 +7607,7 @@ static void chv_prepare_pll(struct intel * in cases where we need the PLL enabled even when @pipe is not going to * be enabled. */ -void vlv_force_pll_on(struct drm_device *dev, enum i915_pipe pipe, +void vlv_force_pll_on(struct drm_device *dev, enum pipe pipe, const struct dpll *dpll) { struct intel_crtc *crtc = @@ -7637,7 +7637,7 @@ void vlv_force_pll_on(struct drm_device * Disable the PLL for @pipe. To be used in cases where we need * the PLL enabled even when @pipe is not going to be enabled. */ -void vlv_force_pll_off(struct drm_device *dev, enum i915_pipe pipe) +void vlv_force_pll_off(struct drm_device *dev, enum pipe pipe) { if (IS_CHERRYVIEW(dev)) chv_disable_pll(to_i915(dev), pipe); @@ -7764,7 +7764,7 @@ static void intel_set_pipe_timings(struc { struct drm_device *dev = intel_crtc->base.dev; struct drm_i915_private *dev_priv = dev->dev_private; - enum i915_pipe pipe = intel_crtc->pipe; + enum pipe pipe = intel_crtc->pipe; enum transcoder cpu_transcoder = intel_crtc->config->cpu_transcoder; const struct drm_display_mode *adjusted_mode = &intel_crtc->config->base.adjusted_mode; uint32_t crtc_vtotal, crtc_vblank_end; @@ -8806,7 +8806,7 @@ static void haswell_set_pipeconf(struct struct drm_device *dev = crtc->dev; struct drm_i915_private *dev_priv = dev->dev_private; struct intel_crtc *intel_crtc = to_intel_crtc(crtc); - enum i915_pipe pipe = intel_crtc->pipe; + enum pipe pipe = intel_crtc->pipe; enum transcoder cpu_transcoder = intel_crtc->config->cpu_transcoder; uint32_t val; @@ -9066,7 +9066,7 @@ static void intel_pch_transcoder_get_m_n { struct drm_device *dev = crtc->base.dev; struct drm_i915_private *dev_priv = dev->dev_private; - enum i915_pipe pipe = crtc->pipe; + enum pipe pipe = crtc->pipe; m_n->link_m = I915_READ(PCH_TRANS_LINK_M1(pipe)); m_n->link_n = I915_READ(PCH_TRANS_LINK_N1(pipe)); @@ -9084,7 +9084,7 @@ static void intel_cpu_transcoder_get_m_n { struct drm_device *dev = crtc->base.dev; struct drm_i915_private *dev_priv = dev->dev_private; - enum i915_pipe pipe = crtc->pipe; + enum pipe pipe = crtc->pipe; if (INTEL_INFO(dev)->gen >= 5) { m_n->link_m = I915_READ(PIPE_LINK_M1(transcoder)); @@ -9950,7 +9950,7 @@ static bool haswell_get_pipe_config(stru tmp = I915_READ(TRANS_DDI_FUNC_CTL(TRANSCODER_EDP)); if (tmp & TRANS_DDI_FUNC_ENABLE) { - enum i915_pipe trans_edp_pipe; + enum pipe trans_edp_pipe; switch (tmp & TRANS_DDI_EDP_INPUT_MASK) { default: WARN(1, "unknown pipe linked to edp transcoder\n"); @@ -10770,7 +10770,7 @@ struct drm_display_mode *intel_crtc_mode int hsync = I915_READ(HSYNC(cpu_transcoder)); int vtot = I915_READ(VTOTAL(cpu_transcoder)); int vsync = I915_READ(VSYNC(cpu_transcoder)); - enum i915_pipe pipe = intel_crtc->pipe; + enum pipe pipe = intel_crtc->pipe; mode = kzalloc(sizeof(*mode), GFP_KERNEL); if (!mode) @@ -11283,7 +11283,7 @@ static void skl_do_mmio_flip(struct inte struct drm_device *dev = intel_crtc->base.dev; struct drm_i915_private *dev_priv = dev->dev_private; struct drm_framebuffer *fb = intel_crtc->base.primary->fb; - const enum i915_pipe pipe = intel_crtc->pipe; + const enum pipe pipe = intel_crtc->pipe; u32 ctl, stride; ctl = I915_READ(PLANE_CTL(pipe, 0)); @@ -11505,7 +11505,7 @@ static int intel_crtc_page_flip(struct d struct drm_i915_gem_object *obj = intel_fb_obj(fb); struct intel_crtc *intel_crtc = to_intel_crtc(crtc); struct drm_plane *primary = crtc->primary; - enum i915_pipe pipe = intel_crtc->pipe; + enum pipe pipe = intel_crtc->pipe; struct intel_unpin_work *work; struct intel_engine_cs *ring; bool mmio_flip; @@ -12737,7 +12737,7 @@ static void check_wm_state(struct drm_de for_each_intel_crtc(dev, intel_crtc) { struct skl_ddb_entry *hw_entry, *sw_entry; - const enum i915_pipe pipe = intel_crtc->pipe; + const enum pipe pipe = intel_crtc->pipe; if (!intel_crtc->active) continue; @@ -12801,7 +12801,7 @@ check_encoder_state(struct drm_device *d for_each_intel_encoder(dev, encoder) { bool enabled = false; - enum i915_pipe pipe; + enum pipe pipe; DRM_DEBUG_KMS("[ENCODER:%d:%s]\n", encoder->base.base.id, @@ -12877,7 +12877,7 @@ check_crtc_state(struct drm_device *dev, "(expected %i, found %i)\n", crtc->state->active, intel_crtc->active); for_each_encoder_on_crtc(dev, crtc, encoder) { - enum i915_pipe pipe; + enum pipe pipe; active = encoder->get_hw_state(encoder, &pipe); I915_STATE_WARN(active != crtc->state->active, @@ -13063,7 +13063,7 @@ static int haswell_mode_set_planes_worka struct drm_crtc *crtc; struct intel_crtc_state *first_crtc_state = NULL; struct intel_crtc_state *other_crtc_state = NULL; - enum i915_pipe first_pipe = INVALID_PIPE, enabled_pipe = INVALID_PIPE; + enum pipe first_pipe = INVALID_PIPE, enabled_pipe = INVALID_PIPE; int i; /* look at all crtc's that are going to be enabled in during modeset */ @@ -13832,7 +13832,7 @@ intel_check_cursor_plane(struct drm_plan struct drm_crtc *crtc = crtc_state->base.crtc; struct drm_framebuffer *fb = state->base.fb; struct drm_i915_gem_object *obj = intel_fb_obj(fb); - enum i915_pipe pipe = to_intel_plane(plane)->pipe; + enum pipe pipe = to_intel_plane(plane)->pipe; unsigned stride; int ret; @@ -14072,7 +14072,7 @@ fail: kfree(intel_crtc); } -enum i915_pipe intel_get_pipe_from_connector(struct intel_connector *connector) +enum pipe intel_get_pipe_from_connector(struct intel_connector *connector) { struct drm_encoder *encoder = connector->base.encoder; struct drm_device *dev = connector->base.dev; @@ -15001,7 +15001,7 @@ void intel_modeset_init(struct drm_devic { struct drm_i915_private *dev_priv = dev->dev_private; int sprite, ret; - enum i915_pipe pipe; + enum pipe pipe; struct intel_crtc *crtc; drm_mode_config_init(dev); @@ -15388,7 +15388,7 @@ static void readout_plane_state(struct i static void intel_modeset_readout_hw_state(struct drm_device *dev) { struct drm_i915_private *dev_priv = dev->dev_private; - enum i915_pipe pipe; + enum pipe pipe; struct intel_crtc *crtc; struct intel_encoder *encoder; struct intel_connector *connector; @@ -15506,7 +15506,7 @@ static void intel_modeset_setup_hw_state(struct drm_device *dev) { struct drm_i915_private *dev_priv = dev->dev_private; - enum i915_pipe pipe; + enum pipe pipe; struct intel_crtc *crtc; struct intel_encoder *encoder; int i; Index: src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.h diff -u src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.h:1.30 src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.h:1.31 --- src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.h:1.30 Thu Dec 5 20:03:09 2019 +++ src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.h Fri Feb 14 04:36:11 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: i915_drv.h,v 1.30 2019/12/05 20:03:09 maya Exp $ */ +/* $NetBSD: i915_drv.h,v 1.31 2020/02/14 04:36:11 riastradh Exp $ */ /* i915_drv.h -- Private header for the I915 driver -*- linux-c -*- */ @@ -127,7 +127,7 @@ static inline const char *yesno(bool v) return v ? "yes" : "no"; } -enum i915_pipe { +enum pipe { INVALID_PIPE = -1, PIPE_A = 0, PIPE_B, @@ -2880,11 +2880,11 @@ static inline bool intel_vgpu_active(str } void -i915_enable_pipestat(struct drm_i915_private *dev_priv, enum i915_pipe pipe, +i915_enable_pipestat(struct drm_i915_private *dev_priv, enum pipe pipe, u32 status_mask); void -i915_disable_pipestat(struct drm_i915_private *dev_priv, enum i915_pipe pipe, +i915_disable_pipestat(struct drm_i915_private *dev_priv, enum pipe pipe, u32 status_mask); void valleyview_enable_display_irqs(struct drm_i915_private *dev_priv); @@ -3591,8 +3591,8 @@ u32 vlv_bunit_read(struct drm_i915_priva void vlv_bunit_write(struct drm_i915_private *dev_priv, u32 reg, u32 val); u32 vlv_gps_core_read(struct drm_i915_private *dev_priv, u32 reg); void vlv_gps_core_write(struct drm_i915_private *dev_priv, u32 reg, u32 val); -u32 vlv_dpio_read(struct drm_i915_private *dev_priv, enum i915_pipe pipe, int reg); -void vlv_dpio_write(struct drm_i915_private *dev_priv, enum i915_pipe pipe, int reg, u32 val); +u32 vlv_dpio_read(struct drm_i915_private *dev_priv, enum pipe pipe, int reg); +void vlv_dpio_write(struct drm_i915_private *dev_priv, enum pipe pipe, int reg, u32 val); u32 intel_sbi_read(struct drm_i915_private *dev_priv, u16 reg, enum intel_sbi_destination destination); void intel_sbi_write(struct drm_i915_private *dev_priv, u16 reg, u32 value, Index: src/sys/external/bsd/drm2/dist/drm/i915/i915_irq.c diff -u src/sys/external/bsd/drm2/dist/drm/i915/i915_irq.c:1.17 src/sys/external/bsd/drm2/dist/drm/i915/i915_irq.c:1.18 --- src/sys/external/bsd/drm2/dist/drm/i915/i915_irq.c:1.17 Thu Sep 13 08:25:55 2018 +++ src/sys/external/bsd/drm2/dist/drm/i915/i915_irq.c Fri Feb 14 04:36:11 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: i915_irq.c,v 1.17 2018/09/13 08:25:55 mrg Exp $ */ +/* $NetBSD: i915_irq.c,v 1.18 2020/02/14 04:36:11 riastradh Exp $ */ /* i915_irq.c -- IRQ support for the I915 -*- linux-c -*- */ @@ -29,7 +29,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: i915_irq.c,v 1.17 2018/09/13 08:25:55 mrg Exp $"); +__KERNEL_RCSID(0, "$NetBSD: i915_irq.c,v 1.18 2020/02/14 04:36:11 riastradh Exp $"); #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt @@ -487,7 +487,7 @@ void ibx_display_interrupt_update(struct } static void -__i915_enable_pipestat(struct drm_i915_private *dev_priv, enum i915_pipe pipe, +__i915_enable_pipestat(struct drm_i915_private *dev_priv, enum pipe pipe, u32 enable_mask, u32 status_mask) { u32 reg = PIPESTAT(pipe); @@ -514,7 +514,7 @@ __i915_enable_pipestat(struct drm_i915_p } static void -__i915_disable_pipestat(struct drm_i915_private *dev_priv, enum i915_pipe pipe, +__i915_disable_pipestat(struct drm_i915_private *dev_priv, enum pipe pipe, u32 enable_mask, u32 status_mask) { u32 reg = PIPESTAT(pipe); @@ -568,7 +568,7 @@ static u32 vlv_get_pipestat_enable_mask( } void -i915_enable_pipestat(struct drm_i915_private *dev_priv, enum i915_pipe pipe, +i915_enable_pipestat(struct drm_i915_private *dev_priv, enum pipe pipe, u32 status_mask) { u32 enable_mask; @@ -582,7 +582,7 @@ i915_enable_pipestat(struct drm_i915_pri } void -i915_disable_pipestat(struct drm_i915_private *dev_priv, enum i915_pipe pipe, +i915_disable_pipestat(struct drm_i915_private *dev_priv, enum pipe pipe, u32 status_mask) { u32 enable_mask; @@ -742,7 +742,7 @@ static int __intel_get_crtc_scanline(str struct drm_device *dev = crtc->base.dev; struct drm_i915_private *dev_priv = dev->dev_private; const struct drm_display_mode *mode = &crtc->base.hwmode; - enum i915_pipe pipe = crtc->pipe; + enum pipe pipe = crtc->pipe; int position, vtotal; vtotal = mode->crtc_vtotal; @@ -1518,7 +1518,7 @@ static void dp_aux_irq_handler(struct dr } #if defined(CONFIG_DEBUG_FS) -static void display_pipe_crc_irq_handler(struct drm_device *dev, enum i915_pipe pipe, +static void display_pipe_crc_irq_handler(struct drm_device *dev, enum pipe pipe, uint32_t crc0, uint32_t crc1, uint32_t crc2, uint32_t crc3, uint32_t crc4) @@ -1563,14 +1563,14 @@ static void display_pipe_crc_irq_handler } #else static inline void -display_pipe_crc_irq_handler(struct drm_device *dev, enum i915_pipe pipe, +display_pipe_crc_irq_handler(struct drm_device *dev, enum pipe pipe, uint32_t crc0, uint32_t crc1, uint32_t crc2, uint32_t crc3, uint32_t crc4) {} #endif -static void hsw_pipe_crc_irq_handler(struct drm_device *dev, enum i915_pipe pipe) +static void hsw_pipe_crc_irq_handler(struct drm_device *dev, enum pipe pipe) { struct drm_i915_private *dev_priv = dev->dev_private; @@ -1579,7 +1579,7 @@ static void hsw_pipe_crc_irq_handler(str 0, 0, 0, 0); } -static void ivb_pipe_crc_irq_handler(struct drm_device *dev, enum i915_pipe pipe) +static void ivb_pipe_crc_irq_handler(struct drm_device *dev, enum pipe pipe) { struct drm_i915_private *dev_priv = dev->dev_private; @@ -1591,7 +1591,7 @@ static void ivb_pipe_crc_irq_handler(str I915_READ(PIPE_CRC_RES_5_IVB(pipe))); } -static void i9xx_pipe_crc_irq_handler(struct drm_device *dev, enum i915_pipe pipe) +static void i9xx_pipe_crc_irq_handler(struct drm_device *dev, enum pipe pipe) { struct drm_i915_private *dev_priv = dev->dev_private; uint32_t res1, res2; @@ -1640,7 +1640,7 @@ static void gen6_rps_irq_handler(struct } } -static bool intel_pipe_handle_vblank(struct drm_device *dev, enum i915_pipe pipe) +static bool intel_pipe_handle_vblank(struct drm_device *dev, enum pipe pipe) { if (!drm_handle_vblank(dev, pipe)) return false; @@ -1922,7 +1922,7 @@ static void ivb_err_int_handler(struct d { struct drm_i915_private *dev_priv = dev->dev_private; u32 err_int = I915_READ(GEN7_ERR_INT); - enum i915_pipe pipe; + enum pipe pipe; if (err_int & ERR_INT_POISON) DRM_ERROR("Poison interrupt\n"); @@ -2056,7 +2056,7 @@ static void ilk_hpd_irq_handler(struct d static void ilk_display_irq_handler(struct drm_device *dev, u32 de_iir) { struct drm_i915_private *dev_priv = dev->dev_private; - enum i915_pipe pipe; + enum pipe pipe; u32 hotplug_trigger = de_iir & DE_DP_A_HOTPLUG; if (hotplug_trigger) @@ -2109,7 +2109,7 @@ static void ilk_display_irq_handler(stru static void ivb_display_irq_handler(struct drm_device *dev, u32 de_iir) { struct drm_i915_private *dev_priv = dev->dev_private; - enum i915_pipe pipe; + enum pipe pipe; u32 hotplug_trigger = de_iir & DE_DP_A_HOTPLUG_IVB; if (hotplug_trigger) @@ -2249,7 +2249,7 @@ static irqreturn_t gen8_irq_handler(DRM_ u32 master_ctl; irqreturn_t ret = IRQ_NONE; uint32_t tmp = 0; - enum i915_pipe pipe; + enum pipe pipe; u32 aux_mask = GEN8_AUX_CHANNEL_A; if (!intel_irqs_enabled(dev_priv)) @@ -3268,7 +3268,7 @@ static void ironlake_irq_reset(struct dr static void vlv_display_irq_reset(struct drm_i915_private *dev_priv) { - enum i915_pipe pipe; + enum pipe pipe; i915_hotplug_interrupt_update(dev_priv, 0xFFFFFFFF, 0); I915_WRITE(PORT_HOTPLUG_STAT, I915_READ(PORT_HOTPLUG_STAT)); @@ -3592,7 +3592,7 @@ static void valleyview_display_irqs_inst { u32 pipestat_mask; u32 iir_mask; - enum i915_pipe pipe; + enum pipe pipe; pipestat_mask = PIPESTAT_INT_STATUS_MASK | PIPE_FIFO_UNDERRUN_STATUS; @@ -3626,7 +3626,7 @@ static void valleyview_display_irqs_unin { u32 pipestat_mask; u32 iir_mask; - enum i915_pipe pipe; + enum pipe pipe; iir_mask = I915_DISPLAY_PORT_INTERRUPT | I915_DISPLAY_PIPE_A_EVENT_INTERRUPT | @@ -3757,7 +3757,7 @@ static void gen8_de_irq_postinstall(stru uint32_t de_pipe_enables; u32 de_port_masked = GEN8_AUX_CHANNEL_A; u32 de_port_enables; - enum i915_pipe pipe; + enum pipe pipe; if (INTEL_INFO(dev_priv)->gen >= 9) { de_pipe_masked |= GEN9_PIPE_PLANE1_FLIP_DONE | Index: src/sys/external/bsd/drm2/dist/drm/i915/intel_audio.c diff -u src/sys/external/bsd/drm2/dist/drm/i915/intel_audio.c:1.5 src/sys/external/bsd/drm2/dist/drm/i915/intel_audio.c:1.6 --- src/sys/external/bsd/drm2/dist/drm/i915/intel_audio.c:1.5 Mon Aug 27 07:56:59 2018 +++ src/sys/external/bsd/drm2/dist/drm/i915/intel_audio.c Fri Feb 14 04:36:11 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: intel_audio.c,v 1.5 2018/08/27 07:56:59 riastradh Exp $ */ +/* $NetBSD: intel_audio.c,v 1.6 2020/02/14 04:36:11 riastradh Exp $ */ /* * Copyright © 2014 Intel Corporation @@ -24,7 +24,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: intel_audio.c,v 1.5 2018/08/27 07:56:59 riastradh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: intel_audio.c,v 1.6 2020/02/14 04:36:11 riastradh Exp $"); #include <linux/kernel.h> #include <linux/component.h> @@ -254,7 +254,7 @@ static void hsw_audio_codec_disable(stru { struct drm_i915_private *dev_priv = encoder->base.dev->dev_private; struct intel_crtc *intel_crtc = to_intel_crtc(encoder->base.crtc); - enum i915_pipe pipe = intel_crtc->pipe; + enum pipe pipe = intel_crtc->pipe; uint32_t tmp; DRM_DEBUG_KMS("Disable audio codec on pipe %c\n", pipe_name(pipe)); @@ -286,7 +286,7 @@ static void hsw_audio_codec_enable(struc { struct drm_i915_private *dev_priv = connector->dev->dev_private; struct intel_crtc *intel_crtc = to_intel_crtc(encoder->base.crtc); - enum i915_pipe pipe = intel_crtc->pipe; + enum pipe pipe = intel_crtc->pipe; struct i915_audio_component *acomp = dev_priv->audio_component; const uint8_t *eld = connector->eld; struct intel_digital_port *intel_dig_port = @@ -367,7 +367,7 @@ static void ilk_audio_codec_disable(stru struct intel_digital_port *intel_dig_port = enc_to_dig_port(&encoder->base); enum port port = intel_dig_port->port; - enum i915_pipe pipe = intel_crtc->pipe; + enum pipe pipe = intel_crtc->pipe; uint32_t tmp, eldv; int aud_config; int aud_cntrl_st2; @@ -416,7 +416,7 @@ static void ilk_audio_codec_enable(struc struct intel_digital_port *intel_dig_port = enc_to_dig_port(&encoder->base); enum port port = intel_dig_port->port; - enum i915_pipe pipe = intel_crtc->pipe; + enum pipe pipe = intel_crtc->pipe; uint8_t *eld = connector->eld; uint32_t eldv; uint32_t tmp; @@ -645,7 +645,7 @@ static int i915_audio_component_sync_aud struct intel_crtc *crtc; struct drm_display_mode *mode; struct i915_audio_component *acomp = dev_priv->audio_component; - enum i915_pipe pipe = -1; + enum pipe pipe = -1; u32 tmp; int n; Index: src/sys/external/bsd/drm2/dist/drm/i915/intel_fbc.c diff -u src/sys/external/bsd/drm2/dist/drm/i915/intel_fbc.c:1.5 src/sys/external/bsd/drm2/dist/drm/i915/intel_fbc.c:1.6 --- src/sys/external/bsd/drm2/dist/drm/i915/intel_fbc.c:1.5 Fri Feb 14 04:35:19 2020 +++ src/sys/external/bsd/drm2/dist/drm/i915/intel_fbc.c Fri Feb 14 04:36:11 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: intel_fbc.c,v 1.5 2020/02/14 04:35:19 riastradh Exp $ */ +/* $NetBSD: intel_fbc.c,v 1.6 2020/02/14 04:36:11 riastradh Exp $ */ /* * Copyright © 2014 Intel Corporation @@ -41,7 +41,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: intel_fbc.c,v 1.5 2020/02/14 04:35:19 riastradh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: intel_fbc.c,v 1.6 2020/02/14 04:36:11 riastradh Exp $"); #include "intel_drv.h" #include "i915_drv.h" @@ -532,7 +532,7 @@ static void set_no_fbc_reason(struct drm static struct drm_crtc *intel_fbc_find_crtc(struct drm_i915_private *dev_priv) { struct drm_crtc *crtc = NULL, *tmp_crtc; - enum i915_pipe pipe; + enum pipe pipe; bool pipe_a_only = false; if (IS_HASWELL(dev_priv) || INTEL_INFO(dev_priv)->gen >= 8) @@ -557,7 +557,7 @@ static struct drm_crtc *intel_fbc_find_c static bool multiple_pipes_ok(struct drm_i915_private *dev_priv) { - enum i915_pipe pipe; + enum pipe pipe; int n_pipes = 0; struct drm_crtc *crtc; @@ -1090,7 +1090,7 @@ void intel_fbc_flush(struct drm_i915_pri */ void intel_fbc_init(struct drm_i915_private *dev_priv) { - enum i915_pipe pipe; + enum pipe pipe; mutex_init(&dev_priv->fbc.lock); Index: src/sys/external/bsd/drm2/dist/drm/i915/intel_crt.c diff -u src/sys/external/bsd/drm2/dist/drm/i915/intel_crt.c:1.6 src/sys/external/bsd/drm2/dist/drm/i915/intel_crt.c:1.7 --- src/sys/external/bsd/drm2/dist/drm/i915/intel_crt.c:1.6 Mon Aug 27 04:58:24 2018 +++ src/sys/external/bsd/drm2/dist/drm/i915/intel_crt.c Fri Feb 14 04:36:11 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: intel_crt.c,v 1.6 2018/08/27 04:58:24 riastradh Exp $ */ +/* $NetBSD: intel_crt.c,v 1.7 2020/02/14 04:36:11 riastradh Exp $ */ /* * Copyright © 2006-2007 Intel Corporation @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: intel_crt.c,v 1.6 2018/08/27 04:58:24 riastradh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: intel_crt.c,v 1.7 2020/02/14 04:36:11 riastradh Exp $"); #include <linux/dmi.h> #include <linux/i2c.h> @@ -69,7 +69,7 @@ static struct intel_crt *intel_attached_ } static bool intel_crt_get_hw_state(struct intel_encoder *encoder, - enum i915_pipe *pipe) + enum pipe *pipe) { struct drm_device *dev = encoder->base.dev; struct drm_i915_private *dev_priv = dev->dev_private; Index: src/sys/external/bsd/drm2/dist/drm/i915/intel_ddi.c diff -u src/sys/external/bsd/drm2/dist/drm/i915/intel_ddi.c:1.10 src/sys/external/bsd/drm2/dist/drm/i915/intel_ddi.c:1.11 --- src/sys/external/bsd/drm2/dist/drm/i915/intel_ddi.c:1.10 Tue Feb 19 00:30:16 2019 +++ src/sys/external/bsd/drm2/dist/drm/i915/intel_ddi.c Fri Feb 14 04:36:11 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: intel_ddi.c,v 1.10 2019/02/19 00:30:16 christos Exp $ */ +/* $NetBSD: intel_ddi.c,v 1.11 2020/02/14 04:36:11 riastradh Exp $ */ /* * Copyright © 2012 Intel Corporation @@ -28,7 +28,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: intel_ddi.c,v 1.10 2019/02/19 00:30:16 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: intel_ddi.c,v 1.11 2020/02/14 04:36:11 riastradh Exp $"); #include <linux/math64.h> @@ -1860,7 +1860,7 @@ void intel_ddi_enable_transcoder_func(st struct drm_encoder *encoder = &intel_encoder->base; struct drm_device *dev = crtc->dev; struct drm_i915_private *dev_priv = dev->dev_private; - enum i915_pipe pipe = intel_crtc->pipe; + enum pipe pipe = intel_crtc->pipe; enum transcoder cpu_transcoder = intel_crtc->config->cpu_transcoder; enum port port = intel_ddi_get_encoder_port(intel_encoder); int type = intel_encoder->type; @@ -1973,7 +1973,7 @@ bool intel_ddi_connector_get_hw_state(st struct intel_encoder *intel_encoder = intel_connector->encoder; int type = intel_connector->base.connector_type; enum port port = intel_ddi_get_encoder_port(intel_encoder); - enum i915_pipe pipe = 0; + enum pipe pipe = 0; enum transcoder cpu_transcoder; enum intel_display_power_domain power_domain; uint32_t tmp; @@ -2015,7 +2015,7 @@ bool intel_ddi_connector_get_hw_state(st } bool intel_ddi_get_hw_state(struct intel_encoder *encoder, - enum i915_pipe *pipe) + enum pipe *pipe) { struct drm_device *dev = encoder->base.dev; struct drm_i915_private *dev_priv = dev->dev_private; Index: src/sys/external/bsd/drm2/dist/drm/i915/intel_dp.c diff -u src/sys/external/bsd/drm2/dist/drm/i915/intel_dp.c:1.20 src/sys/external/bsd/drm2/dist/drm/i915/intel_dp.c:1.21 --- src/sys/external/bsd/drm2/dist/drm/i915/intel_dp.c:1.20 Tue Oct 15 18:50:44 2019 +++ src/sys/external/bsd/drm2/dist/drm/i915/intel_dp.c Fri Feb 14 04:36:11 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: intel_dp.c,v 1.20 2019/10/15 18:50:44 msaitoh Exp $ */ +/* $NetBSD: intel_dp.c,v 1.21 2020/02/14 04:36:11 riastradh Exp $ */ /* * Copyright © 2008 Intel Corporation @@ -28,7 +28,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: intel_dp.c,v 1.20 2019/10/15 18:50:44 msaitoh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: intel_dp.c,v 1.21 2020/02/14 04:36:11 riastradh Exp $"); #include <linux/i2c.h> #include <linux/slab.h> @@ -138,7 +138,7 @@ static bool edp_panel_vdd_on(struct inte static void edp_panel_vdd_off(struct intel_dp *intel_dp, bool sync); static void vlv_init_panel_power_sequencer(struct intel_dp *intel_dp); static void vlv_steal_power_sequencer(struct drm_device *dev, - enum i915_pipe pipe); + enum pipe pipe); static unsigned int intel_dp_unused_lane_mask(int lane_count) { @@ -313,7 +313,7 @@ vlv_power_sequencer_kick(struct intel_dp struct intel_digital_port *intel_dig_port = dp_to_dig_port(intel_dp); struct drm_device *dev = intel_dig_port->base.base.dev; struct drm_i915_private *dev_priv = dev->dev_private; - enum i915_pipe pipe = intel_dp->pps_pipe; + enum pipe pipe = intel_dp->pps_pipe; bool pll_enabled, release_cl_override = false; enum dpio_phy phy = DPIO_PHY(pipe); enum dpio_channel ch = vlv_pipe_to_channel(pipe); @@ -377,7 +377,7 @@ vlv_power_sequencer_kick(struct intel_dp } } -static enum i915_pipe +static enum pipe vlv_power_sequencer_pipe(struct intel_dp *intel_dp) { struct intel_digital_port *intel_dig_port = dp_to_dig_port(intel_dp); @@ -385,7 +385,7 @@ vlv_power_sequencer_pipe(struct intel_dp struct drm_i915_private *dev_priv __lockdep_used = dev->dev_private; struct intel_encoder *encoder; unsigned int pipes = (1 << PIPE_A) | (1 << PIPE_B); - enum i915_pipe pipe; + enum pipe pipe; lockdep_assert_held(&dev_priv->pps_mutex); @@ -442,32 +442,32 @@ vlv_power_sequencer_pipe(struct intel_dp } typedef bool (*vlv_pipe_check)(struct drm_i915_private *dev_priv, - enum i915_pipe pipe); + enum pipe pipe); static bool vlv_pipe_has_pp_on(struct drm_i915_private *dev_priv, - enum i915_pipe pipe) + enum pipe pipe) { return I915_READ(VLV_PIPE_PP_STATUS(pipe)) & PP_ON; } static bool vlv_pipe_has_vdd_on(struct drm_i915_private *dev_priv, - enum i915_pipe pipe) + enum pipe pipe) { return I915_READ(VLV_PIPE_PP_CONTROL(pipe)) & EDP_FORCE_VDD; } static bool vlv_pipe_any(struct drm_i915_private *dev_priv, - enum i915_pipe pipe) + enum pipe pipe) { return true; } -static enum i915_pipe +static enum pipe vlv_initial_pps_pipe(struct drm_i915_private *dev_priv, enum port port, vlv_pipe_check pipe_check) { - enum i915_pipe pipe; + enum pipe pipe; for (pipe = PIPE_A; pipe <= PIPE_B; pipe++) { u32 port_sel = I915_READ(VLV_PIPE_PP_ON_DELAYS(pipe)) & @@ -591,7 +591,7 @@ static int edp_notify_handler(struct not pps_lock(intel_dp); if (IS_VALLEYVIEW(dev)) { - enum i915_pipe pipe = vlv_power_sequencer_pipe(intel_dp); + enum pipe pipe = vlv_power_sequencer_pipe(intel_dp); u32 pp_ctrl_reg, pp_div_reg; u32 pp_div; @@ -2270,7 +2270,7 @@ void intel_dp_sink_dpms(struct intel_dp } static bool intel_dp_get_hw_state(struct intel_encoder *encoder, - enum i915_pipe *pipe) + enum pipe *pipe) { struct intel_dp *intel_dp = enc_to_intel_dp(&encoder->base); enum port port = dp_to_dig_port(intel_dp)->port; @@ -2291,7 +2291,7 @@ static bool intel_dp_get_hw_state(struct if (IS_GEN7(dev) && port == PORT_A) { *pipe = PORT_TO_PIPE_CPT(tmp); } else if (HAS_PCH_CPT(dev) && port != PORT_A) { - enum i915_pipe p; + enum pipe p; for_each_pipe(dev_priv, p) { u32 trans_dp = I915_READ(TRANS_DP_CTL(p)); @@ -2447,7 +2447,7 @@ static void chv_data_lane_soft_reset(str struct drm_i915_private *dev_priv = to_i915(encoder->base.dev); enum dpio_channel ch = vlv_dport_to_channel(enc_to_dig_port(&encoder->base)); struct intel_crtc *crtc = to_intel_crtc(encoder->base.crtc); - enum i915_pipe pipe = crtc->pipe; + enum pipe pipe = crtc->pipe; uint32_t val; val = vlv_dpio_read(dev_priv, pipe, VLV_PCS01_DW0(ch)); @@ -2688,7 +2688,7 @@ static void vlv_detach_power_sequencer(s { struct intel_digital_port *intel_dig_port = dp_to_dig_port(intel_dp); struct drm_i915_private *dev_priv = intel_dig_port->base.base.dev->dev_private; - enum i915_pipe pipe = intel_dp->pps_pipe; + enum pipe pipe = intel_dp->pps_pipe; int pp_on_reg = VLV_PIPE_PP_ON_DELAYS(pipe); edp_panel_vdd_off_sync(intel_dp); @@ -2711,7 +2711,7 @@ static void vlv_detach_power_sequencer(s } static void vlv_steal_power_sequencer(struct drm_device *dev, - enum i915_pipe pipe) + enum pipe pipe) { struct drm_i915_private *dev_priv __lockdep_used = dev->dev_private; struct intel_encoder *encoder; @@ -2944,7 +2944,7 @@ static void chv_dp_pre_pll_enable(struct struct intel_crtc *intel_crtc = to_intel_crtc(encoder->base.crtc); enum dpio_channel ch = vlv_dport_to_channel(dport); - enum i915_pipe pipe = intel_crtc->pipe; + enum pipe pipe = intel_crtc->pipe; unsigned int lane_mask = intel_dp_unused_lane_mask(intel_crtc->config->lane_count); u32 val; @@ -3022,7 +3022,7 @@ static void chv_dp_pre_pll_enable(struct static void chv_dp_post_pll_disable(struct intel_encoder *encoder) { struct drm_i915_private *dev_priv = to_i915(encoder->base.dev); - enum i915_pipe pipe = to_intel_crtc(encoder->base.crtc)->pipe; + enum pipe pipe = to_intel_crtc(encoder->base.crtc)->pipe; u32 val; mutex_lock(&dev_priv->sb_lock); @@ -3303,7 +3303,7 @@ static uint32_t chv_signal_levels(struct u32 deemph_reg_value, margin_reg_value, val; uint8_t train_set = intel_dp->train_set[0]; enum dpio_channel ch = vlv_dport_to_channel(dport); - enum i915_pipe pipe = intel_crtc->pipe; + enum pipe pipe = intel_crtc->pipe; int i; switch (train_set & DP_TRAIN_PRE_EMPHASIS_MASK) { @@ -5339,7 +5339,7 @@ intel_dp_init_panel_power_sequencer(stru pp_off_reg = PCH_PP_OFF_DELAYS; pp_div_reg = PCH_PP_DIVISOR; } else { - enum i915_pipe pipe = vlv_power_sequencer_pipe(intel_dp); + enum pipe pipe = vlv_power_sequencer_pipe(intel_dp); pp_ctrl_reg = VLV_PIPE_PP_CONTROL(pipe); pp_on_reg = VLV_PIPE_PP_ON_DELAYS(pipe); @@ -5459,7 +5459,7 @@ intel_dp_init_panel_power_sequencer_regi pp_off_reg = PCH_PP_OFF_DELAYS; pp_div_reg = PCH_PP_DIVISOR; } else { - enum i915_pipe pipe = vlv_power_sequencer_pipe(intel_dp); + enum pipe pipe = vlv_power_sequencer_pipe(intel_dp); pp_on_reg = VLV_PIPE_PP_ON_DELAYS(pipe); pp_off_reg = VLV_PIPE_PP_OFF_DELAYS(pipe); @@ -5734,7 +5734,7 @@ void intel_edp_drrs_invalidate(struct dr { struct drm_i915_private *dev_priv = dev->dev_private; struct drm_crtc *crtc; - enum i915_pipe pipe; + enum pipe pipe; if (dev_priv->drrs.type == DRRS_NOT_SUPPORTED) return; @@ -5779,7 +5779,7 @@ void intel_edp_drrs_flush(struct drm_dev { struct drm_i915_private *dev_priv = dev->dev_private; struct drm_crtc *crtc; - enum i915_pipe pipe; + enum pipe pipe; if (dev_priv->drrs.type == DRRS_NOT_SUPPORTED) return; @@ -5913,7 +5913,7 @@ static bool intel_edp_init_connector(str bool has_dpcd; struct drm_display_mode *scan; struct edid *edid; - enum i915_pipe pipe = INVALID_PIPE; + enum pipe pipe = INVALID_PIPE; if (!is_edp(intel_dp)) return true; Index: src/sys/external/bsd/drm2/dist/drm/i915/intel_drv.h diff -u src/sys/external/bsd/drm2/dist/drm/i915/intel_drv.h:1.11 src/sys/external/bsd/drm2/dist/drm/i915/intel_drv.h:1.12 --- src/sys/external/bsd/drm2/dist/drm/i915/intel_drv.h:1.11 Thu Dec 5 20:03:09 2019 +++ src/sys/external/bsd/drm2/dist/drm/i915/intel_drv.h Fri Feb 14 04:36:11 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: intel_drv.h,v 1.11 2019/12/05 20:03:09 maya Exp $ */ +/* $NetBSD: intel_drv.h,v 1.12 2020/02/14 04:36:11 riastradh Exp $ */ /* * Copyright (c) 2006 Dave Airlie <airl...@linux.ie> @@ -183,7 +183,7 @@ struct intel_encoder { /* Read out the current hw state of this connector, returning true if * the encoder is active. If the encoder is enabled it also set the pipe * it is connected to in the pipe parameter. */ - bool (*get_hw_state)(struct intel_encoder *, enum i915_pipe *pipe); + bool (*get_hw_state)(struct intel_encoder *, enum pipe *pipe); /* Reconstructs the equivalent mode flags for the current hardware * state. This must be called _after_ display->get_pipe_config has * pre-filled the pipe config. Note that intel_encoder->base.crtc must @@ -223,7 +223,7 @@ struct intel_panel { struct backlight_device *device; /* Connector and platform specific backlight functions */ - int (*setup)(struct intel_connector *connector, enum i915_pipe pipe); + int (*setup)(struct intel_connector *connector, enum pipe pipe); uint32_t (*get)(struct intel_connector *connector); void (*set)(struct intel_connector *connector, uint32_t level); void (*disable)(struct intel_connector *connector); @@ -504,7 +504,7 @@ struct intel_crtc_state { struct intel_crtc_scaler_state scaler_state; /* w/a for waiting 2 vblanks during crtc enable */ - enum i915_pipe hsw_workaround_pipe; + enum pipe hsw_workaround_pipe; }; struct vlv_wm_state { @@ -564,7 +564,7 @@ struct intel_crtc_atomic_commit { struct intel_crtc { struct drm_crtc base; - enum i915_pipe pipe; + enum pipe pipe; enum plane plane; u8 lut_r[256], lut_g[256], lut_b[256]; /* @@ -650,7 +650,7 @@ struct intel_plane_wm_parameters { struct intel_plane { struct drm_plane base; int plane; - enum i915_pipe pipe; + enum pipe pipe; bool can_scale; int max_downscale; uint32_t frontbuffer_bit; @@ -798,7 +798,7 @@ struct intel_dp { * Pipe whose power sequencer is currently locked into * this port. Only relevant on VLV/CHV. */ - enum i915_pipe pps_pipe; + enum pipe pps_pipe; struct edp_power_seq pps_delays; bool can_mst; /* this port supports mst */ @@ -839,7 +839,7 @@ struct intel_digital_port { struct intel_dp_mst_encoder { struct intel_encoder base; - enum i915_pipe pipe; + enum pipe pipe; struct intel_digital_port *primary; void *port; /* store this opaque as its illegal to dereference it */ }; @@ -873,7 +873,7 @@ vlv_dport_to_phy(struct intel_digital_po } static inline enum dpio_channel -vlv_pipe_to_channel(enum i915_pipe pipe) +vlv_pipe_to_channel(enum pipe pipe) { switch (pipe) { case PIPE_A: @@ -970,12 +970,12 @@ static inline unsigned int intel_num_pla /* intel_fifo_underrun.c */ bool intel_set_cpu_fifo_underrun_reporting(struct drm_i915_private *dev_priv, - enum i915_pipe pipe, bool enable); + enum pipe pipe, bool enable); bool intel_set_pch_fifo_underrun_reporting(struct drm_i915_private *dev_priv, enum transcoder pch_transcoder, bool enable); void intel_cpu_fifo_underrun_irq_handler(struct drm_i915_private *dev_priv, - enum i915_pipe pipe); + enum pipe pipe); void intel_pch_fifo_underrun_irq_handler(struct drm_i915_private *dev_priv, enum transcoder pch_transcoder); void i9xx_check_fifo_underruns(struct drm_i915_private *dev_priv); @@ -1013,7 +1013,7 @@ void intel_prepare_ddi(struct drm_device void hsw_fdi_link_train(struct drm_crtc *crtc); void intel_ddi_init(struct drm_device *dev, enum port port); enum port intel_ddi_get_encoder_port(struct intel_encoder *intel_encoder); -bool intel_ddi_get_hw_state(struct intel_encoder *encoder, enum i915_pipe *pipe); +bool intel_ddi_get_hw_state(struct intel_encoder *encoder, enum pipe *pipe); void intel_ddi_pll_init(struct drm_device *dev); void intel_ddi_enable_transcoder_func(struct drm_crtc *crtc); void intel_ddi_disable_transcoder_func(struct drm_i915_private *dev_priv, @@ -1080,11 +1080,11 @@ void intel_connector_attach_encoder(stru struct drm_encoder *intel_best_encoder(struct drm_connector *connector); struct drm_display_mode *intel_crtc_mode_get(struct drm_device *dev, struct drm_crtc *crtc); -enum i915_pipe intel_get_pipe_from_connector(struct intel_connector *connector); +enum pipe intel_get_pipe_from_connector(struct intel_connector *connector); int intel_get_pipe_from_crtc_id(struct drm_device *dev, void *data, struct drm_file *file_priv); enum transcoder intel_pipe_to_cpu_transcoder(struct drm_i915_private *dev_priv, - enum i915_pipe pipe); + enum pipe pipe); bool intel_pipe_has_type(struct intel_crtc *crtc, enum intel_output_type type); static inline void intel_wait_for_vblank(struct drm_device *dev, int pipe) @@ -1153,22 +1153,22 @@ void assert_shared_dpll(struct drm_i915_ struct intel_shared_dpll *intel_get_shared_dpll(struct intel_crtc *crtc, struct intel_crtc_state *state); -void vlv_force_pll_on(struct drm_device *dev, enum i915_pipe pipe, +void vlv_force_pll_on(struct drm_device *dev, enum pipe pipe, const struct dpll *dpll); -void vlv_force_pll_off(struct drm_device *dev, enum i915_pipe pipe); +void vlv_force_pll_off(struct drm_device *dev, enum pipe pipe); /* modesetting asserts */ void assert_panel_unlocked(struct drm_i915_private *dev_priv, - enum i915_pipe pipe); + enum pipe pipe); void assert_pll(struct drm_i915_private *dev_priv, - enum i915_pipe pipe, bool state); + enum pipe pipe, bool state); #define assert_pll_enabled(d, p) assert_pll(d, p, true) #define assert_pll_disabled(d, p) assert_pll(d, p, false) void assert_fdi_rx_pll(struct drm_i915_private *dev_priv, - enum i915_pipe pipe, bool state); + enum pipe pipe, bool state); #define assert_fdi_rx_pll_enabled(d, p) assert_fdi_rx_pll(d, p, true) #define assert_fdi_rx_pll_disabled(d, p) assert_fdi_rx_pll(d, p, false) -void assert_pipe(struct drm_i915_private *dev_priv, enum i915_pipe pipe, bool state); +void assert_pipe(struct drm_i915_private *dev_priv, enum pipe pipe, bool state); #define assert_pipe_enabled(d, p) assert_pipe(d, p, true) #define assert_pipe_disabled(d, p) assert_pipe(d, p, false) unsigned long intel_gen4_compute_page_offset(struct drm_i915_private *dev_priv, @@ -1379,7 +1379,7 @@ void intel_gmch_panel_fitting(struct int int fitting_mode); void intel_panel_set_backlight_acpi(struct intel_connector *connector, u32 level, u32 max); -int intel_panel_setup_backlight(struct drm_connector *connector, enum i915_pipe pipe); +int intel_panel_setup_backlight(struct drm_connector *connector, enum pipe pipe); void intel_panel_enable_backlight(struct intel_connector *connector); void intel_panel_disable_backlight(struct intel_connector *connector); void intel_panel_destroy_backlight(struct drm_connector *connector); @@ -1475,7 +1475,7 @@ bool intel_sdvo_init(struct drm_device * /* intel_sprite.c */ -int intel_plane_init(struct drm_device *dev, enum i915_pipe pipe, int plane); +int intel_plane_init(struct drm_device *dev, enum pipe pipe, int plane); int intel_sprite_set_colorkey(struct drm_device *dev, void *data, struct drm_file *file_priv); void intel_pipe_update_start(struct intel_crtc *crtc); Index: src/sys/external/bsd/drm2/dist/drm/i915/intel_dsi.c diff -u src/sys/external/bsd/drm2/dist/drm/i915/intel_dsi.c:1.4 src/sys/external/bsd/drm2/dist/drm/i915/intel_dsi.c:1.5 --- src/sys/external/bsd/drm2/dist/drm/i915/intel_dsi.c:1.4 Mon Aug 27 04:58:24 2018 +++ src/sys/external/bsd/drm2/dist/drm/i915/intel_dsi.c Fri Feb 14 04:36:11 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: intel_dsi.c,v 1.4 2018/08/27 04:58:24 riastradh Exp $ */ +/* $NetBSD: intel_dsi.c,v 1.5 2020/02/14 04:36:11 riastradh Exp $ */ /* * Copyright © 2013 Intel Corporation @@ -26,7 +26,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: intel_dsi.c,v 1.4 2018/08/27 04:58:24 riastradh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: intel_dsi.c,v 1.5 2020/02/14 04:36:11 riastradh Exp $"); #include <drm/drmP.h> #include <drm/drm_atomic_helper.h> @@ -655,7 +655,7 @@ static void intel_dsi_post_disable(struc } static bool intel_dsi_get_hw_state(struct intel_encoder *encoder, - enum i915_pipe *pipe) + enum pipe *pipe) { struct drm_i915_private *dev_priv = encoder->base.dev->dev_private; struct intel_dsi *intel_dsi = enc_to_intel_dsi(&encoder->base); Index: src/sys/external/bsd/drm2/dist/drm/i915/intel_dvo.c diff -u src/sys/external/bsd/drm2/dist/drm/i915/intel_dvo.c:1.4 src/sys/external/bsd/drm2/dist/drm/i915/intel_dvo.c:1.5 --- src/sys/external/bsd/drm2/dist/drm/i915/intel_dvo.c:1.4 Mon Aug 27 07:22:18 2018 +++ src/sys/external/bsd/drm2/dist/drm/i915/intel_dvo.c Fri Feb 14 04:36:11 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: intel_dvo.c,v 1.4 2018/08/27 07:22:18 riastradh Exp $ */ +/* $NetBSD: intel_dvo.c,v 1.5 2020/02/14 04:36:11 riastradh Exp $ */ /* * Copyright 2006 Dave Airlie <airl...@linux.ie> @@ -27,7 +27,7 @@ * Eric Anholt <e...@anholt.net> */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: intel_dvo.c,v 1.4 2018/08/27 07:22:18 riastradh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: intel_dvo.c,v 1.5 2020/02/14 04:36:11 riastradh Exp $"); #include <linux/i2c.h> #include <linux/slab.h> @@ -133,7 +133,7 @@ static bool intel_dvo_connector_get_hw_s } static bool intel_dvo_get_hw_state(struct intel_encoder *encoder, - enum i915_pipe *pipe) + enum pipe *pipe) { struct drm_device *dev = encoder->base.dev; struct drm_i915_private *dev_priv = dev->dev_private; @@ -457,7 +457,7 @@ void intel_dvo_init(struct drm_device *d struct i2c_adapter *i2c; int gpio; bool dvoinit; - enum i915_pipe pipe; + enum pipe pipe; uint32_t dpll[I915_MAX_PIPES]; /* Allow the I2C driver info to specify the GPIO to be used in Index: src/sys/external/bsd/drm2/dist/drm/i915/intel_fifo_underrun.c diff -u src/sys/external/bsd/drm2/dist/drm/i915/intel_fifo_underrun.c:1.2 src/sys/external/bsd/drm2/dist/drm/i915/intel_fifo_underrun.c:1.3 --- src/sys/external/bsd/drm2/dist/drm/i915/intel_fifo_underrun.c:1.2 Mon Aug 27 04:58:24 2018 +++ src/sys/external/bsd/drm2/dist/drm/i915/intel_fifo_underrun.c Fri Feb 14 04:36:11 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: intel_fifo_underrun.c,v 1.2 2018/08/27 04:58:24 riastradh Exp $ */ +/* $NetBSD: intel_fifo_underrun.c,v 1.3 2020/02/14 04:36:11 riastradh Exp $ */ /* * Copyright © 2014 Intel Corporation @@ -28,7 +28,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: intel_fifo_underrun.c,v 1.2 2018/08/27 04:58:24 riastradh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: intel_fifo_underrun.c,v 1.3 2020/02/14 04:36:11 riastradh Exp $"); #include "i915_drv.h" #include "intel_drv.h" @@ -57,7 +57,7 @@ static bool ivb_can_enable_err_int(struc { struct drm_i915_private *dev_priv = dev->dev_private; struct intel_crtc *crtc; - enum i915_pipe pipe; + enum pipe pipe; assert_spin_locked(&dev_priv->irq_lock); @@ -74,7 +74,7 @@ static bool ivb_can_enable_err_int(struc static bool cpt_can_enable_serr_int(struct drm_device *dev) { struct drm_i915_private *dev_priv = dev->dev_private; - enum i915_pipe pipe; + enum pipe pipe; struct intel_crtc *crtc; assert_spin_locked(&dev_priv->irq_lock); @@ -124,7 +124,7 @@ void i9xx_check_fifo_underruns(struct dr } static void i9xx_set_fifo_underrun_reporting(struct drm_device *dev, - enum i915_pipe pipe, + enum pipe pipe, bool enable, bool old) { struct drm_i915_private *dev_priv = dev->dev_private; @@ -143,7 +143,7 @@ static void i9xx_set_fifo_underrun_repor } static void ironlake_set_fifo_underrun_reporting(struct drm_device *dev, - enum i915_pipe pipe, bool enable) + enum pipe pipe, bool enable) { struct drm_i915_private *dev_priv = dev->dev_private; uint32_t bit = (pipe == PIPE_A) ? DE_PIPEA_FIFO_UNDERRUN : @@ -156,7 +156,7 @@ static void ironlake_set_fifo_underrun_r } static void ivybridge_set_fifo_underrun_reporting(struct drm_device *dev, - enum i915_pipe pipe, + enum pipe pipe, bool enable, bool old) { struct drm_i915_private *dev_priv = dev->dev_private; @@ -179,7 +179,7 @@ static void ivybridge_set_fifo_underrun_ } static void broadwell_set_fifo_underrun_reporting(struct drm_device *dev, - enum i915_pipe pipe, bool enable) + enum pipe pipe, bool enable) { struct drm_i915_private *dev_priv = dev->dev_private; @@ -233,7 +233,7 @@ static void cpt_set_fifo_underrun_report } static bool __intel_set_cpu_fifo_underrun_reporting(struct drm_device *dev, - enum i915_pipe pipe, bool enable) + enum pipe pipe, bool enable) { struct drm_i915_private *dev_priv = dev->dev_private; struct drm_crtc *crtc = dev_priv->pipe_to_crtc_mapping[pipe]; @@ -274,7 +274,7 @@ static bool __intel_set_cpu_fifo_underru * Returns the previous state of underrun reporting. */ bool intel_set_cpu_fifo_underrun_reporting(struct drm_i915_private *dev_priv, - enum i915_pipe pipe, bool enable) + enum pipe pipe, bool enable) { unsigned long flags; bool ret; @@ -345,7 +345,7 @@ bool intel_set_pch_fifo_underrun_reporti * interrupt to avoid an irq storm. */ void intel_cpu_fifo_underrun_irq_handler(struct drm_i915_private *dev_priv, - enum i915_pipe pipe) + enum pipe pipe) { struct drm_crtc *crtc = dev_priv->pipe_to_crtc_mapping[pipe]; Index: src/sys/external/bsd/drm2/dist/drm/i915/intel_hdmi.c diff -u src/sys/external/bsd/drm2/dist/drm/i915/intel_hdmi.c:1.7 src/sys/external/bsd/drm2/dist/drm/i915/intel_hdmi.c:1.8 --- src/sys/external/bsd/drm2/dist/drm/i915/intel_hdmi.c:1.7 Mon Aug 27 07:23:10 2018 +++ src/sys/external/bsd/drm2/dist/drm/i915/intel_hdmi.c Fri Feb 14 04:36:11 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: intel_hdmi.c,v 1.7 2018/08/27 07:23:10 riastradh Exp $ */ +/* $NetBSD: intel_hdmi.c,v 1.8 2020/02/14 04:36:11 riastradh Exp $ */ /* * Copyright 2006 Dave Airlie <airl...@linux.ie> @@ -29,7 +29,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: intel_hdmi.c,v 1.7 2018/08/27 07:23:10 riastradh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: intel_hdmi.c,v 1.8 2020/02/14 04:36:11 riastradh Exp $"); #include <linux/i2c.h> #include <linux/slab.h> @@ -880,7 +880,7 @@ static void intel_hdmi_prepare(struct in } static bool intel_hdmi_get_hw_state(struct intel_encoder *encoder, - enum i915_pipe *pipe) + enum pipe *pipe) { struct drm_device *dev = encoder->base.dev; struct drm_i915_private *dev_priv = dev->dev_private; @@ -1043,7 +1043,7 @@ static void cpt_enable_hdmi(struct intel struct drm_i915_private *dev_priv = dev->dev_private; struct intel_crtc *crtc = to_intel_crtc(encoder->base.crtc); struct intel_hdmi *intel_hdmi = enc_to_intel_hdmi(&encoder->base); - enum i915_pipe pipe = crtc->pipe; + enum pipe pipe = crtc->pipe; u32 temp; temp = I915_READ(intel_hdmi->hdmi_reg); @@ -1628,7 +1628,7 @@ static void chv_data_lane_soft_reset(str struct drm_i915_private *dev_priv = to_i915(encoder->base.dev); enum dpio_channel ch = vlv_dport_to_channel(enc_to_dig_port(&encoder->base)); struct intel_crtc *crtc = to_intel_crtc(encoder->base.crtc); - enum i915_pipe pipe = crtc->pipe; + enum pipe pipe = crtc->pipe; uint32_t val; val = vlv_dpio_read(dev_priv, pipe, VLV_PCS01_DW0(ch)); @@ -1674,7 +1674,7 @@ static void chv_hdmi_pre_pll_enable(stru struct intel_crtc *intel_crtc = to_intel_crtc(encoder->base.crtc); enum dpio_channel ch = vlv_dport_to_channel(dport); - enum i915_pipe pipe = intel_crtc->pipe; + enum pipe pipe = intel_crtc->pipe; u32 val; intel_hdmi_prepare(encoder); @@ -1748,7 +1748,7 @@ static void chv_hdmi_pre_pll_enable(stru static void chv_hdmi_post_pll_disable(struct intel_encoder *encoder) { struct drm_i915_private *dev_priv = to_i915(encoder->base.dev); - enum i915_pipe pipe = to_intel_crtc(encoder->base.crtc)->pipe; + enum pipe pipe = to_intel_crtc(encoder->base.crtc)->pipe; u32 val; mutex_lock(&dev_priv->sb_lock); Index: src/sys/external/bsd/drm2/dist/drm/i915/intel_lvds.c diff -u src/sys/external/bsd/drm2/dist/drm/i915/intel_lvds.c:1.7 src/sys/external/bsd/drm2/dist/drm/i915/intel_lvds.c:1.8 --- src/sys/external/bsd/drm2/dist/drm/i915/intel_lvds.c:1.7 Mon Aug 27 04:58:24 2018 +++ src/sys/external/bsd/drm2/dist/drm/i915/intel_lvds.c Fri Feb 14 04:36:12 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: intel_lvds.c,v 1.7 2018/08/27 04:58:24 riastradh Exp $ */ +/* $NetBSD: intel_lvds.c,v 1.8 2020/02/14 04:36:12 riastradh Exp $ */ /* * Copyright © 2006-2007 Intel Corporation @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: intel_lvds.c,v 1.7 2018/08/27 04:58:24 riastradh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: intel_lvds.c,v 1.8 2020/02/14 04:36:12 riastradh Exp $"); #include <acpi/button.h> #include <linux/dmi.h> @@ -75,7 +75,7 @@ static struct intel_lvds_connector *to_l } static bool intel_lvds_get_hw_state(struct intel_encoder *encoder, - enum i915_pipe *pipe) + enum pipe *pipe) { struct drm_device *dev = encoder->base.dev; struct drm_i915_private *dev_priv = dev->dev_private; Index: src/sys/external/bsd/drm2/dist/drm/i915/intel_psr.c diff -u src/sys/external/bsd/drm2/dist/drm/i915/intel_psr.c:1.7 src/sys/external/bsd/drm2/dist/drm/i915/intel_psr.c:1.8 --- src/sys/external/bsd/drm2/dist/drm/i915/intel_psr.c:1.7 Fri Feb 14 04:35:19 2020 +++ src/sys/external/bsd/drm2/dist/drm/i915/intel_psr.c Fri Feb 14 04:36:12 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: intel_psr.c,v 1.7 2020/02/14 04:35:19 riastradh Exp $ */ +/* $NetBSD: intel_psr.c,v 1.8 2020/02/14 04:36:12 riastradh Exp $ */ /* * Copyright © 2014 Intel Corporation @@ -54,7 +54,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: intel_psr.c,v 1.7 2020/02/14 04:35:19 riastradh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: intel_psr.c,v 1.8 2020/02/14 04:36:12 riastradh Exp $"); #include <drm/drmP.h> @@ -117,7 +117,7 @@ static void vlv_psr_setup_vsc(struct int struct drm_device *dev = intel_dig_port->base.base.dev; struct drm_i915_private *dev_priv = dev->dev_private; struct drm_crtc *crtc = intel_dig_port->base.base.crtc; - enum i915_pipe pipe = to_intel_crtc(crtc)->pipe; + enum pipe pipe = to_intel_crtc(crtc)->pipe; uint32_t val; /* VLV auto-generate VSC package as per EDP 1.3 spec, Table 3.10 */ @@ -229,7 +229,7 @@ static void vlv_psr_enable_source(struct struct drm_device *dev = dig_port->base.base.dev; struct drm_i915_private *dev_priv = dev->dev_private; struct drm_crtc *crtc = dig_port->base.base.crtc; - enum i915_pipe pipe = to_intel_crtc(crtc)->pipe; + enum pipe pipe = to_intel_crtc(crtc)->pipe; /* Transition from PSR_state 0 to PSR_state 1, i.e. PSR Inactive */ I915_WRITE(VLV_PSRCTL(pipe), @@ -244,7 +244,7 @@ static void vlv_psr_activate(struct inte struct drm_device *dev = dig_port->base.base.dev; struct drm_i915_private *dev_priv = dev->dev_private; struct drm_crtc *crtc = dig_port->base.base.crtc; - enum i915_pipe pipe = to_intel_crtc(crtc)->pipe; + enum pipe pipe = to_intel_crtc(crtc)->pipe; /* Let's do the transition from PSR_state 1 to PSR_state 2 * that is PSR transition to active - static frame transmission. @@ -523,7 +523,7 @@ static void intel_psr_work(struct work_s container_of(work, typeof(*dev_priv), psr.work.work); struct intel_dp *intel_dp = dev_priv->psr.enabled; struct drm_crtc *crtc = dp_to_dig_port(intel_dp)->base.base.crtc; - enum i915_pipe pipe = to_intel_crtc(crtc)->pipe; + enum pipe pipe = to_intel_crtc(crtc)->pipe; /* We have to make sure PSR is ready for re-enable * otherwise it keeps disabled until next full enable/disable cycle. @@ -567,7 +567,7 @@ static void intel_psr_exit(struct drm_de struct drm_i915_private *dev_priv = dev->dev_private; struct intel_dp *intel_dp = dev_priv->psr.enabled; struct drm_crtc *crtc = dp_to_dig_port(intel_dp)->base.base.crtc; - enum i915_pipe pipe = to_intel_crtc(crtc)->pipe; + enum pipe pipe = to_intel_crtc(crtc)->pipe; u32 val; if (!dev_priv->psr.active) @@ -621,7 +621,7 @@ void intel_psr_single_frame_update(struc { struct drm_i915_private *dev_priv = dev->dev_private; struct drm_crtc *crtc; - enum i915_pipe pipe; + enum pipe pipe; u32 val; /* @@ -669,7 +669,7 @@ void intel_psr_invalidate(struct drm_dev { struct drm_i915_private *dev_priv = dev->dev_private; struct drm_crtc *crtc; - enum i915_pipe pipe; + enum pipe pipe; mutex_lock(&dev_priv->psr.lock); if (!dev_priv->psr.enabled) { @@ -707,7 +707,7 @@ void intel_psr_flush(struct drm_device * { struct drm_i915_private *dev_priv = dev->dev_private; struct drm_crtc *crtc; - enum i915_pipe pipe; + enum pipe pipe; int delay_ms = HAS_DDI(dev) ? 100 : 500; mutex_lock(&dev_priv->psr.lock); Index: src/sys/external/bsd/drm2/dist/drm/i915/intel_tv.c diff -u src/sys/external/bsd/drm2/dist/drm/i915/intel_tv.c:1.7 src/sys/external/bsd/drm2/dist/drm/i915/intel_tv.c:1.8 --- src/sys/external/bsd/drm2/dist/drm/i915/intel_tv.c:1.7 Mon Aug 27 04:58:24 2018 +++ src/sys/external/bsd/drm2/dist/drm/i915/intel_tv.c Fri Feb 14 04:36:12 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: intel_tv.c,v 1.7 2018/08/27 04:58:24 riastradh Exp $ */ +/* $NetBSD: intel_tv.c,v 1.8 2020/02/14 04:36:12 riastradh Exp $ */ /* * Copyright © 2006-2008 Intel Corporation @@ -33,7 +33,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: intel_tv.c,v 1.7 2018/08/27 04:58:24 riastradh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: intel_tv.c,v 1.8 2020/02/14 04:36:12 riastradh Exp $"); #include <linux/math64.h> #include <drm/drmP.h> @@ -845,7 +845,7 @@ static struct intel_tv *intel_attached_t } static bool -intel_tv_get_hw_state(struct intel_encoder *encoder, enum i915_pipe *pipe) +intel_tv_get_hw_state(struct intel_encoder *encoder, enum pipe *pipe) { struct drm_device *dev = encoder->base.dev; struct drm_i915_private *dev_priv = dev->dev_private; Index: src/sys/external/bsd/drm2/dist/drm/i915/intel_overlay.c diff -u src/sys/external/bsd/drm2/dist/drm/i915/intel_overlay.c:1.8 src/sys/external/bsd/drm2/dist/drm/i915/intel_overlay.c:1.9 --- src/sys/external/bsd/drm2/dist/drm/i915/intel_overlay.c:1.8 Mon Aug 27 07:26:59 2018 +++ src/sys/external/bsd/drm2/dist/drm/i915/intel_overlay.c Fri Feb 14 04:36:12 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: intel_overlay.c,v 1.8 2018/08/27 07:26:59 riastradh Exp $ */ +/* $NetBSD: intel_overlay.c,v 1.9 2020/02/14 04:36:12 riastradh Exp $ */ /* * Copyright © 2009 @@ -28,7 +28,7 @@ * Derived from Xorg ddx, xf86-video-intel, src/i830_video.c */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: intel_overlay.c,v 1.8 2018/08/27 07:26:59 riastradh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: intel_overlay.c,v 1.9 2020/02/14 04:36:12 riastradh Exp $"); #include <linux/kernel.h> #include <asm/io.h> @@ -767,7 +767,7 @@ static int intel_overlay_do_put_image(st bool scale_changed = false; struct drm_device *dev __diagused = overlay->dev; u32 swidth, swidthsw, sheight, ostride; - enum i915_pipe pipe = overlay->crtc->pipe; + enum pipe pipe = overlay->crtc->pipe; WARN_ON(!mutex_is_locked(&dev->struct_mutex)); WARN_ON(!drm_modeset_is_locked(&dev->mode_config.connection_mutex)); Index: src/sys/external/bsd/drm2/dist/drm/i915/intel_runtime_pm.c diff -u src/sys/external/bsd/drm2/dist/drm/i915/intel_runtime_pm.c:1.8 src/sys/external/bsd/drm2/dist/drm/i915/intel_runtime_pm.c:1.9 --- src/sys/external/bsd/drm2/dist/drm/i915/intel_runtime_pm.c:1.8 Fri Feb 14 04:35:19 2020 +++ src/sys/external/bsd/drm2/dist/drm/i915/intel_runtime_pm.c Fri Feb 14 04:36:12 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: intel_runtime_pm.c,v 1.8 2020/02/14 04:35:19 riastradh Exp $ */ +/* $NetBSD: intel_runtime_pm.c,v 1.9 2020/02/14 04:36:12 riastradh Exp $ */ /* * Copyright © 2012-2014 Intel Corporation @@ -29,7 +29,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: intel_runtime_pm.c,v 1.8 2020/02/14 04:35:19 riastradh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: intel_runtime_pm.c,v 1.9 2020/02/14 04:36:12 riastradh Exp $"); #include <linux/pm_runtime.h> #include <linux/vgaarb.h> @@ -895,7 +895,7 @@ static bool vlv_power_well_enabled(struc static void vlv_display_power_well_init(struct drm_i915_private *dev_priv) { - enum i915_pipe pipe; + enum pipe pipe; /* * Enable the CRI clock source so we can get at the @@ -987,7 +987,7 @@ static void vlv_dpio_cmn_power_well_enab static void vlv_dpio_cmn_power_well_disable(struct drm_i915_private *dev_priv, struct i915_power_well *power_well) { - enum i915_pipe pipe; + enum pipe pipe; WARN_ON_ONCE(power_well->data != PUNIT_POWER_WELL_DPIO_CMN_BC); @@ -1128,7 +1128,7 @@ static void chv_dpio_cmn_power_well_enab struct i915_power_well *power_well) { enum dpio_phy phy; - enum i915_pipe pipe; + enum pipe pipe; uint32_t tmp; WARN_ON_ONCE(power_well->data != PUNIT_POWER_WELL_DPIO_CMN_BC && @@ -1218,7 +1218,7 @@ static void chv_dpio_cmn_power_well_disa static void assert_chv_phy_powergate(struct drm_i915_private *dev_priv, enum dpio_phy phy, enum dpio_channel ch, bool override, unsigned int mask) { - enum i915_pipe pipe = phy == DPIO_PHY0 ? PIPE_A : PIPE_C; + enum pipe pipe = phy == DPIO_PHY0 ? PIPE_A : PIPE_C; u32 reg, val, expected, actual; /* @@ -1341,7 +1341,7 @@ void chv_phy_powergate_lanes(struct inte static bool chv_pipe_power_well_enabled(struct drm_i915_private *dev_priv, struct i915_power_well *power_well) { - enum i915_pipe pipe = power_well->data; + enum pipe pipe = power_well->data; bool enabled; u32 state, ctrl; @@ -1371,7 +1371,7 @@ static void chv_set_pipe_power_well(stru struct i915_power_well *power_well, bool enable) { - enum i915_pipe pipe = power_well->data; + enum pipe pipe = power_well->data; u32 state; u32 ctrl; Index: src/sys/external/bsd/drm2/dist/drm/i915/intel_panel.c diff -u src/sys/external/bsd/drm2/dist/drm/i915/intel_panel.c:1.12 src/sys/external/bsd/drm2/dist/drm/i915/intel_panel.c:1.13 --- src/sys/external/bsd/drm2/dist/drm/i915/intel_panel.c:1.12 Sat Oct 6 15:33:35 2018 +++ src/sys/external/bsd/drm2/dist/drm/i915/intel_panel.c Fri Feb 14 04:36:12 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: intel_panel.c,v 1.12 2018/10/06 15:33:35 christos Exp $ */ +/* $NetBSD: intel_panel.c,v 1.13 2020/02/14 04:36:12 riastradh Exp $ */ /* * Copyright © 2006-2010 Intel Corporation @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: intel_panel.c,v 1.12 2018/10/06 15:33:35 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: intel_panel.c,v 1.13 2020/02/14 04:36:12 riastradh Exp $"); #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt @@ -527,7 +527,7 @@ static u32 i9xx_get_backlight(struct int return val; } -static u32 _vlv_get_backlight(struct drm_device *dev, enum i915_pipe pipe) +static u32 _vlv_get_backlight(struct drm_device *dev, enum pipe pipe) { struct drm_i915_private *dev_priv = dev->dev_private; @@ -540,7 +540,7 @@ static u32 _vlv_get_backlight(struct drm static u32 vlv_get_backlight(struct intel_connector *connector) { struct drm_device *dev = connector->base.dev; - enum i915_pipe pipe = intel_get_pipe_from_connector(connector); + enum pipe pipe = intel_get_pipe_from_connector(connector); return _vlv_get_backlight(dev, pipe); } @@ -637,7 +637,7 @@ static void vlv_set_backlight(struct int { struct drm_device *dev = connector->base.dev; struct drm_i915_private *dev_priv = dev->dev_private; - enum i915_pipe pipe = intel_get_pipe_from_connector(connector); + enum pipe pipe = intel_get_pipe_from_connector(connector); u32 tmp; if (WARN_ON(pipe != PIPE_A && pipe != PIPE_B)) @@ -713,7 +713,7 @@ void intel_panel_set_backlight_acpi(stru struct drm_device *dev = connector->base.dev; struct drm_i915_private *dev_priv = dev->dev_private; struct intel_panel *panel = &connector->panel; - enum i915_pipe pipe = intel_get_pipe_from_connector(connector); + enum pipe pipe = intel_get_pipe_from_connector(connector); u32 hw_level; /* @@ -808,7 +808,7 @@ static void vlv_disable_backlight(struct { struct drm_device *dev = connector->base.dev; struct drm_i915_private *dev_priv = dev->dev_private; - enum i915_pipe pipe = intel_get_pipe_from_connector(connector); + enum pipe pipe = intel_get_pipe_from_connector(connector); u32 tmp; if (WARN_ON(pipe != PIPE_A && pipe != PIPE_B)) @@ -922,7 +922,7 @@ static void pch_enable_backlight(struct struct drm_device *dev = connector->base.dev; struct drm_i915_private *dev_priv = dev->dev_private; struct intel_panel *panel = &connector->panel; - enum i915_pipe pipe = intel_get_pipe_from_connector(connector); + enum pipe pipe = intel_get_pipe_from_connector(connector); enum transcoder cpu_transcoder = intel_pipe_to_cpu_transcoder(dev_priv, pipe); u32 cpu_ctl2, pch_ctl1, pch_ctl2; @@ -1007,7 +1007,7 @@ static void i965_enable_backlight(struct struct drm_device *dev = connector->base.dev; struct drm_i915_private *dev_priv = dev->dev_private; struct intel_panel *panel = &connector->panel; - enum i915_pipe pipe = intel_get_pipe_from_connector(connector); + enum pipe pipe = intel_get_pipe_from_connector(connector); u32 ctl, ctl2, freq; ctl2 = I915_READ(BLC_PWM_CTL2); @@ -1041,7 +1041,7 @@ static void vlv_enable_backlight(struct struct drm_device *dev = connector->base.dev; struct drm_i915_private *dev_priv = dev->dev_private; struct intel_panel *panel = &connector->panel; - enum i915_pipe pipe = intel_get_pipe_from_connector(connector); + enum pipe pipe = intel_get_pipe_from_connector(connector); u32 ctl, ctl2; if (WARN_ON(pipe != PIPE_A && pipe != PIPE_B)) @@ -1073,7 +1073,7 @@ static void bxt_enable_backlight(struct struct drm_device *dev = connector->base.dev; struct drm_i915_private *dev_priv = dev->dev_private; struct intel_panel *panel = &connector->panel; - enum i915_pipe pipe = intel_get_pipe_from_connector(connector); + enum pipe pipe = intel_get_pipe_from_connector(connector); u32 pwm_ctl, val; /* To use 2nd set of backlight registers, utility pin has to be @@ -1133,7 +1133,7 @@ void intel_panel_enable_backlight(struct struct drm_device *dev = connector->base.dev; struct drm_i915_private *dev_priv = dev->dev_private; struct intel_panel *panel = &connector->panel; - enum i915_pipe pipe = intel_get_pipe_from_connector(connector); + enum pipe pipe = intel_get_pipe_from_connector(connector); if (!panel->backlight.present) return; @@ -1467,7 +1467,7 @@ static u32 get_backlight_min_vbt(struct return scale(min, 0, 255, 0, panel->backlight.max); } -static int lpt_setup_backlight(struct intel_connector *connector, enum i915_pipe unused) +static int lpt_setup_backlight(struct intel_connector *connector, enum pipe unused) { struct drm_device *dev = connector->base.dev; struct drm_i915_private *dev_priv = dev->dev_private; @@ -1497,7 +1497,7 @@ static int lpt_setup_backlight(struct in return 0; } -static int pch_setup_backlight(struct intel_connector *connector, enum i915_pipe unused) +static int pch_setup_backlight(struct intel_connector *connector, enum pipe unused) { struct drm_device *dev = connector->base.dev; struct drm_i915_private *dev_priv = dev->dev_private; @@ -1528,7 +1528,7 @@ static int pch_setup_backlight(struct in return 0; } -static int i9xx_setup_backlight(struct intel_connector *connector, enum i915_pipe unused) +static int i9xx_setup_backlight(struct intel_connector *connector, enum pipe unused) { struct drm_device *dev = connector->base.dev; struct drm_i915_private *dev_priv = dev->dev_private; @@ -1566,7 +1566,7 @@ static int i9xx_setup_backlight(struct i return 0; } -static int i965_setup_backlight(struct intel_connector *connector, enum i915_pipe unused) +static int i965_setup_backlight(struct intel_connector *connector, enum pipe unused) { struct drm_device *dev = connector->base.dev; struct drm_i915_private *dev_priv = dev->dev_private; @@ -1600,7 +1600,7 @@ static int i965_setup_backlight(struct i return 0; } -static int vlv_setup_backlight(struct intel_connector *connector, enum i915_pipe pipe) +static int vlv_setup_backlight(struct intel_connector *connector, enum pipe pipe) { struct drm_device *dev = connector->base.dev; struct drm_i915_private *dev_priv = dev->dev_private; @@ -1634,7 +1634,7 @@ static int vlv_setup_backlight(struct in } static int -bxt_setup_backlight(struct intel_connector *connector, enum i915_pipe unused) +bxt_setup_backlight(struct intel_connector *connector, enum pipe unused) { struct drm_device *dev = connector->base.dev; struct drm_i915_private *dev_priv = dev->dev_private; @@ -1681,7 +1681,7 @@ bxt_setup_backlight(struct intel_connect #ifndef __NetBSD__ /* XXX mipi */ static int pwm_setup_backlight(struct intel_connector *connector, - enum i915_pipe pipe) + enum pipe pipe) { struct drm_device *dev = connector->base.dev; struct intel_panel *panel = &connector->panel; @@ -1715,7 +1715,7 @@ static int pwm_setup_backlight(struct in } #endif -int intel_panel_setup_backlight(struct drm_connector *connector, enum i915_pipe pipe) +int intel_panel_setup_backlight(struct drm_connector *connector, enum pipe pipe) { struct drm_device *dev = connector->dev; struct drm_i915_private *dev_priv = dev->dev_private; Index: src/sys/external/bsd/drm2/dist/drm/i915/intel_sdvo.c diff -u src/sys/external/bsd/drm2/dist/drm/i915/intel_sdvo.c:1.12 src/sys/external/bsd/drm2/dist/drm/i915/intel_sdvo.c:1.13 --- src/sys/external/bsd/drm2/dist/drm/i915/intel_sdvo.c:1.12 Tue Feb 19 00:30:16 2019 +++ src/sys/external/bsd/drm2/dist/drm/i915/intel_sdvo.c Fri Feb 14 04:36:12 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: intel_sdvo.c,v 1.12 2019/02/19 00:30:16 christos Exp $ */ +/* $NetBSD: intel_sdvo.c,v 1.13 2020/02/14 04:36:12 riastradh Exp $ */ /* * Copyright 2006 Dave Airlie <airl...@linux.ie> @@ -28,7 +28,7 @@ * Eric Anholt <e...@anholt.net> */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: intel_sdvo.c,v 1.12 2019/02/19 00:30:16 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: intel_sdvo.c,v 1.13 2020/02/14 04:36:12 riastradh Exp $"); #include <linux/i2c.h> #include <linux/slab.h> @@ -1346,7 +1346,7 @@ static bool intel_sdvo_connector_get_hw_ } static bool intel_sdvo_get_hw_state(struct intel_encoder *encoder, - enum i915_pipe *pipe) + enum pipe *pipe) { struct drm_device *dev = encoder->base.dev; struct drm_i915_private *dev_priv = dev->dev_private; Index: src/sys/external/bsd/drm2/dist/drm/i915/intel_pm.c diff -u src/sys/external/bsd/drm2/dist/drm/i915/intel_pm.c:1.21 src/sys/external/bsd/drm2/dist/drm/i915/intel_pm.c:1.22 --- src/sys/external/bsd/drm2/dist/drm/i915/intel_pm.c:1.21 Fri Feb 14 04:35:19 2020 +++ src/sys/external/bsd/drm2/dist/drm/i915/intel_pm.c Fri Feb 14 04:36:12 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: intel_pm.c,v 1.21 2020/02/14 04:35:19 riastradh Exp $ */ +/* $NetBSD: intel_pm.c,v 1.22 2020/02/14 04:36:12 riastradh Exp $ */ /* * Copyright © 2012 Intel Corporation @@ -28,7 +28,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: intel_pm.c,v 1.21 2020/02/14 04:35:19 riastradh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: intel_pm.c,v 1.22 2020/02/14 04:36:12 riastradh Exp $"); #include <linux/bitops.h> #include <linux/cpufreq.h> @@ -357,7 +357,7 @@ static const int pessimal_latency_ns = 5 ((((dsparb) >> (lo_shift)) & 0xff) | ((((dsparb2) >> (hi_shift)) & 0x1) << 8)) static int vlv_get_fifo_size(struct drm_device *dev, - enum i915_pipe pipe, int plane) + enum pipe pipe, int plane) { struct drm_i915_private *dev_priv = dev->dev_private; int sprite0_start, sprite1_start, size; @@ -843,7 +843,7 @@ static void vlv_write_wm_values(struct i const struct vlv_wm_values *wm) { struct drm_i915_private *dev_priv = to_i915(crtc->base.dev); - enum i915_pipe pipe = crtc->pipe; + enum pipe pipe = crtc->pipe; I915_WRITE(VLV_DDL(pipe), (wm->ddl[pipe].cursor << DDL_CURSOR_SHIFT) | @@ -1305,7 +1305,7 @@ static void vlv_merge_wm(struct drm_devi for_each_intel_crtc(dev, crtc) { struct vlv_wm_state *wm_state = &crtc->wm_state; - enum i915_pipe pipe = crtc->pipe; + enum pipe pipe = crtc->pipe; if (!crtc->active) continue; @@ -1326,7 +1326,7 @@ static void vlv_update_wm(struct drm_crt struct drm_device *dev = crtc->dev; struct drm_i915_private *dev_priv = dev->dev_private; struct intel_crtc *intel_crtc = to_intel_crtc(crtc); - enum i915_pipe pipe = intel_crtc->pipe; + enum pipe pipe = intel_crtc->pipe; struct vlv_wm_values wm = {}; vlv_compute_wm(intel_crtc); @@ -2555,7 +2555,7 @@ static void ilk_compute_wm_results(struc /* LP0 register values */ for_each_intel_crtc(dev, intel_crtc) { - enum i915_pipe pipe = intel_crtc->pipe; + enum pipe pipe = intel_crtc->pipe; const struct intel_wm_level *r = &intel_crtc->wm.active.wm[0]; @@ -2612,7 +2612,7 @@ static unsigned int ilk_compute_wm_dirty const struct ilk_wm_values *new) { unsigned int dirty = 0; - enum i915_pipe pipe; + enum pipe pipe; int wm_lp; for_each_pipe(dev_priv, pipe) { @@ -2843,7 +2843,7 @@ static void skl_ddb_entry_init_from_hw(s void skl_ddb_get_hw_state(struct drm_i915_private *dev_priv, struct skl_ddb_allocation *ddb /* out */) { - enum i915_pipe pipe; + enum pipe pipe; int plane; u32 val; @@ -2918,7 +2918,7 @@ skl_allocate_pipe_ddb(struct drm_crtc *c struct drm_device *dev = crtc->dev; struct drm_i915_private *dev_priv = dev->dev_private; struct intel_crtc *intel_crtc = to_intel_crtc(crtc); - enum i915_pipe pipe = intel_crtc->pipe; + enum pipe pipe = intel_crtc->pipe; struct skl_ddb_entry *alloc = &ddb->pipe[pipe]; uint16_t alloc_size, start, cursor_blocks; uint16_t minimum[I915_MAX_PLANES]; @@ -3070,7 +3070,7 @@ static bool skl_ddb_allocation_changed(c struct drm_device *dev = intel_crtc->base.dev; struct drm_i915_private *dev_priv = dev->dev_private; const struct skl_ddb_allocation *cur_ddb = &dev_priv->wm.skl_hw.ddb; - enum i915_pipe pipe = intel_crtc->pipe; + enum pipe pipe = intel_crtc->pipe; if (memcmp(new_ddb->plane[pipe], cur_ddb->plane[pipe], sizeof(new_ddb->plane[pipe]))) @@ -3106,7 +3106,7 @@ static void skl_compute_wm_pipe_paramete { struct drm_device *dev = crtc->dev; struct intel_crtc *intel_crtc = to_intel_crtc(crtc); - enum i915_pipe pipe = intel_crtc->pipe; + enum pipe pipe = intel_crtc->pipe; struct drm_plane *plane; struct drm_framebuffer *fb; int i = 1; /* Index for sprite planes start */ @@ -3242,7 +3242,7 @@ static bool skl_compute_plane_wm(const s static void skl_compute_wm_level(const struct drm_i915_private *dev_priv, struct skl_ddb_allocation *ddb, struct skl_pipe_wm_parameters *p, - enum i915_pipe pipe, + enum pipe pipe, int level, int num_planes, struct skl_wm_level *result) @@ -3324,7 +3324,7 @@ static void skl_compute_wm_results(struc struct intel_crtc *intel_crtc) { int level, max_level = ilk_wm_max_level(dev); - enum i915_pipe pipe = intel_crtc->pipe; + enum pipe pipe = intel_crtc->pipe; uint32_t temp; int i; @@ -3392,7 +3392,7 @@ static void skl_write_wm_values(struct d list_for_each_entry(crtc, &dev->mode_config.crtc_list, base.head) { int i, level, max_level = ilk_wm_max_level(dev); - enum i915_pipe pipe = crtc->pipe; + enum pipe pipe = crtc->pipe; if (!new->dirty[pipe]) continue; @@ -3451,7 +3451,7 @@ static void skl_write_wm_values(struct d */ static void -skl_wm_flush_pipe(struct drm_i915_private *dev_priv, enum i915_pipe pipe, int pass) +skl_wm_flush_pipe(struct drm_i915_private *dev_priv, enum pipe pipe, int pass) { int plane; @@ -3467,7 +3467,7 @@ skl_wm_flush_pipe(struct drm_i915_privat static bool skl_ddb_allocation_included(const struct skl_ddb_allocation *old, const struct skl_ddb_allocation *new, - enum i915_pipe pipe) + enum pipe pipe) { uint16_t old_size, new_size; @@ -3486,7 +3486,7 @@ static void skl_flush_wm_values(struct d struct skl_ddb_allocation *cur_ddb, *new_ddb; bool reallocated[I915_MAX_PIPES] = {}; struct intel_crtc *crtc; - enum i915_pipe pipe; + enum pipe pipe; new_ddb = &new_values->ddb; cur_ddb = &dev_priv->wm.skl_hw.ddb; @@ -3630,7 +3630,7 @@ static void skl_update_other_pipe_wm(str } } -static void skl_clear_wm(struct skl_wm_values *watermarks, enum i915_pipe pipe) +static void skl_clear_wm(struct skl_wm_values *watermarks, enum pipe pipe) { watermarks->wm_linetime[pipe] = 0; memset(watermarks->plane[pipe], 0, @@ -3839,7 +3839,7 @@ static void skl_pipe_wm_get_hw_state(str struct skl_wm_values *hw = &dev_priv->wm.skl_hw; struct intel_crtc *intel_crtc = to_intel_crtc(crtc); struct skl_pipe_wm *active = &intel_crtc->wm.skl_active; - enum i915_pipe pipe = intel_crtc->pipe; + enum pipe pipe = intel_crtc->pipe; int level, i, max_level; uint32_t temp; @@ -3902,7 +3902,7 @@ static void ilk_pipe_wm_get_hw_state(str struct ilk_wm_values *hw = &dev_priv->wm.hw; struct intel_crtc *intel_crtc = to_intel_crtc(crtc); struct intel_pipe_wm *active = &intel_crtc->wm.active; - enum i915_pipe pipe = intel_crtc->pipe; + enum pipe pipe = intel_crtc->pipe; static const unsigned int wm0_pipe_reg[] = { [PIPE_A] = WM0_PIPEA_ILK, [PIPE_B] = WM0_PIPEB_ILK, @@ -3952,7 +3952,7 @@ static void ilk_pipe_wm_get_hw_state(str static void vlv_read_wm_values(struct drm_i915_private *dev_priv, struct vlv_wm_values *wm) { - enum i915_pipe pipe; + enum pipe pipe; uint32_t tmp; for_each_pipe(dev_priv, pipe) { @@ -4030,7 +4030,7 @@ void vlv_wm_get_hw_state(struct drm_devi struct drm_i915_private *dev_priv = to_i915(dev); struct vlv_wm_values *wm = &dev_priv->wm.vlv; struct intel_plane *plane; - enum i915_pipe pipe; + enum pipe pipe; u32 val; vlv_read_wm_values(dev_priv, wm); @@ -6479,7 +6479,7 @@ static void ibx_init_clock_gating(struct static void g4x_disable_trickle_feed(struct drm_device *dev) { struct drm_i915_private *dev_priv = dev->dev_private; - enum i915_pipe pipe; + enum pipe pipe; for_each_pipe(dev_priv, pipe) { I915_WRITE(DSPCNTR(pipe), @@ -6776,7 +6776,7 @@ static void lpt_suspend_hw(struct drm_de static void broadwell_init_clock_gating(struct drm_device *dev) { struct drm_i915_private *dev_priv = dev->dev_private; - enum i915_pipe pipe; + enum pipe pipe; uint32_t misccpctl; ilk_init_lp_watermarks(dev); Index: src/sys/external/bsd/drm2/dist/drm/i915/intel_sprite.c diff -u src/sys/external/bsd/drm2/dist/drm/i915/intel_sprite.c:1.9 src/sys/external/bsd/drm2/dist/drm/i915/intel_sprite.c:1.10 --- src/sys/external/bsd/drm2/dist/drm/i915/intel_sprite.c:1.9 Mon Aug 27 15:09:35 2018 +++ src/sys/external/bsd/drm2/dist/drm/i915/intel_sprite.c Fri Feb 14 04:36:12 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: intel_sprite.c,v 1.9 2018/08/27 15:09:35 riastradh Exp $ */ +/* $NetBSD: intel_sprite.c,v 1.10 2020/02/14 04:36:12 riastradh Exp $ */ /* * Copyright © 2011 Intel Corporation @@ -32,7 +32,7 @@ * support. */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: intel_sprite.c,v 1.9 2018/08/27 15:09:35 riastradh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: intel_sprite.c,v 1.10 2020/02/14 04:36:12 riastradh Exp $"); #include <drm/drmP.h> #include <drm/drm_crtc.h> @@ -88,7 +88,7 @@ void intel_pipe_update_start(struct inte { struct drm_device *dev = crtc->base.dev; const struct drm_display_mode *adjusted_mode = &crtc->config->base.adjusted_mode; - enum i915_pipe pipe = crtc->pipe; + enum pipe pipe = crtc->pipe; long timeout = msecs_to_jiffies_timeout(1); int scanline, min, max, vblank_start; #ifdef __NetBSD__ @@ -182,7 +182,7 @@ void intel_pipe_update_start(struct inte void intel_pipe_update_end(struct intel_crtc *crtc) { struct drm_device *dev = crtc->base.dev; - enum i915_pipe pipe = crtc->pipe; + enum pipe pipe = crtc->pipe; int scanline_end = intel_get_crtc_scanline(crtc); u32 end_vbl_count = dev->driver->get_vblank_counter(dev, pipe); ktime_t end_vbl_time = ktime_get(); @@ -521,7 +521,7 @@ ivb_update_plane(struct drm_plane *plane struct drm_i915_private *dev_priv = dev->dev_private; struct intel_plane *intel_plane = to_intel_plane(plane); struct drm_i915_gem_object *obj = intel_fb_obj(fb); - enum i915_pipe pipe = intel_plane->pipe; + enum pipe pipe = intel_plane->pipe; u32 sprctl, sprscale = 0; unsigned long sprsurf_offset, linear_offset; int pixel_size = drm_format_plane_cpp(fb->pixel_format, 0); @@ -1083,7 +1083,7 @@ static uint32_t skl_plane_formats[] = { }; int -intel_plane_init(struct drm_device *dev, enum i915_pipe pipe, int plane) +intel_plane_init(struct drm_device *dev, enum pipe pipe, int plane) { struct intel_plane *intel_plane; struct intel_plane_state *state;