drm/fb-helper: Unexport cmdline helpers
diff mbox series

Message ID 20190607185211.25040-1-daniel.vetter@ffwll.ch
State New
Headers show
Series
  • drm/fb-helper: Unexport cmdline helpers
Related show

Commit Message

Daniel Vetter June 7, 2019, 6:52 p.m. UTC
No longer needed since the i915 initial config logic was pulled into
the shared helper by Noralf.

Spotted while reviewing patches from Ville.

Cc: Noralf Trønnes <noralf@tronnes.org>
Cc: Ville Syrjala <ville.syrjala@linux.intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
---
 drivers/gpu/drm/drm_fb_helper.c | 9 +++++----
 include/drm/drm_fb_helper.h     | 5 -----
 2 files changed, 5 insertions(+), 9 deletions(-)

Comments

Noralf Trønnes June 8, 2019, 3:41 p.m. UTC | #1
Den 07.06.2019 20.52, skrev Daniel Vetter:
> No longer needed since the i915 initial config logic was pulled into
> the shared helper by Noralf.
> 

I'm fixing this when I move the modeset code to drm_client. I hope I can
apply the remaining bits this week (sent a v8). The CI gave me a failure
on v7 and the trybot has given me weird/changing failures this week when
I have tried to find which patch it chokes on. I don't think there's any
wrong with the patchset since it has been cleared by the CI several
times, and the patches in question has not been changed. Well, we'll see.

Noralf.

