[PATCH] drm/i915: Make intel_resume_power_well() static

[PATCH] drm/i915: Make intel_resume_power_well() static

[Damien Lespiau]

Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>
---
 drivers/gpu/drm/i915/intel_drv.h | 1 -
 drivers/gpu/drm/i915/intel_pm.c  | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
index a17a86a..e6db0c6 100644
--- a/drivers/gpu/drm/i915/intel_drv.h
+++ b/drivers/gpu/drm/i915/intel_drv.h
@@ -798,7 +798,6 @@ void intel_display_power_put(struct drm_device *dev,
 			     enum intel_display_power_domain domain);
 void intel_init_power_well(struct drm_device *dev);
 void intel_set_power_well(struct drm_device *dev, bool enable);
-void intel_resume_power_well(struct drm_device *dev);
 void intel_enable_gt_powersave(struct drm_device *dev);
 void intel_disable_gt_powersave(struct drm_device *dev);
 void ironlake_teardown_rc6(struct drm_device *dev);
diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
index 10054b5..698257c 100644
--- a/drivers/gpu/drm/i915/intel_pm.c
+++ b/drivers/gpu/drm/i915/intel_pm.c
@@ -5512,7 +5512,7 @@ void intel_set_power_well(struct drm_device *dev, bool enable)
 	spin_unlock_irq(&power_well->lock);
 }
 
-void intel_resume_power_well(struct drm_device *dev)
+static void intel_resume_power_well(struct drm_device *dev)
 {
 	struct drm_i915_private *dev_priv = dev->dev_private;
 	struct i915_power_well *power_well = &dev_priv->power_well;
-- 
1.8.3.1

Re: [PATCH] drm/i915: Make intel_resume_power_well() static

[Ville Syrjälä]

On Sat, Sep 28, 2013 at 04:46:56PM +0100, Damien Lespiau wrote:
> Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>

Not sure why I made it non-static in the first place.

Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>

> ---
>  drivers/gpu/drm/i915/intel_drv.h | 1 -
>  drivers/gpu/drm/i915/intel_pm.c  | 2 +-
>  2 files changed, 1 insertion(+), 2 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
> index a17a86a..e6db0c6 100644
> --- a/drivers/gpu/drm/i915/intel_drv.h
> +++ b/drivers/gpu/drm/i915/intel_drv.h
> @@ -798,7 +798,6 @@ void intel_display_power_put(struct drm_device *dev,
>  			     enum intel_display_power_domain domain);
>  void intel_init_power_well(struct drm_device *dev);
>  void intel_set_power_well(struct drm_device *dev, bool enable);
> -void intel_resume_power_well(struct drm_device *dev);
>  void intel_enable_gt_powersave(struct drm_device *dev);
>  void intel_disable_gt_powersave(struct drm_device *dev);
>  void ironlake_teardown_rc6(struct drm_device *dev);
> diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
> index 10054b5..698257c 100644
> --- a/drivers/gpu/drm/i915/intel_pm.c
> +++ b/drivers/gpu/drm/i915/intel_pm.c
> @@ -5512,7 +5512,7 @@ void intel_set_power_well(struct drm_device *dev, bool enable)
>  	spin_unlock_irq(&power_well->lock);
>  }
>  
> -void intel_resume_power_well(struct drm_device *dev)
> +static void intel_resume_power_well(struct drm_device *dev)
>  {
>  	struct drm_i915_private *dev_priv = dev->dev_private;
>  	struct i915_power_well *power_well = &dev_priv->power_well;
> -- 
> 1.8.3.1
> 
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx

-- 
Ville Syrjälä
Intel OTC

Re: [PATCH] drm/i915: Make intel_resume_power_well() static

[Daniel Vetter]

On Tue, Oct 01, 2013 at 12:14:57AM +0300, Ville Syrjälä wrote:
> On Sat, Sep 28, 2013 at 04:46:56PM +0100, Damien Lespiau wrote:
> > Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>
> 
> Not sure why I made it non-static in the first place.
> 
> Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>

Queued for -next, thanks for the patch.
-Daniel
-- 
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch