Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/external/bsd/drm2/dist/drm/i915 Undo the `enum pipe' -> ...
details: https://anonhg.NetBSD.org/src/rev/811ce0249f42
branches: trunk
changeset: 744837:811ce0249f42
user: riastradh <riastradh%NetBSD.org@localhost>
date: Fri Feb 14 04:36:11 2020 +0000
description:
Undo the `enum pipe' -> `enum i915_pipe' rename.
diffstat:
sys/external/bsd/drm2/dist/drm/i915/i915_debugfs.c | 26 +-
sys/external/bsd/drm2/dist/drm/i915/i915_dma.c | 6 +-
sys/external/bsd/drm2/dist/drm/i915/i915_drv.h | 12 +-
sys/external/bsd/drm2/dist/drm/i915/i915_irq.c | 42 ++--
sys/external/bsd/drm2/dist/drm/i915/intel_audio.c | 14 +-
sys/external/bsd/drm2/dist/drm/i915/intel_crt.c | 6 +-
sys/external/bsd/drm2/dist/drm/i915/intel_ddi.c | 10 +-
sys/external/bsd/drm2/dist/drm/i915/intel_display.c | 126 +++++++-------
sys/external/bsd/drm2/dist/drm/i915/intel_dp.c | 52 ++--
sys/external/bsd/drm2/dist/drm/i915/intel_dp_mst.c | 10 +-
sys/external/bsd/drm2/dist/drm/i915/intel_drv.h | 44 ++--
sys/external/bsd/drm2/dist/drm/i915/intel_dsi.c | 6 +-
sys/external/bsd/drm2/dist/drm/i915/intel_dvo.c | 8 +-
sys/external/bsd/drm2/dist/drm/i915/intel_fbc.c | 10 +-
sys/external/bsd/drm2/dist/drm/i915/intel_fifo_underrun.c | 22 +-
sys/external/bsd/drm2/dist/drm/i915/intel_hdmi.c | 14 +-
sys/external/bsd/drm2/dist/drm/i915/intel_lvds.c | 6 +-
sys/external/bsd/drm2/dist/drm/i915/intel_overlay.c | 6 +-
sys/external/bsd/drm2/dist/drm/i915/intel_panel.c | 40 ++--
sys/external/bsd/drm2/dist/drm/i915/intel_pm.c | 50 ++--
sys/external/bsd/drm2/dist/drm/i915/intel_psr.c | 20 +-
sys/external/bsd/drm2/dist/drm/i915/intel_runtime_pm.c | 16 +-
sys/external/bsd/drm2/dist/drm/i915/intel_sdvo.c | 6 +-
sys/external/bsd/drm2/dist/drm/i915/intel_sideband.c | 8 +-
sys/external/bsd/drm2/dist/drm/i915/intel_sprite.c | 12 +-
sys/external/bsd/drm2/dist/drm/i915/intel_tv.c | 6 +-
26 files changed, 289 insertions(+), 289 deletions(-)
diffs (truncated from 2527 to 300 lines):
diff -r 645a44b41863 -r 811ce0249f42 sys/external/bsd/drm2/dist/drm/i915/i915_debugfs.c
--- a/sys/external/bsd/drm2/dist/drm/i915/i915_debugfs.c Fri Feb 14 04:35:19 2020 +0000
+++ b/sys/external/bsd/drm2/dist/drm/i915/i915_debugfs.c Fri Feb 14 04:36:11 2020 +0000
@@ -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 @@
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 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 @@
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 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 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 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 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 @@
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 @@
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 @@
#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 @@
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];
diff -r 645a44b41863 -r 811ce0249f42 sys/external/bsd/drm2/dist/drm/i915/i915_dma.c
--- a/sys/external/bsd/drm2/dist/drm/i915/i915_dma.c Fri Feb 14 04:35:19 2020 +0000
+++ b/sys/external/bsd/drm2/dist/drm/i915/i915_dma.c Fri Feb 14 04:36:11 2020 +0000
@@ -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 @@
{
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;
diff -r 645a44b41863 -r 811ce0249f42 sys/external/bsd/drm2/dist/drm/i915/i915_drv.h
--- a/sys/external/bsd/drm2/dist/drm/i915/i915_drv.h Fri Feb 14 04:35:19 2020 +0000
+++ b/sys/external/bsd/drm2/dist/drm/i915/i915_drv.h Fri Feb 14 04:36:11 2020 +0000
@@ -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 @@
return v ? "yes" : "no";
}
-enum i915_pipe {
+enum pipe {
INVALID_PIPE = -1,
PIPE_A = 0,
PIPE_B,
@@ -2880,11 +2880,11 @@
}
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 @@
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,
diff -r 645a44b41863 -r 811ce0249f42 sys/external/bsd/drm2/dist/drm/i915/i915_irq.c
--- a/sys/external/bsd/drm2/dist/drm/i915/i915_irq.c Fri Feb 14 04:35:19 2020 +0000
+++ b/sys/external/bsd/drm2/dist/drm/i915/i915_irq.c Fri Feb 14 04:36:11 2020 +0000
@@ -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 @@
}
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 @@
}
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 @@
}
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 @@
}
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 @@
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 @@
}
#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 @@
}
#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 @@
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 @@
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 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)
Home |
Main Index |
Thread Index |
Old Index