Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e7b8243d authored by Alex Deucher's avatar Alex Deucher
Browse files

drm/amdgpu: drop is_display_hung from display funcs 



Not used.

Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 042eb910

drivers/gpu/drm/amd/amdgpu/amdgpu.h

+0 −1
Original line number Diff line number Diff line
@@ -1632,7 +1632,6 @@ amdgpu_get_sdma_instance(struct amdgpu_ring *ring) 
#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))

#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
Original line number Diff line number Diff line
@@ -271,8 +271,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
Original line number Diff line number Diff line
@@ -3750,7 +3750,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
Original line number Diff line number Diff line
@@ -3806,7 +3806,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
Original line number Diff line number Diff line
@@ -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)
@@ -3036,7 +3029,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,