diff mbox

[v4,14/14] drm: remove unused and redundant callbacks

Message ID 1499343648-29695-15-git-send-email-peda@axentia.se (mailing list archive)
State New, archived
Headers show

Commit Message

Peter Rosin July 6, 2017, 12:20 p.m. UTC
Drivers no longer have any need for these callbacks, and there are no
users. Zap. Zap-zap-zzzap-p-pp-p.

Signed-off-by: Peter Rosin <peda@axentia.se>
---
 include/drm/drm_crtc.h                   |  8 --------
 include/drm/drm_fb_helper.h              | 32 --------------------------------
 include/drm/drm_modeset_helper_vtables.h | 16 ----------------
 3 files changed, 56 deletions(-)

Comments

Daniel Vetter July 11, 2017, 8:13 a.m. UTC | #1
On Thu, Jul 06, 2017 at 02:20:48PM +0200, Peter Rosin wrote:
> Drivers no longer have any need for these callbacks, and there are no
> users. Zap. Zap-zap-zzzap-p-pp-p.
> 
> Signed-off-by: Peter Rosin <peda@axentia.se>

On patches 4-14: Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch>

I'll try to haggle for a few more reviews by maintainers as soon as the
first 3 patches have landed, but I think I'll pull them all in about a
month or so latest. Please remind me in case I forget to do that (which is
likely ...).

Thanks a lot for doing this.
-Daniel
> ---
>  include/drm/drm_crtc.h                   |  8 --------
>  include/drm/drm_fb_helper.h              | 32 --------------------------------
>  include/drm/drm_modeset_helper_vtables.h | 16 ----------------
>  3 files changed, 56 deletions(-)
> 
> diff --git a/include/drm/drm_crtc.h b/include/drm/drm_crtc.h
> index 3a911a6..0cc8962 100644
> --- a/include/drm/drm_crtc.h
> +++ b/include/drm/drm_crtc.h
> @@ -358,14 +358,6 @@ struct drm_crtc_funcs {
>  	 * drm_crtc_enable_color_mgmt(), which then supports the legacy gamma
>  	 * interface through the drm_atomic_helper_legacy_gamma_set()
>  	 * compatibility implementation.
> -	 *
> -	 * NOTE:
> -	 *
> -	 * Drivers that support gamma tables and also fbdev emulation through
> -	 * the provided helper library need to take care to fill out the gamma
> -	 * hooks for both. Currently there's a bit an unfortunate duplication
> -	 * going on, which should eventually be unified to just one set of
> -	 * hooks.
>  	 */
>  	int (*gamma_set)(struct drm_crtc *crtc, u16 *r, u16 *g, u16 *b,
>  			 uint32_t size,
> diff --git a/include/drm/drm_fb_helper.h b/include/drm/drm_fb_helper.h
> index ea170b9..21c5630 100644
> --- a/include/drm/drm_fb_helper.h
> +++ b/include/drm/drm_fb_helper.h
> @@ -85,38 +85,6 @@ struct drm_fb_helper_surface_size {
>   */
>  struct drm_fb_helper_funcs {
>  	/**
> -	 * @gamma_set:
> -	 *
> -	 * Set the given gamma LUT register on the given CRTC.
> -	 *
> -	 * This callback is optional.
> -	 *
> -	 * FIXME:
> -	 *
> -	 * This callback is functionally redundant with the core gamma table
> -	 * support and simply exists because the fbdev hasn't yet been
> -	 * refactored to use the core gamma table interfaces.
> -	 */
> -	void (*gamma_set)(struct drm_crtc *crtc, u16 red, u16 green,
> -			  u16 blue, int regno);
> -	/**
> -	 * @gamma_get:
> -	 *
> -	 * Read the given gamma LUT register on the given CRTC, used to save the
> -	 * current LUT when force-restoring the fbdev for e.g. kdbg.
> -	 *
> -	 * This callback is optional.
> -	 *
> -	 * FIXME:
> -	 *
> -	 * This callback is functionally redundant with the core gamma table
> -	 * support and simply exists because the fbdev hasn't yet been
> -	 * refactored to use the core gamma table interfaces.
> -	 */
> -	void (*gamma_get)(struct drm_crtc *crtc, u16 *red, u16 *green,
> -			  u16 *blue, int regno);
> -
> -	/**
>  	 * @fb_probe:
>  	 *
>  	 * Driver callback to allocate and initialize the fbdev info structure.
> diff --git a/include/drm/drm_modeset_helper_vtables.h b/include/drm/drm_modeset_helper_vtables.h
> index 0656984..6cdcb42 100644
> --- a/include/drm/drm_modeset_helper_vtables.h
> +++ b/include/drm/drm_modeset_helper_vtables.h
> @@ -267,22 +267,6 @@ struct drm_crtc_helper_funcs {
>  				    enum mode_set_atomic);
>  
>  	/**
> -	 * @load_lut:
> -	 *
> -	 * Load a LUT prepared with the &drm_fb_helper_funcs.gamma_set vfunc.
> -	 *
> -	 * This callback is optional and is only used by the fbdev emulation
> -	 * helpers.
> -	 *
> -	 * FIXME:
> -	 *
> -	 * This callback is functionally redundant with the core gamma table
> -	 * support and simply exists because the fbdev hasn't yet been
> -	 * refactored to use the core gamma table interfaces.
> -	 */
> -	void (*load_lut)(struct drm_crtc *crtc);
> -
> -	/**
>  	 * @disable:
>  	 *
>  	 * This callback should be used to disable the CRTC. With the atomic
> -- 
> 2.1.4
> 
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel
Peter Rosin July 11, 2017, 12:13 p.m. UTC | #2
On 2017-07-11 10:13, Daniel Vetter wrote:
> On Thu, Jul 06, 2017 at 02:20:48PM +0200, Peter Rosin wrote:
>> Drivers no longer have any need for these callbacks, and there are no
>> users. Zap. Zap-zap-zzzap-p-pp-p.
>>
>> Signed-off-by: Peter Rosin <peda@axentia.se>
> 
> On patches 4-14: Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch>
> 
> I'll try to haggle for a few more reviews by maintainers as soon as the
> first 3 patches have landed, but I think I'll pull them all in about a
> month or so latest. Please remind me in case I forget to do that (which is
> likely ...).

Ok, will do!

> Thanks a lot for doing this.

And thank you for pointers and reviews!

Cheers,
Peter

> -Daniel
>> ---
>>  include/drm/drm_crtc.h                   |  8 --------
>>  include/drm/drm_fb_helper.h              | 32 --------------------------------
>>  include/drm/drm_modeset_helper_vtables.h | 16 ----------------
>>  3 files changed, 56 deletions(-)
>>
>> diff --git a/include/drm/drm_crtc.h b/include/drm/drm_crtc.h
>> index 3a911a6..0cc8962 100644
>> --- a/include/drm/drm_crtc.h
>> +++ b/include/drm/drm_crtc.h
>> @@ -358,14 +358,6 @@ struct drm_crtc_funcs {
>>  	 * drm_crtc_enable_color_mgmt(), which then supports the legacy gamma
>>  	 * interface through the drm_atomic_helper_legacy_gamma_set()
>>  	 * compatibility implementation.
>> -	 *
>> -	 * NOTE:
>> -	 *
>> -	 * Drivers that support gamma tables and also fbdev emulation through
>> -	 * the provided helper library need to take care to fill out the gamma
>> -	 * hooks for both. Currently there's a bit an unfortunate duplication
>> -	 * going on, which should eventually be unified to just one set of
>> -	 * hooks.
>>  	 */
>>  	int (*gamma_set)(struct drm_crtc *crtc, u16 *r, u16 *g, u16 *b,
>>  			 uint32_t size,
>> diff --git a/include/drm/drm_fb_helper.h b/include/drm/drm_fb_helper.h
>> index ea170b9..21c5630 100644
>> --- a/include/drm/drm_fb_helper.h
>> +++ b/include/drm/drm_fb_helper.h
>> @@ -85,38 +85,6 @@ struct drm_fb_helper_surface_size {
>>   */
>>  struct drm_fb_helper_funcs {
>>  	/**
>> -	 * @gamma_set:
>> -	 *
>> -	 * Set the given gamma LUT register on the given CRTC.
>> -	 *
>> -	 * This callback is optional.
>> -	 *
>> -	 * FIXME:
>> -	 *
>> -	 * This callback is functionally redundant with the core gamma table
>> -	 * support and simply exists because the fbdev hasn't yet been
>> -	 * refactored to use the core gamma table interfaces.
>> -	 */
>> -	void (*gamma_set)(struct drm_crtc *crtc, u16 red, u16 green,
>> -			  u16 blue, int regno);
>> -	/**
>> -	 * @gamma_get:
>> -	 *
>> -	 * Read the given gamma LUT register on the given CRTC, used to save the
>> -	 * current LUT when force-restoring the fbdev for e.g. kdbg.
>> -	 *
>> -	 * This callback is optional.
>> -	 *
>> -	 * FIXME:
>> -	 *
>> -	 * This callback is functionally redundant with the core gamma table
>> -	 * support and simply exists because the fbdev hasn't yet been
>> -	 * refactored to use the core gamma table interfaces.
>> -	 */
>> -	void (*gamma_get)(struct drm_crtc *crtc, u16 *red, u16 *green,
>> -			  u16 *blue, int regno);
>> -
>> -	/**
>>  	 * @fb_probe:
>>  	 *
>>  	 * Driver callback to allocate and initialize the fbdev info structure.
>> diff --git a/include/drm/drm_modeset_helper_vtables.h b/include/drm/drm_modeset_helper_vtables.h
>> index 0656984..6cdcb42 100644
>> --- a/include/drm/drm_modeset_helper_vtables.h
>> +++ b/include/drm/drm_modeset_helper_vtables.h
>> @@ -267,22 +267,6 @@ struct drm_crtc_helper_funcs {
>>  				    enum mode_set_atomic);
>>  
>>  	/**
>> -	 * @load_lut:
>> -	 *
>> -	 * Load a LUT prepared with the &drm_fb_helper_funcs.gamma_set vfunc.
>> -	 *
>> -	 * This callback is optional and is only used by the fbdev emulation
>> -	 * helpers.
>> -	 *
>> -	 * FIXME:
>> -	 *
>> -	 * This callback is functionally redundant with the core gamma table
>> -	 * support and simply exists because the fbdev hasn't yet been
>> -	 * refactored to use the core gamma table interfaces.
>> -	 */
>> -	void (*load_lut)(struct drm_crtc *crtc);
>> -
>> -	/**
>>  	 * @disable:
>>  	 *
>>  	 * This callback should be used to disable the CRTC. With the atomic
>> -- 
>> 2.1.4
>>
>> _______________________________________________
>> dri-devel mailing list
>> dri-devel@lists.freedesktop.org
>> https://lists.freedesktop.org/mailman/listinfo/dri-devel
>
diff mbox

Patch

diff --git a/include/drm/drm_crtc.h b/include/drm/drm_crtc.h
index 3a911a6..0cc8962 100644
--- a/include/drm/drm_crtc.h
+++ b/include/drm/drm_crtc.h
@@ -358,14 +358,6 @@  struct drm_crtc_funcs {
 	 * drm_crtc_enable_color_mgmt(), which then supports the legacy gamma
 	 * interface through the drm_atomic_helper_legacy_gamma_set()
 	 * compatibility implementation.
-	 *
-	 * NOTE:
-	 *
-	 * Drivers that support gamma tables and also fbdev emulation through
-	 * the provided helper library need to take care to fill out the gamma
-	 * hooks for both. Currently there's a bit an unfortunate duplication
-	 * going on, which should eventually be unified to just one set of
-	 * hooks.
 	 */
 	int (*gamma_set)(struct drm_crtc *crtc, u16 *r, u16 *g, u16 *b,
 			 uint32_t size,
diff --git a/include/drm/drm_fb_helper.h b/include/drm/drm_fb_helper.h
index ea170b9..21c5630 100644
--- a/include/drm/drm_fb_helper.h
+++ b/include/drm/drm_fb_helper.h
@@ -85,38 +85,6 @@  struct drm_fb_helper_surface_size {
  */
 struct drm_fb_helper_funcs {
 	/**
-	 * @gamma_set:
-	 *
-	 * Set the given gamma LUT register on the given CRTC.
-	 *
-	 * This callback is optional.
-	 *
-	 * FIXME:
-	 *
-	 * This callback is functionally redundant with the core gamma table
-	 * support and simply exists because the fbdev hasn't yet been
-	 * refactored to use the core gamma table interfaces.
-	 */
-	void (*gamma_set)(struct drm_crtc *crtc, u16 red, u16 green,
-			  u16 blue, int regno);
-	/**
-	 * @gamma_get:
-	 *
-	 * Read the given gamma LUT register on the given CRTC, used to save the
-	 * current LUT when force-restoring the fbdev for e.g. kdbg.
-	 *
-	 * This callback is optional.
-	 *
-	 * FIXME:
-	 *
-	 * This callback is functionally redundant with the core gamma table
-	 * support and simply exists because the fbdev hasn't yet been
-	 * refactored to use the core gamma table interfaces.
-	 */
-	void (*gamma_get)(struct drm_crtc *crtc, u16 *red, u16 *green,
-			  u16 *blue, int regno);
-
-	/**
 	 * @fb_probe:
 	 *
 	 * Driver callback to allocate and initialize the fbdev info structure.
diff --git a/include/drm/drm_modeset_helper_vtables.h b/include/drm/drm_modeset_helper_vtables.h
index 0656984..6cdcb42 100644
--- a/include/drm/drm_modeset_helper_vtables.h
+++ b/include/drm/drm_modeset_helper_vtables.h
@@ -267,22 +267,6 @@  struct drm_crtc_helper_funcs {
 				    enum mode_set_atomic);
 
 	/**
-	 * @load_lut:
-	 *
-	 * Load a LUT prepared with the &drm_fb_helper_funcs.gamma_set vfunc.
-	 *
-	 * This callback is optional and is only used by the fbdev emulation
-	 * helpers.
-	 *
-	 * FIXME:
-	 *
-	 * This callback is functionally redundant with the core gamma table
-	 * support and simply exists because the fbdev hasn't yet been
-	 * refactored to use the core gamma table interfaces.
-	 */
-	void (*load_lut)(struct drm_crtc *crtc);
-
-	/**
 	 * @disable:
 	 *
 	 * This callback should be used to disable the CRTC. With the atomic