> Spotted while reviewing patches from Ville.
> 
> Cc: Noralf Trønnes <noralf@tronnes.org>
> Cc: Ville Syrjala <ville.syrjala@linux.intel.com>
> Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
> ---
>  drivers/gpu/drm/drm_fb_helper.c | 9 +++++----
>  include/drm/drm_fb_helper.h     | 5 -----
>  2 files changed, 5 insertions(+), 9 deletions(-)
> 
> diff --git a/drivers/gpu/drm/drm_fb_helper.c b/drivers/gpu/drm/drm_fb_helper.c
> index b9b7c06cbc4f..95079d5c07b8 100644
> --- a/drivers/gpu/drm/drm_fb_helper.c
> +++ b/drivers/gpu/drm/drm_fb_helper.c
> @@ -2138,7 +2138,9 @@ static int drm_fb_helper_probe_connector_modes(struct drm_fb_helper *fb_helper,
>  	return count;
>  }
>  
> -struct drm_display_mode *drm_has_preferred_mode(struct drm_fb_helper_connector *fb_connector, int width, int height)
> +static struct drm_display_mode *
> +drm_has_preferred_mode(struct drm_fb_helper_connector *fb_connector,
> +		       int width, int height)
>  {
>  	struct drm_display_mode *mode;
>  
> @@ -2151,14 +2153,14 @@ struct drm_display_mode *drm_has_preferred_mode(struct drm_fb_helper_connector *
>  	}
>  	return NULL;
>  }
> -EXPORT_SYMBOL(drm_has_preferred_mode);
>  
>  static bool drm_has_cmdline_mode(struct drm_fb_helper_connector *fb_connector)
>  {
>  	return fb_connector->connector->cmdline_mode.specified;
>  }
>  
> -struct drm_display_mode *drm_pick_cmdline_mode(struct drm_fb_helper_connector *fb_helper_conn)
> +static struct drm_display_mode *
> +drm_pick_cmdline_mode(struct drm_fb_helper_connector *fb_helper_conn)
>  {
>  	struct drm_cmdline_mode *cmdline_mode;
>  	struct drm_display_mode *mode;
> @@ -2208,7 +2210,6 @@ struct drm_display_mode *drm_pick_cmdline_mode(struct drm_fb_helper_connector *f
>  	list_add(&mode->head, &fb_helper_conn->connector->modes);
>  	return mode;
>  }
> -EXPORT_SYMBOL(drm_pick_cmdline_mode);
>  
>  static bool drm_connector_enabled(struct drm_connector *connector, bool strict)
>  {
> diff --git a/include/drm/drm_fb_helper.h b/include/drm/drm_fb_helper.h
> index 6b334f4d8a22..5a7e5d131913 100644
> --- a/include/drm/drm_fb_helper.h
> +++ b/include/drm/drm_fb_helper.h
> @@ -289,11 +289,6 @@ int drm_fb_helper_initial_config(struct drm_fb_helper *fb_helper, int bpp_sel);
>  int drm_fb_helper_single_add_all_connectors(struct drm_fb_helper *fb_helper);
>  int drm_fb_helper_debug_enter(struct fb_info *info);
>  int drm_fb_helper_debug_leave(struct fb_info *info);
> -struct drm_display_mode *
> -drm_has_preferred_mode(struct drm_fb_helper_connector *fb_connector,
> -			int width, int height);
> -struct drm_display_mode *
> -drm_pick_cmdline_mode(struct drm_fb_helper_connector *fb_helper_conn);
>  
>  int drm_fb_helper_add_one_connector(struct drm_fb_helper *fb_helper, struct drm_connector *connector);
>  int drm_fb_helper_remove_one_connector(struct drm_fb_helper *fb_helper,
>
Daniel Vetter June 11, 2019, 8:06 a.m. UTC | #2
On Sat, Jun 08, 2019 at 05:41:49PM +0200, Noralf Trønnes wrote:
> 
> 
> Den 07.06.2019 20.52, skrev Daniel Vetter:
> > No longer needed since the i915 initial config logic was pulled into
> > the shared helper by Noralf.
> > 
> 
> I'm fixing this when I move the modeset code to drm_client. I hope I can
> apply the remaining bits this week (sent a v8). The CI gave me a failure
> on v7 and the trybot has given me weird/changing failures this week when
> I have tried to find which patch it chokes on. I don't think there's any
> wrong with the patchset since it has been cleared by the CI several
> times, and the patches in question has not been changed. Well, we'll see.

CI is having a bit a bad time right now, tbh I'd say go ahead. With your
current patchset I'm not seeing anything that could affect i915 much.

And yeah I can just wait and throw this one out from my patch pile when
your stuff has landed.
-Daniel

 
> Noralf.
> 
> > Spotted while reviewing patches from Ville.
> > 
> > Cc: Noralf Trønnes <noralf@tronnes.org>
> > Cc: Ville Syrjala <ville.syrjala@linux.intel.com>
> > Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
> > ---
> >  drivers/gpu/drm/drm_fb_helper.c | 9 +++++----
> >  include/drm/drm_fb_helper.h     | 5 -----
> >  2 files changed, 5 insertions(+), 9 deletions(-)
> > 
> > diff --git a/drivers/gpu/drm/drm_fb_helper.c b/drivers/gpu/drm/drm_fb_helper.c
> > index b9b7c06cbc4f..95079d5c07b8 100644
> > --- a/drivers/gpu/drm/drm_fb_helper.c
> > +++ b/drivers/gpu/drm/drm_fb_helper.c
> > @@ -2138,7 +2138,9 @@ static int drm_fb_helper_probe_connector_modes(struct drm_fb_helper *fb_helper,
> >  	return count;
> >  }
> >  
> > -struct drm_display_mode *drm_has_preferred_mode(struct drm_fb_helper_connector *fb_connector, int width, int height)
> > +static struct drm_display_mode *
> > +drm_has_preferred_mode(struct drm_fb_helper_connector *fb_connector,
> > +		       int width, int height)
> >  {
> >  	struct drm_display_mode *mode;
> >  
> > @@ -2151,14 +2153,14 @@ struct drm_display_mode *drm_has_preferred_mode(struct drm_fb_helper_connector *
> >  	}
> >  	return NULL;
> >  }
> > -EXPORT_SYMBOL(drm_has_preferred_mode);
> >  
> >  static bool drm_has_cmdline_mode(struct drm_fb_helper_connector *fb_connector)
> >  {
> >  	return fb_connector->connector->cmdline_mode.specified;
> >  }
> >  
> > -struct drm_display_mode *drm_pick_cmdline_mode(struct drm_fb_helper_connector *fb_helper_conn)
> > +static struct drm_display_mode *
> > +drm_pick_cmdline_mode(struct drm_fb_helper_connector *fb_helper_conn)
> >  {
> >  	struct drm_cmdline_mode *cmdline_mode;
> >  	struct drm_display_mode *mode;
> > @@ -2208,7 +2210,6 @@ struct drm_display_mode *drm_pick_cmdline_mode(struct drm_fb_helper_connector *f
> >  	list_add(&mode->head, &fb_helper_conn->connector->modes);
> >  	return mode;
> >  }
> > -EXPORT_SYMBOL(drm_pick_cmdline_mode);
> >  
> >  static bool drm_connector_enabled(struct drm_connector *connector, bool strict)
> >  {
> > diff --git a/include/drm/drm_fb_helper.h b/include/drm/drm_fb_helper.h
> > index 6b334f4d8a22..5a7e5d131913 100644
> > --- a/include/drm/drm_fb_helper.h
> > +++ b/include/drm/drm_fb_helper.h
> > @@ -289,11 +289,6 @@ int drm_fb_helper_initial_config(struct drm_fb_helper *fb_helper, int bpp_sel);
> >  int drm_fb_helper_single_add_all_connectors(struct drm_fb_helper *fb_helper);
> >  int drm_fb_helper_debug_enter(struct fb_info *info);
> >  int drm_fb_helper_debug_leave(struct fb_info *info);
> > -struct drm_display_mode *
> > -drm_has_preferred_mode(struct drm_fb_helper_connector *fb_connector,
> > -			int width, int height);
> > -struct drm_display_mode *
> > -drm_pick_cmdline_mode(struct drm_fb_helper_connector *fb_helper_conn);
> >  
> >  int drm_fb_helper_add_one_connector(struct drm_fb_helper *fb_helper, struct drm_connector *connector);
> >  int drm_fb_helper_remove_one_connector(struct drm_fb_helper *fb_helper,
> >
Noralf Trønnes June 11, 2019, 1:12 p.m. UTC | #3
Den 11.06.2019 10.06, skrev Daniel Vetter:
> On Sat, Jun 08, 2019 at 05:41:49PM +0200, Noralf Trønnes wrote:
>>
>>
>> Den 07.06.2019 20.52, skrev Daniel Vetter:
>>> No longer needed since the i915 initial config logic was pulled into
>>> the shared helper by Noralf.
>>>
>>
>> I'm fixing this when I move the modeset code to drm_client. I hope I can
>> apply the remaining bits this week (sent a v8). The CI gave me a failure
>> on v7 and the trybot has given me weird/changing failures this week when
>> I have tried to find which patch it chokes on. I don't think there's any
>> wrong with the patchset since it has been cleared by the CI several
>> times, and the patches in question has not been changed. Well, we'll see.
> 
> CI is having a bit a bad time right now, tbh I'd say go ahead. With your
> current patchset I'm not seeing anything that could affect i915 much.
> 

Ah that explains my conflicting CI results. Anyway the CI agreed now so
I have applied the patches before it changes its mind :-)

Noralf.

> And yeah I can just wait and throw this one out from my patch pile when
> your stuff has landed.
> -Daniel
> 
>  
>> Noralf.
>>
>>> Spotted while reviewing patches from Ville.
>>>
>>> Cc: Noralf Trønnes <noralf@tronnes.org>
>>> Cc: Ville Syrjala <ville.syrjala@linux.intel.com>
>>> Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
>>> ---
>>>  drivers/gpu/drm/drm_fb_helper.c | 9 +++++----
>>>  include/drm/drm_fb_helper.h     | 5 -----
>>>  2 files changed, 5 insertions(+), 9 deletions(-)
>>>
>>> diff --git a/drivers/gpu/drm/drm_fb_helper.c b/drivers/gpu/drm/drm_fb_helper.c
>>> index b9b7c06cbc4f..95079d5c07b8 100644
>>> --- a/drivers/gpu/drm/drm_fb_helper.c
>>> +++ b/drivers/gpu/drm/drm_fb_helper.c
>>> @@ -2138,7 +2138,9 @@ static int drm_fb_helper_probe_connector_modes(struct drm_fb_helper *fb_helper,
>>>  	return count;
>>>  }
>>>  
>>> -struct drm_display_mode *drm_has_preferred_mode(struct drm_fb_helper_connector *fb_connector, int width, int height)
>>> +static struct drm_display_mode *
>>> +drm_has_preferred_mode(struct drm_fb_helper_connector *fb_connector,
>>> +		       int width, int height)
>>>  {
>>>  	struct drm_display_mode *mode;
>>>  
>>> @@ -2151,14 +2153,14 @@ struct drm_display_mode *drm_has_preferred_mode(struct drm_fb_helper_connector *
>>>  	}
>>>  	return NULL;
>>>  }
>>> -EXPORT_SYMBOL(drm_has_preferred_mode);
>>>  
>>>  static bool drm_has_cmdline_mode(struct drm_fb_helper_connector *fb_connector)
>>>  {
>>>  	return fb_connector->connector->cmdline_mode.specified;
>>>  }
>>>  
>>> -struct drm_display_mode *drm_pick_cmdline_mode(struct drm_fb_helper_connector *fb_helper_conn)
>>> +static struct drm_display_mode *
>>> +drm_pick_cmdline_mode(struct drm_fb_helper_connector *fb_helper_conn)
>>>  {
>>>  	struct drm_cmdline_mode *cmdline_mode;
>>>  	struct drm_display_mode *mode;
>>> @@ -2208,7 +2210,6 @@ struct drm_display_mode *drm_pick_cmdline_mode(struct drm_fb_helper_connector *f
>>>  	list_add(&mode->head, &fb_helper_conn->connector->modes);
>>>  	return mode;
>>>  }
>>> -EXPORT_SYMBOL(drm_pick_cmdline_mode);
>>>  
>>>  static bool drm_connector_enabled(struct drm_connector *connector, bool strict)
>>>  {
>>> diff --git a/include/drm/drm_fb_helper.h b/include/drm/drm_fb_helper.h
>>> index 6b334f4d8a22..5a7e5d131913 100644
>>> --- a/include/drm/drm_fb_helper.h
>>> +++ b/include/drm/drm_fb_helper.h
>>> @@ -289,11 +289,6 @@ int drm_fb_helper_initial_config(struct drm_fb_helper *fb_helper, int bpp_sel);
>>>  int drm_fb_helper_single_add_all_connectors(struct drm_fb_helper *fb_helper);
>>>  int drm_fb_helper_debug_enter(struct fb_info *info);
>>>  int drm_fb_helper_debug_leave(struct fb_info *info);
>>> -struct drm_display_mode *
>>> -drm_has_preferred_mode(struct drm_fb_helper_connector *fb_connector,
>>> -			int width, int height);
>>> -struct drm_display_mode *
>>> -drm_pick_cmdline_mode(struct drm_fb_helper_connector *fb_helper_conn);
>>>  
>>>  int drm_fb_helper_add_one_connector(struct drm_fb_helper *fb_helper, struct drm_connector *connector);
>>>  int drm_fb_helper_remove_one_connector(struct drm_fb_helper *fb_helper,
>>>
>

Patch
diff mbox series

diff --git a/drivers/gpu/drm/drm_fb_helper.c b/drivers/gpu/drm/drm_fb_helper.c
index b9b7c06cbc4f..95079d5c07b8 100644
--- a/drivers/gpu/drm/drm_fb_helper.c
+++ b/drivers/gpu/drm/drm_fb_helper.c
@@ -2138,7 +2138,9 @@  static int drm_fb_helper_probe_connector_modes(struct drm_fb_helper *fb_helper,
 	return count;
 }
 
-struct drm_display_mode *drm_has_preferred_mode(struct drm_fb_helper_connector *fb_connector, int width, int height)
+static struct drm_display_mode *
+drm_has_preferred_mode(struct drm_fb_helper_connector *fb_connector,
+		       int width, int height)
 {
 	struct drm_display_mode *mode;
 
@@ -2151,14 +2153,14 @@  struct drm_display_mode *drm_has_preferred_mode(struct drm_fb_helper_connector *
 	}
 	return NULL;
 }
-EXPORT_SYMBOL(drm_has_preferred_mode);
 
 static bool drm_has_cmdline_mode(struct drm_fb_helper_connector *fb_connector)
 {
 	return fb_connector->connector->cmdline_mode.specified;
 }
 
-struct drm_display_mode *drm_pick_cmdline_mode(struct drm_fb_helper_connector *fb_helper_conn)
+static struct drm_display_mode *
+drm_pick_cmdline_mode(struct drm_fb_helper_connector *fb_helper_conn)
 {
 	struct drm_cmdline_mode *cmdline_mode;
 	struct drm_display_mode *mode;
@@ -2208,7 +2210,6 @@  struct drm_display_mode *drm_pick_cmdline_mode(struct drm_fb_helper_connector *f
 	list_add(&mode->head, &fb_helper_conn->connector->modes);
 	return mode;
 }
-EXPORT_SYMBOL(drm_pick_cmdline_mode);
 
 static bool drm_connector_enabled(struct drm_connector *connector, bool strict)
 {
diff --git a/include/drm/drm_fb_helper.h b/include/drm/drm_fb_helper.h
index 6b334f4d8a22..5a7e5d131913 100644
--- a/include/drm/drm_fb_helper.h
+++ b/include/drm/drm_fb_helper.h
@@ -289,11 +289,6 @@  int drm_fb_helper_initial_config(struct drm_fb_helper *fb_helper, int bpp_sel);
 int drm_fb_helper_single_add_all_connectors(struct drm_fb_helper *fb_helper);
 int drm_fb_helper_debug_enter(struct fb_info *info);
 int drm_fb_helper_debug_leave(struct fb_info *info);
-struct drm_display_mode *
-drm_has_preferred_mode(struct drm_fb_helper_connector *fb_connector,
-			int width, int height);
-struct drm_display_mode *
-drm_pick_cmdline_mode(struct drm_fb_helper_connector *fb_helper_conn);
 
 int drm_fb_helper_add_one_connector(struct drm_fb_helper *fb_helper, struct drm_connector *connector);
 int drm_fb_helper_remove_one_connector(struct drm_fb_helper *fb_helper,