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 Change enum pipe to enum...
details: https://anonhg.NetBSD.org/src/rev/d28bb7af9cc6
branches: trunk
changeset: 332127:d28bb7af9cc6
user: matt <matt%NetBSD.org@localhost>
date: Sun Sep 07 23:03:11 2014 +0000
description:
Change enum pipe to enum i915_pipe
(enum pipe uses too global of a tag and conflicts with struct pipe).
diffstat:
sys/external/bsd/drm2/dist/drm/i915/i915_debugfs.c | 22 +-
sys/external/bsd/drm2/dist/drm/i915/i915_dma.c | 2 +-
sys/external/bsd/drm2/dist/drm/i915/i915_drv.h | 10 +-
sys/external/bsd/drm2/dist/drm/i915/i915_irq.c | 46 ++++----
sys/external/bsd/drm2/dist/drm/i915/i915_ums.c | 6 +-
sys/external/bsd/drm2/dist/drm/i915/intel_crt.c | 2 +-
sys/external/bsd/drm2/dist/drm/i915/intel_ddi.c | 12 +-
sys/external/bsd/drm2/dist/drm/i915/intel_display.c | 108 +++++++++---------
sys/external/bsd/drm2/dist/drm/i915/intel_dp.c | 10 +-
sys/external/bsd/drm2/dist/drm/i915/intel_drv.h | 24 ++--
sys/external/bsd/drm2/dist/drm/i915/intel_dsi.c | 4 +-
sys/external/bsd/drm2/dist/drm/i915/intel_dsi_cmd.c | 16 +-
sys/external/bsd/drm2/dist/drm/i915/intel_dvo.c | 2 +-
sys/external/bsd/drm2/dist/drm/i915/intel_hdmi.c | 2 +-
sys/external/bsd/drm2/dist/drm/i915/intel_lvds.c | 2 +-
sys/external/bsd/drm2/dist/drm/i915/intel_panel.c | 22 +-
sys/external/bsd/drm2/dist/drm/i915/intel_pm.c | 16 +-
sys/external/bsd/drm2/dist/drm/i915/intel_sdvo.c | 2 +-
sys/external/bsd/drm2/dist/drm/i915/intel_sideband.c | 4 +-
sys/external/bsd/drm2/dist/drm/i915/intel_sprite.c | 2 +-
sys/external/bsd/drm2/dist/drm/i915/intel_tv.c | 2 +-
21 files changed, 158 insertions(+), 158 deletions(-)
diffs (truncated from 1440 to 300 lines):
diff -r 501c6c1b33bd -r d28bb7af9cc6 sys/external/bsd/drm2/dist/drm/i915/i915_debugfs.c
--- a/sys/external/bsd/drm2/dist/drm/i915/i915_debugfs.c Sun Sep 07 22:24:40 2014 +0000
+++ b/sys/external/bsd/drm2/dist/drm/i915/i915_debugfs.c Sun Sep 07 23:03:11 2014 +0000
@@ -2360,7 +2360,7 @@
struct pipe_crc_info {
const char *name;
struct drm_device *dev;
- enum pipe pipe;
+ enum i915_pipe pipe;
};
static int i915_pipe_crc_open(struct inode *inode, struct file *filep)
@@ -2511,7 +2511,7 @@
};
static int i915_pipe_crc_create(struct dentry *root, struct drm_minor *minor,
- enum pipe pipe)
+ enum i915_pipe pipe)
{
struct drm_device *dev = minor->dev;
struct dentry *ent;
@@ -2585,7 +2585,7 @@
return 0;
}
-static int i9xx_pipe_crc_auto_source(struct drm_device *dev, enum pipe pipe,
+static int i9xx_pipe_crc_auto_source(struct drm_device *dev, enum i915_pipe pipe,
enum intel_pipe_crc_source *source)
{
struct intel_encoder *encoder;
@@ -2637,7 +2637,7 @@
}
static int vlv_pipe_crc_ctl_reg(struct drm_device *dev,
- enum pipe pipe,
+ enum i915_pipe pipe,
enum intel_pipe_crc_source *source,
uint32_t *val)
{
@@ -2694,7 +2694,7 @@
}
static int i9xx_pipe_crc_ctl_reg(struct drm_device *dev,
- enum pipe pipe,
+ enum i915_pipe pipe,
enum intel_pipe_crc_source *source,
uint32_t *val)
{
@@ -2770,7 +2770,7 @@
}
static void vlv_undo_pipe_scramble_reset(struct drm_device *dev,
- enum pipe pipe)
+ enum i915_pipe pipe)
{
struct drm_i915_private *dev_priv = dev->dev_private;
uint32_t tmp = I915_READ(PORT_DFT2_G4X);
@@ -2786,7 +2786,7 @@
}
static void g4x_undo_pipe_scramble_reset(struct drm_device *dev,
- enum pipe pipe)
+ enum i915_pipe pipe)
{
struct drm_i915_private *dev_priv = dev->dev_private;
uint32_t tmp = I915_READ(PORT_DFT2_G4X);
@@ -2855,7 +2855,7 @@
return 0;
}
-static int pipe_crc_set_source(struct drm_device *dev, enum pipe pipe,
+static int pipe_crc_set_source(struct drm_device *dev, enum i915_pipe pipe,
enum intel_pipe_crc_source source)
{
struct drm_i915_private *dev_priv = dev->dev_private;
@@ -2996,7 +2996,7 @@
return -EINVAL;
}
-static int display_crc_ctl_parse_pipe(const char *buf, enum pipe *pipe)
+static int display_crc_ctl_parse_pipe(const char *buf, enum i915_pipe *pipe)
{
const char name = buf[0];
@@ -3027,7 +3027,7 @@
#define N_WORDS 3
int n_words;
char *words[N_WORDS];
- enum pipe pipe;
+ enum i915_pipe pipe;
enum intel_pipe_crc_object object;
enum intel_pipe_crc_source source;
@@ -3824,7 +3824,7 @@
void intel_display_crc_init(struct drm_device *dev)
{
struct drm_i915_private *dev_priv = dev->dev_private;
- enum pipe pipe;
+ enum i915_pipe pipe;
for_each_pipe(pipe) {
struct intel_pipe_crc *pipe_crc = &dev_priv->pipe_crc[pipe];
diff -r 501c6c1b33bd -r d28bb7af9cc6 sys/external/bsd/drm2/dist/drm/i915/i915_dma.c
--- a/sys/external/bsd/drm2/dist/drm/i915/i915_dma.c Sun Sep 07 22:24:40 2014 +0000
+++ b/sys/external/bsd/drm2/dist/drm/i915/i915_dma.c Sun Sep 07 23:03:11 2014 +0000
@@ -1552,7 +1552,7 @@
{
struct drm_i915_private *dev_priv = dev->dev_private;
struct intel_device_info *info;
- enum pipe pipe;
+ enum i915_pipe pipe;
info = (struct intel_device_info *)&dev_priv->info;
diff -r 501c6c1b33bd -r d28bb7af9cc6 sys/external/bsd/drm2/dist/drm/i915/i915_drv.h
--- a/sys/external/bsd/drm2/dist/drm/i915/i915_drv.h Sun Sep 07 22:24:40 2014 +0000
+++ b/sys/external/bsd/drm2/dist/drm/i915/i915_drv.h Sun Sep 07 23:03:11 2014 +0000
@@ -56,7 +56,7 @@
#define DRIVER_DESC "Intel Graphics"
#define DRIVER_DATE "20080730"
-enum pipe {
+enum i915_pipe {
INVALID_PIPE = -1,
PIPE_A = 0,
PIPE_B,
@@ -2237,11 +2237,11 @@
extern void intel_uncore_destroy(struct drm_device *dev);
void
-i915_enable_pipestat(struct drm_i915_private *dev_priv, enum pipe pipe,
+i915_enable_pipestat(struct drm_i915_private *dev_priv, enum i915_pipe pipe,
u32 status_mask);
void
-i915_disable_pipestat(struct drm_i915_private *dev_priv, enum pipe pipe,
+i915_disable_pipestat(struct drm_i915_private *dev_priv, enum i915_pipe pipe,
u32 status_mask);
void valleyview_enable_display_irqs(struct drm_i915_private *dev_priv);
@@ -2820,8 +2820,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 pipe pipe, int reg);
-void vlv_dpio_write(struct drm_i915_private *dev_priv, enum pipe pipe, int 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 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 501c6c1b33bd -r d28bb7af9cc6 sys/external/bsd/drm2/dist/drm/i915/i915_irq.c
--- a/sys/external/bsd/drm2/dist/drm/i915/i915_irq.c Sun Sep 07 22:24:40 2014 +0000
+++ b/sys/external/bsd/drm2/dist/drm/i915/i915_irq.c Sun Sep 07 23:03:11 2014 +0000
@@ -207,7 +207,7 @@
{
struct drm_i915_private *dev_priv = dev->dev_private;
struct intel_crtc *crtc;
- enum pipe pipe;
+ enum i915_pipe pipe;
assert_spin_locked(&dev_priv->irq_lock);
@@ -224,7 +224,7 @@
static bool cpt_can_enable_serr_int(struct drm_device *dev)
{
struct drm_i915_private *dev_priv = dev->dev_private;
- enum pipe pipe;
+ enum i915_pipe pipe;
struct intel_crtc *crtc;
assert_spin_locked(&dev_priv->irq_lock);
@@ -239,7 +239,7 @@
return true;
}
-static void i9xx_clear_fifo_underrun(struct drm_device *dev, enum pipe pipe)
+static void i9xx_clear_fifo_underrun(struct drm_device *dev, enum i915_pipe pipe)
{
struct drm_i915_private *dev_priv = dev->dev_private;
u32 reg = PIPESTAT(pipe);
@@ -252,7 +252,7 @@
}
static void ironlake_set_fifo_underrun_reporting(struct drm_device *dev,
- enum pipe pipe, bool enable)
+ enum i915_pipe pipe, bool enable)
{
struct drm_i915_private *dev_priv = dev->dev_private;
uint32_t bit = (pipe == PIPE_A) ? DE_PIPEA_FIFO_UNDERRUN :
@@ -265,7 +265,7 @@
}
static void ivybridge_set_fifo_underrun_reporting(struct drm_device *dev,
- enum pipe pipe, bool enable)
+ enum i915_pipe pipe, bool enable)
{
struct drm_i915_private *dev_priv = dev->dev_private;
if (enable) {
@@ -290,7 +290,7 @@
}
static void broadwell_set_fifo_underrun_reporting(struct drm_device *dev,
- enum pipe pipe, bool enable)
+ enum i915_pipe pipe, bool enable)
{
struct drm_i915_private *dev_priv = dev->dev_private;
@@ -395,7 +395,7 @@
* Returns the previous state of underrun reporting.
*/
bool __intel_set_cpu_fifo_underrun_reporting(struct drm_device *dev,
- enum pipe pipe, bool enable)
+ enum i915_pipe pipe, bool enable)
{
struct drm_i915_private *dev_priv = dev->dev_private;
struct drm_crtc *crtc = dev_priv->pipe_to_crtc_mapping[pipe];
@@ -425,7 +425,7 @@
}
bool intel_set_cpu_fifo_underrun_reporting(struct drm_device *dev,
- enum pipe pipe, bool enable)
+ enum i915_pipe pipe, bool enable)
{
struct drm_i915_private *dev_priv = dev->dev_private;
unsigned long flags;
@@ -439,7 +439,7 @@
}
static bool __cpu_fifo_underrun_reporting_enabled(struct drm_device *dev,
- enum pipe pipe)
+ enum i915_pipe pipe)
{
struct drm_i915_private *dev_priv = dev->dev_private;
struct drm_crtc *crtc = dev_priv->pipe_to_crtc_mapping[pipe];
@@ -502,7 +502,7 @@
static void
-__i915_enable_pipestat(struct drm_i915_private *dev_priv, enum pipe pipe,
+__i915_enable_pipestat(struct drm_i915_private *dev_priv, enum i915_pipe pipe,
u32 enable_mask, u32 status_mask)
{
u32 reg = PIPESTAT(pipe);
@@ -526,7 +526,7 @@
}
static void
-__i915_disable_pipestat(struct drm_i915_private *dev_priv, enum pipe pipe,
+__i915_disable_pipestat(struct drm_i915_private *dev_priv, enum i915_pipe pipe,
u32 enable_mask, u32 status_mask)
{
u32 reg = PIPESTAT(pipe);
@@ -571,7 +571,7 @@
}
void
-i915_enable_pipestat(struct drm_i915_private *dev_priv, enum pipe pipe,
+i915_enable_pipestat(struct drm_i915_private *dev_priv, enum i915_pipe pipe,
u32 status_mask)
{
u32 enable_mask;
@@ -585,7 +585,7 @@
}
void
-i915_disable_pipestat(struct drm_i915_private *dev_priv, enum pipe pipe,
+i915_disable_pipestat(struct drm_i915_private *dev_priv, enum i915_pipe pipe,
u32 status_mask)
{
u32 enable_mask;
@@ -730,7 +730,7 @@
#define __raw_i915_read32(dev_priv__, reg__) readl((dev_priv__)->regs + (reg__))
#endif
-static bool ilk_pipe_in_vblank_locked(struct drm_device *dev, enum pipe pipe)
+static bool ilk_pipe_in_vblank_locked(struct drm_device *dev, enum i915_pipe pipe)
{
struct drm_i915_private *dev_priv = dev->dev_private;
uint32_t status;
@@ -1479,7 +1479,7 @@
}
#if defined(CONFIG_DEBUG_FS)
-static void display_pipe_crc_irq_handler(struct drm_device *dev, enum pipe pipe,
+static void display_pipe_crc_irq_handler(struct drm_device *dev, enum i915_pipe pipe,
uint32_t crc0, uint32_t crc1,
uint32_t crc2, uint32_t crc3,
uint32_t crc4)
@@ -1524,14 +1524,14 @@
}
#else
static inline void
-display_pipe_crc_irq_handler(struct drm_device *dev, enum pipe pipe,
+display_pipe_crc_irq_handler(struct drm_device *dev, enum i915_pipe pipe,
uint32_t crc0, uint32_t crc1,
uint32_t crc2, uint32_t crc3,
uint32_t crc4) {}
#endif
Home |
Main Index |
Thread Index |
Old Index