[1/2] drm/amdgpu: drop set_vga_render_state from display funcs

Submitted by Alex Deucher on Nov. 22, 2016, 11:24 p.m.

Details

Message ID 1479857081-20237-1-git-send-email-alexander.deucher@amd.com
State New
Headers show
Series "Series without cover letter" ( rev: 1 ) in AMD X.Org drivers

Not browsing as part of any series.

Commit Message

Alex Deucher Nov. 22, 2016, 11:24 p.m.
Not used.

Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
---
 drivers/gpu/drm/amd/amdgpu/amdgpu.h      | 1 -
 drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h | 2 --
 drivers/gpu/drm/amd/amdgpu/dce_v10_0.c   | 1 -
 drivers/gpu/drm/amd/amdgpu/dce_v11_0.c   | 1 -
 drivers/gpu/drm/amd/amdgpu/dce_v6_0.c    | 1 -
 drivers/gpu/drm/amd/amdgpu/dce_v8_0.c    | 1 -
 drivers/gpu/drm/amd/amdgpu/dce_virtual.c | 7 -------
 7 files changed, 14 deletions(-)

Patch hide | download patch | download mbox

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
index 8d326bc..210c4e8 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
@@ -1630,7 +1630,6 @@  amdgpu_get_sdma_instance(struct amdgpu_ring *ring)
 #define amdgpu_ih_get_wptr(adev) (adev)->irq.ih_funcs->get_wptr((adev))
 #define amdgpu_ih_decode_iv(adev, iv) (adev)->irq.ih_funcs->decode_iv((adev), (iv))
 #define amdgpu_ih_set_rptr(adev) (adev)->irq.ih_funcs->set_rptr((adev))
