2019-04-13 14:17:31

by Yue Haibing

Subject: [PATCH -next] drm/meson: Make some functions static

From: YueHaibing <[email protected]>

Fix sparse warnings:

drivers/gpu/drm/meson/meson_viu.c:93:6: warning: symbol 'meson_viu_set_g12a_osd1_matrix' was not declared. Should it be static?
drivers/gpu/drm/meson/meson_viu.c:121:6: warning: symbol 'meson_viu_set_osd_matrix' was not declared. Should it be static?
drivers/gpu/drm/meson/meson_viu.c:190:6: warning: symbol 'meson_viu_set_osd_lut' was not declared. Should it be static?

Signed-off-by: YueHaibing <[email protected]>
---
drivers/gpu/drm/meson/meson_viu.c | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/drivers/gpu/drm/meson/meson_viu.c b/drivers/gpu/drm/meson/meson_viu.c
index 0169c98..b590723 100644
--- a/drivers/gpu/drm/meson/meson_viu.c
+++ b/drivers/gpu/drm/meson/meson_viu.c
@@ -90,8 +90,8 @@ static int eotf_bypass_coeff[EOTF_COEFF_SIZE] = {
EOTF_COEFF_RIGHTSHIFT /* right shift */
};

-void meson_viu_set_g12a_osd1_matrix(struct meson_drm *priv, int *m,
- bool csc_on)
+static void meson_viu_set_g12a_osd1_matrix(struct meson_drm *priv,
+ int *m, bool csc_on)
{
/* VPP WRAP OSD1 matrix */
writel(((m[0] & 0xfff) << 16) | (m[1] & 0xfff),
@@ -118,8 +118,8 @@ void meson_viu_set_g12a_osd1_matrix(struct meson_drm *priv, int *m,
priv->io_base + _REG(VPP_WRAP_OSD1_MATRIX_EN_CTRL));
}

-void meson_viu_set_osd_matrix(struct meson_drm *priv,
- enum viu_matrix_sel_e m_select,
+static void meson_viu_set_osd_matrix(struct meson_drm *priv,
+ enum viu_matrix_sel_e m_select,
int *m, bool csc_on)
{
if (m_select == VIU_MATRIX_OSD) {
@@ -187,10 +187,10 @@ void meson_viu_set_osd_matrix(struct meson_drm *priv,
#define OSD_EOTF_LUT_SIZE 33
#define OSD_OETF_LUT_SIZE 41

-void meson_viu_set_osd_lut(struct meson_drm *priv, enum viu_lut_sel_e lut_sel,
- unsigned int *r_map, unsigned int *g_map,
- unsigned int *b_map,
- bool csc_on)
+static void
+meson_viu_set_osd_lut(struct meson_drm *priv, enum viu_lut_sel_e lut_sel,
+ unsigned int *r_map, unsigned int *g_map,
+ unsigned int *b_map, bool csc_on)
{
unsigned int addr_port;
unsigned int data_port;
--
2.7.4

2019-04-16 11:25:01

by Neil Armstrong

Subject: Re: [PATCH -next] drm/meson: Make some functions static

Le 13/04/2019 16:14, Yue Haibing a ?crit :
> From: YueHaibing <[email protected]>
>
> Fix sparse warnings:
>
> drivers/gpu/drm/meson/meson_viu.c:93:6: warning: symbol 'meson_viu_set_g12a_osd1_matrix' was not declared. Should it be static?
> drivers/gpu/drm/meson/meson_viu.c:121:6: warning: symbol 'meson_viu_set_osd_matrix' was not declared. Should it be static?
> drivers/gpu/drm/meson/meson_viu.c:190:6: warning: symbol 'meson_viu_set_osd_lut' was not declared. Should it be static?
>
> Signed-off-by: YueHaibing <[email protected]>
> ---
> drivers/gpu/drm/meson/meson_viu.c | 16 ++++++++--------
> 1 file changed, 8 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/gpu/drm/meson/meson_viu.c b/drivers/gpu/drm/meson/meson_viu.c
> index 0169c98..b590723 100644
> --- a/drivers/gpu/drm/meson/meson_viu.c
> +++ b/drivers/gpu/drm/meson/meson_viu.c
> @@ -90,8 +90,8 @@ static int eotf_bypass_coeff[EOTF_COEFF_SIZE] = {
> EOTF_COEFF_RIGHTSHIFT /* right shift */
> };
>
> -void meson_viu_set_g12a_osd1_matrix(struct meson_drm *priv, int *m,
> - bool csc_on)
> +static void meson_viu_set_g12a_osd1_matrix(struct meson_drm *priv,
> + int *m, bool csc_on)
> {
> /* VPP WRAP OSD1 matrix */
> writel(((m[0] & 0xfff) << 16) | (m[1] & 0xfff),
> @@ -118,8 +118,8 @@ void meson_viu_set_g12a_osd1_matrix(struct meson_drm *priv, int *m,
> priv->io_base + _REG(VPP_WRAP_OSD1_MATRIX_EN_CTRL));
> }
>
> -void meson_viu_set_osd_matrix(struct meson_drm *priv,
> - enum viu_matrix_sel_e m_select,
> +static void meson_viu_set_osd_matrix(struct meson_drm *priv,
> + enum viu_matrix_sel_e m_select,
> int *m, bool csc_on)
> {
> if (m_select == VIU_MATRIX_OSD) {
> @@ -187,10 +187,10 @@ void meson_viu_set_osd_matrix(struct meson_drm *priv,
> #define OSD_EOTF_LUT_SIZE 33
> #define OSD_OETF_LUT_SIZE 41
>
> -void meson_viu_set_osd_lut(struct meson_drm *priv, enum viu_lut_sel_e lut_sel,
> - unsigned int *r_map, unsigned int *g_map,
> - unsigned int *b_map,
> - bool csc_on)
> +static void
> +meson_viu_set_osd_lut(struct meson_drm *priv, enum viu_lut_sel_e lut_sel,
> + unsigned int *r_map, unsigned int *g_map,
> + unsigned int *b_map, bool csc_on)
> {
> unsigned int addr_port;
> unsigned int data_port;
>

Acked-by: Neil Armstrong <[email protected]>

2019-04-17 18:27:49

by Neil Armstrong

Subject: Re: [PATCH -next] drm/meson: Make some functions static

On 16/04/2019 13:23, Neil Armstrong wrote:
>
>
> Le 13/04/2019 16:14, Yue Haibing a écrit :
>> From: YueHaibing <[email protected]>
>>
>> Fix sparse warnings:
>>
>> drivers/gpu/drm/meson/meson_viu.c:93:6: warning: symbol 'meson_viu_set_g12a_osd1_matrix' was not declared. Should it be static?
>> drivers/gpu/drm/meson/meson_viu.c:121:6: warning: symbol 'meson_viu_set_osd_matrix' was not declared. Should it be static?
>> drivers/gpu/drm/meson/meson_viu.c:190:6: warning: symbol 'meson_viu_set_osd_lut' was not declared. Should it be static?
>>
>> Signed-off-by: YueHaibing <[email protected]>
>> ---
>> drivers/gpu/drm/meson/meson_viu.c | 16 ++++++++--------
>> 1 file changed, 8 insertions(+), 8 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/meson/meson_viu.c b/drivers/gpu/drm/meson/meson_viu.c
>> index 0169c98..b590723 100644
>> --- a/drivers/gpu/drm/meson/meson_viu.c
>> +++ b/drivers/gpu/drm/meson/meson_viu.c
>> @@ -90,8 +90,8 @@ static int eotf_bypass_coeff[EOTF_COEFF_SIZE] = {
>> EOTF_COEFF_RIGHTSHIFT /* right shift */
>> };
>>
>> -void meson_viu_set_g12a_osd1_matrix(struct meson_drm *priv, int *m,
>> - bool csc_on)
>> +static void meson_viu_set_g12a_osd1_matrix(struct meson_drm *priv,
>> + int *m, bool csc_on)
>> {
>> /* VPP WRAP OSD1 matrix */
>> writel(((m[0] & 0xfff) << 16) | (m[1] & 0xfff),
>> @@ -118,8 +118,8 @@ void meson_viu_set_g12a_osd1_matrix(struct meson_drm *priv, int *m,
>> priv->io_base + _REG(VPP_WRAP_OSD1_MATRIX_EN_CTRL));
>> }
>>
>> -void meson_viu_set_osd_matrix(struct meson_drm *priv,
>> - enum viu_matrix_sel_e m_select,
>> +static void meson_viu_set_osd_matrix(struct meson_drm *priv,
>> + enum viu_matrix_sel_e m_select,
>> int *m, bool csc_on)
>> {
>> if (m_select == VIU_MATRIX_OSD) {
>> @@ -187,10 +187,10 @@ void meson_viu_set_osd_matrix(struct meson_drm *priv,
>> #define OSD_EOTF_LUT_SIZE 33
>> #define OSD_OETF_LUT_SIZE 41
>>
>> -void meson_viu_set_osd_lut(struct meson_drm *priv, enum viu_lut_sel_e lut_sel,
>> - unsigned int *r_map, unsigned int *g_map,
>> - unsigned int *b_map,
>> - bool csc_on)
>> +static void
>> +meson_viu_set_osd_lut(struct meson_drm *priv, enum viu_lut_sel_e lut_sel,
>> + unsigned int *r_map, unsigned int *g_map,
>> + unsigned int *b_map, bool csc_on)
>> {
>> unsigned int addr_port;
>> unsigned int data_port;
>>
>
> Acked-by: Neil Armstrong <[email protected]>
>

Applied to drm-misc-next, thanks