On Tue, Feb 16, 2021 at 10:22 AM Nirmoy Das <nirmoy.das@xxxxxxx> wrote:
>
> Fixes below compilation error:
> conflicting types for ‘r100_debugfs_mc_info_init’
>
> Fixes: 6f8672d6523bfe38e ("drm/radeon: do not use drm middle layer for
> debugfs")
> Signed-off-by: Nirmoy Das <nirmoy.das@xxxxxxx>
> Reported-by: Mark Broadworth <Mark.Broadworth@xxxxxxx>
> ---
> Hi Alex,
>
> Can you please squash this with the "Fixes" commit.
> I am not sure how I missed it.
> I even tested the patch with my radeon card before pushing.
Sure.
Acked-by: Alex Deucher <alexander.deucher@xxxxxxx>
>
> drivers/gpu/drm/radeon/r300.c | 6 +-----
> drivers/gpu/drm/radeon/radeon_asic.h | 2 +-
> 2 files changed, 2 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/gpu/drm/radeon/r300.c b/drivers/gpu/drm/radeon/r300.c
> index 03b0d4a81f7a..92643dfdd8a8 100644
> --- a/drivers/gpu/drm/radeon/r300.c
> +++ b/drivers/gpu/drm/radeon/r300.c
> @@ -1326,12 +1326,8 @@ void r300_set_reg_safe(struct radeon_device *rdev)
> void r300_mc_program(struct radeon_device *rdev)
> {
> struct r100_mc_save save;
> - int r;
>
> - r = r100_debugfs_mc_info_init(rdev);
> - if (r) {
> - dev_err(rdev->dev, "Failed to create r100_mc debugfs file.\n");
> - }
> + r100_debugfs_mc_info_init(rdev);
>
> /* Stops all mc clients */
> r100_mc_stop(rdev, &save);
> diff --git a/drivers/gpu/drm/radeon/radeon_asic.h b/drivers/gpu/drm/radeon/radeon_asic.h
> index 2c77f151ef62..1cf2a5e0d91d 100644
> --- a/drivers/gpu/drm/radeon/radeon_asic.h
> +++ b/drivers/gpu/drm/radeon/radeon_asic.h
> @@ -108,7 +108,7 @@ int r100_pci_gart_init(struct radeon_device *rdev);
> void r100_pci_gart_fini(struct radeon_device *rdev);
> int r100_pci_gart_enable(struct radeon_device *rdev);
> void r100_pci_gart_disable(struct radeon_device *rdev);
> -int r100_debugfs_mc_info_init(struct radeon_device *rdev);
> +void r100_debugfs_mc_info_init(struct radeon_device *rdev);
> int r100_gui_wait_for_idle(struct radeon_device *rdev);
> int r100_ib_test(struct radeon_device *rdev, struct radeon_ring *ring);
> void r100_irq_disable(struct radeon_device *rdev);
> --
> 2.30.0
>
> _______________________________________________
> amd-gfx mailing list
> amd-gfx@xxxxxxxxxxxxxxxxxxxxx
> https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
amd-gfx@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