-#define amdgpu_display_set_vga_render_state(adev, r) (adev)->mode_info.funcs->set_vga_render_state((adev), (r))
 #define amdgpu_display_vblank_get_counter(adev, crtc) (adev)->mode_info.funcs->vblank_get_counter((adev), (crtc))
 #define amdgpu_display_vblank_wait(adev, crtc) (adev)->mode_info.funcs->vblank_wait((adev), (crtc))
 #define amdgpu_display_is_display_hung(adev) (adev)->mode_info.funcs->is_display_hung((adev))
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h
index 1e23334..a50b39e 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h
@@ -263,8 +263,6 @@  struct amdgpu_mode_mc_save {
 };
 
 struct amdgpu_display_funcs {
-	/* vga render */
-	void (*set_vga_render_state)(struct amdgpu_device *adev, bool render);
 	/* display watermarks */
 	void (*bandwidth_update)(struct amdgpu_device *adev);
 	/* get frame count */
diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c b/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c
index 679dd73..e64165f 100644
--- a/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c
@@ -3746,7 +3746,6 @@  static void dce_v10_0_encoder_add(struct amdgpu_device *adev,
 }
 
 static const struct amdgpu_display_funcs dce_v10_0_display_funcs = {
-	.set_vga_render_state = &dce_v10_0_set_vga_render_state,
 	.bandwidth_update = &dce_v10_0_bandwidth_update,
 	.vblank_get_counter = &dce_v10_0_vblank_get_counter,
 	.vblank_wait = &dce_v10_0_vblank_wait,
diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c b/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c
index 807dfed..c9e12988 100644
--- a/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c
@@ -3802,7 +3802,6 @@  static void dce_v11_0_encoder_add(struct amdgpu_device *adev,
 }
 
 static const struct amdgpu_display_funcs dce_v11_0_display_funcs = {
-	.set_vga_render_state = &dce_v11_0_set_vga_render_state,
 	.bandwidth_update = &dce_v11_0_bandwidth_update,
 	.vblank_get_counter = &dce_v11_0_vblank_get_counter,
 	.vblank_wait = &dce_v11_0_vblank_wait,
diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v6_0.c b/drivers/gpu/drm/amd/amdgpu/dce_v6_0.c
index 1f322f7..c3b72bc 100644
--- a/drivers/gpu/drm/amd/amdgpu/dce_v6_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/dce_v6_0.c
@@ -3032,7 +3032,6 @@  static void dce_v6_0_encoder_add(struct amdgpu_device *adev,
 }
 
 static const struct amdgpu_display_funcs dce_v6_0_display_funcs = {
-	.set_vga_render_state = &dce_v6_0_set_vga_render_state,
 	.bandwidth_update = &dce_v6_0_bandwidth_update,
 	.vblank_get_counter = &dce_v6_0_vblank_get_counter,
 	.vblank_wait = &dce_v6_0_vblank_wait,
diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c b/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c
index 6f7656d..cc94a34 100644
--- a/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c
@@ -3583,7 +3583,6 @@  static void dce_v8_0_encoder_add(struct amdgpu_device *adev,
 }
 
 static const struct amdgpu_display_funcs dce_v8_0_display_funcs = {
-	.set_vga_render_state = &dce_v8_0_set_vga_render_state,
 	.bandwidth_update = &dce_v8_0_bandwidth_update,
 	.vblank_get_counter = &dce_v8_0_vblank_get_counter,
 	.vblank_wait = &dce_v8_0_vblank_wait,
diff --git a/drivers/gpu/drm/amd/amdgpu/dce_virtual.c b/drivers/gpu/drm/amd/amdgpu/dce_virtual.c
index cc85676..bd5dad9 100644
--- a/drivers/gpu/drm/amd/amdgpu/dce_virtual.c
+++ b/drivers/gpu/drm/amd/amdgpu/dce_virtual.c
@@ -149,12 +149,6 @@  static void dce_virtual_resume_mc_access(struct amdgpu_device *adev,
 	return;
 }
 
-static void dce_virtual_set_vga_render_state(struct amdgpu_device *adev,
-				    bool render)
-{
-	return;
-}
-
 /**
  * dce_virtual_bandwidth_update - program display watermarks
  *
@@ -687,7 +681,6 @@  static int dce_virtual_connector_encoder_init(struct amdgpu_device *adev,
 }
 
 static const struct amdgpu_display_funcs dce_virtual_display_funcs = {
-	.set_vga_render_state = &dce_virtual_set_vga_render_state,
 	.bandwidth_update = &dce_virtual_bandwidth_update,
 	.vblank_get_counter = &dce_virtual_vblank_get_counter,
 	.vblank_wait = &dce_virtual_vblank_wait,

Comments

Am 23.11.2016 um 00:24 schrieb Alex Deucher:
> Not used.
>
> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

Reviewed-by: Christian König <christian.koenig@amd.com>.

> ---
>   drivers/gpu/drm/amd/amdgpu/amdgpu.h      | 1 -
>   drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h | 2 --
>   drivers/gpu/drm/amd/amdgpu/dce_v10_0.c   | 1 -
>   drivers/gpu/drm/amd/amdgpu/dce_v11_0.c   | 1 -
>   drivers/gpu/drm/amd/amdgpu/dce_v6_0.c    | 1 -
>   drivers/gpu/drm/amd/amdgpu/dce_v8_0.c    | 1 -
>   drivers/gpu/drm/amd/amdgpu/dce_virtual.c | 7 -------
>   7 files changed, 14 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
> index 8d326bc..210c4e8 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
> @@ -1630,7 +1630,6 @@ amdgpu_get_sdma_instance(struct amdgpu_ring *ring)
>   #define amdgpu_ih_get_wptr(adev) (adev)->irq.ih_funcs->get_wptr((adev))
>   #define amdgpu_ih_decode_iv(adev, iv) (adev)->irq.ih_funcs->decode_iv((adev), (iv))
>   #define amdgpu_ih_set_rptr(adev) (adev)->irq.ih_funcs->set_rptr((adev))
> -#define amdgpu_display_set_vga_render_state(adev, r) (adev)->mode_info.funcs->set_vga_render_state((adev), (r))
>   #define amdgpu_display_vblank_get_counter(adev, crtc) (adev)->mode_info.funcs->vblank_get_counter((adev), (crtc))
>   #define amdgpu_display_vblank_wait(adev, crtc) (adev)->mode_info.funcs->vblank_wait((adev), (crtc))
>   #define amdgpu_display_is_display_hung(adev) (adev)->mode_info.funcs->is_display_hung((adev))
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h
> index 1e23334..a50b39e 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h
> @@ -263,8 +263,6 @@ struct amdgpu_mode_mc_save {
>   };
>   
>   struct amdgpu_display_funcs {
> -	/* vga render */
> -	void (*set_vga_render_state)(struct amdgpu_device *adev, bool render);
>   	/* display watermarks */
>   	void (*bandwidth_update)(struct amdgpu_device *adev);
>   	/* get frame count */
> diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c b/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c
> index 679dd73..e64165f 100644
> --- a/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c
> @@ -3746,7 +3746,6 @@ static void dce_v10_0_encoder_add(struct amdgpu_device *adev,
>   }
>   
>   static const struct amdgpu_display_funcs dce_v10_0_display_funcs = {
> -	.set_vga_render_state = &dce_v10_0_set_vga_render_state,
>   	.bandwidth_update = &dce_v10_0_bandwidth_update,
>   	.vblank_get_counter = &dce_v10_0_vblank_get_counter,
>   	.vblank_wait = &dce_v10_0_vblank_wait,
> diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c b/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c
> index 807dfed..c9e12988 100644
> --- a/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c
> @@ -3802,7 +3802,6 @@ static void dce_v11_0_encoder_add(struct amdgpu_device *adev,
>   }
>   
>   static const struct amdgpu_display_funcs dce_v11_0_display_funcs = {
> -	.set_vga_render_state = &dce_v11_0_set_vga_render_state,
>   	.bandwidth_update = &dce_v11_0_bandwidth_update,
>   	.vblank_get_counter = &dce_v11_0_vblank_get_counter,
>   	.vblank_wait = &dce_v11_0_vblank_wait,
> diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v6_0.c b/drivers/gpu/drm/amd/amdgpu/dce_v6_0.c
> index 1f322f7..c3b72bc 100644
> --- a/drivers/gpu/drm/amd/amdgpu/dce_v6_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/dce_v6_0.c
> @@ -3032,7 +3032,6 @@ static void dce_v6_0_encoder_add(struct amdgpu_device *adev,
>   }
>   
>   static const struct amdgpu_display_funcs dce_v6_0_display_funcs = {
> -	.set_vga_render_state = &dce_v6_0_set_vga_render_state,
>   	.bandwidth_update = &dce_v6_0_bandwidth_update,
>   	.vblank_get_counter = &dce_v6_0_vblank_get_counter,
>   	.vblank_wait = &dce_v6_0_vblank_wait,
> diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c b/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c
> index 6f7656d..cc94a34 100644
> --- a/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c
> @@ -3583,7 +3583,6 @@ static void dce_v8_0_encoder_add(struct amdgpu_device *adev,
>   }
>   
>   static const struct amdgpu_display_funcs dce_v8_0_display_funcs = {
> -	.set_vga_render_state = &dce_v8_0_set_vga_render_state,
>   	.bandwidth_update = &dce_v8_0_bandwidth_update,
>   	.vblank_get_counter = &dce_v8_0_vblank_get_counter,
>   	.vblank_wait = &dce_v8_0_vblank_wait,
> diff --git a/drivers/gpu/drm/amd/amdgpu/dce_virtual.c b/drivers/gpu/drm/amd/amdgpu/dce_virtual.c
> index cc85676..bd5dad9 100644
> --- a/drivers/gpu/drm/amd/amdgpu/dce_virtual.c
> +++ b/drivers/gpu/drm/amd/amdgpu/dce_virtual.c
> @@ -149,12 +149,6 @@ static void dce_virtual_resume_mc_access(struct amdgpu_device *adev,
>   	return;
>   }
>   
> -static void dce_virtual_set_vga_render_state(struct amdgpu_device *adev,
> -				    bool render)
> -{
> -	return;
> -}
> -
>   /**
>    * dce_virtual_bandwidth_update - program display watermarks
>    *
> @@ -687,7 +681,6 @@ static int dce_virtual_connector_encoder_init(struct amdgpu_device *adev,
>   }
>   
>   static const struct amdgpu_display_funcs dce_virtual_display_funcs = {
> -	.set_vga_render_state = &dce_virtual_set_vga_render_state,
>   	.bandwidth_update = &dce_virtual_bandwidth_update,
>   	.vblank_get_counter = &dce_virtual_vblank_get_counter,
>   	.vblank_wait = &dce_virtual_vblank_wait,