lkml.org 
[lkml]   [2020]   [Nov]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 17/20] drm/radeon/evergreend: Move 'evergreen_*' and 'sumo_*' prototypes out to shared location
    Date
    Fixes the following W=1 kernel build warning(s):

    drivers/gpu/drm/radeon/evergreen.c:1281:6: warning: no previous prototype for ‘evergreen_fix_pci_max_read_req_size’ [-Wmissing-prototypes]
    1281 | void evergreen_fix_pci_max_read_req_size(struct radeon_device *rdev)
    | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
    drivers/gpu/drm/radeon/evergreen.c:2664:6: warning: no previous prototype for ‘evergreen_mc_stop’ [-Wmissing-prototypes]
    2664 | void evergreen_mc_stop(struct radeon_device *rdev, struct evergreen_mc_save *save)
    | ^~~~~~~~~~~~~~~~~
    drivers/gpu/drm/radeon/evergreen.c:2762:6: warning: no previous prototype for ‘evergreen_mc_resume’ [-Wmissing-prototypes]
    2762 | void evergreen_mc_resume(struct radeon_device *rdev, struct evergreen_mc_save *save)
    | ^~~~~~~~~~~~~~~~~~~
    drivers/gpu/drm/radeon/evergreen.c:2850:6: warning: no previous prototype for ‘evergreen_mc_program’ [-Wmissing-prototypes]
    2850 | void evergreen_mc_program(struct radeon_device *rdev)
    | ^~~~~~~~~~~~~~~~~~~~
    drivers/gpu/drm/radeon/evergreen.c:3710:5: warning: no previous prototype for ‘evergreen_mc_init’ [-Wmissing-prototypes]
    3710 | int evergreen_mc_init(struct radeon_device *rdev)
    | ^~~~~~~~~~~~~~~~~
    drivers/gpu/drm/radeon/evergreen.c:3769:6: warning: no previous prototype for ‘evergreen_print_gpu_status_regs’ [-Wmissing-prototypes]
    3769 | void evergreen_print_gpu_status_regs(struct radeon_device *rdev)
    | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
    drivers/gpu/drm/radeon/evergreen.c:3797:6: warning: no previous prototype for ‘evergreen_is_display_hung’ [-Wmissing-prototypes]
    3797 | bool evergreen_is_display_hung(struct radeon_device *rdev)
    | ^~~~~~~~~~~~~~~~~~~~~~~~~
    drivers/gpu/drm/radeon/evergreen.c:4009:6: warning: no previous prototype for ‘evergreen_gpu_pci_config_reset’ [-Wmissing-prototypes]
    4009 | void evergreen_gpu_pci_config_reset(struct radeon_device *rdev)
    | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
    drivers/gpu/drm/radeon/evergreen.c:4110:6: warning: no previous prototype for ‘sumo_rlc_fini’ [-Wmissing-prototypes]
    4110 | void sumo_rlc_fini(struct radeon_device *rdev)
    | ^~~~~~~~~~~~~
    drivers/gpu/drm/radeon/evergreen.c:4153:5: warning: no previous prototype for ‘sumo_rlc_init’ [-Wmissing-prototypes]
    4153 | int sumo_rlc_init(struct radeon_device *rdev)
    | ^~~~~~~~~~~~~
    drivers/gpu/drm/radeon/evergreen.c:4381:5: warning: no previous prototype for ‘evergreen_rlc_resume’ [-Wmissing-prototypes]
    4381 | int evergreen_rlc_resume(struct radeon_device *rdev)
    | ^~~~~~~~~~~~~
    drivers/gpu/drm/radeon/evergreen.c:4670:6: warning: no previous prototype for ‘evergreen_irq_suspend’ [-Wmissing-prototypes]
    4670 | void evergreen_irq_suspend(struct radeon_device *rdev)
    | ^~~~~~~~~~~~~~~~~~~~~

    NB: Lots more of these - snipped for brevity

    Cc: Alex Deucher <alexander.deucher@amd.com>
    Cc: "Christian König" <christian.koenig@amd.com>
    Cc: David Airlie <airlied@linux.ie>
    Cc: Daniel Vetter <daniel@ffwll.ch>
    Cc: amd-gfx@lists.freedesktop.org
    Cc: dri-devel@lists.freedesktop.org
    Signed-off-by: Lee Jones <lee.jones@linaro.org>
    ---
    drivers/gpu/drm/radeon/ni.c | 16 ----------------
    drivers/gpu/drm/radeon/radeon.h | 23 +++++++++++++++++++++++
    drivers/gpu/drm/radeon/si.c | 6 ------
    3 files changed, 23 insertions(+), 22 deletions(-)

    diff --git a/drivers/gpu/drm/radeon/ni.c b/drivers/gpu/drm/radeon/ni.c
    index 02feb0801fd30..91bba473f2703 100644
    --- a/drivers/gpu/drm/radeon/ni.c
    +++ b/drivers/gpu/drm/radeon/ni.c
    @@ -38,7 +38,6 @@
    #include "radeon_asic.h"
    #include "radeon_audio.h"
    #include "radeon_ucode.h"
    -
    /*
    * Indirect registers accessor
    */
    @@ -190,21 +189,6 @@ static const u32 tn_rlc_save_restore_register_list[] =
    0x802c,
    };

    -extern bool evergreen_is_display_hung(struct radeon_device *rdev);
    -extern void evergreen_print_gpu_status_regs(struct radeon_device *rdev);
    -extern void evergreen_mc_stop(struct radeon_device *rdev, struct evergreen_mc_save *save);
    -extern void evergreen_mc_resume(struct radeon_device *rdev, struct evergreen_mc_save *save);
    -extern int evergreen_mc_wait_for_idle(struct radeon_device *rdev);
    -extern void evergreen_mc_program(struct radeon_device *rdev);
    -extern void evergreen_irq_suspend(struct radeon_device *rdev);
    -extern int evergreen_mc_init(struct radeon_device *rdev);
    -extern void evergreen_fix_pci_max_read_req_size(struct radeon_device *rdev);
    -extern void evergreen_pcie_gen2_enable(struct radeon_device *rdev);
    -extern void evergreen_program_aspm(struct radeon_device *rdev);
    -extern void sumo_rlc_fini(struct radeon_device *rdev);
    -extern int sumo_rlc_init(struct radeon_device *rdev);
    -extern void evergreen_gpu_pci_config_reset(struct radeon_device *rdev);
    -
    /* Firmware Names */
    MODULE_FIRMWARE("radeon/BARTS_pfp.bin");
    MODULE_FIRMWARE("radeon/BARTS_me.bin");
    diff --git a/drivers/gpu/drm/radeon/radeon.h b/drivers/gpu/drm/radeon/radeon.h
    index 1cbbaff7cede2..3e53a9493ae92 100644
    --- a/drivers/gpu/drm/radeon/radeon.h
    +++ b/drivers/gpu/drm/radeon/radeon.h
    @@ -2951,6 +2951,29 @@ extern u32 r6xx_remap_render_backend(struct radeon_device *rdev,
    extern int ni_init_microcode(struct radeon_device *rdev);
    extern int ni_mc_load_microcode(struct radeon_device *rdev);

    +/*
    + * evergreen functions used by ni.c and si.c
    + */
    +
    +struct evergreen_mc_save;
    +
    +bool evergreen_is_display_hung(struct radeon_device *rdev);
    +void evergreen_print_gpu_status_regs(struct radeon_device *rdev);
    +void evergreen_mc_stop(struct radeon_device *rdev, struct evergreen_mc_save *save);
    +void evergreen_mc_resume(struct radeon_device *rdev, struct evergreen_mc_save *save);
    +int evergreen_mc_wait_for_idle(struct radeon_device *rdev);
    +void evergreen_mc_program(struct radeon_device *rdev);
    +void evergreen_irq_suspend(struct radeon_device *rdev);
    +int evergreen_mc_init(struct radeon_device *rdev);
    +void evergreen_fix_pci_max_read_req_size(struct radeon_device *rdev);
    +void evergreen_pcie_gen2_enable(struct radeon_device *rdev);
    +void evergreen_program_aspm(struct radeon_device *rdev);
    +void sumo_rlc_fini(struct radeon_device *rdev);
    +int sumo_rlc_init(struct radeon_device *rdev);
    +void evergreen_gpu_pci_config_reset(struct radeon_device *rdev);
    +u32 evergreen_get_number_of_dram_channels(struct radeon_device *rdev);
    +void evergreen_print_gpu_status_regs(struct radeon_device *rdev);
    +
    /* radeon_acpi.c */
    #if defined(CONFIG_ACPI)
    extern int radeon_acpi_init(struct radeon_device *rdev);
    diff --git a/drivers/gpu/drm/radeon/si.c b/drivers/gpu/drm/radeon/si.c
    index 93dcab548a835..8b80884990aee 100644
    --- a/drivers/gpu/drm/radeon/si.c
    +++ b/drivers/gpu/drm/radeon/si.c
    @@ -129,12 +129,6 @@ extern void sumo_rlc_fini(struct radeon_device *rdev);
    extern int sumo_rlc_init(struct radeon_device *rdev);
    extern int r600_ih_ring_alloc(struct radeon_device *rdev);
    extern void r600_ih_ring_fini(struct radeon_device *rdev);
    -extern void evergreen_fix_pci_max_read_req_size(struct radeon_device *rdev);
    -extern void evergreen_mc_stop(struct radeon_device *rdev, struct evergreen_mc_save *save);
    -extern void evergreen_mc_resume(struct radeon_device *rdev, struct evergreen_mc_save *save);
    -extern u32 evergreen_get_number_of_dram_channels(struct radeon_device *rdev);
    -extern void evergreen_print_gpu_status_regs(struct radeon_device *rdev);
    -extern bool evergreen_is_display_hung(struct radeon_device *rdev);
    static void si_enable_gui_idle_interrupt(struct radeon_device *rdev,
    bool enable);
    static void si_init_pg(struct radeon_device *rdev);
    --
    2.25.1
    \
     
     \ /
      Last update: 2020-11-09 22:20    [W:3.430 / U:0.084 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site