* [PATCH] drm/radeon: remove the repeated declaration
@ 2021-05-25 7:51 Shaokun Zhang
2021-05-26 2:24 ` Alex Deucher
0 siblings, 1 reply; 2+ messages in thread
From: Shaokun Zhang @ 2021-05-25 7:51 UTC (permalink / raw)
To: amd-gfx, dri-devel; +Cc: Shaokun Zhang, Alex Deucher, Christian König
Function 'r300_mc_wait_for_idle' and 'r600_mc_wait_for_idle'
are declared twice, remove the repeated declaration.
Cc: Alex Deucher <alexander.deucher@amd.com>
Cc: "Christian König" <christian.koenig@amd.com>
Signed-off-by: Shaokun Zhang <zhangshaokun@hisilicon.com>
---
drivers/gpu/drm/radeon/radeon_asic.h | 2 --
1 file changed, 2 deletions(-)
diff --git a/drivers/gpu/drm/radeon/radeon_asic.h b/drivers/gpu/drm/radeon/radeon_asic.h
index 1cf2a5e0d91d..1e00f6b99f94 100644
--- a/drivers/gpu/drm/radeon/radeon_asic.h
+++ b/drivers/gpu/drm/radeon/radeon_asic.h
@@ -187,7 +187,6 @@ extern int rv370_pcie_gart_init(struct radeon_device *rdev);
extern void rv370_pcie_gart_fini(struct radeon_device *rdev);
extern int rv370_pcie_gart_enable(struct radeon_device *rdev);
extern void rv370_pcie_gart_disable(struct radeon_device *rdev);
-extern int r300_mc_wait_for_idle(struct radeon_device *rdev);
/*
* r420,r423,rv410
@@ -404,7 +403,6 @@ void r600_hdmi_update_ACR(struct drm_encoder *encoder, uint32_t clock);
void r600_hdmi_audio_workaround(struct drm_encoder *encoder);
int r600_hdmi_buffer_status_changed(struct drm_encoder *encoder);
void r600_hdmi_update_audio_settings(struct drm_encoder *encoder);
-int r600_mc_wait_for_idle(struct radeon_device *rdev);
u32 r600_get_xclk(struct radeon_device *rdev);
uint64_t r600_get_gpu_clock_counter(struct radeon_device *rdev);
int rv6xx_get_temp(struct radeon_device *rdev);
--
2.7.4
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] drm/radeon: remove the repeated declaration
2021-05-25 7:51 [PATCH] drm/radeon: remove the repeated declaration Shaokun Zhang
@ 2021-05-26 2:24 ` Alex Deucher
0 siblings, 0 replies; 2+ messages in thread
From: Alex Deucher @ 2021-05-26 2:24 UTC (permalink / raw)
To: Shaokun Zhang
Cc: Alex Deucher, Maling list - DRI developers, amd-gfx list,
Christian König
Applied. Thanks!
Alex
On Tue, May 25, 2021 at 3:51 AM Shaokun Zhang
<zhangshaokun@hisilicon.com> wrote:
>
> Function 'r300_mc_wait_for_idle' and 'r600_mc_wait_for_idle'
> are declared twice, remove the repeated declaration.
>
> Cc: Alex Deucher <alexander.deucher@amd.com>
> Cc: "Christian König" <christian.koenig@amd.com>
> Signed-off-by: Shaokun Zhang <zhangshaokun@hisilicon.com>
> ---
> drivers/gpu/drm/radeon/radeon_asic.h | 2 --
> 1 file changed, 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/radeon/radeon_asic.h b/drivers/gpu/drm/radeon/radeon_asic.h
> index 1cf2a5e0d91d..1e00f6b99f94 100644
> --- a/drivers/gpu/drm/radeon/radeon_asic.h
> +++ b/drivers/gpu/drm/radeon/radeon_asic.h
> @@ -187,7 +187,6 @@ extern int rv370_pcie_gart_init(struct radeon_device *rdev);
> extern void rv370_pcie_gart_fini(struct radeon_device *rdev);
> extern int rv370_pcie_gart_enable(struct radeon_device *rdev);
> extern void rv370_pcie_gart_disable(struct radeon_device *rdev);
> -extern int r300_mc_wait_for_idle(struct radeon_device *rdev);
>
> /*
> * r420,r423,rv410
> @@ -404,7 +403,6 @@ void r600_hdmi_update_ACR(struct drm_encoder *encoder, uint32_t clock);
> void r600_hdmi_audio_workaround(struct drm_encoder *encoder);
> int r600_hdmi_buffer_status_changed(struct drm_encoder *encoder);
> void r600_hdmi_update_audio_settings(struct drm_encoder *encoder);
> -int r600_mc_wait_for_idle(struct radeon_device *rdev);
> u32 r600_get_xclk(struct radeon_device *rdev);
> uint64_t r600_get_gpu_clock_counter(struct radeon_device *rdev);
> int rv6xx_get_temp(struct radeon_device *rdev);
> --
> 2.7.4
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-05-26 2:24 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-05-25 7:51 [PATCH] drm/radeon: remove the repeated declaration Shaokun Zhang
2021-05-26 2:24 ` Alex Deucher
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).