Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/external/bsd/drm/dist/shared-core change "int pipe" into...
details: https://anonhg.NetBSD.org/src/rev/2c8567270f0c
branches: trunk
changeset: 762602:2c8567270f0c
user: mrg <mrg%NetBSD.org@localhost>
date: Thu Feb 24 08:02:55 2011 +0000
description:
change "int pipe" into "unsigned int pipe".
diffstat:
sys/external/bsd/drm/dist/shared-core/i915_drm.h | 1 +
sys/external/bsd/drm/dist/shared-core/i915_drv.h | 4 ++--
sys/external/bsd/drm/dist/shared-core/i915_irq.c | 8 ++++----
3 files changed, 7 insertions(+), 6 deletions(-)
diffs (66 lines):
diff -r 87277d817fb8 -r 2c8567270f0c sys/external/bsd/drm/dist/shared-core/i915_drm.h
--- a/sys/external/bsd/drm/dist/shared-core/i915_drm.h Thu Feb 24 07:59:44 2011 +0000
+++ b/sys/external/bsd/drm/dist/shared-core/i915_drm.h Thu Feb 24 08:02:55 2011 +0000
@@ -254,6 +254,7 @@
* out there check for HAVE_I915_FLIP and so might pick up this
* version.
*/
+ /* XXXMRG: make this unsigned? */
int pipes;
} drm_i915_flip_t;
diff -r 87277d817fb8 -r 2c8567270f0c sys/external/bsd/drm/dist/shared-core/i915_drv.h
--- a/sys/external/bsd/drm/dist/shared-core/i915_drv.h Thu Feb 24 07:59:44 2011 +0000
+++ b/sys/external/bsd/drm/dist/shared-core/i915_drv.h Thu Feb 24 08:02:55 2011 +0000
@@ -440,10 +440,10 @@
struct drm_file *file_priv);
void
-i915_enable_pipestat(drm_i915_private_t *dev_priv, int pipe, u32 mask);
+i915_enable_pipestat(drm_i915_private_t *dev_priv, unsigned int pipe, u32 mask);
void
-i915_disable_pipestat(drm_i915_private_t *dev_priv, int pipe, u32 mask);
+i915_disable_pipestat(drm_i915_private_t *dev_priv, unsigned int pipe, u32 mask);
/* i915_mem.c */
diff -r 87277d817fb8 -r 2c8567270f0c sys/external/bsd/drm/dist/shared-core/i915_irq.c
--- a/sys/external/bsd/drm/dist/shared-core/i915_irq.c Thu Feb 24 07:59:44 2011 +0000
+++ b/sys/external/bsd/drm/dist/shared-core/i915_irq.c Thu Feb 24 08:02:55 2011 +0000
@@ -75,7 +75,7 @@
}
static inline u32
-i915_pipestat(int pipe)
+i915_pipestat(unsigned int pipe)
{
if (pipe == 0)
return PIPEASTAT;
@@ -85,7 +85,7 @@
}
void
-i915_enable_pipestat(drm_i915_private_t *dev_priv, int pipe, u32 mask)
+i915_enable_pipestat(drm_i915_private_t *dev_priv, unsigned int pipe, u32 mask)
{
if ((dev_priv->pipestat[pipe] & mask) != mask) {
u32 reg = i915_pipestat(pipe);
@@ -98,7 +98,7 @@
}
void
-i915_disable_pipestat(drm_i915_private_t *dev_priv, int pipe, u32 mask)
+i915_disable_pipestat(drm_i915_private_t *dev_priv, unsigned int pipe, u32 mask)
{
if ((dev_priv->pipestat[pipe] & mask) != 0) {
u32 reg = i915_pipestat(pipe);
@@ -119,7 +119,7 @@
* before reading such registers if unsure.
*/
static int
-i915_pipe_enabled(struct drm_device *dev, int pipe)
+i915_pipe_enabled(struct drm_device *dev, unsigned int pipe)
{
drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
unsigned long pipeconf = pipe ? PIPEBCONF : PIPEACONF;
Home |
Main Index |
Thread Index |
Old Index