[PATCH] drm/i915: Make skl_write_{plane, cursor}_wm() static

[PATCH] drm/i915: Make skl_write_{plane, cursor}_wm() static

[ville.syrjala]

From: Ville Syrjälä <ville.syrjala@linux.intel.com>

Someone forgot to make skl_write_{plane,cursor}_wm() static when
removing the prototypes from the header. Sparse isn't pleased.

Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Cc: Lyude <cpaul@redhat.com>
Cc: Matt Roper <matthew.d.roper@intel.com>
Fixes: e62929b3f628 ("drm/i915/gen9+: Program watermarks as a separate step during evasion, v3.")
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
---
 drivers/gpu/drm/i915/intel_pm.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
index bbb1eaf1e6db..d67974eb127a 100644
--- a/drivers/gpu/drm/i915/intel_pm.c
+++ b/drivers/gpu/drm/i915/intel_pm.c
@@ -3851,10 +3851,10 @@ static void skl_write_wm_level(struct drm_i915_private *dev_priv,
 	I915_WRITE(reg, val);
 }
 
-void skl_write_plane_wm(struct intel_crtc *intel_crtc,
-			const struct skl_plane_wm *wm,
-			const struct skl_ddb_allocation *ddb,
-			int plane)
+static void skl_write_plane_wm(struct intel_crtc *intel_crtc,
+			       const struct skl_plane_wm *wm,
+			       const struct skl_ddb_allocation *ddb,
+			       int plane)
 {
 	struct drm_crtc *crtc = &intel_crtc->base;
 	struct drm_device *dev = crtc->dev;
@@ -3875,9 +3875,9 @@ void skl_write_plane_wm(struct intel_crtc *intel_crtc,
 			    &ddb->y_plane[pipe][plane]);
 }
 
-void skl_write_cursor_wm(struct intel_crtc *intel_crtc,
-			 const struct skl_plane_wm *wm,
-			 const struct skl_ddb_allocation *ddb)
+static void skl_write_cursor_wm(struct intel_crtc *intel_crtc,
+				const struct skl_plane_wm *wm,
+				const struct skl_ddb_allocation *ddb)
 {
 	struct drm_crtc *crtc = &intel_crtc->base;
 	struct drm_device *dev = crtc->dev;
-- 
2.7.4

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH] drm/i915: Make skl_write_{plane, cursor}_wm() static

[Lyude Paul]

Reviewed-by: Lyude <lyude@redhat.com>

