Skip to contentSkip to conversation

drm/amdgpu: drop set_vga_render_state from display funcs

PATCH In review Alex Deucher 2 participants 3 messages Nov 22, 2016 – Nov 23, 2016 1 message not in the archive

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/2 drm/amdgpu: drop set_vga_render_state from display funcs

Not used.

---
 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(-)
drivers/gpu/drm/amd/amdgpu/amdgpu.h +0 -1
index 8d326bc..210c4e8 100644
@@ -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))
drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h +0 -2
index 1e23334..a50b39e 100644
@@ -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 */
drivers/gpu/drm/amd/amdgpu/dce_v10_0.c +0 -1
index 679dd73..e64165f 100644
@@ -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,
drivers/gpu/drm/amd/amdgpu/dce_v11_0.c +0 -1
index 807dfed..c9e12988 100644
@@ -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,
drivers/gpu/drm/amd/amdgpu/dce_v6_0.c +0 -1
index 1f322f7..c3b72bc 100644
@@ -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,
drivers/gpu/drm/amd/amdgpu/dce_v8_0.c +0 -1
index 6f7656d..cc94a34 100644
@@ -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,
drivers/gpu/drm/amd/amdgpu/dce_virtual.c +0 -7
index cc85676..bd5dad9 100644
@@ -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,
Signature · 6 lines
2.5.5

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

A message that is not in the archive (sent off-list or not yet received): 1479857081-20237-1-git-send-email-alexander.deucher-5C7GfCeVMHo@public.gmane.org

#2 lore raw

PATCH 2/2 drm/amdgpu: drop is_display_hung from display funcs

Not used.

---
 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    | 8 --------
 drivers/gpu/drm/amd/amdgpu/dce_v8_0.c    | 1 -
 drivers/gpu/drm/amd/amdgpu/dce_virtual.c | 6 ------
 7 files changed, 20 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu.h +0 -1
index 210c4e8..3c917e0 100644
@@ -1632,7 +1632,6 @@ amdgpu_get_sdma_instance(struct amdgpu_ring *ring)
 #define amdgpu_ih_set_rptr(adev) (adev)->irq.ih_funcs->set_rptr((adev))
 #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))
 #define amdgpu_display_backlight_set_level(adev, e, l) (adev)->mode_info.funcs->backlight_set_level((e), (l))
 #define amdgpu_display_backlight_get_level(adev, e) (adev)->mode_info.funcs->backlight_get_level((e))
 #define amdgpu_display_hpd_sense(adev, h) (adev)->mode_info.funcs->hpd_sense((adev), (h))
drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h +0 -2
index a50b39e..9a2c088 100644
@@ -269,8 +269,6 @@ struct amdgpu_display_funcs {
 	u32 (*vblank_get_counter)(struct amdgpu_device *adev, int crtc);
 	/* wait for vblank */
 	void (*vblank_wait)(struct amdgpu_device *adev, int crtc);
-	/* is dce hung */
-	bool (*is_display_hung)(struct amdgpu_device *adev);
 	/* set backlight level */
 	void (*backlight_set_level)(struct amdgpu_encoder *amdgpu_encoder,
 				    u8 level);
drivers/gpu/drm/amd/amdgpu/dce_v10_0.c +0 -1
index e64165f..47ebb0b 100644
@@ -3749,7 +3749,6 @@ static const struct amdgpu_display_funcs dce_v10_0_display_funcs = {
 	.bandwidth_update = &dce_v10_0_bandwidth_update,
 	.vblank_get_counter = &dce_v10_0_vblank_get_counter,
 	.vblank_wait = &dce_v10_0_vblank_wait,
-	.is_display_hung = &dce_v10_0_is_display_hung,
 	.backlight_set_level = &amdgpu_atombios_encoder_set_backlight_level,
 	.backlight_get_level = &amdgpu_atombios_encoder_get_backlight_level,
 	.hpd_sense = &dce_v10_0_hpd_sense,
drivers/gpu/drm/amd/amdgpu/dce_v11_0.c +0 -1
index c9e12988..8416373 100644
@@ -3805,7 +3805,6 @@ static const struct amdgpu_display_funcs dce_v11_0_display_funcs = {
 	.bandwidth_update = &dce_v11_0_bandwidth_update,
 	.vblank_get_counter = &dce_v11_0_vblank_get_counter,
 	.vblank_wait = &dce_v11_0_vblank_wait,
-	.is_display_hung = &dce_v11_0_is_display_hung,
 	.backlight_set_level = &amdgpu_atombios_encoder_set_backlight_level,
 	.backlight_get_level = &amdgpu_atombios_encoder_get_backlight_level,
 	.hpd_sense = &dce_v11_0_hpd_sense,
drivers/gpu/drm/amd/amdgpu/dce_v6_0.c +0 -8
index c3b72bc..f532bae 100644
@@ -379,13 +379,6 @@ static u32 dce_v6_0_hpd_get_gpio_reg(struct amdgpu_device *adev)
 	return mmDC_GPIO_HPD_A;
 }
 
-static bool dce_v6_0_is_display_hung(struct amdgpu_device *adev)
-{
-	DRM_INFO("xxxx: dce_v6_0_is_display_hung ----no imp!!!!!\n");
-
-	return true;
-}
-
 static u32 evergreen_get_vblank_counter(struct amdgpu_device* adev, int crtc)
 {
 	if (crtc >= adev->mode_info.num_crtc)
@@ -3035,7 +3028,6 @@ static const struct amdgpu_display_funcs dce_v6_0_display_funcs = {
 	.bandwidth_update = &dce_v6_0_bandwidth_update,
 	.vblank_get_counter = &dce_v6_0_vblank_get_counter,
 	.vblank_wait = &dce_v6_0_vblank_wait,
-	.is_display_hung = &dce_v6_0_is_display_hung,
 	.backlight_set_level = &amdgpu_atombios_encoder_set_backlight_level,
 	.backlight_get_level = &amdgpu_atombios_encoder_get_backlight_level,
 	.hpd_sense = &dce_v6_0_hpd_sense,
drivers/gpu/drm/amd/amdgpu/dce_v8_0.c +0 -1
index cc94a34..2b5eeb7 100644
@@ -3586,7 +3586,6 @@ static const struct amdgpu_display_funcs dce_v8_0_display_funcs = {
 	.bandwidth_update = &dce_v8_0_bandwidth_update,
 	.vblank_get_counter = &dce_v8_0_vblank_get_counter,
 	.vblank_wait = &dce_v8_0_vblank_wait,
-	.is_display_hung = &dce_v8_0_is_display_hung,
 	.backlight_set_level = &amdgpu_atombios_encoder_set_backlight_level,
 	.backlight_get_level = &amdgpu_atombios_encoder_get_backlight_level,
 	.hpd_sense = &dce_v8_0_hpd_sense,
drivers/gpu/drm/amd/amdgpu/dce_virtual.c +0 -6
index bd5dad9..5ef09c4 100644
@@ -95,11 +95,6 @@ static u32 dce_virtual_hpd_get_gpio_reg(struct amdgpu_device *adev)
 	return 0;
 }
 
-static bool dce_virtual_is_display_hung(struct amdgpu_device *adev)
-{
-	return false;
-}
-
 static void dce_virtual_stop_mc_access(struct amdgpu_device *adev,
 			      struct amdgpu_mode_mc_save *save)
 {
@@ -684,7 +679,6 @@ static const struct amdgpu_display_funcs dce_virtual_display_funcs = {
 	.bandwidth_update = &dce_virtual_bandwidth_update,
 	.vblank_get_counter = &dce_virtual_vblank_get_counter,
 	.vblank_wait = &dce_virtual_vblank_wait,
-	.is_display_hung = &dce_virtual_is_display_hung,
 	.backlight_set_level = NULL,
 	.backlight_get_level = NULL,
 	.hpd_sense = &dce_virtual_hpd_sense,
Signature · 6 lines
2.5.5

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Reviewed-by
#3 lore raw
In reply to a message not in the archive

Am 23.11.2016 um 00:24 schrieb Alex Deucher:

Quoted 3 lines

Not used.

Quoted 101 lines
---
  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(-)
drivers/gpu/drm/amd/amdgpu/amdgpu.h +0 -1
index 8d326bc..210c4e8 100644
@@ -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))
drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h +0 -2
index 1e23334..a50b39e 100644
@@ -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 */
drivers/gpu/drm/amd/amdgpu/dce_v10_0.c +0 -1
index 679dd73..e64165f 100644
@@ -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,
drivers/gpu/drm/amd/amdgpu/dce_v11_0.c +0 -1
index 807dfed..c9e12988 100644
@@ -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,
drivers/gpu/drm/amd/amdgpu/dce_v6_0.c +0 -1
index 1f322f7..c3b72bc 100644
@@ -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,
drivers/gpu/drm/amd/amdgpu/dce_v8_0.c +0 -1
index 6f7656d..cc94a34 100644
@@ -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,
drivers/gpu/drm/amd/amdgpu/dce_virtual.c +0 -6
index cc85676..bd5dad9 100644
@@ -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
   *

drivers/gpu/drm/amd/amdgpu/dce_virtual.c static int dce_virtual_connector_encoder_init(struct amdgpu_device *adev, · line 686

Quoted 7 lines
drivers/gpu/drm/amd/amdgpu/dce_virtual.c +0 -1
@@ -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,

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx