Module Name: src Committed By: mrg Date: Thu Feb 24 08:02:55 UTC 2011
Modified Files: src/sys/external/bsd/drm/dist/shared-core: i915_drm.h i915_drv.h i915_irq.c Log Message: change "int pipe" into "unsigned int pipe". To generate a diff of this commit: cvs rdiff -u -r1.1.1.2 -r1.2 \ src/sys/external/bsd/drm/dist/shared-core/i915_drm.h cvs rdiff -u -r1.3 -r1.4 src/sys/external/bsd/drm/dist/shared-core/i915_drv.h cvs rdiff -u -r1.4 -r1.5 src/sys/external/bsd/drm/dist/shared-core/i915_irq.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/drm/dist/shared-core/i915_drm.h diff -u src/sys/external/bsd/drm/dist/shared-core/i915_drm.h:1.1.1.2 src/sys/external/bsd/drm/dist/shared-core/i915_drm.h:1.2 --- src/sys/external/bsd/drm/dist/shared-core/i915_drm.h:1.1.1.2 Fri Jun 19 03:22:24 2009 +++ src/sys/external/bsd/drm/dist/shared-core/i915_drm.h Thu Feb 24 08:02:55 2011 @@ -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; Index: src/sys/external/bsd/drm/dist/shared-core/i915_drv.h diff -u src/sys/external/bsd/drm/dist/shared-core/i915_drv.h:1.3 src/sys/external/bsd/drm/dist/shared-core/i915_drv.h:1.4 --- src/sys/external/bsd/drm/dist/shared-core/i915_drv.h:1.3 Thu Feb 24 07:59:44 2011 +++ src/sys/external/bsd/drm/dist/shared-core/i915_drv.h Thu Feb 24 08:02:55 2011 @@ -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 */ Index: src/sys/external/bsd/drm/dist/shared-core/i915_irq.c diff -u src/sys/external/bsd/drm/dist/shared-core/i915_irq.c:1.4 src/sys/external/bsd/drm/dist/shared-core/i915_irq.c:1.5 --- src/sys/external/bsd/drm/dist/shared-core/i915_irq.c:1.4 Thu Feb 24 07:59:44 2011 +++ src/sys/external/bsd/drm/dist/shared-core/i915_irq.c Thu Feb 24 08:02:55 2011 @@ -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;