On Tue, 2016-11-22 at 22:21 +0200, ville.syrjala@linux.intel.com wrote:
> From: Ville Syrjälä <ville.syrjala@linux.intel.com>
> 
> Someone forgot to make skl_write_{plane,cursor}_wm() static when
> removing the prototypes from the header. Sparse isn't pleased.
> 
> Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
> Cc: Lyude <cpaul@redhat.com>
> Cc: Matt Roper <matthew.d.roper@intel.com>
> Fixes: e62929b3f628 ("drm/i915/gen9+: Program watermarks as a
> separate step during evasion, v3.")
> Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
> ---
>  drivers/gpu/drm/i915/intel_pm.c | 14 +++++++-------
>  1 file changed, 7 insertions(+), 7 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/intel_pm.c
> b/drivers/gpu/drm/i915/intel_pm.c
> index bbb1eaf1e6db..d67974eb127a 100644
> --- a/drivers/gpu/drm/i915/intel_pm.c
> +++ b/drivers/gpu/drm/i915/intel_pm.c
> @@ -3851,10 +3851,10 @@ static void skl_write_wm_level(struct
> drm_i915_private *dev_priv,
>  	I915_WRITE(reg, val);
>  }
>  
> -void skl_write_plane_wm(struct intel_crtc *intel_crtc,
> -			const struct skl_plane_wm *wm,
> -			const struct skl_ddb_allocation *ddb,
> -			int plane)
> +static void skl_write_plane_wm(struct intel_crtc *intel_crtc,
> +			       const struct skl_plane_wm *wm,
> +			       const struct skl_ddb_allocation *ddb,
> +			       int plane)
>  {
>  	struct drm_crtc *crtc = &intel_crtc->base;
>  	struct drm_device *dev = crtc->dev;
> @@ -3875,9 +3875,9 @@ void skl_write_plane_wm(struct intel_crtc
> *intel_crtc,
>  			    &ddb->y_plane[pipe][plane]);
>  }
>  
> -void skl_write_cursor_wm(struct intel_crtc *intel_crtc,
> -			 const struct skl_plane_wm *wm,
> -			 const struct skl_ddb_allocation *ddb)
> +static void skl_write_cursor_wm(struct intel_crtc *intel_crtc,
> +				const struct skl_plane_wm *wm,
> +				const struct skl_ddb_allocation
> *ddb)
>  {
>  	struct drm_crtc *crtc = &intel_crtc->base;
>  	struct drm_device *dev = crtc->dev;
-- 
Cheers,
	Lyude
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

✓ Fi.CI.BAT: success for drm/i915: Make skl_write_{plane, cursor}_wm() static

[Patchwork]

== Series Details ==

Series: drm/i915: Make skl_write_{plane, cursor}_wm() static
URL   : https://patchwork.freedesktop.org/series/15767/
State : success

== Summary ==

Series 15767v1 drm/i915: Make skl_write_{plane, cursor}_wm() static
https://patchwork.freedesktop.org/api/1.0/series/15767/revisions/1/mbox/

Test kms_pipe_crc_basic:
        Subgroup nonblocking-crc-pipe-a:
                dmesg-warn -> PASS       (fi-ilk-650)

fi-bdw-5557u     total:244  pass:229  dwarn:0   dfail:0   fail:0   skip:15 
fi-bsw-n3050     total:244  pass:204  dwarn:0   dfail:0   fail:0   skip:40 
fi-bxt-t5700     total:244  pass:216  dwarn:0   dfail:0   fail:0   skip:28 
fi-byt-j1900     total:244  pass:216  dwarn:0   dfail:0   fail:0   skip:28 
fi-byt-n2820     total:244  pass:212  dwarn:0   dfail:0   fail:0   skip:32 
fi-hsw-4770      total:244  pass:224  dwarn:0   dfail:0   fail:0   skip:20 
fi-hsw-4770r     total:244  pass:224  dwarn:0   dfail:0   fail:0   skip:20 
fi-ilk-650       total:244  pass:191  dwarn:0   dfail:0   fail:0   skip:53 
fi-ivb-3520m     total:244  pass:222  dwarn:0   dfail:0   fail:0   skip:22 
fi-ivb-3770      total:244  pass:222  dwarn:0   dfail:0   fail:0   skip:22 
fi-kbl-7200u     total:244  pass:222  dwarn:0   dfail:0   fail:0   skip:22 
fi-skl-6260u     total:244  pass:230  dwarn:0   dfail:0   fail:0   skip:14 
fi-skl-6700hq    total:244  pass:223  dwarn:0   dfail:0   fail:0   skip:21 
fi-skl-6700k     total:244  pass:222  dwarn:1   dfail:0   fail:0   skip:21 
fi-skl-6770hq    total:244  pass:229  dwarn:1   dfail:0   fail:0   skip:14 
fi-snb-2520m     total:244  pass:212  dwarn:0   dfail:0   fail:0   skip:32 
fi-snb-2600      total:244  pass:211  dwarn:0   dfail:0   fail:0   skip:33 

b34f27e00c9a21d2078062da760e24fd4a620391 drm-intel-nightly: 2016y-11m-22d-17h-42m-39s UTC integration manifest
410252c drm/i915: Make skl_write_{plane, cursor}_wm() static

== Logs ==

For more details see: https://intel-gfx-ci.01.org/CI/Patchwork_3084/
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH] drm/i915: Make skl_write_{plane, cursor}_wm() static

[Maarten Lankhorst]

Op 22-11-16 om 21:28 schreef Lyude Paul:
> Reviewed-by: Lyude <lyude@redhat.com>
>
> On Tue, 2016-11-22 at 22:21 +0200, ville.syrjala@linux.intel.com wrote:
>> From: Ville Syrjälä <ville.syrjala@linux.intel.com>
>>
>> Someone forgot to make skl_write_{plane,cursor}_wm() static when
>> removing the prototypes from the header. Sparse isn't pleased.
>>
>> Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
>> Cc: Lyude <cpaul@redhat.com>
>> Cc: Matt Roper <matthew.d.roper@intel.com>
>> Fixes: e62929b3f628 ("drm/i915/gen9+: Program watermarks as a
>> separate step during evasion, v3.")
>> Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
>> ---
>>  drivers/gpu/drm/i915/intel_pm.c | 14 +++++++-------
>>  1 file changed, 7 insertions(+), 7 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/i915/intel_pm.c
>> b/drivers/gpu/drm/i915/intel_pm.c
>> index bbb1eaf1e6db..d67974eb127a 100644
>> --- a/drivers/gpu/drm/i915/intel_pm.c
>> +++ b/drivers/gpu/drm/i915/intel_pm.c
>> @@ -3851,10 +3851,10 @@ static void skl_write_wm_level(struct
>> drm_i915_private *dev_priv,
>>  	I915_WRITE(reg, val);
>>  }
>>  
>> -void skl_write_plane_wm(struct intel_crtc *intel_crtc,
>> -			const struct skl_plane_wm *wm,
>> -			const struct skl_ddb_allocation *ddb,
>> -			int plane)
>> +static void skl_write_plane_wm(struct intel_crtc *intel_crtc,
>> +			       const struct skl_plane_wm *wm,
>> +			       const struct skl_ddb_allocation *ddb,
>> +			       int plane)
>>  {
>>  	struct drm_crtc *crtc = &intel_crtc->base;
>>  	struct drm_device *dev = crtc->dev;
>> @@ -3875,9 +3875,9 @@ void skl_write_plane_wm(struct intel_crtc
>> *intel_crtc,
>>  			    &ddb->y_plane[pipe][plane]);
>>  }
>>  
>> -void skl_write_cursor_wm(struct intel_crtc *intel_crtc,
>> -			 const struct skl_plane_wm *wm,
>> -			 const struct skl_ddb_allocation *ddb)
>> +static void skl_write_cursor_wm(struct intel_crtc *intel_crtc,
>> +				const struct skl_plane_wm *wm,
>> +				const struct skl_ddb_allocation
>> *ddb)
>>  {
>>  	struct drm_crtc *crtc = &intel_crtc->base;
>>  	struct drm_device *dev = crtc->dev;

Mea-culpa!

Reviewed-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH] drm/i915: Make skl_write_{plane, cursor}_wm() static

[Ville Syrjälä]

On Wed, Nov 23, 2016 at 11:15:45AM +0100, Maarten Lankhorst wrote:
> Op 22-11-16 om 21:28 schreef Lyude Paul:
> > Reviewed-by: Lyude <lyude@redhat.com>
> >
> > On Tue, 2016-11-22 at 22:21 +0200, ville.syrjala@linux.intel.com wrote:
> >> From: Ville Syrjälä <ville.syrjala@linux.intel.com>
> >>
> >> Someone forgot to make skl_write_{plane,cursor}_wm() static when
> >> removing the prototypes from the header. Sparse isn't pleased.
> >>
> >> Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
> >> Cc: Lyude <cpaul@redhat.com>
> >> Cc: Matt Roper <matthew.d.roper@intel.com>
> >> Fixes: e62929b3f628 ("drm/i915/gen9+: Program watermarks as a
> >> separate step during evasion, v3.")
> >> Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
> >> ---
> >>  drivers/gpu/drm/i915/intel_pm.c | 14 +++++++-------
> >>  1 file changed, 7 insertions(+), 7 deletions(-)
> >>
> >> diff --git a/drivers/gpu/drm/i915/intel_pm.c
> >> b/drivers/gpu/drm/i915/intel_pm.c
> >> index bbb1eaf1e6db..d67974eb127a 100644
> >> --- a/drivers/gpu/drm/i915/intel_pm.c
> >> +++ b/drivers/gpu/drm/i915/intel_pm.c
> >> @@ -3851,10 +3851,10 @@ static void skl_write_wm_level(struct
> >> drm_i915_private *dev_priv,
> >>  	I915_WRITE(reg, val);
> >>  }
> >>  
> >> -void skl_write_plane_wm(struct intel_crtc *intel_crtc,
> >> -			const struct skl_plane_wm *wm,
> >> -			const struct skl_ddb_allocation *ddb,
> >> -			int plane)
> >> +static void skl_write_plane_wm(struct intel_crtc *intel_crtc,
> >> +			       const struct skl_plane_wm *wm,
> >> +			       const struct skl_ddb_allocation *ddb,
> >> +			       int plane)
> >>  {
> >>  	struct drm_crtc *crtc = &intel_crtc->base;
> >>  	struct drm_device *dev = crtc->dev;
> >> @@ -3875,9 +3875,9 @@ void skl_write_plane_wm(struct intel_crtc
> >> *intel_crtc,
> >>  			    &ddb->y_plane[pipe][plane]);
> >>  }
> >>  
> >> -void skl_write_cursor_wm(struct intel_crtc *intel_crtc,
> >> -			 const struct skl_plane_wm *wm,
> >> -			 const struct skl_ddb_allocation *ddb)
> >> +static void skl_write_cursor_wm(struct intel_crtc *intel_crtc,
> >> +				const struct skl_plane_wm *wm,
> >> +				const struct skl_ddb_allocation
> >> *ddb)
> >>  {
> >>  	struct drm_crtc *crtc = &intel_crtc->base;
> >>  	struct drm_device *dev = crtc->dev;
> 
> Mea-culpa!
> 
> Reviewed-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>

Pushed to dinq. Thanks for the reviews.

-- 
Ville Syrjälä
Intel OTC
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx