Mark function ast_bo_unref() as static because it is not used outside file ast_main.c and remove unused function ast_get_max_dclk() in ast_main.c.

This eliminates the following warning in drm/ast/ast_main.c: drivers/gpu/drm/ast/ast_main.c:192:10: warning: no previous prototype for ‘ast_get_max_dclk’ [-Wmissing-prototypes] drivers/gpu/drm/ast/ast_main.c:452:6: warning: no previous prototype for ‘ast_bo_unref’ [-Wmissing-prototypes]

Signed-off-by: Rashika Kheria rashika.kheria@gmail.com Reviewed-by: Josh Triplett josh@joshtriplett.org --- drivers/gpu/drm/ast/ast_main.c | 49 +--------------------------------------- 1 file changed, 1 insertion(+), 48 deletions(-)

diff --git a/drivers/gpu/drm/ast/ast_main.c b/drivers/gpu/drm/ast/ast_main.c index af0b868..50535fd 100644 --- a/drivers/gpu/drm/ast/ast_main.c +++ b/drivers/gpu/drm/ast/ast_main.c @@ -189,53 +189,6 @@ static int ast_get_dram_info(struct drm_device *dev) return 0; }

-uint32_t ast_get_max_dclk(struct drm_device *dev, int bpp) -{ - struct ast_private *ast = dev->dev_private; - uint32_t dclk, jreg; - uint32_t dram_bus_width, mclk, dram_bandwidth, actual_dram_bandwidth, dram_efficency = 500; - - dram_bus_width = ast->dram_bus_width; - mclk = ast->mclk; - - if (ast->chip == AST2100 || - ast->chip == AST1100 || - ast->chip == AST2200 || - ast->chip == AST2150 || - ast->dram_bus_width == 16) - dram_efficency = 600; - else if (ast->chip == AST2300) - dram_efficency = 400; - - dram_bandwidth = mclk * dram_bus_width * 2 / 8; - actual_dram_bandwidth = dram_bandwidth * dram_efficency / 1000; - - if (ast->chip == AST1180) - dclk = actual_dram_bandwidth / ((bpp + 1) / 8); - else { - jreg = ast_get_index_reg_mask(ast, AST_IO_CRTC_PORT, 0xd0, 0xff); - if ((jreg & 0x08) && (ast->chip == AST2000)) - dclk = actual_dram_bandwidth / ((bpp + 1 + 16) / 8); - else if ((jreg & 0x08) && (bpp == 8)) - dclk = actual_dram_bandwidth / ((bpp + 1 + 24) / 8); - else - dclk = actual_dram_bandwidth / ((bpp + 1) / 8); - } - - if (ast->chip == AST2100 || - ast->chip == AST2200 || - ast->chip == AST2300 || - ast->chip == AST1180) { - if (dclk > 200) - dclk = 200; - } else { - if (dclk > 165) - dclk = 165; - } - - return dclk; -} - static void ast_user_framebuffer_destroy(struct drm_framebuffer *fb) { struct ast_framebuffer *ast_fb = to_ast_framebuffer(fb); @@ -449,7 +402,7 @@ int ast_dumb_create(struct drm_file *file, return 0; }

-void ast_bo_unref(struct ast_bo **bo) +static void ast_bo_unref(struct ast_bo **bo) { struct ttm_buffer_object *tbo;

Mark functions ast_ttm_global_release(), ast_ttm_bo_is_ast_bo() and ast_ttm_tt_create() as static in drm/ast/ast_ttm.c because they are not used outside this file.

This eliminates the following warnings in drm/ast/ast_ttm.c: drivers/gpu/drm/ast/ast_ttm.c:84:1: warning: no previous prototype for ‘ast_ttm_global_release’ [-Wmissing-prototypes] drivers/gpu/drm/ast/ast_ttm.c:105:6: warning: no previous prototype for ‘ast_ttm_bo_is_ast_bo’ [-Wmissing-prototypes] drivers/gpu/drm/ast/ast_ttm.c:211:16: warning: no previous prototype for ‘ast_ttm_tt_create’ [-Wmissing-prototypes]

Signed-off-by: Rashika Kheria rashika.kheria@gmail.com Reviewed-by: Josh Triplett josh@joshtriplett.org --- drivers/gpu/drm/ast/ast_ttm.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/gpu/drm/ast/ast_ttm.c b/drivers/gpu/drm/ast/ast_ttm.c index 32aecb3..4ea9b17 100644 --- a/drivers/gpu/drm/ast/ast_ttm.c +++ b/drivers/gpu/drm/ast/ast_ttm.c @@ -80,7 +80,7 @@ static int ast_ttm_global_init(struct ast_private *ast) return 0; }

-void +static void ast_ttm_global_release(struct ast_private *ast) { if (ast->ttm.mem_global_ref.release == NULL) @@ -102,7 +102,7 @@ static void ast_bo_ttm_destroy(struct ttm_buffer_object *tbo) kfree(bo); }

-bool ast_ttm_bo_is_ast_bo(struct ttm_buffer_object *bo) +static bool ast_ttm_bo_is_ast_bo(struct ttm_buffer_object *bo) { if (bo->destroy == &ast_bo_ttm_destroy) return true; @@ -208,7 +208,7 @@ static struct ttm_backend_func ast_tt_backend_func = { };

-struct ttm_tt *ast_ttm_tt_create(struct ttm_bo_device *bdev, +static struct ttm_tt *ast_ttm_tt_create(struct ttm_bo_device *bdev, unsigned long size, uint32_t page_flags, struct page *dummy_read_page) {

Mark functions cirrus_set_start_address(), cirrus_encoder_destroy(), cirrus_vga_get_modes() and cirrus_connector_best_encoder() as static in drm/cirrus/cirrus_mode.c because they are not used outside this file.

This eliminates the following warnings in drm/cirrus/cirrus_mode.c: drivers/gpu/drm/cirrus/cirrus_mode.c:105:6: warning: no previous prototype for ‘cirrus_set_start_address’ [-Wmissing-prototypes] drivers/gpu/drm/cirrus/cirrus_mode.c:456:6: warning: no previous prototype for ‘cirrus_encoder_destroy’ [-Wmissing-prototypes] drivers/gpu/drm/cirrus/cirrus_mode.c:495:5: warning: no previous prototype for ‘cirrus_vga_get_modes’ [-Wmissing-prototypes] drivers/gpu/drm/cirrus/cirrus_mode.c:512:21: warning: no previous prototype for ‘cirrus_connector_best_encoder’ [-Wmissing-prototypes]

Signed-off-by: Rashika Kheria rashika.kheria@gmail.com Reviewed-by: Josh Triplett josh@joshtriplett.org --- drivers/gpu/drm/cirrus/cirrus_mode.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/gpu/drm/cirrus/cirrus_mode.c b/drivers/gpu/drm/cirrus/cirrus_mode.c index adabc3d..58dd900 100644 --- a/drivers/gpu/drm/cirrus/cirrus_mode.c +++ b/drivers/gpu/drm/cirrus/cirrus_mode.c @@ -102,7 +102,7 @@ static bool cirrus_crtc_mode_fixup(struct drm_crtc *crtc, return true; }

-void cirrus_set_start_address(struct drm_crtc *crtc, unsigned offset) +static void cirrus_set_start_address(struct drm_crtc *crtc, unsigned offset) { struct cirrus_device *cdev = crtc->dev->dev_private; u32 addr; @@ -453,7 +453,7 @@ static void cirrus_encoder_commit(struct drm_encoder *encoder) { }

-void cirrus_encoder_destroy(struct drm_encoder *encoder) +static void cirrus_encoder_destroy(struct drm_encoder *encoder) { struct cirrus_encoder *cirrus_encoder = to_cirrus_encoder(encoder); drm_encoder_cleanup(encoder); @@ -492,7 +492,7 @@ static struct drm_encoder *cirrus_encoder_init(struct drm_device *dev) }

-int cirrus_vga_get_modes(struct drm_connector *connector) +static int cirrus_vga_get_modes(struct drm_connector *connector) { int count;

@@ -509,7 +509,7 @@ static int cirrus_vga_mode_valid(struct drm_connector *connector, return MODE_OK; }

-struct drm_encoder *cirrus_connector_best_encoder(struct drm_connector +static struct drm_encoder *cirrus_connector_best_encoder(struct drm_connector *connector) { int enc_id = connector->encoder_ids[0];

Mark function cdv_intel_fixed_panel_mode() as static in drm/gma500/cdv_intel_dp.c because it is not used outside this file.

This eliminates the following warning in drm/gma500/cdv_intel_dp.c: drivers/gpu/drm/gma500/cdv_intel_dp.c:680:6: warning: no previous prototype for ‘cdv_intel_fixed_panel_mode’ [-Wmissing-prototypes]

Signed-off-by: Rashika Kheria rashika.kheria@gmail.com Reviewed-by: Josh Triplett josh@joshtriplett.org --- drivers/gpu/drm/gma500/cdv_intel_dp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/gma500/cdv_intel_dp.c b/drivers/gpu/drm/gma500/cdv_intel_dp.c index f88a181..36975bd 100644 --- a/drivers/gpu/drm/gma500/cdv_intel_dp.c +++ b/drivers/gpu/drm/gma500/cdv_intel_dp.c @@ -677,7 +677,7 @@ cdv_intel_dp_i2c_init(struct gma_connector *connector, return ret; }

-void cdv_intel_fixed_panel_mode(struct drm_display_mode *fixed_mode, +static void cdv_intel_fixed_panel_mode(struct drm_display_mode *fixed_mode, struct drm_display_mode *adjusted_mode) { adjusted_mode->hdisplay = fixed_mode->hdisplay;

Include appropriate header file drivers/gpu/drm/mga/mga_drv.h in drm/mga/mga_ioc32.c because function mga_compat_ioctl() has its prototype declaration in the header file.

This eliminates the following warning in drm/mga/mga_ioc32.c: drivers/gpu/drm/mga/mga_ioc32.c:207:6: warning: no previous prototype for ‘mga_compat_ioctl’ [-Wmissing-prototypes]

Signed-off-by: Rashika Kheria rashika.kheria@gmail.com Reviewed-by: Josh Triplett josh@joshtriplett.org --- drivers/gpu/drm/mga/mga_ioc32.c | 1 + 1 file changed, 1 insertion(+)

diff --git a/drivers/gpu/drm/mga/mga_ioc32.c b/drivers/gpu/drm/mga/mga_ioc32.c index 709e90d..86b4bb8 100644 --- a/drivers/gpu/drm/mga/mga_ioc32.c +++ b/drivers/gpu/drm/mga/mga_ioc32.c @@ -34,6 +34,7 @@

#include <drm/drmP.h> #include <drm/mga_drm.h> +#include "mga_drv.h"

typedef struct drm32_mga_init { int func;

Mark functions mga_set_start_address(), mga_encoder_destroy() and mga_connector_best_encoder() as static in drm/mgag200/mgag200_mode.c because they are not used outside this file.

This eliminates the following warnings in drm/mgag200/mgag200_mode.c: drivers/gpu/drm/mgag200/mgag200_mode.c:694:6: warning: no previous prototype for ‘mga_set_start_address’ [-Wmissing-prototypes] drivers/gpu/drm/mgag200/mgag200_mode.c:1401:6: warning: no previous prototype for ‘mga_encoder_destroy’ [-Wmissing-prototypes] drivers/gpu/drm/mgag200/mgag200_mode.c:1561:21: warning: no previous prototype for ‘mga_connector_best_encoder’ [-Wmissing-prototypes]

Signed-off-by: Rashika Kheria rashika.kheria@gmail.com Reviewed-by: Josh Triplett josh@joshtriplett.org --- drivers/gpu/drm/mgag200/mgag200_mode.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/gpu/drm/mgag200/mgag200_mode.c b/drivers/gpu/drm/mgag200/mgag200_mode.c index ee6ed63..b8583f2 100644 --- a/drivers/gpu/drm/mgag200/mgag200_mode.c +++ b/drivers/gpu/drm/mgag200/mgag200_mode.c @@ -691,7 +691,7 @@ static void mga_g200wb_commit(struct drm_crtc *crtc) CRTCEXT0 has to be programmed last to trigger an update and make the new addr variable take effect. */ -void mga_set_start_address(struct drm_crtc *crtc, unsigned offset) +static void mga_set_start_address(struct drm_crtc *crtc, unsigned offset) { struct mga_device *mdev = crtc->dev->dev_private; u32 addr; @@ -1398,7 +1398,7 @@ static void mga_encoder_commit(struct drm_encoder *encoder) { }

-void mga_encoder_destroy(struct drm_encoder *encoder) +static void mga_encoder_destroy(struct drm_encoder *encoder) { struct mga_encoder *mga_encoder = to_mga_encoder(encoder); drm_encoder_cleanup(encoder); @@ -1558,7 +1558,7 @@ static int mga_vga_mode_valid(struct drm_connector *connector, return MODE_OK; }

-struct drm_encoder *mga_connector_best_encoder(struct drm_connector +static struct drm_encoder *mga_connector_best_encoder(struct drm_connector *connector) { int enc_id = connector->encoder_ids[0];

Mark functions nve0_gpio_intr(), nve0_gpio_intr_enable(), nve0_gpio_intr_disable(), nve0_gpio_fini() and nve0_gpio_init() as static in drm/nouveau/core/subdev/gpio/nve0.c because they are not used outside this file. Remove unused function nve0_gpio_dtor() from file drm/nouveau/core/subdev/gpio/nve0.c.

This eliminates the following warnings in drm/nouveau/core/subdev/gpio/nve0.c: drivers/gpu/drm/nouveau/core/subdev/gpio/nve0.c:32:1: warning: no previous prototype for ‘nve0_gpio_intr’ [-Wmissing-prototypes] drivers/gpu/drm/nouveau/core/subdev/gpio/nve0.c:51:1: warning: no previous prototype for ‘nve0_gpio_intr_enable’ [-Wmissing-prototypes] drivers/gpu/drm/nouveau/core/subdev/gpio/nve0.c:60:1: warning: no previous prototype for ‘nve0_gpio_intr_disable’ [-Wmissing-prototypes] drivers/gpu/drm/nouveau/core/subdev/gpio/nve0.c:69:1: warning: no previous prototype for ‘nve0_gpio_fini’ [-Wmissing-prototypes] drivers/gpu/drm/nouveau/core/subdev/gpio/nve0.c:78:1: warning: no previous prototype for ‘nve0_gpio_init’ [-Wmissing-prototypes] drivers/gpu/drm/nouveau/core/subdev/gpio/nve0.c:93:1: warning: no previous prototype for ‘nve0_gpio_dtor’ [-Wmissing-prototypes]

Signed-off-by: Rashika Kheria rashika.kheria@gmail.com Reviewed-by: Josh Triplett josh@joshtriplett.org --- drivers/gpu/drm/nouveau/core/subdev/gpio/nve0.c | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-)

diff --git a/drivers/gpu/drm/nouveau/core/subdev/gpio/nve0.c b/drivers/gpu/drm/nouveau/core/subdev/gpio/nve0.c index 16b8c5b..428374a 100644 --- a/drivers/gpu/drm/nouveau/core/subdev/gpio/nve0.c +++ b/drivers/gpu/drm/nouveau/core/subdev/gpio/nve0.c @@ -28,7 +28,7 @@ struct nve0_gpio_priv { struct nouveau_gpio base; };

-void +static void nve0_gpio_intr(struct nouveau_subdev *subdev) { struct nve0_gpio_priv *priv = (void *)subdev; @@ -47,7 +47,7 @@ nve0_gpio_intr(struct nouveau_subdev *subdev) nv_wr32(priv, 0xdc88, intr1); }

-void +static void nve0_gpio_intr_enable(struct nouveau_event *event, int line) { const u32 addr = line < 16 ? 0xdc00 : 0xdc80; @@ -56,7 +56,7 @@ nve0_gpio_intr_enable(struct nouveau_event *event, int line) nv_mask(event->priv, addr + 0x00, mask, mask); }

-void +static void nve0_gpio_intr_disable(struct nouveau_event *event, int line) { const u32 addr = line < 16 ? 0xdc00 : 0xdc80; @@ -65,7 +65,7 @@ nve0_gpio_intr_disable(struct nouveau_event *event, int line) nv_mask(event->priv, addr + 0x00, mask, 0x00000000); }

-int +static int nve0_gpio_fini(struct nouveau_object *object, bool suspend) { struct nve0_gpio_priv *priv = (void *)object; @@ -74,7 +74,7 @@ nve0_gpio_fini(struct nouveau_object *object, bool suspend) return nouveau_gpio_fini(&priv->base, suspend); }

-int +static int nve0_gpio_init(struct nouveau_object *object) { struct nve0_gpio_priv *priv = (void *)object; @@ -89,13 +89,6 @@ nve0_gpio_init(struct nouveau_object *object) return 0; }

-void -nve0_gpio_dtor(struct nouveau_object *object) -{ - struct nve0_gpio_priv *priv = (void *)object; - nouveau_gpio_destroy(&priv->base); -} - static int nve0_gpio_ctor(struct nouveau_object *parent, struct nouveau_object *engine, struct nouveau_oclass *oclass, void *data, u32 size,

Mark function nvd7_grctx_generate_main() as static in drm/nouveau/core/engine/graph/ctxnvd7.c because it is not used outside this file.

This eliminates the following warning in drm/nouveau/core/engine/graph/ctxnvd7.c: drivers/gpu/drm/nouveau/core/engine/graph/ctxnvd7.c:215:1: warning: no previous prototype for ‘nvd7_grctx_generate_main’ [-Wmissing-prototypes]

Signed-off-by: Rashika Kheria rashika.kheria@gmail.com Reviewed-by: Josh Triplett josh@joshtriplett.org --- .../gpu/drm/nouveau/core/engine/graph/ctxnvd7.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/nouveau/core/engine/graph/ctxnvd7.c b/drivers/gpu/drm/nouveau/core/engine/graph/ctxnvd7.c index c4740d5..0e126ce 100644 --- a/drivers/gpu/drm/nouveau/core/engine/graph/ctxnvd7.c +++ b/drivers/gpu/drm/nouveau/core/engine/graph/ctxnvd7.c @@ -211,7 +211,7 @@ nvd7_grctx_generate_mods(struct nvc0_graph_priv *priv, struct nvc0_grctx *info) mmio_list(0x17e91c, 0x03060609, 0, 0); /* different from kepler */ }

-void +static void nvd7_grctx_generate_main(struct nvc0_graph_priv *priv, struct nvc0_grctx *info) { struct nvc0_grctx_oclass *oclass = (void *)nv_engine(priv)->cclass;

Mark functions nvc0_graph_init_fw() and nvc0_graph_ctor_fw() as static in drm/nouveau/core/engine/graph/nvc0.c because they are not used outside this file.

This eliminates the following warning in drm/nouveau/core/engine/graph/nvc0.c: drivers/gpu/drm/nouveau/core/engine/graph/nvc0.c:756:1: warning: no previous prototype for ‘nvc0_graph_init_fw’ [-Wmissing-prototypes] drivers/gpu/drm/nouveau/core/engine/graph/nvc0.c:1082:1: warning: no previous prototype for ‘nvc0_graph_ctor_fw’ [-Wmissing-prototypes]

Signed-off-by: Rashika Kheria rashika.kheria@gmail.com Reviewed-by: Josh Triplett josh@joshtriplett.org --- drivers/gpu/drm/nouveau/core/engine/graph/nvc0.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/nouveau/core/engine/graph/nvc0.c b/drivers/gpu/drm/nouveau/core/engine/graph/nvc0.c index 434bb4b..8d895a9 100644 --- a/drivers/gpu/drm/nouveau/core/engine/graph/nvc0.c +++ b/drivers/gpu/drm/nouveau/core/engine/graph/nvc0.c @@ -752,7 +752,7 @@ nvc0_graph_intr(struct nouveau_subdev *subdev) nouveau_engctx_put(engctx); }

-void +static void nvc0_graph_init_fw(struct nvc0_graph_priv *priv, u32 fuc_base, struct nvc0_graph_fuc *code, struct nvc0_graph_fuc *data) { @@ -1078,7 +1078,7 @@ nvc0_graph_dtor_fw(struct nvc0_graph_fuc *fuc) fuc->data = NULL; }

-int +static int nvc0_graph_ctor_fw(struct nvc0_graph_priv *priv, const char *fwname, struct nvc0_graph_fuc *fuc) {

Mark function nv10_fence_context_new() as static in drm/nouveau/nv10_fence.c because it is not used outside this file.

This eliminates the following warning in drm/nouveau/nv10_fence.c: drivers/gpu/drm/nouveau/nv10_fence.c:69:1: warning: no previous prototype for ‘nv10_fence_context_new’ [-Wmissing-prototypes]

Signed-off-by: Rashika Kheria rashika.kheria@gmail.com Reviewed-by: Josh Triplett josh@joshtriplett.org --- drivers/gpu/drm/nouveau/nv10_fence.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/nouveau/nv10_fence.c b/drivers/gpu/drm/nouveau/nv10_fence.c index 06f434f..b5de158 100644 --- a/drivers/gpu/drm/nouveau/nv10_fence.c +++ b/drivers/gpu/drm/nouveau/nv10_fence.c @@ -65,7 +65,7 @@ nv10_fence_context_del(struct nouveau_channel *chan) kfree(fctx); }

-int +static int nv10_fence_context_new(struct nouveau_channel *chan) { struct nv10_fence_chan *fctx;

Mark function qxl_device_init() as static in drm/qxl/qxl_kms.c because it is not used outside this file.

This eliminates the following warning in drm/qxl/qxl_kms.c: drivers/gpu/drm/qxl/qxl_kms.c:118:5: warning: no previous prototype for ‘qxl_device_init’ [-Wmissing-prototypes]

Signed-off-by: Rashika Kheria rashika.kheria@gmail.com Reviewed-by: Josh Triplett josh@joshtriplett.org --- drivers/gpu/drm/qxl/qxl_kms.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/qxl/qxl_kms.c b/drivers/gpu/drm/qxl/qxl_kms.c index e5ca498..fd88eb4 100644 --- a/drivers/gpu/drm/qxl/qxl_kms.c +++ b/drivers/gpu/drm/qxl/qxl_kms.c @@ -115,7 +115,7 @@ static void qxl_gc_work(struct work_struct *work) qxl_garbage_collect(qdev); }

-int qxl_device_init(struct qxl_device *qdev, +static int qxl_device_init(struct qxl_device *qdev, struct drm_device *ddev, struct pci_dev *pdev, unsigned long flags)

Mark functions radeon_doorbell_init() and radeon_doorbell_fini() as static in drm/radeon/radeon_device.c because they are not used outside this file.

This eliminates the following warning in drm/radeon/radeon_device.c: drivers/gpu/drm/radeon/radeon_device.c:252:5: warning: no previous prototype for ‘radeon_doorbell_init’ [-Wmissing-prototypes] drivers/gpu/drm/radeon/radeon_device.c:281:6: warning: no previous prototype for ‘radeon_doorbell_fini’ [-Wmissing-prototypes]

Signed-off-by: Rashika Kheria rashika.kheria@gmail.com Reviewed-by: Josh Triplett josh@joshtriplett.org --- drivers/gpu/drm/radeon/radeon_device.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/radeon/radeon_device.c b/drivers/gpu/drm/radeon/radeon_device.c index 39b033b..caf4975 100644 --- a/drivers/gpu/drm/radeon/radeon_device.c +++ b/drivers/gpu/drm/radeon/radeon_device.c @@ -249,7 +249,7 @@ void radeon_scratch_free(struct radeon_device *rdev, uint32_t reg) * Init doorbell driver information (CIK) * Returns 0 on success, error on failure. */ -int radeon_doorbell_init(struct radeon_device *rdev) +static int radeon_doorbell_init(struct radeon_device *rdev) { /* doorbell bar mapping */ rdev->doorbell.base = pci_resource_start(rdev->pdev, 2); @@ -278,7 +278,7 @@ int radeon_doorbell_init(struct radeon_device *rdev) * * Tear down doorbell driver information (CIK) */ -void radeon_doorbell_fini(struct radeon_device *rdev) +static void radeon_doorbell_fini(struct radeon_device *rdev) { iounmap(rdev->doorbell.ptr); rdev->doorbell.ptr = NULL;

Mark function radeon_info_ioctl() as static in drm/radeon/radeon_kms.c because it is not used outside this file.

This eliminates the following warning in drm/radeon/radeon_kms.c: drivers/gpu/drm/radeon/radeon_kms.c:194:5: warning: no previous prototype for ‘radeon_info_ioctl’ [-Wmissing-prototypes]

Signed-off-by: Rashika Kheria rashika.kheria@gmail.com Reviewed-by: Josh Triplett josh@joshtriplett.org --- drivers/gpu/drm/radeon/radeon_kms.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/radeon/radeon_kms.c b/drivers/gpu/drm/radeon/radeon_kms.c index 55d0b47..03cbb6b 100644 --- a/drivers/gpu/drm/radeon/radeon_kms.c +++ b/drivers/gpu/drm/radeon/radeon_kms.c @@ -191,7 +191,7 @@ static void radeon_set_filp_rights(struct drm_device *dev, * etc. (all asics). * Returns 0 on success, -EINVAL on failure. */ -int radeon_info_ioctl(struct drm_device *dev, void *data, struct drm_file *filp) +static int radeon_info_ioctl(struct drm_device *dev, void *data, struct drm_file *filp) { struct radeon_device *rdev = dev->dev_private; struct drm_radeon_info *info = data;

Mark function radeon_bo_clear_va() as static in drm/radeon/radeon_object.c because it is not used outside this file.

This eliminates the following warning in drm/radeon/radeon_object.c: drivers/gpu/drm/radeon/radeon_object.c:49:6: warning: no previous prototype for ‘radeon_bo_clear_va’ [-Wmissing-prototypes]

Signed-off-by: Rashika Kheria rashika.kheria@gmail.com Reviewed-by: Josh Triplett josh@joshtriplett.org --- drivers/gpu/drm/radeon/radeon_object.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/radeon/radeon_object.c b/drivers/gpu/drm/radeon/radeon_object.c index 2543430..4820cc8 100644 --- a/drivers/gpu/drm/radeon/radeon_object.c +++ b/drivers/gpu/drm/radeon/radeon_object.c @@ -44,7 +44,7 @@ static void radeon_bo_clear_surface_reg(struct radeon_bo *bo); * function are calling it. */

-void radeon_bo_clear_va(struct radeon_bo *bo) +static void radeon_bo_clear_va(struct radeon_bo *bo) { struct radeon_bo_va *bo_va, *tmp;

Include appropriate header file drivers/gpu/drm/radeon/radeon_asic.h in file drm/radeon/radeon_clocks.c because functions radeon_legacy_get_engine_clock(), radeon_legacy_get_memory_clock() and radeon_legacy_set_engine_clock() have their prototype declarations in the header file.

This eliminates the following warnings in drm/radeon/radeon_clocks.c: drivers/gpu/drm/radeon/radeon_clocks.c:35:10: warning: no previous prototype for ‘radeon_legacy_get_engine_clock’ [-Wmissing-prototypes] drivers/gpu/drm/radeon/radeon_clocks.c:65:10: warning: no previous prototype for ‘radeon_legacy_get_memory_clock’ [-Wmissing-prototypes] drivers/gpu/drm/radeon/radeon_clocks.c:385:6: warning: no previous prototype for ‘radeon_legacy_set_engine_clock’ [-Wmissing-prototypes]

Signed-off-by: Rashika Kheria rashika.kheria@gmail.com Reviewed-by: Josh Triplett josh@joshtriplett.org --- drivers/gpu/drm/radeon/radeon_clocks.c | 1 + 1 file changed, 1 insertion(+)

diff --git a/drivers/gpu/drm/radeon/radeon_clocks.c b/drivers/gpu/drm/radeon/radeon_clocks.c index 38e396d..08f615f 100644 --- a/drivers/gpu/drm/radeon/radeon_clocks.c +++ b/drivers/gpu/drm/radeon/radeon_clocks.c @@ -30,6 +30,7 @@ #include "radeon_reg.h" #include "radeon.h" #include "atom.h" +#include "radeon_asic.h"

/* 10 khz */ uint32_t radeon_legacy_get_engine_clock(struct radeon_device *rdev)

Include appropriate header file drivers/gpu/drm/radeon/radeon_asic.h to file drm/radeon/radeon_ring.c because functions radeon_ring_generic_set_wptr(), radeon_ring_generic_get_rptr() and radeon_ring_generic_get_wptr() have their prototype declarations in the header file.

This eliminates the following warnings in drm/radeon/radeon_ring.c: drivers/gpu/drm/radeon/radeon_ring.c:335:5: warning: no previous prototype for ‘radeon_ring_generic_get_rptr’ [-Wmissing-prototypes] drivers/gpu/drm/radeon/radeon_ring.c:348:5: warning: no previous prototype for ‘radeon_ring_generic_get_wptr’ [-Wmissing-prototypes] drivers/gpu/drm/radeon/radeon_ring.c:358:6: warning: no previous prototype for ‘radeon_ring_generic_set_wptr’ [-Wmissing-prototypes]

Signed-off-by: Rashika Kheria rashika.kheria@gmail.com Reviewed-by: Josh Triplett josh@joshtriplett.org --- drivers/gpu/drm/radeon/radeon_ring.c | 1 + 1 file changed, 1 insertion(+)

diff --git a/drivers/gpu/drm/radeon/radeon_ring.c b/drivers/gpu/drm/radeon/radeon_ring.c index 9214403..90bc2b1 100644 --- a/drivers/gpu/drm/radeon/radeon_ring.c +++ b/drivers/gpu/drm/radeon/radeon_ring.c @@ -33,6 +33,7 @@ #include "radeon_reg.h" #include "radeon.h" #include "atom.h" +#include "radeon_asic.h"

/* * IB

Add static keyword to the definition of KMS_INVALID_IOCTL(name) in radeon_kms.c because the functions passed to it as arguments are not used anywhere else.

This eliminates the following warnings in drm/radeon/radeon_kms.c: drivers/gpu/drm/radeon/radeon_kms.c:719:1: warning: no previous prototype for ‘radeon_cp_init_kms’ [-Wmissing-prototypes] drivers/gpu/drm/radeon/radeon_kms.c:720:1: warning: no previous prototype for ‘radeon_cp_start_kms’ [-Wmissing-prototypes] drivers/gpu/drm/radeon/radeon_kms.c:721:1: warning: no previous prototype for ‘radeon_cp_stop_kms’ [-Wmissing-prototypes] drivers/gpu/drm/radeon/radeon_kms.c:722:1: warning: no previous prototype for ‘radeon_cp_reset_kms’ [-Wmissing-prototypes] drivers/gpu/drm/radeon/radeon_kms.c:723:1: warning: no previous prototype for ‘radeon_cp_idle_kms’ [-Wmissing-prototypes] drivers/gpu/drm/radeon/radeon_kms.c:724:1: warning: no previous prototype for ‘radeon_cp_resume_kms’ [-Wmissing-prototypes] drivers/gpu/drm/radeon/radeon_kms.c:725:1: warning: no previous prototype for ‘radeon_engine_reset_kms’ [-Wmissing-prototypes] drivers/gpu/drm/radeon/radeon_kms.c:726:1: warning: no previous prototype for ‘radeon_fullscreen_kms’ [-Wmissing-prototypes] drivers/gpu/drm/radeon/radeon_kms.c:727:1: warning: no previous prototype for ‘radeon_cp_swap_kms’ [-Wmissing-prototypes] drivers/gpu/drm/radeon/radeon_kms.c:728:1: warning: no previous rototype for ‘radeon_cp_clear_kms’ [-Wmissing-prototypes] drivers/gpu/drm/radeon/radeon_kms.c:729:1: warning: no previous prototype for ‘radeon_cp_vertex_kms’ [-Wmissing-prototypes] drivers/gpu/drm/radeon/radeon_kms.c:730:1: warning: no previous rototype for ‘radeon_cp_indices_kms’ [-Wmissing-prototypes] drivers/gpu/drm/radeon/radeon_kms.c:731:1: warning: no previous prototype for ‘radeon_cp_texture_kms’ [-Wmissing-prototypes] drivers/gpu/drm/radeon/radeon_kms.c:732:1: warning: no previous prototype for ‘radeon_cp_stipple_kms’ [-Wmissing-prototypes] drivers/gpu/drm/radeon/radeon_kms.c:733:1: warning: no previous prototype for ‘radeon_cp_indirect_kms’ [-Wmissing-prototypes] drivers/gpu/drm/radeon/radeon_kms.c:734:1: warning: no previous prototype for ‘radeon_cp_vertex2_kms’ [-Wmissing-prototypes] drivers/gpu/drm/radeon/radeon_kms.c:735:1: warning: no previous prototype for ‘radeon_cp_cmdbuf_kms’ [-Wmissing-prototypes] drivers/gpu/drm/radeon/radeon_kms.c:736:1: warning: no previous prototype for ‘radeon_cp_getparam_kms’ [-Wmissing-prototypes] drivers/gpu/drm/radeon/radeon_kms.c:737:1: warning: no previous prototype for ‘radeon_cp_flip_kms’ [-Wmissing-prototypes] drivers/gpu/drm/radeon/radeon_kms.c:738:1: warning: no previous prototype for ‘radeon_mem_alloc_kms’ [-Wmissing-prototypes] drivers/gpu/drm/radeon/radeon_kms.c:739:1: warning: no previous prototype for ‘radeon_mem_free_kms’ [-Wmissing-prototypes] drivers/gpu/drm/radeon/radeon_kms.c:740:1: warning: no previous rototype for ‘radeon_mem_init_heap_kms’ [-Wmissing-prototypes] drivers/gpu/drm/radeon/radeon_kms.c:741:1: warning: no previous rototype for ‘radeon_irq_emit_kms’ [-Wmissing-prototypes] drivers/gpu/drm/radeon/radeon_kms.c:742:1: warning: no previous prototype for ‘radeon_irq_wait_kms’ [-Wmissing-prototypes] drivers/gpu/drm/radeon/radeon_kms.c:743:1: warning: no previous rototype for ‘radeon_cp_setparam_kms’ [-Wmissing-prototypes] drivers/gpu/drm/radeon/radeon_kms.c:744:1: warning: no previous prototype for ‘radeon_surface_alloc_kms’ [-Wmissing-prototypes] drivers/gpu/drm/radeon/radeon_kms.c:745:1: warning: no previous prototype for ‘radeon_surface_free_kms’ [-Wmissing-prototypes]

Signed-off-by: Rashika Kheria rashika.kheria@gmail.com Reviewed-by: Josh Triplett josh@joshtriplett.org --- drivers/gpu/drm/radeon/radeon_kms.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/radeon/radeon_kms.c b/drivers/gpu/drm/radeon/radeon_kms.c index 03cbb6b..4797b41 100644 --- a/drivers/gpu/drm/radeon/radeon_kms.c +++ b/drivers/gpu/drm/radeon/radeon_kms.c @@ -707,7 +707,8 @@ int radeon_get_vblank_timestamp_kms(struct drm_device *dev, int crtc, }

#define KMS_INVALID_IOCTL(name) \ -int name(struct drm_device *dev, void *data, struct drm_file *file_priv)\ +static int name(struct drm_device *dev, void *data, struct drm_file \ + *file_priv) \ { \ DRM_ERROR("invalid ioctl with kms %s\n", __func__); \ return -EINVAL; \

Move prototype declaration of function radeon_combios_connected_scratch_regs() to header file drm/radeon/radeon_mode.h from drm/radeon/radeon_connectors.c because it is used by more than one file.

This eliminates the following warning in drm/radeon/radeon_combios.c: drivers/gpu/drm/radeon/radeon_combios.c:3449:1: warning: no previous prototype for ‘radeon_combios_connected_scratch_regs’ [-Wmissing-prototypes]

Signed-off-by: Rashika Kheria rashika.kheria@gmail.com Reviewed-by: Josh Triplett josh@joshtriplett.org --- drivers/gpu/drm/radeon/radeon_connectors.c | 5 ----- drivers/gpu/drm/radeon/radeon_mode.h | 5 +++++ 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/drivers/gpu/drm/radeon/radeon_connectors.c b/drivers/gpu/drm/radeon/radeon_connectors.c index 9070487..c12eca0 100644 --- a/drivers/gpu/drm/radeon/radeon_connectors.c +++ b/drivers/gpu/drm/radeon/radeon_connectors.c @@ -34,11 +34,6 @@

#include <linux/pm_runtime.h>

-extern void -radeon_combios_connected_scratch_regs(struct drm_connector *connector, - struct drm_encoder *encoder, - bool connected); - void radeon_connector_hotplug(struct drm_connector *connector) { struct drm_device *dev = connector->dev; diff --git a/drivers/gpu/drm/radeon/radeon_mode.h b/drivers/gpu/drm/radeon/radeon_mode.h index 3f0dd66..b2b556b 100644 --- a/drivers/gpu/drm/radeon/radeon_mode.h +++ b/drivers/gpu/drm/radeon/radeon_mode.h @@ -46,6 +46,11 @@ struct radeon_device; #define to_radeon_encoder(x) container_of(x, struct radeon_encoder, base) #define to_radeon_framebuffer(x) container_of(x, struct radeon_framebuffer, base)

+void +radeon_combios_connected_scratch_regs(struct drm_connector *connector, + struct drm_encoder *encoder, + bool connected); + enum radeon_rmx_type { RMX_OFF, RMX_FULL,

Move prototype declarations of functions radeon_get_encoder_enum() and radeon_link_encoder_connector() to header file drm/radeon/radeon_mode.h because they are used by more than one file.

This eliminates the following warnings in drm/radeon/radeon_encoders.c: drivers/gpu/drm/radeon/radeon_encoders.c:86:1: warning: no previous prototype for ‘radeon_get_encoder_enum’ [-Wmissing-prototypes] drivers/gpu/drm/radeon/radeon_encoders.c:162:1: warning: no previous prototype for ‘radeon_link_encoder_connector’ [-Wmissing-prototypes]

Signed-off-by: Rashika Kheria rashika.kheria@gmail.com Reviewed-by: Josh Triplett josh@joshtriplett.org --- drivers/gpu/drm/radeon/radeon_atombios.c | 5 ----- drivers/gpu/drm/radeon/radeon_combios.c | 6 ------ drivers/gpu/drm/radeon/radeon_mode.h | 4 ++++ 3 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/drivers/gpu/drm/radeon/radeon_atombios.c b/drivers/gpu/drm/radeon/radeon_atombios.c index 392ea6e..a876fae 100644 --- a/drivers/gpu/drm/radeon/radeon_atombios.c +++ b/drivers/gpu/drm/radeon/radeon_atombios.c @@ -32,11 +32,6 @@ #include "radeon_asic.h" #include "atom-bits.h"

-/* from radeon_encoder.c */ -extern uint32_t -radeon_get_encoder_enum(struct drm_device *dev, uint32_t supported_device, - uint8_t dac); -extern void radeon_link_encoder_connector(struct drm_device *dev); extern void radeon_add_atom_encoder(struct drm_device *dev, uint32_t encoder_enum, uint32_t supported_device, u16 caps); diff --git a/drivers/gpu/drm/radeon/radeon_combios.c b/drivers/gpu/drm/radeon/radeon_combios.c index e4c1b8d..6651177 100644 --- a/drivers/gpu/drm/radeon/radeon_combios.c +++ b/drivers/gpu/drm/radeon/radeon_combios.c @@ -37,12 +37,6 @@ #include <asm/pci-bridge.h> #endif /* CONFIG_PPC_PMAC */

-/* from radeon_encoder.c */ -extern uint32_t -radeon_get_encoder_enum(struct drm_device *dev, uint32_t supported_device, - uint8_t dac); -extern void radeon_link_encoder_connector(struct drm_device *dev); - /* from radeon_legacy_encoder.c */ extern void radeon_add_legacy_encoder(struct drm_device *dev, uint32_t encoder_enum, diff --git a/drivers/gpu/drm/radeon/radeon_mode.h b/drivers/gpu/drm/radeon/radeon_mode.h index e841fde..d1f7a0e 100644 --- a/drivers/gpu/drm/radeon/radeon_mode.h +++ b/drivers/gpu/drm/radeon/radeon_mode.h @@ -647,6 +647,10 @@ radeon_add_legacy_connector(struct drm_device *dev, struct radeon_i2c_bus_rec *i2c_bus, uint16_t connector_object_id, struct radeon_hpd *hpd); +uint32_t +radeon_get_encoder_enum(struct drm_device *dev, uint32_t supported_device, + uint8_t dac); +void radeon_link_encoder_connector(struct drm_device *dev);

extern enum radeon_tv_std radeon_combios_get_tv_info(struct radeon_device *rdev);

Move prototype declarations of functions radeon_pm_acpi_event_handler() to header file drm/radeon/radeon.h because it is used by more than one file.

This eliminates the following warning in drm/radeon/radeon_pm.c: drivers/gpu/drm/radeon/radeon_pm.c:68:6: warning: no previous prototype for ‘radeon_pm_acpi_event_handler’ [-Wmissing-prototypes]

Signed-off-by: Rashika Kheria rashika.kheria@gmail.com Reviewed-by: Josh Triplett josh@joshtriplett.org --- drivers/gpu/drm/radeon/radeon.h | 1 + drivers/gpu/drm/radeon/radeon_acpi.c | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/radeon/radeon.h b/drivers/gpu/drm/radeon/radeon.h index 28414f2..8e0b9dd 100644 --- a/drivers/gpu/drm/radeon/radeon.h +++ b/drivers/gpu/drm/radeon/radeon.h @@ -104,6 +104,7 @@ u32 r600_gpu_check_soft_reset(struct radeon_device *rdev);

void r600_ih_ring_fini(struct radeon_device *rdev); int r600_ih_ring_alloc(struct radeon_device *rdev); +void radeon_pm_acpi_event_handler(struct radeon_device *rdev);

/* * Copy from radeon_drv.h so we don't have to include both and have conflicting diff --git a/drivers/gpu/drm/radeon/radeon_acpi.c b/drivers/gpu/drm/radeon/radeon_acpi.c index 98a9074..d3018cb 100644 --- a/drivers/gpu/drm/radeon/radeon_acpi.c +++ b/drivers/gpu/drm/radeon/radeon_acpi.c @@ -39,8 +39,6 @@

#define ACPI_AC_CLASS "ac_adapter"

-extern void radeon_pm_acpi_event_handler(struct radeon_device *rdev); - struct atif_verify_interface { u16 size; /* structure size in bytes (includes size field) */ u16 version; /* version */

Mark function r600_audio_set_dto() as static in drm/radeon/r600_hdmi.c because it is not used outside this file.

This eliminates the following warning in drm/radeon/r600_hdmi.c: drivers/gpu/drm/radeon/r600_hdmi.c:253:6: warning: no previous prototype for ‘r600_audio_set_dto’ [-Wmissing-prototypes]

Signed-off-by: Rashika Kheria rashika.kheria@gmail.com Reviewed-by: Josh Triplett josh@joshtriplett.org --- drivers/gpu/drm/radeon/r600_hdmi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/radeon/r600_hdmi.c b/drivers/gpu/drm/radeon/r600_hdmi.c index b7d3ecb..3016fc1 100644 --- a/drivers/gpu/drm/radeon/r600_hdmi.c +++ b/drivers/gpu/drm/radeon/r600_hdmi.c @@ -250,7 +250,7 @@ static void r600_hdmi_audio_workaround(struct drm_encoder *encoder) value, ~HDMI0_AUDIO_TEST_EN); }

-void r600_audio_set_dto(struct drm_encoder *encoder, u32 clock) +static void r600_audio_set_dto(struct drm_encoder *encoder, u32 clock) { struct drm_device *dev = encoder->dev; struct radeon_device *rdev = dev->dev_private;

Move prototype declaration of functions evergreen_mc_stop(), evergreen_mc_resume(), evergreen_is_display_hung(), sumo_rlc_fini(), sumo_rlc_init(), evergreen_fix_pci_max_read_req_size(), evergreen_get_number_of_dram_channels(), evergreen_mc_program(), evergreen_mc_init(), evergreen_gpu_check_soft_reset(), evergreen_rlc_resume() and evergreen_irq_suspend() to header file drm/radeon/radeon_asic.h because they are used by more than one file.

This eliminates the following warnings in drm/radeon/evergreen.c: drivers/gpu/drm/radeon/evergreen.c:1175:6: warning: no previous prototype for ‘evergreen_fix_pci_max_read_req_size’ [-Wmissing-prototypes] drivers/gpu/drm/radeon/evergreen.c:1950:5: warning: no previous prototype for ‘evergreen_get_number_of_dram_channels’ [-Wmissing-prototypes] drivers/gpu/drm/radeon/evergreen.c:2548:6: warning: no previous prototype for ‘evergreen_mc_stop’ [-Wmissing-prototypes] drivers/gpu/drm/radeon/evergreen.c:2634:6: warning: no previous prototype for ‘evergreen_mc_resume’ [-Wmissing-prototypes] drivers/gpu/drm/radeon/evergreen.c:2722:6: warning: no previous prototype for ‘evergreen_mc_program’ [-Wmissing-prototypes] drivers/gpu/drm/radeon/evergreen.c:3571:5: warning: no previous prototype for ‘evergreen_mc_init’ [-Wmissing-prototypes] drivers/gpu/drm/radeon/evergreen.c:3630:6: warning: no previous prototype for ‘evergreen_print_gpu_status_regs’ [-Wmissing-prototypes] drivers/gpu/drm/radeon/evergreen.c:3658:6: warning: no previous prototype for ‘evergreen_is_display_hung’ [-Wmissing-prototypes] drivers/gpu/drm/radeon/evergreen.c:3687:5: warning: no previous prototype for ‘evergreen_gpu_check_soft_reset’ [-Wmissing-prototypes] drivers/gpu/drm/radeon/evergreen.c:3919:6: warning: no previous prototype for ‘sumo_rlc_fini’ [-Wmissing-prototypes] drivers/gpu/drm/radeon/evergreen.c:3962:5: warning: no previous prototype for ‘sumo_rlc_init’ [-Wmissing-prototypes] drivers/gpu/drm/radeon/evergreen.c:4186:5: warning: no previous prototype for ‘evergreen_rlc_resume’ [-Wmissing-prototypes] drivers/gpu/drm/radeon/evergreen.c:4685:6: warning: no previous prototype for ‘evergreen_irq_suspend’ [-Wmissing-prototypes]

Signed-off-by: Rashika Kheria rashika.kheria@gmail.com Reviewed-by: Josh Triplett josh@joshtriplett.org --- drivers/gpu/drm/radeon/cik.c | 5 ----- drivers/gpu/drm/radeon/evergreen_dma.c | 2 -- drivers/gpu/drm/radeon/ni.c | 10 ---------- drivers/gpu/drm/radeon/r600.c | 1 - drivers/gpu/drm/radeon/radeon_asic.h | 13 +++++++++++++ drivers/gpu/drm/radeon/si.c | 8 -------- 6 files changed, 13 insertions(+), 26 deletions(-)

diff --git a/drivers/gpu/drm/radeon/cik.c b/drivers/gpu/drm/radeon/cik.c index fb5943c..bc21542 100644 --- a/drivers/gpu/drm/radeon/cik.c +++ b/drivers/gpu/drm/radeon/cik.c @@ -62,11 +62,6 @@ MODULE_FIRMWARE("radeon/KABINI_mec.bin"); MODULE_FIRMWARE("radeon/KABINI_rlc.bin"); MODULE_FIRMWARE("radeon/KABINI_sdma.bin");

-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 bool evergreen_is_display_hung(struct radeon_device *rdev); -extern void sumo_rlc_fini(struct radeon_device *rdev); -extern int sumo_rlc_init(struct radeon_device *rdev); extern void si_vram_gtt_location(struct radeon_device *rdev, struct radeon_mc *mc); extern void si_rlc_reset(struct radeon_device *rdev); extern void si_init_uvd_internal_cg(struct radeon_device *rdev); diff --git a/drivers/gpu/drm/radeon/evergreen_dma.c b/drivers/gpu/drm/radeon/evergreen_dma.c index a37b544..b4230bf 100644 --- a/drivers/gpu/drm/radeon/evergreen_dma.c +++ b/drivers/gpu/drm/radeon/evergreen_dma.c @@ -26,8 +26,6 @@ #include "radeon_asic.h" #include "evergreend.h"

-u32 evergreen_gpu_check_soft_reset(struct radeon_device *rdev); - /** * evergreen_dma_fence_ring_emit - emit a fence on the DMA ring * diff --git a/drivers/gpu/drm/radeon/ni.c b/drivers/gpu/drm/radeon/ni.c index 11aab2a..2817382 100644 --- a/drivers/gpu/drm/radeon/ni.c +++ b/drivers/gpu/drm/radeon/ni.c @@ -161,19 +161,9 @@ 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);

/* Firmware Names */ MODULE_FIRMWARE("radeon/BARTS_pfp.bin"); diff --git a/drivers/gpu/drm/radeon/r600.c b/drivers/gpu/drm/radeon/r600.c index 9ad0673..6a517f3 100644 --- a/drivers/gpu/drm/radeon/r600.c +++ b/drivers/gpu/drm/radeon/r600.c @@ -104,7 +104,6 @@ static void r600_gpu_init(struct radeon_device *rdev); void r600_fini(struct radeon_device *rdev); void r600_irq_disable(struct radeon_device *rdev); static void r600_pcie_gen2_enable(struct radeon_device *rdev); -extern int evergreen_rlc_resume(struct radeon_device *rdev);

/** * r600_get_xclk - get the xclk diff --git a/drivers/gpu/drm/radeon/radeon_asic.h b/drivers/gpu/drm/radeon/radeon_asic.h index c9fd97b..5e1f169 100644 --- a/drivers/gpu/drm/radeon/radeon_asic.h +++ b/drivers/gpu/drm/radeon/radeon_asic.h @@ -560,6 +560,19 @@ void sumo_dpm_debugfs_print_current_performance_level(struct radeon_device *rdev struct seq_file *m); int sumo_dpm_force_performance_level(struct radeon_device *rdev, enum radeon_dpm_forced_level level); +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); +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 sumo_rlc_fini(struct radeon_device *rdev); +int sumo_rlc_init(struct radeon_device *rdev); +u32 evergreen_get_number_of_dram_channels(struct radeon_device *rdev); +u32 evergreen_gpu_check_soft_reset(struct radeon_device *rdev); +int evergreen_rlc_resume(struct radeon_device *rdev);

/* * cayman diff --git a/drivers/gpu/drm/radeon/si.c b/drivers/gpu/drm/radeon/si.c index 762c5f6..b3047a7 100644 --- a/drivers/gpu/drm/radeon/si.c +++ b/drivers/gpu/drm/radeon/si.c @@ -68,14 +68,6 @@ MODULE_FIRMWARE("radeon/HAINAN_smc.bin");

static void si_pcie_gen3_enable(struct radeon_device *rdev); static void si_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_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_fini_pg(struct radeon_device *rdev);

Move prototype declarations of function radeon_add_atom_encoder() and radeon_atom_backlight_init() to header file drm/radeon/radeon_mode.h because they are used by more than one file.

This eliminates the following warning in drm/radeon/atombios_encoders.c: drivers/gpu/drm/radeon/atombios_encoders.c:177:6: warning: no previous prototype for ‘radeon_atom_backlight_init’ [-Wmissing-prototypes] drivers/gpu/drm/radeon/atombios_encoders.c:2600:1: warning: no previous prototype for ‘radeon_add_atom_encoder’ [-Wmissing-prototypes]

Signed-off-by: Rashika Kheria rashika.kheria@gmail.com Reviewed-by: Josh Triplett josh@joshtriplett.org --- drivers/gpu/drm/radeon/radeon_atombios.c | 4 ---- drivers/gpu/drm/radeon/radeon_encoders.c | 4 ---- drivers/gpu/drm/radeon/radeon_mode.h | 7 +++++++ 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/drivers/gpu/drm/radeon/radeon_atombios.c b/drivers/gpu/drm/radeon/radeon_atombios.c index a876fae..19a7350 100644 --- a/drivers/gpu/drm/radeon/radeon_atombios.c +++ b/drivers/gpu/drm/radeon/radeon_atombios.c @@ -32,10 +32,6 @@ #include "radeon_asic.h" #include "atom-bits.h"

-extern void -radeon_add_atom_encoder(struct drm_device *dev, uint32_t encoder_enum, - uint32_t supported_device, u16 caps); - /* from radeon_legacy_encoder.c */ extern void radeon_add_legacy_encoder(struct drm_device *dev, uint32_t encoder_enum, diff --git a/drivers/gpu/drm/radeon/radeon_encoders.c b/drivers/gpu/drm/radeon/radeon_encoders.c index bd4959c..a88ba7a 100644 --- a/drivers/gpu/drm/radeon/radeon_encoders.c +++ b/drivers/gpu/drm/radeon/radeon_encoders.c @@ -32,10 +32,6 @@ extern void radeon_legacy_backlight_init(struct radeon_encoder *radeon_encoder, struct drm_connector *drm_connector); -extern void -radeon_atom_backlight_init(struct radeon_encoder *radeon_encoder, - struct drm_connector *drm_connector); -

static uint32_t radeon_encoder_clones(struct drm_encoder *encoder) { diff --git a/drivers/gpu/drm/radeon/radeon_mode.h b/drivers/gpu/drm/radeon/radeon_mode.h index b5f4e52..8f2f4a3 100644 --- a/drivers/gpu/drm/radeon/radeon_mode.h +++ b/drivers/gpu/drm/radeon/radeon_mode.h @@ -628,6 +628,13 @@ struct atom_voltage_table struct atom_voltage_table_entry entries[MAX_VOLTAGE_ENTRIES]; };

+void +radeon_atom_backlight_init(struct radeon_encoder *radeon_encoder, + struct drm_connector *drm_connector); + +void +radeon_add_atom_encoder(struct drm_device *dev, uint32_t encoder_enum, + uint32_t supported_device, u16 caps);

void radeon_add_atom_connector(struct drm_device *dev,

Move prototype declaration of functions radeon_atom_hw_i2c_xfer() and radeon_atom_hw_i2c_func() to header file drm/radeon/radeon_mode.h because they are used by more than one file.

This eliminates the following warnings in drm/radeon/atombios_i2c.c: drivers/gpu/drm/radeon/atombios_i2c.c:96:5: warning: no previous prototype for ‘radeon_atom_hw_i2c_xfer’ [-Wmissing-prototypes] drivers/gpu/drm/radeon/atombios_i2c.c:146:5: warning: no previous prototype for ‘radeon_atom_hw_i2c_func’ [-Wmissing-prototypes]

Signed-off-by: Rashika Kheria rashika.kheria@gmail.com Reviewed-by: Josh Triplett josh@joshtriplett.org --- drivers/gpu/drm/radeon/radeon_i2c.c | 4 ---- drivers/gpu/drm/radeon/radeon_mode.h | 4 ++++ 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/gpu/drm/radeon/radeon_i2c.c b/drivers/gpu/drm/radeon/radeon_i2c.c index fc60b74..fd07db8 100644 --- a/drivers/gpu/drm/radeon/radeon_i2c.c +++ b/drivers/gpu/drm/radeon/radeon_i2c.c @@ -31,10 +31,6 @@ #include "radeon.h" #include "atom.h"

-extern int radeon_atom_hw_i2c_xfer(struct i2c_adapter *i2c_adap, - struct i2c_msg *msgs, int num); -extern u32 radeon_atom_hw_i2c_func(struct i2c_adapter *adap); - /** * radeon_ddc_probe * diff --git a/drivers/gpu/drm/radeon/radeon_mode.h b/drivers/gpu/drm/radeon/radeon_mode.h index 8f2f4a3..129f069 100644 --- a/drivers/gpu/drm/radeon/radeon_mode.h +++ b/drivers/gpu/drm/radeon/radeon_mode.h @@ -628,6 +628,10 @@ struct atom_voltage_table struct atom_voltage_table_entry entries[MAX_VOLTAGE_ENTRIES]; };

+int radeon_atom_hw_i2c_xfer(struct i2c_adapter *i2c_adap, + struct i2c_msg *msgs, int num); +u32 radeon_atom_hw_i2c_func(struct i2c_adapter *adap); + void radeon_atom_backlight_init(struct radeon_encoder *radeon_encoder, struct drm_connector *drm_connector);

Move prototype declaration of functions cik_gpu_check_soft_reset(), cik_enter_rlc_safe_mode(), cik_exit_rlc_safe_mode(), cik_update_cg(), cik_init_cp_pg_table(), cik_get_csb_size() and cik_get_csb_buffer() to header file drm/radeon/radeon_asic.h because they are used by more than one file.

Also include the header file in drm/radeon/ci_dpm.c because it uses functions declared in the file.

This eliminates the following warning in drivers/gpu/drm/radeon/cik.c:4648:5: warning: no previous prototype for ‘cik_gpu_check_soft_reset’ [-Wmissing-prototypes] drivers/gpu/drm/radeon/cik.c:5481:6: warning: no previous prototype for ‘cik_enter_rlc_safe_mode’ [-Wmissing-prototypes] drivers/gpu/drm/radeon/cik.c:5502:6: warning: no previous prototype for ‘cik_exit_rlc_safe_mode’ [-Wmissing-prototypes] drivers/gpu/drm/radeon/cik.c:5900:6: warning: no previous prototype for ‘cik_update_cg’ [-Wmissing-prototypes] drivers/gpu/drm/radeon/cik.c:6028:6: warning: no previous prototype for ‘cik_init_cp_pg_table’ [-Wmissing-prototypes] drivers/gpu/drm/radeon/cik.c:6239:5: warning: no previous prototype for ‘cik_get_csb_size’ [-Wmissing-prototypes] drivers/gpu/drm/radeon/cik.c:6271:6: warning: no previous prototype for ‘cik_get_csb_buffer’ [-Wmissing-prototypes]

Signed-off-by: Rashika Kheria rashika.kheria@gmail.com Reviewed-by: Josh Triplett josh@joshtriplett.org --- drivers/gpu/drm/radeon/ci_dpm.c | 5 +---- drivers/gpu/drm/radeon/cik_sdma.c | 2 -- drivers/gpu/drm/radeon/evergreen.c | 4 ---- drivers/gpu/drm/radeon/kv_dpm.c | 5 ----- drivers/gpu/drm/radeon/radeon_asic.h | 8 ++++++++ 5 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/drivers/gpu/drm/radeon/ci_dpm.c b/drivers/gpu/drm/radeon/ci_dpm.c index 1ed4799..899c843 100644 --- a/drivers/gpu/drm/radeon/ci_dpm.c +++ b/drivers/gpu/drm/radeon/ci_dpm.c @@ -23,6 +23,7 @@

#include "drmP.h" #include "radeon.h" +#include "radeon_asic.h" #include "cikd.h" #include "r600_dpm.h" #include "ci_dpm.h" @@ -169,10 +170,6 @@ extern u8 si_get_mclk_frequency_ratio(u32 memory_clock, bool strobe_mode); extern void si_trim_voltage_table_to_fit_state_table(struct radeon_device *rdev, u32 max_voltage_steps, struct atom_voltage_table *voltage_table); -extern void cik_enter_rlc_safe_mode(struct radeon_device *rdev); -extern void cik_exit_rlc_safe_mode(struct radeon_device *rdev); -extern void cik_update_cg(struct radeon_device *rdev, - u32 block, bool enable);

static int ci_get_std_voltage_value_sidd(struct radeon_device *rdev, struct atom_voltage_table_entry *voltage_table, diff --git a/drivers/gpu/drm/radeon/cik_sdma.c b/drivers/gpu/drm/radeon/cik_sdma.c index 0300727..2fc7ede 100644 --- a/drivers/gpu/drm/radeon/cik_sdma.c +++ b/drivers/gpu/drm/radeon/cik_sdma.c @@ -32,8 +32,6 @@ #define CIK_SDMA_UCODE_SIZE 1050 #define CIK_SDMA_UCODE_VERSION 64

-u32 cik_gpu_check_soft_reset(struct radeon_device *rdev); - /* * sDMA - System DMA * Starting with CIK, the GPU has new asynchronous diff --git a/drivers/gpu/drm/radeon/evergreen.c b/drivers/gpu/drm/radeon/evergreen.c index 534a2fa..3b68229 100644 --- a/drivers/gpu/drm/radeon/evergreen.c +++ b/drivers/gpu/drm/radeon/evergreen.c @@ -136,10 +136,6 @@ static void evergreen_gpu_init(struct radeon_device *rdev); void evergreen_fini(struct radeon_device *rdev); void evergreen_pcie_gen2_enable(struct radeon_device *rdev); void evergreen_program_aspm(struct radeon_device *rdev); -void cik_init_cp_pg_table(struct radeon_device *rdev); - -extern u32 cik_get_csb_size(struct radeon_device *rdev); -extern void cik_get_csb_buffer(struct radeon_device *rdev, volatile u32 *buffer);

static const u32 evergreen_golden_registers[] = { diff --git a/drivers/gpu/drm/radeon/kv_dpm.c b/drivers/gpu/drm/radeon/kv_dpm.c index b419055..7e58dfb 100644 --- a/drivers/gpu/drm/radeon/kv_dpm.c +++ b/drivers/gpu/drm/radeon/kv_dpm.c @@ -56,11 +56,6 @@ static void kv_dpm_powergate_vce(struct radeon_device *rdev, bool gate); static void kv_dpm_powergate_samu(struct radeon_device *rdev, bool gate); static void kv_dpm_powergate_acp(struct radeon_device *rdev, bool gate);

-extern void cik_enter_rlc_safe_mode(struct radeon_device *rdev); -extern void cik_exit_rlc_safe_mode(struct radeon_device *rdev); -extern void cik_update_cg(struct radeon_device *rdev, - u32 block, bool enable); - static const struct kv_lcac_config_values sx_local_cac_cfg_kv[] = { { 0, 4, 1 }, diff --git a/drivers/gpu/drm/radeon/radeon_asic.h b/drivers/gpu/drm/radeon/radeon_asic.h index 51ec129c..1d631cd 100644 --- a/drivers/gpu/drm/radeon/radeon_asic.h +++ b/drivers/gpu/drm/radeon/radeon_asic.h @@ -712,6 +712,14 @@ void dce8_bandwidth_update(struct radeon_device *rdev); /* * cik */ +u32 cik_gpu_check_soft_reset(struct radeon_device *rdev); +void cik_enter_rlc_safe_mode(struct radeon_device *rdev); +void cik_exit_rlc_safe_mode(struct radeon_device *rdev); +void cik_update_cg(struct radeon_device *rdev, + u32 block, bool enable); +void cik_init_cp_pg_table(struct radeon_device *rdev); +u32 cik_get_csb_size(struct radeon_device *rdev); +void cik_get_csb_buffer(struct radeon_device *rdev, volatile u32 *buffer); uint64_t cik_get_gpu_clock_counter(struct radeon_device *rdev); u32 cik_get_xclk(struct radeon_device *rdev); uint32_t cik_pciep_rreg(struct radeon_device *rdev, uint32_t reg);

Include appropriate header file drm/radeon/radeon_asic.h in drm/radeon/rs780_dpm.c because it uses function declared in the header file.

This eliminates the following warnings in drm/radeon/rs780_dpm.c: drivers/gpu/drm/radeon/rs780_dpm.c:596:5: warning: no previous prototype for ‘rs780_dpm_enable’ [-Wmissing-prototypes] drivers/gpu/drm/radeon/rs780_dpm.c:637:6: warning: no previous prototype for ‘rs780_dpm_disable’ [-Wmissing-prototypes] drivers/gpu/drm/radeon/rs780_dpm.c:656:5: warning: no previous prototype for ‘rs780_dpm_set_power_state’ [-Wmissing-prototypes] drivers/gpu/drm/radeon/rs780_dpm.c:687:6: warning: no previous prototype for ‘rs780_dpm_setup_asic’ [-Wmissing-prototypes] drivers/gpu/drm/radeon/rs780_dpm.c:692:6: warning: no previous prototype for ‘rs780_dpm_display_configuration_changed’ [-Wmissing-prototypes] drivers/gpu/drm/radeon/rs780_dpm.c:856:5: warning: no previous prototype for ‘rs780_dpm_init’ [-Wmissing-prototypes] drivers/gpu/drm/radeon/rs780_dpm.c:943:6: warning: no previous prototype for ‘rs780_dpm_print_power_state’ [-Wmissing-prototypes] drivers/gpu/drm/radeon/rs780_dpm.c:958:6: warning: no previous prototype for ‘rs780_dpm_fini’ [-Wmissing-prototypes] drivers/gpu/drm/radeon/rs780_dpm.c:969:5: warning: no previous prototype for ‘rs780_dpm_get_sclk’ [-Wmissing-prototypes] drivers/gpu/drm/radeon/rs780_dpm.c:979:5: warning: no previous prototype for ‘rs780_dpm_get_mclk’ [-Wmissing-prototypes] drivers/gpu/drm/radeon/rs780_dpm.c:986:6: warning: no previous prototype for ‘rs780_dpm_debugfs_print_current_performance_level’ [-Wmissing-prototypes] drivers/gpu/drm/radeon/rs780_dpm.c:1010:5: warning: no previous prototype for ‘rs780_dpm_force_performance_level’ [-Wmissing-prototypes]

Signed-off-by: Rashika Kheria rashika.kheria@gmail.com Reviewed-by: Josh Triplett josh@joshtriplett.org --- drivers/gpu/drm/radeon/rs780_dpm.c | 1 + 1 file changed, 1 insertion(+)

diff --git a/drivers/gpu/drm/radeon/rs780_dpm.c b/drivers/gpu/drm/radeon/rs780_dpm.c index 6af8505..dd264f5 100644 --- a/drivers/gpu/drm/radeon/rs780_dpm.c +++ b/drivers/gpu/drm/radeon/rs780_dpm.c @@ -24,6 +24,7 @@

#include "drmP.h" #include "radeon.h" +#include "radeon_asic.h" #include "rs780d.h" #include "r600_dpm.h" #include "rs780_dpm.h"

Include header file gpu/drm/radeon/radeon_asic.h in drm/radeon/rv770_dpm.c because it uses functions declared in the header file.

This eliminates the following warning in drm/radeon/rv770_dpm.c: drivers/gpu/drm/radeon/rv770_dpm.c:47:18: warning: no previous prototype for ‘rv770_get_ps’ [-Wmissing-prototypes] drivers/gpu/drm/radeon/rv770_dpm.c:54:26: warning: no previous prototype for ‘rv770_get_pi’ [-Wmissing-prototypes] drivers/gpu/drm/radeon/rv770_dpm.c:61:30: warning: no previous prototype for ‘evergreen_get_pi’ [-Wmissing-prototypes] drivers/gpu/drm/radeon/rv770_dpm.c:1891:5: warning: no previous prototype for ‘rv770_dpm_enable’ [-Wmissing-prototypes] drivers/gpu/drm/radeon/rv770_dpm.c:1989:6: warning: no previous prototype for ‘rv770_dpm_disable’ [-Wmissing-prototypes] drivers/gpu/drm/radeon/rv770_dpm.c:2027:5: warning: no previous prototype for ‘rv770_dpm_set_power_state’ [-Wmissing-prototypes] drivers/gpu/drm/radeon/rv770_dpm.c:2083:6: warning: no previous prototype for ‘rv770_dpm_setup_asic’ [-Wmissing-prototypes] drivers/gpu/drm/radeon/rv770_dpm.c:2106:6: warning: no previous prototype for ‘rv770_dpm_display_configuration_changed’ [-Wmissing-prototypes] drivers/gpu/drm/radeon/rv770_dpm.c:2337:5: warning: no previous prototype for ‘rv770_dpm_init’ [-Wmissing-prototypes] drivers/gpu/drm/radeon/rv770_dpm.c:2422:6: warning: no previous prototype for ‘rv770_dpm_print_power_state’ [-Wmissing-prototypes] drivers/gpu/drm/radeon/rv770_dpm.c:2455:6: warning: no previous prototype for ‘rv770_dpm_debugfs_print_current_performance_level’ [-Wmissing-prototypes] drivers/gpu/drm/radeon/rv770_dpm.c:2485:6: warning: no previous prototype for ‘rv770_dpm_fini’ [-Wmissing-prototypes] drivers/gpu/drm/radeon/rv770_dpm.c:2496:5: warning: no previous prototype for ‘rv770_dpm_get_sclk’ [-Wmissing-prototypes] drivers/gpu/drm/radeon/rv770_dpm.c:2506:5: warning: no previous prototype for ‘rv770_dpm_get_mclk’ [-Wmissing-prototypes] drivers/gpu/drm/radeon/rv770_dpm.c:2516:6: warning: no previous prototype for ‘rv770_dpm_vblank_too_short’ [-Wmissing-prototypes]

Signed-off-by: Rashika Kheria rashika.kheria@gmail.com Reviewed-by: Josh Triplett josh@joshtriplett.org --- drivers/gpu/drm/radeon/rv770_dpm.c | 1 + 1 file changed, 1 insertion(+)

diff --git a/drivers/gpu/drm/radeon/rv770_dpm.c b/drivers/gpu/drm/radeon/rv770_dpm.c index 913b025..cd22549 100644 --- a/drivers/gpu/drm/radeon/rv770_dpm.c +++ b/drivers/gpu/drm/radeon/rv770_dpm.c @@ -24,6 +24,7 @@

#include "drmP.h" #include "radeon.h" +#include "radeon_asic.h" #include "rv770d.h" #include "r600_dpm.h" #include "rv770_dpm.h"

Move prototype declarations of functions rv770_get_ps(), rv770_get_pi() and evergreen_get_pi() to header file drm/radeon/rv770_dpm.h because they are used by more than one file.

This eliminates the following warnings in drm/radeon/rv770_dpm.c: drivers/gpu/drm/radeon/rv770_dpm.c:47:18: warning: no previous prototype for ‘rv770_get_ps’ [-Wmissing-prototypes] drivers/gpu/drm/radeon/rv770_dpm.c:54:26: warning: no previous prototype for ‘rv770_get_pi’ [-Wmissing-prototypes] drivers/gpu/drm/radeon/rv770_dpm.c:61:30: warning: no previous prototype for ‘evergreen_get_pi’ [-Wmissing-prototypes]

Signed-off-by: Rashika Kheria rashika.kheria@gmail.com Reviewed-by: Josh Triplett josh@joshtriplett.org --- drivers/gpu/drm/radeon/btc_dpm.c | 4 ---- drivers/gpu/drm/radeon/cypress_dpm.c | 4 ---- drivers/gpu/drm/radeon/ni_dpm.c | 3 --- drivers/gpu/drm/radeon/rv730_dpm.c | 3 --- drivers/gpu/drm/radeon/rv740_dpm.c | 2 -- drivers/gpu/drm/radeon/rv770_dpm.h | 4 ++++ drivers/gpu/drm/radeon/si_dpm.c | 2 -- 7 files changed, 4 insertions(+), 18 deletions(-)

diff --git a/drivers/gpu/drm/radeon/btc_dpm.c b/drivers/gpu/drm/radeon/btc_dpm.c index 9b6950d..4261c3f 100644 --- a/drivers/gpu/drm/radeon/btc_dpm.c +++ b/drivers/gpu/drm/radeon/btc_dpm.c @@ -45,10 +45,6 @@ #ifndef BTC_MGCG_SEQUENCE #define BTC_MGCG_SEQUENCE 300

-struct rv7xx_ps *rv770_get_ps(struct radeon_ps *rps); -struct rv7xx_power_info *rv770_get_pi(struct radeon_device *rdev); -struct evergreen_power_info *evergreen_get_pi(struct radeon_device *rdev); -

//********* BARTS **************// static const u32 barts_cgcg_cgls_default[] = diff --git a/drivers/gpu/drm/radeon/cypress_dpm.c b/drivers/gpu/drm/radeon/cypress_dpm.c index 920e1e4..75dc1d8 100644 --- a/drivers/gpu/drm/radeon/cypress_dpm.c +++ b/drivers/gpu/drm/radeon/cypress_dpm.c @@ -41,10 +41,6 @@ #define MC_CG_SEQ_YCLK_SUSPEND 0x04 #define MC_CG_SEQ_YCLK_RESUME 0x0a

-struct rv7xx_ps *rv770_get_ps(struct radeon_ps *rps); -struct rv7xx_power_info *rv770_get_pi(struct radeon_device *rdev); -struct evergreen_power_info *evergreen_get_pi(struct radeon_device *rdev); - static void cypress_enable_bif_dynamic_pcie_gen2(struct radeon_device *rdev, bool enable) { diff --git a/drivers/gpu/drm/radeon/ni_dpm.c b/drivers/gpu/drm/radeon/ni_dpm.c index 49c4d48..33a1e21 100644 --- a/drivers/gpu/drm/radeon/ni_dpm.c +++ b/drivers/gpu/drm/radeon/ni_dpm.c @@ -717,9 +717,6 @@ static const u32 cayman_sysls_enable[] = }; #define CAYMAN_SYSLS_ENABLE_LENGTH sizeof(cayman_sysls_enable) / (3 * sizeof(u32))

-struct rv7xx_power_info *rv770_get_pi(struct radeon_device *rdev); -struct evergreen_power_info *evergreen_get_pi(struct radeon_device *rdev); - struct ni_power_info *ni_get_pi(struct radeon_device *rdev) { struct ni_power_info *pi = rdev->pm.dpm.priv; diff --git a/drivers/gpu/drm/radeon/rv730_dpm.c b/drivers/gpu/drm/radeon/rv730_dpm.c index 3f5e1cf..f07b87d 100644 --- a/drivers/gpu/drm/radeon/rv730_dpm.c +++ b/drivers/gpu/drm/radeon/rv730_dpm.c @@ -34,9 +34,6 @@ #define MC_CG_ARB_FREQ_F2 0x0c #define MC_CG_ARB_FREQ_F3 0x0d

-struct rv7xx_ps *rv770_get_ps(struct radeon_ps *rps); -struct rv7xx_power_info *rv770_get_pi(struct radeon_device *rdev); - int rv730_populate_sclk_value(struct radeon_device *rdev, u32 engine_clock, RV770_SMC_SCLK_VALUE *sclk) diff --git a/drivers/gpu/drm/radeon/rv740_dpm.c b/drivers/gpu/drm/radeon/rv740_dpm.c index c4c8da5..ca714f8 100644 --- a/drivers/gpu/drm/radeon/rv740_dpm.c +++ b/drivers/gpu/drm/radeon/rv740_dpm.c @@ -29,8 +29,6 @@ #include "rv770_dpm.h" #include "atom.h"

-struct rv7xx_power_info *rv770_get_pi(struct radeon_device *rdev); - u32 rv740_get_decoded_reference_divider(u32 encoded_ref) { u32 ref = 0; diff --git a/drivers/gpu/drm/radeon/rv770_dpm.h b/drivers/gpu/drm/radeon/rv770_dpm.h index 9244eff..2d74927 100644 --- a/drivers/gpu/drm/radeon/rv770_dpm.h +++ b/drivers/gpu/drm/radeon/rv770_dpm.h @@ -213,6 +213,10 @@ u32 rv740_get_dll_speed(bool is_gddr5, u32 memory_clock); u32 rv740_get_decoded_reference_divider(u32 encoded_ref);

/* rv770 */ +struct rv7xx_ps *rv770_get_ps(struct radeon_ps *rps); +struct rv7xx_power_info *rv770_get_pi(struct radeon_device *rdev); +struct evergreen_power_info *evergreen_get_pi(struct radeon_device *rdev); + u32 rv770_map_clkf_to_ibias(struct radeon_device *rdev, u32 clkf); int rv770_populate_vddc_value(struct radeon_device *rdev, u16 vddc, RV770_SMC_VOLTAGE_VALUE *voltage); diff --git a/drivers/gpu/drm/radeon/si_dpm.c b/drivers/gpu/drm/radeon/si_dpm.c index a3a5866..8732005 100644 --- a/drivers/gpu/drm/radeon/si_dpm.c +++ b/drivers/gpu/drm/radeon/si_dpm.c @@ -1734,8 +1734,6 @@ static const struct si_powertune_data powertune_data_hainan = true };

-struct rv7xx_power_info *rv770_get_pi(struct radeon_device *rdev); -struct evergreen_power_info *evergreen_get_pi(struct radeon_device *rdev); struct ni_power_info *ni_get_pi(struct radeon_device *rdev); struct ni_ps *ni_get_ps(struct radeon_ps *rps);

Remove unused function cypress_dpm_reset_asic() from drm/radeon/cypress_dpm.c.

This eliminates the following warnings in drm/radeon/cypress_dpm.c: drivers/gpu/drm/radeon/cypress_dpm.c:2022:6: warning: no previous prototype for ‘cypress_dpm_reset_asic’ [-Wmissing-prototypes]

Signed-off-by: Rashika Kheria rashika.kheria@gmail.com Reviewed-by: Josh Triplett josh@joshtriplett.org --- drivers/gpu/drm/radeon/cypress_dpm.c | 6 ------ 1 file changed, 6 deletions(-)

diff --git a/drivers/gpu/drm/radeon/cypress_dpm.c b/drivers/gpu/drm/radeon/cypress_dpm.c index 8b9e033..7db6e87 100644 --- a/drivers/gpu/drm/radeon/cypress_dpm.c +++ b/drivers/gpu/drm/radeon/cypress_dpm.c @@ -2016,12 +2016,6 @@ int cypress_dpm_set_power_state(struct radeon_device *rdev) return 0; }

-void cypress_dpm_reset_asic(struct radeon_device *rdev) -{ - rv770_restrict_performance_levels_before_switch(rdev); - rv770_set_boot_state(rdev); -} - void cypress_dpm_display_configuration_changed(struct radeon_device *rdev) { cypress_program_display_gap(rdev);

Remove unused function btc_dpm_reset_asic() from drm/radeon/btc_dpm.c.

This eliminates the following warnings in drm/radeon/btc_dpm.c: drivers/gpu/drm/radeon/btc_dpm.c:2311:6: warning: no previous prototype for ‘btc_dpm_reset_asic’ [-Wmissing-prototypes]

Signed-off-by: Rashika Kheria rashika.kheria@gmail.com Reviewed-by: Josh Triplett josh@joshtriplett.org --- drivers/gpu/drm/radeon/btc_dpm.c | 8 -------- 1 file changed, 8 deletions(-)

diff --git a/drivers/gpu/drm/radeon/btc_dpm.c b/drivers/gpu/drm/radeon/btc_dpm.c index 9b309ab9..7afd781 100644 --- a/drivers/gpu/drm/radeon/btc_dpm.c +++ b/drivers/gpu/drm/radeon/btc_dpm.c @@ -2305,14 +2305,6 @@ static void btc_update_requested_ps(struct radeon_device *rdev, eg_pi->requested_rps.ps_priv = &eg_pi->requested_ps; }

-void btc_dpm_reset_asic(struct radeon_device *rdev) -{ - rv770_restrict_performance_levels_before_switch(rdev); - btc_disable_ulv(rdev); - btc_set_boot_state_timing(rdev); - rv770_set_boot_state(rdev); -} - int btc_dpm_pre_set_power_state(struct radeon_device *rdev) { struct evergreen_power_info *eg_pi = evergreen_get_pi(rdev);

Include header file drm/radeon/radeon_asic.h because it uses the function declared in the header file.

This eliminates the following warnings in drm/radeon/sumo_dpm.c: drivers/gpu/drm/radeon/sumo_dpm.c:1202:5: warning: no previous prototype for ‘sumo_dpm_enable’ [-Wmissing-prototypes] drivers/gpu/drm/radeon/sumo_dpm.c:1250:6: warning: no previous prototype for ‘sumo_dpm_disable’ [-Wmissing-prototypes] drivers/gpu/drm/radeon/sumo_dpm.c:1273:5: warning: no previous prototype for ‘sumo_dpm_pre_set_power_state’ [-Wmissing-prototypes] drivers/gpu/drm/radeon/sumo_dpm.c:1289:5: warning: no previous prototype for ‘sumo_dpm_set_power_state’ [-Wmissing-prototypes] drivers/gpu/drm/radeon/sumo_dpm.c:1325:6: warning: no previous prototype for ‘sumo_dpm_post_set_power_state’ [-Wmissing-prototypes] drivers/gpu/drm/radeon/sumo_dpm.c:1345:6: warning: no previous prototype for ‘sumo_dpm_setup_asic’ [-Wmissing-prototypes] drivers/gpu/drm/radeon/sumo_dpm.c:1357:6: warning: no previous prototype for ‘sumo_dpm_display_configuration_changed’ [-Wmissing-prototypes] drivers/gpu/drm/radeon/sumo_dpm.c:1731:5: warning: no previous prototype for ‘sumo_dpm_init’ [-Wmissing-prototypes] drivers/gpu/drm/radeon/sumo_dpm.c:1781:6: warning: no previous prototype for ‘sumo_dpm_print_power_state’ [-Wmissing-prototypes] drivers/gpu/drm/radeon/sumo_dpm.c:1799:6: warning: no previous prototype for ‘sumo_dpm_debugfs_print_current_performance_level’ [-Wmissing-prototypes] drivers/gpu/drm/radeon/sumo_dpm.c:1827:6: warning: no previous prototype for ‘sumo_dpm_fini’ [-Wmissing-prototypes] drivers/gpu/drm/radeon/sumo_dpm.c:1840:5: warning: no previous prototype for ‘sumo_dpm_get_sclk’ [-Wmissing-prototypes] drivers/gpu/drm/radeon/sumo_dpm.c:1851:5: warning: no previous prototype for ‘sumo_dpm_get_mclk’ [-Wmissing-prototypes] drivers/gpu/drm/radeon/sumo_dpm.c:1858:5: warning: no previous prototype for ‘sumo_dpm_force_performance_level’ [-Wmissing-prototypes]

Signed-off-by: Rashika Kheria rashika.kheria@gmail.com Reviewed-by: Josh Triplett josh@joshtriplett.org --- drivers/gpu/drm/radeon/sumo_dpm.c | 1 + 1 file changed, 1 insertion(+)

diff --git a/drivers/gpu/drm/radeon/sumo_dpm.c b/drivers/gpu/drm/radeon/sumo_dpm.c index eb2e8e6..09cd0cf 100644 --- a/drivers/gpu/drm/radeon/sumo_dpm.c +++ b/drivers/gpu/drm/radeon/sumo_dpm.c @@ -23,6 +23,7 @@

#include "drmP.h" #include "radeon.h" +#include "radeon_asic.h" #include "sumod.h" #include "r600_dpm.h" #include "cypress_dpm.h"

Mark function trinity_get_ps() and trinity_get_pi() as static because they are not used outside this file and remove unused function trinity_dpm_reset_asic() from file drm/radeon/trinity_dpm.c.

Also remove prototype declarations of functions trinity_get_ps() and trinity_get_pi() from drm/radeon/trinity_smc.c because they are not used in this file.

This eliminates the following warnings in drm/radeon/trinity_dpm.c: drivers/gpu/drm/radeon/trinity_dpm.c:345:20: warning: no previous prototype for ‘trinity_get_ps’ [-Wmissing-prototypes] drivers/gpu/drm/radeon/trinity_dpm.c:352:28: warning: no previous prototype for ‘trinity_get_pi’ [-Wmissing-prototypes] drivers/gpu/drm/radeon/trinity_dpm.c:1262:6: warning: no previous prototype for ‘trinity_dpm_reset_asic’ [-Wmissing-prototypes]

Signed-off-by: Rashika Kheria rashika.kheria@gmail.com Reviewed-by: Josh Triplett josh@joshtriplett.org --- drivers/gpu/drm/radeon/trinity_dpm.c | 20 ++------------------ drivers/gpu/drm/radeon/trinity_smc.c | 3 --- 2 files changed, 2 insertions(+), 21 deletions(-)

diff --git a/drivers/gpu/drm/radeon/trinity_dpm.c b/drivers/gpu/drm/radeon/trinity_dpm.c index d700698..83778b6 100644 --- a/drivers/gpu/drm/radeon/trinity_dpm.c +++ b/drivers/gpu/drm/radeon/trinity_dpm.c @@ -342,14 +342,14 @@ static void trinity_apply_state_adjust_rules(struct radeon_device *rdev, struct radeon_ps *new_rps, struct radeon_ps *old_rps);

-struct trinity_ps *trinity_get_ps(struct radeon_ps *rps) +static struct trinity_ps *trinity_get_ps(struct radeon_ps *rps) { struct trinity_ps *ps = rps->ps_priv;

return ps; }

-struct trinity_power_info *trinity_get_pi(struct radeon_device *rdev) +static struct trinity_power_info *trinity_get_pi(struct radeon_device *rdev) { struct trinity_power_info *pi = rdev->pm.dpm.priv;

@@ -1259,22 +1259,6 @@ void trinity_dpm_setup_asic(struct radeon_device *rdev) trinity_release_mutex(rdev); }

-void trinity_dpm_reset_asic(struct radeon_device *rdev) -{ - struct trinity_power_info *pi = trinity_get_pi(rdev); - - trinity_acquire_mutex(rdev); - if (pi->enable_dpm) { - trinity_enable_power_level_0(rdev); - trinity_force_level_0(rdev); - trinity_wait_for_level_0(rdev); - trinity_program_bootup_state(rdev); - trinity_force_level_0(rdev); - trinity_unforce_levels(rdev); - } - trinity_release_mutex(rdev); -} - static u16 trinity_convert_voltage_index_to_value(struct radeon_device *rdev, u32 vid_2bit) { diff --git a/drivers/gpu/drm/radeon/trinity_smc.c b/drivers/gpu/drm/radeon/trinity_smc.c index 9672bcb..99dd045 100644 --- a/drivers/gpu/drm/radeon/trinity_smc.c +++ b/drivers/gpu/drm/radeon/trinity_smc.c @@ -27,9 +27,6 @@ #include "trinity_dpm.h" #include "ppsmc.h"

-struct trinity_ps *trinity_get_ps(struct radeon_ps *rps); -struct trinity_power_info *trinity_get_pi(struct radeon_device *rdev); - static int trinity_notify_message_to_smu(struct radeon_device *rdev, u32 id) { int i;

Remove unused function ni_dpm_reset_asic() from drm/radeon/ni_dpm.c.

This eliminates the following warnings in drm/radeon/ni_dpm.c: drivers/gpu/drm/radeon/ni_dpm.c:3897:6: warning: no previous prototype for ‘ni_dpm_reset_asic’ [-Wmissing-prototypes]

Signed-off-by: Rashika Kheria rashika.kheria@gmail.com Reviewed-by: Josh Triplett josh@joshtriplett.org --- drivers/gpu/drm/radeon/ni_dpm.c | 6 ------ 1 file changed, 6 deletions(-)

diff --git a/drivers/gpu/drm/radeon/ni_dpm.c b/drivers/gpu/drm/radeon/ni_dpm.c index 33a1e21..97aa32f 100644 --- a/drivers/gpu/drm/radeon/ni_dpm.c +++ b/drivers/gpu/drm/radeon/ni_dpm.c @@ -3891,12 +3891,6 @@ void ni_dpm_post_set_power_state(struct radeon_device *rdev) ni_update_current_ps(rdev, new_ps); }

-void ni_dpm_reset_asic(struct radeon_device *rdev) -{ - ni_restrict_performance_levels_before_switch(rdev); - rv770_set_boot_state(rdev); -} - union power_info { struct _ATOM_POWERPLAY_INFO info; struct _ATOM_POWERPLAY_INFO_V2 info_2;

Move prototype declarations of functions ni_get_pi() and ni_get_ps() to header file drm/radeon/ni_dpm.h because it is used by more than one file.

This eliminates the following warnings in drm/radeon/ni_dpm.c: drivers/gpu/drm/radeon/ni_dpm.c:723:23: warning: no previous prototype for ‘ni_get_pi’ [-Wmissing-prototypes] drivers/gpu/drm/radeon/ni_dpm.c:730:15: warning: no previous prototype for ‘ni_get_ps’ [-Wmissing-prototypes]

Signed-off-by: Rashika Kheria rashika.kheria@gmail.com Reviewed-by: Josh Triplett josh@joshtriplett.org --- drivers/gpu/drm/radeon/ni_dpm.h | 2 ++ drivers/gpu/drm/radeon/si_dpm.c | 3 --- 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/gpu/drm/radeon/ni_dpm.h b/drivers/gpu/drm/radeon/ni_dpm.h index 6bbee91..876aaf2 100644 --- a/drivers/gpu/drm/radeon/ni_dpm.h +++ b/drivers/gpu/drm/radeon/ni_dpm.h @@ -231,6 +231,8 @@ struct ni_power_info { #define NISLANDS_DPM2_SQ_RAMP_STI_SIZE 0x1E #define NISLANDS_DPM2_SQ_RAMP_LTI_RATIO 0xF

+struct ni_power_info *ni_get_pi(struct radeon_device *rdev); +struct ni_ps *ni_get_ps(struct radeon_ps *rps); int ni_copy_and_switch_arb_sets(struct radeon_device *rdev, u32 arb_freq_src, u32 arb_freq_dest); void ni_update_current_ps(struct radeon_device *rdev, diff --git a/drivers/gpu/drm/radeon/si_dpm.c b/drivers/gpu/drm/radeon/si_dpm.c index 8732005..8ce849e 100644 --- a/drivers/gpu/drm/radeon/si_dpm.c +++ b/drivers/gpu/drm/radeon/si_dpm.c @@ -1734,9 +1734,6 @@ static const struct si_powertune_data powertune_data_hainan = true };

-struct ni_power_info *ni_get_pi(struct radeon_device *rdev); -struct ni_ps *ni_get_ps(struct radeon_ps *rps); - static int si_populate_voltage_value(struct radeon_device *rdev, const struct atom_voltage_table *table, u16 value, SISLANDS_SMC_VOLTAGE_VALUE *voltage);

Remove unused function si_dpm_reset_asic() from drm/radeon/si_dpm.c.

This elimiantes the following warnings in drm/radeon/si_dpm.c: drivers/gpu/drm/radeon/si_dpm.c:6126:6: warning: no previous prototype for ‘si_dpm_reset_asic’ [-Wmissing-prototypes]

Signed-off-by: Rashika Kheria rashika.kheria@gmail.com Reviewed-by: Josh Triplett josh@joshtriplett.org --- drivers/gpu/drm/radeon/si_dpm.c | 8 -------- 1 file changed, 8 deletions(-)

diff --git a/drivers/gpu/drm/radeon/si_dpm.c b/drivers/gpu/drm/radeon/si_dpm.c index 8ce849e..aec98ff 100644 --- a/drivers/gpu/drm/radeon/si_dpm.c +++ b/drivers/gpu/drm/radeon/si_dpm.c @@ -6115,14 +6115,6 @@ void si_dpm_post_set_power_state(struct radeon_device *rdev) ni_update_current_ps(rdev, new_ps); }

- -void si_dpm_reset_asic(struct radeon_device *rdev) -{ - si_restrict_performance_levels_before_switch(rdev); - si_disable_ulv(rdev); - si_set_boot_state(rdev); -} - void si_dpm_display_configuration_changed(struct radeon_device *rdev) { si_program_display_gap(rdev);

Remove unused function kv_dpm_reset_asic() from drm/radeon/kv_dpm.c.

This eliminates the following warnings in drm/radeon/kv_dpm.c: drivers/gpu/drm/radeon/kv_dpm.c:1875:6: warning: no previous prototype for ‘kv_dpm_reset_asic’ [-Wmissing-prototypes]

Signed-off-by: Rashika Kheria rashika.kheria@gmail.com Reviewed-by: Josh Triplett josh@joshtriplett.org --- drivers/gpu/drm/radeon/kv_dpm.c | 21 --------------------- 1 file changed, 21 deletions(-)

diff --git a/drivers/gpu/drm/radeon/kv_dpm.c b/drivers/gpu/drm/radeon/kv_dpm.c index 7e58dfb..8c0cb67 100644 --- a/drivers/gpu/drm/radeon/kv_dpm.c +++ b/drivers/gpu/drm/radeon/kv_dpm.c @@ -1867,27 +1867,6 @@ void kv_dpm_setup_asic(struct radeon_device *rdev) kv_init_sclk_t(rdev); }

-void kv_dpm_reset_asic(struct radeon_device *rdev) -{ - struct kv_power_info *pi = kv_get_pi(rdev); - - if (rdev->family == CHIP_KABINI) { - kv_force_lowest_valid(rdev); - kv_init_graphics_levels(rdev); - kv_program_bootup_state(rdev); - kv_upload_dpm_settings(rdev); - kv_force_lowest_valid(rdev); - kv_unforce_levels(rdev); - } else { - kv_init_graphics_levels(rdev); - kv_program_bootup_state(rdev); - kv_freeze_sclk_dpm(rdev, true); - kv_upload_dpm_settings(rdev); - kv_freeze_sclk_dpm(rdev, false); - kv_set_enabled_level(rdev, pi->graphics_boot_level); - } -} - //XXX use sumo_dpm_display_configuration_changed

static void kv_construct_max_power_limits_table(struct radeon_device *rdev,

Mark functions as static because they are not used outside this file and remove unused function ci_dpm_power_control_set_level() and ci_dpm_reset_asic() from file drm/radeon/ci_dpm.c.

This eliminates the following warnings in drm/radeon/ci_dpm.c: drivers/gpu/drm/radeon/ci_dpm.c:4506:6: warning: no previous prototype for ‘ci_update_current_ps’ [-Wmissing-prototypes] drivers/gpu/drm/radeon/ci_dpm.c:4517:6: warning: no previous prototype for ‘ci_update_requested_ps’ [-Wmissing-prototypes] drivers/gpu/drm/radeon/ci_dpm.c:4817:5: warning: no previous prototype for ‘ci_dpm_power_control_set_level’ [-Wmissing-prototypes] drivers/gpu/drm/radeon/ci_dpm.c:4822:6: warning: no previous prototype for ‘ci_dpm_reset_asic’ [-Wmissing-prototypes] drivers/gpu/drm/radeon/ci_dpm.c:5026:5: warning: no previous prototype for ‘ci_get_vbios_boot_values’ [-Wmissing-prototypes]

Signed-off-by: Rashika Kheria rashika.kheria@gmail.com Reviewed-by: Josh Triplett josh@joshtriplett.org --- drivers/gpu/drm/radeon/ci_dpm.c | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-)

diff --git a/drivers/gpu/drm/radeon/ci_dpm.c b/drivers/gpu/drm/radeon/ci_dpm.c index 7b3c412..23d26f2 100644 --- a/drivers/gpu/drm/radeon/ci_dpm.c +++ b/drivers/gpu/drm/radeon/ci_dpm.c @@ -4496,7 +4496,7 @@ static void ci_get_memory_type(struct radeon_device *rdev)

}

-void ci_update_current_ps(struct radeon_device *rdev, +static void ci_update_current_ps(struct radeon_device *rdev, struct radeon_ps *rps) { struct ci_ps *new_ps = ci_get_ps(rps); @@ -4507,7 +4507,7 @@ void ci_update_current_ps(struct radeon_device *rdev, pi->current_rps.ps_priv = &pi->current_ps; }

-void ci_update_requested_ps(struct radeon_device *rdev, +static void ci_update_requested_ps(struct radeon_device *rdev, struct radeon_ps *rps) { struct ci_ps *new_ps = ci_get_ps(rps); @@ -4807,16 +4807,6 @@ int ci_dpm_set_power_state(struct radeon_device *rdev) return 0; }

-int ci_dpm_power_control_set_level(struct radeon_device *rdev) -{ - return ci_power_control_set_level(rdev); -} - -void ci_dpm_reset_asic(struct radeon_device *rdev) -{ - ci_set_boot_state(rdev); -} - void ci_dpm_display_configuration_changed(struct radeon_device *rdev) { ci_program_display_gap(rdev); @@ -5016,7 +5006,7 @@ static int ci_parse_power_table(struct radeon_device *rdev) return 0; }

-int ci_get_vbios_boot_values(struct radeon_device *rdev, +static int ci_get_vbios_boot_values(struct radeon_device *rdev, struct ci_vbios_boot_state *boot_state) { struct radeon_mode_info *mode_info = &rdev->mode_info;

Move prototype declarations of function dce6_afmt_write_speaker_allocation(), dce6_afmt_write_sad_regs(), dce6_afmt_select_pin() and dce6_afmt_write_latency_fields() to header file drm/radeon/radeon.h because they are used by more than one file.

This eliminates the following warnings in drm/radeon/dce6_afmt.c: drivers/gpu/drm/radeon/dce6_afmt.c:91:6: warning: no previous prototype for ‘dce6_afmt_select_pin’ [-Wmissing-prototypes] drivers/gpu/drm/radeon/dce6_afmt.c:107:6: warning: no previous prototype for ‘dce6_afmt_write_latency_fields’ [-Wmissing-prototypes] drivers/gpu/drm/radeon/dce6_afmt.c:150:6: warning: no previous prototype for ‘dce6_afmt_write_speaker_allocation’ [-Wmissing-prototypes] drivers/gpu/drm/radeon/dce6_afmt.c:196:6: warning: no previous prototype for ‘dce6_afmt_write_sad_regs’ [-Wmissing-prototypes]

Signed-off-by: Rashika Kheria rashika.kheria@gmail.com Reviewed-by: Josh Triplett josh@joshtriplett.org --- drivers/gpu/drm/radeon/evergreen_hdmi.c | 6 ------ drivers/gpu/drm/radeon/radeon.h | 5 +++++ 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/drivers/gpu/drm/radeon/evergreen_hdmi.c b/drivers/gpu/drm/radeon/evergreen_hdmi.c index aa695c4..af896ac 100644 --- a/drivers/gpu/drm/radeon/evergreen_hdmi.c +++ b/drivers/gpu/drm/radeon/evergreen_hdmi.c @@ -32,12 +32,6 @@ #include "evergreend.h" #include "atom.h"

-extern void dce6_afmt_write_speaker_allocation(struct drm_encoder *encoder); -extern void dce6_afmt_write_sad_regs(struct drm_encoder *encoder); -extern void dce6_afmt_select_pin(struct drm_encoder *encoder); -extern void dce6_afmt_write_latency_fields(struct drm_encoder *encoder, - struct drm_display_mode *mode); - /* * update the N and CTS parameters for a given pixel clock rate */ diff --git a/drivers/gpu/drm/radeon/radeon.h b/drivers/gpu/drm/radeon/radeon.h index 8e0b9dd..b0687fa 100644 --- a/drivers/gpu/drm/radeon/radeon.h +++ b/drivers/gpu/drm/radeon/radeon.h @@ -2741,6 +2741,11 @@ int radeon_vm_bo_rmv(struct radeon_device *rdev, void r600_audio_update_hdmi(struct work_struct *work); struct r600_audio_pin *r600_audio_get_pin(struct radeon_device *rdev); struct r600_audio_pin *dce6_audio_get_pin(struct radeon_device *rdev); +void dce6_afmt_select_pin(struct drm_encoder *encoder); +void dce6_afmt_write_speaker_allocation(struct drm_encoder *encoder); +void dce6_afmt_write_sad_regs(struct drm_encoder *encoder); +void dce6_afmt_write_latency_fields(struct drm_encoder *encoder, + struct drm_display_mode *mode);

/* * R600 vram scratch functions

Move prototype declaration of function radeon_kms_compat_ioctl() to header file drm/radeon/radeon_drv.h because it is used by more than one file.

This eliminates the following warning in drivers/gpu/drm/radeon/radeon_ioc32.c:413:6: warning: no previous prototype for ‘radeon_kms_compat_ioctl’ [-Wmissing-prototypes]

Signed-off-by: Rashika Kheria rashika.kheria@gmail.com Reviewed-by: Josh Triplett josh@joshtriplett.org --- drivers/gpu/drm/radeon/radeon_drv.c | 2 -- drivers/gpu/drm/radeon/radeon_drv.h | 3 ++- 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/gpu/drm/radeon/radeon_drv.c b/drivers/gpu/drm/radeon/radeon_drv.c index 9f5ff28..7868d4e 100644 --- a/drivers/gpu/drm/radeon/radeon_drv.c +++ b/drivers/gpu/drm/radeon/radeon_drv.c @@ -127,8 +127,6 @@ int radeon_gem_prime_pin(struct drm_gem_object *obj); void radeon_gem_prime_unpin(struct drm_gem_object *obj); void *radeon_gem_prime_vmap(struct drm_gem_object *obj); void radeon_gem_prime_vunmap(struct drm_gem_object *obj, void *vaddr); -extern long radeon_kms_compat_ioctl(struct file *filp, unsigned int cmd, - unsigned long arg);

#if defined(CONFIG_DEBUG_FS) int radeon_debugfs_init(struct drm_minor *minor); diff --git a/drivers/gpu/drm/radeon/radeon_drv.h b/drivers/gpu/drm/radeon/radeon_drv.h index 00e0d44..7e1f2215 100644 --- a/drivers/gpu/drm/radeon/radeon_drv.h +++ b/drivers/gpu/drm/radeon/radeon_drv.h @@ -425,7 +425,8 @@ extern int radeon_driver_open(struct drm_device *dev, struct drm_file *file_priv); extern long radeon_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg); - +extern long radeon_kms_compat_ioctl(struct file *filp, unsigned int cmd, + unsigned long arg); extern int radeon_master_create(struct drm_device *dev, struct drm_master *master); extern void radeon_master_destroy(struct drm_device *dev, struct drm_master *master); extern void radeon_cp_dispatch_flip(struct drm_device *dev, struct drm_master *master);

Mark function as static because it is not used outside the file drm/sis/sis_drv.c.

This eliminates the following warning in drm/sis/sis_drv.c: drivers/gpu/drm/sis/sis_drv.c:97:6: warning: no previous prototype for ‘sis_driver_postclose’ [-Wmissing-prototypes]

Signed-off-by: Rashika Kheria rashika.kheria@gmail.com Reviewed-by: Josh Triplett josh@joshtriplett.org --- drivers/gpu/drm/sis/sis_drv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/sis/sis_drv.c b/drivers/gpu/drm/sis/sis_drv.c index 4383b74..756f787 100644 --- a/drivers/gpu/drm/sis/sis_drv.c +++ b/drivers/gpu/drm/sis/sis_drv.c @@ -94,7 +94,7 @@ static int sis_driver_open(struct drm_device *dev, struct drm_file *file) return 0; }

-void sis_driver_postclose(struct drm_device *dev, struct drm_file *file) +static void sis_driver_postclose(struct drm_device *dev, struct drm_file *file) { struct sis_file_private *file_priv = file->driver_priv;

Remove unused function ttm_write_lock_downgrade() from drm/ttm/ttm_lock.c.

This eliminates the following warning in drm/ttm/ttm_lock.c: drivers/gpu/drm/ttm/ttm_lock.c:189:6: warning: no previous prototype for ‘ttm_write_lock_downgrade’ [-Wmissing-prototypes]

Signed-off-by: Rashika Kheria rashika.kheria@gmail.com Reviewed-by: Josh Triplett josh@joshtriplett.org --- drivers/gpu/drm/ttm/ttm_lock.c | 8 -------- 1 file changed, 8 deletions(-)

diff --git a/drivers/gpu/drm/ttm/ttm_lock.c b/drivers/gpu/drm/ttm/ttm_lock.c index 3daa9a3..6a95454 100644 --- a/drivers/gpu/drm/ttm/ttm_lock.c +++ b/drivers/gpu/drm/ttm/ttm_lock.c @@ -186,14 +186,6 @@ int ttm_write_lock(struct ttm_lock *lock, bool interruptible) } EXPORT_SYMBOL(ttm_write_lock);

-void ttm_write_lock_downgrade(struct ttm_lock *lock) -{ - spin_lock(&lock->lock); - lock->rw = 1; - wake_up_all(&lock->queue); - spin_unlock(&lock->lock); -} - static int __ttm_vt_unlock(struct ttm_lock *lock) { int ret = 0;

Mark functions as static because they are not used outside the file drm/vmwgfx/vmwgfx_kms.c.

This eliminates the following warnings in drm/vmwgfx/vmwgfx_kms.c: drivers/gpu/drm/vmwgfx/vmwgfx_kms.c:43:6: warning: no previous prototype for ‘vmw_clip_cliprects’ [-Wmissing-prototypes] drivers/gpu/drm/vmwgfx/vmwgfx_kms.c:426:6: warning: no previous prototype for ‘vmw_framebuffer_surface_destroy’ [-Wmissing-prototypes] drivers/gpu/drm/vmwgfx/vmwgfx_kms.c:592:5: warning: no previous prototype for ‘vmw_framebuffer_surface_dirty’ [-Wmissing-prototypes] drivers/gpu/drm/vmwgfx/vmwgfx_kms.c:757:6: warning: no previous prototype for ‘vmw_framebuffer_dmabuf_destroy’ [-Wmissing-prototypes] drivers/gpu/drm/vmwgfx/vmwgfx_kms.c:943:5: warning: no previous prototype for ‘vmw_framebuffer_dmabuf_dirty’ [-Wmissing-prototypes] drivers/gpu/drm/vmwgfx/vmwgfx_kms.c:1666:5: warning: no previous prototype for ‘vmw_du_update_layout’ [-Wmissing-prototypes]

Signed-off-by: Rashika Kheria rashika.kheria@gmail.com Reviewed-by: Josh Triplett josh@joshtriplett.org --- drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c b/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c index 03f1c20..6af4816 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c @@ -40,7 +40,7 @@ struct vmw_clip_rect { * Clip @num_rects number of @rects against @clip storing the * results in @out_rects and the number of passed rects in @out_num. */ -void vmw_clip_cliprects(struct drm_clip_rect *rects, +static void vmw_clip_cliprects(struct drm_clip_rect *rects, int num_rects, struct vmw_clip_rect clip, SVGASignedRect *out_rects, @@ -423,7 +423,7 @@ struct vmw_framebuffer_surface { struct drm_master *master; };

-void vmw_framebuffer_surface_destroy(struct drm_framebuffer *framebuffer) +static void vmw_framebuffer_surface_destroy(struct drm_framebuffer *framebuffer) { struct vmw_framebuffer_surface *vfbs = vmw_framebuffer_to_vfbs(framebuffer); @@ -589,7 +589,7 @@ out_free_tmp: return ret; }

-int vmw_framebuffer_surface_dirty(struct drm_framebuffer *framebuffer, +static int vmw_framebuffer_surface_dirty(struct drm_framebuffer *framebuffer, struct drm_file *file_priv, unsigned flags, unsigned color, struct drm_clip_rect *clips, @@ -754,7 +754,7 @@ struct vmw_framebuffer_dmabuf { struct vmw_dma_buffer *buffer; };

-void vmw_framebuffer_dmabuf_destroy(struct drm_framebuffer *framebuffer) +static void vmw_framebuffer_dmabuf_destroy(struct drm_framebuffer *framebuffer) { struct vmw_framebuffer_dmabuf *vfbd = vmw_framebuffer_to_vfbd(framebuffer); @@ -940,7 +940,7 @@ static int do_dmabuf_dirty_sou(struct drm_file *file_priv, return ret; }

-int vmw_framebuffer_dmabuf_dirty(struct drm_framebuffer *framebuffer, +static int vmw_framebuffer_dmabuf_dirty(struct drm_framebuffer *framebuffer, struct drm_file *file_priv, unsigned flags, unsigned color, struct drm_clip_rect *clips, @@ -1663,7 +1663,7 @@ void vmw_disable_vblank(struct drm_device *dev, int crtc) * Small shared kms functions. */

-int vmw_du_update_layout(struct vmw_private *dev_priv, unsigned num, +static int vmw_du_update_layout(struct vmw_private *dev_priv, unsigned num, struct drm_vmw_rect *rects) { struct drm_device *dev = dev_priv->dev;

Mark functions as static because they are not used outside the file drm/vmwgfx/vmwgfx_resource.c. Also, remove unused function vmw_user_dmabuf_reference() from drm/vmwgfx/vmwgfx_resource.c.

This eliminates the following warnings in drm/vmwgfx/vmwgfx_resource.c: drivers/gpu/drm/vmwgfx/vmwgfx_resource.c:252:22: warning: no previous prototype for ‘vmw_resource_lookup’ [-Wmissing-prototypes] drivers/gpu/drm/vmwgfx/vmwgfx_resource.c:456:5: warning: no previous prototype for ‘vmw_user_dmabuf_alloc’ [-Wmissing-prototypes] drivers/gpu/drm/vmwgfx/vmwgfx_resource.c:593:5: warning: no previous prototype for ‘vmw_user_dmabuf_reference’ [-Wmissing-prototypes] drivers/gpu/drm/vmwgfx/vmwgfx_resource.c:1145:5: warning: no previous prototype for ‘vmw_resource_do_evict’ [-Wmissing-prototypes]

Signed-off-by: Rashika Kheria rashika.kheria@gmail.com Reviewed-by: Josh Triplett josh@joshtriplett.org --- drivers/gpu/drm/vmwgfx/vmwgfx_resource.c | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-)

diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_resource.c b/drivers/gpu/drm/vmwgfx/vmwgfx_resource.c index 9b5ea2a..5fefc65 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_resource.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_resource.c @@ -249,7 +249,7 @@ void vmw_resource_activate(struct vmw_resource *res, write_unlock(&dev_priv->resource_lock); }

-struct vmw_resource *vmw_resource_lookup(struct vmw_private *dev_priv, +static struct vmw_resource *vmw_resource_lookup(struct vmw_private *dev_priv, struct idr *idr, int id) { struct vmw_resource *res; @@ -453,7 +453,7 @@ static void vmw_user_dmabuf_release(struct ttm_base_object **p_base) * @p_dma_buf: Pointer to where the refcounted struct vmw_dma_buffer pointer * should be assigned. */ -int vmw_user_dmabuf_alloc(struct vmw_private *dev_priv, +static int vmw_user_dmabuf_alloc(struct vmw_private *dev_priv, struct ttm_object_file *tfile, uint32_t size, bool shareable, @@ -590,19 +590,6 @@ int vmw_user_dmabuf_lookup(struct ttm_object_file *tfile, return 0; }

-int vmw_user_dmabuf_reference(struct ttm_object_file *tfile, - struct vmw_dma_buffer *dma_buf) -{ - struct vmw_user_dma_buffer *user_bo; - - if (dma_buf->base.destroy != vmw_user_dmabuf_destroy) - return -EINVAL; - - user_bo = container_of(dma_buf, struct vmw_user_dma_buffer, dma); - return ttm_ref_object_add(tfile, &user_bo->prime.base, - TTM_REF_USAGE, NULL); -} - /* * Stream management */ @@ -1142,7 +1129,7 @@ vmw_resource_backoff_reservation(struct ttm_validate_buffer *val_buf) * @res: The resource to evict. * @interruptible: Whether to wait interruptible. */ -int vmw_resource_do_evict(struct vmw_resource *res, bool interruptible) +static int vmw_resource_do_evict(struct vmw_resource *res, bool interruptible) { struct ttm_validate_buffer val_buf; const struct vmw_res_func *func = res->func;

Mark functions as static because they are not used outside the file drm/vmwgfx/vmwgfx_fence.c.

This eliminates the following warnings in drm/vmwgfx/vmwgfx_fence.c: drivers/gpu/drm/vmwgfx/vmwgfx_fence.c:274:6: warning: no previous prototype for ‘vmw_fences_perform_actions’ [-Wmissing-prototypes] drivers/gpu/drm/vmwgfx/vmwgfx_fence.c:900:6: warning: no previous prototype for ‘vmw_fence_obj_add_action’ [-Wmissing-prototypes] drivers/gpu/drm/vmwgfx/vmwgfx_fence.c:996:5: warning: no previous prototype for ‘vmw_event_fence_action_create’ [-Wmissing-prototypes]

Signed-off-by: Rashika Kheria rashika.kheria@gmail.com Reviewed-by: Josh Triplett josh@joshtriplett.org --- drivers/gpu/drm/vmwgfx/vmwgfx_fence.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c b/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c index c62d20e..79c060d 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c @@ -271,7 +271,7 @@ void vmw_fence_obj_unreference(struct vmw_fence_obj **fence_p) spin_unlock_irq(&fman->lock); }

-void vmw_fences_perform_actions(struct vmw_fence_manager *fman, +static void vmw_fences_perform_actions(struct vmw_fence_manager *fman, struct list_head *list) { struct vmw_fence_action *action, *next_action; @@ -897,7 +897,7 @@ static void vmw_event_fence_action_cleanup(struct vmw_fence_action *action) * Note that the action callbacks may be executed before this function * returns. */ -void vmw_fence_obj_add_action(struct vmw_fence_obj *fence, +static void vmw_fence_obj_add_action(struct vmw_fence_obj *fence, struct vmw_fence_action *action) { struct vmw_fence_manager *fman = fence->fman; @@ -993,7 +993,7 @@ struct vmw_event_fence_pending { struct drm_vmw_event_fence event; };

-int vmw_event_fence_action_create(struct drm_file *file_priv, +static int vmw_event_fence_action_create(struct drm_file *file_priv, struct vmw_fence_obj *fence, uint32_t flags, uint64_t user_data,