| Message ID | 1362172471-7643-25-git-send-email-jbarnes@virtuousgeek.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Fri, Mar 01, 2013 at 01:14:27PM -0800, Jesse Barnes wrote: > We need it for some DP training related bits. > > Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org> Maintainer-bikeshed: Imo having such unstatic-only patches doesn't really add value, I prefer it squashed with the new use-site (with a small comment in the commit message maybe). True bikeshed, so will merge anyway. -Daniel > --- > drivers/gpu/drm/i915/intel_display.c | 3 +-- > drivers/gpu/drm/i915/intel_drv.h | 2 ++ > 2 files changed, 3 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c > index 2559435..022349b 100644 > --- a/drivers/gpu/drm/i915/intel_display.c > +++ b/drivers/gpu/drm/i915/intel_display.c > @@ -434,8 +434,7 @@ u32 intel_dpio_read(struct drm_i915_private *dev_priv, int reg) > return I915_READ(DPIO_DATA); > } > > -static void intel_dpio_write(struct drm_i915_private *dev_priv, int reg, > - u32 val) > +void intel_dpio_write(struct drm_i915_private *dev_priv, int reg, u32 val) > { > WARN_ON(!mutex_is_locked(&dev_priv->dpio_lock)); > > diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h > index 494037d..03fdfbd 100644 > --- a/drivers/gpu/drm/i915/intel_drv.h > +++ b/drivers/gpu/drm/i915/intel_drv.h > @@ -661,6 +661,8 @@ extern int intel_sprite_get_colorkey(struct drm_device *dev, void *data, > struct drm_file *file_priv); > > extern u32 intel_dpio_read(struct drm_i915_private *dev_priv, int reg); > +extern void intel_dpio_write(struct drm_i915_private *dev_priv, int reg, > + u32 val); > > /* Power-related functions, located in intel_pm.c */ > extern void intel_init_pm(struct drm_device *dev); > -- > 1.7.9.5 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/intel-gfx
On Wed, 6 Mar 2013 20:02:43 +0100 Daniel Vetter <daniel@ffwll.ch> wrote: > On Fri, Mar 01, 2013 at 01:14:27PM -0800, Jesse Barnes wrote: > > We need it for some DP training related bits. > > > > Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org> > > Maintainer-bikeshed: Imo having such unstatic-only patches doesn't really > add value, I prefer it squashed with the new use-site (with a small > comment in the commit message maybe). True bikeshed, so will merge anyway. Yeah feel free to squash into the DP vswing/preemphasis patch, that's what needs it. Having it split out helped me with merge & rebase along the way but it's definitely not necessary...
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 2559435..022349b 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -434,8 +434,7 @@ u32 intel_dpio_read(struct drm_i915_private *dev_priv, int reg) return I915_READ(DPIO_DATA); } -static void intel_dpio_write(struct drm_i915_private *dev_priv, int reg, - u32 val) +void intel_dpio_write(struct drm_i915_private *dev_priv, int reg, u32 val) { WARN_ON(!mutex_is_locked(&dev_priv->dpio_lock)); diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h index 494037d..03fdfbd 100644 --- a/drivers/gpu/drm/i915/intel_drv.h +++ b/drivers/gpu/drm/i915/intel_drv.h @@ -661,6 +661,8 @@ extern int intel_sprite_get_colorkey(struct drm_device *dev, void *data, struct drm_file *file_priv); extern u32 intel_dpio_read(struct drm_i915_private *dev_priv, int reg); +extern void intel_dpio_write(struct drm_i915_private *dev_priv, int reg, + u32 val); /* Power-related functions, located in intel_pm.c */ extern void intel_init_pm(struct drm_device *dev);
We need it for some DP training related bits. Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org> --- drivers/gpu/drm/i915/intel_display.c | 3 +-- drivers/gpu/drm/i915/intel_drv.h | 2 ++ 2 files changed, 3 insertions(+), 2 deletions(-)