From 3398c03d2ffccd60c4ca5f42bcaebc81c00a9304 Mon Sep 17 00:00:00 2001 From: zrj Date: Wed, 3 Jun 2015 14:48:49 +0300 Subject: [PATCH] drm/radeon: Move some prototype declarations While there fix a typo in r600_cp.c --- sys/dev/drm/radeon/evergreen.c | 3 --- sys/dev/drm/radeon/evergreen_cs.c | 1 - sys/dev/drm/radeon/ni.c | 4 ---- sys/dev/drm/radeon/r600_cp.c | 10 ++++++++-- sys/dev/drm/radeon/r600_cp.h | 13 ------------- sys/dev/drm/radeon/r600_cs.c | 4 ++-- sys/dev/drm/radeon/r600_cs.h | 9 --------- sys/dev/drm/radeon/radeon_asic.h | 5 +++++ sys/dev/drm/radeon/si.c | 1 - 9 files changed, 15 insertions(+), 35 deletions(-) delete mode 100644 sys/dev/drm/radeon/r600_cp.h delete mode 100644 sys/dev/drm/radeon/r600_cs.h diff --git a/sys/dev/drm/radeon/evergreen.c b/sys/dev/drm/radeon/evergreen.c index 1a8b0663d3..f7fc7a8637 100644 --- a/sys/dev/drm/radeon/evergreen.c +++ b/sys/dev/drm/radeon/evergreen.c @@ -134,9 +134,6 @@ static u32 sumo_rlc_save_restore_register_list[] = static u32 sumo_rlc_save_restore_register_list_size = ARRAY_SIZE(sumo_rlc_save_restore_register_list); static void evergreen_gpu_init(struct radeon_device *rdev); -void evergreen_pcie_gen2_enable(struct radeon_device *rdev); -void evergreen_print_gpu_status_regs(struct radeon_device *rdev); -void evergreen_program_aspm(struct radeon_device *rdev); static const u32 evergreen_golden_registers[] = { diff --git a/sys/dev/drm/radeon/evergreen_cs.c b/sys/dev/drm/radeon/evergreen_cs.c index f0e4f57973..03c4db8ac3 100644 --- a/sys/dev/drm/radeon/evergreen_cs.c +++ b/sys/dev/drm/radeon/evergreen_cs.c @@ -34,7 +34,6 @@ #include "evergreend.h" #include "evergreen_reg_safe.h" #include "cayman_reg_safe.h" -#include "r600_cs.h" #define MAX(a,b) (((a)>(b))?(a):(b)) #define MIN(a,b) (((a)<(b))?(a):(b)) diff --git a/sys/dev/drm/radeon/ni.c b/sys/dev/drm/radeon/ni.c index 6bc4511078..45f6c36d0e 100644 --- a/sys/dev/drm/radeon/ni.c +++ b/sys/dev/drm/radeon/ni.c @@ -162,10 +162,6 @@ static u32 tn_rlc_save_restore_register_list[] = }; static u32 tn_rlc_save_restore_register_list_size = ARRAY_SIZE(tn_rlc_save_restore_register_list); -extern void evergreen_print_gpu_status_regs(struct radeon_device *rdev); -extern void evergreen_pcie_gen2_enable(struct radeon_device *rdev); -extern void evergreen_program_aspm(struct radeon_device *rdev); - /* Firmware Names */ MODULE_FIRMWARE("radeon/BARTS_pfp.bin"); MODULE_FIRMWARE("radeon/BARTS_me.bin"); diff --git a/sys/dev/drm/radeon/r600_cp.c b/sys/dev/drm/radeon/r600_cp.c index 1ce5d6755e..54b5e5ec99 100644 --- a/sys/dev/drm/radeon/r600_cp.c +++ b/sys/dev/drm/radeon/r600_cp.c @@ -39,7 +39,6 @@ #include #include #include "radeon_drv.h" -#include "r600_cp.h" #define PFP_UCODE_SIZE 576 #define PM4_UCODE_SIZE 1792 @@ -68,6 +67,13 @@ MODULE_FIRMWARE("radeon/RV730_me.bin"); MODULE_FIRMWARE("radeon/RV710_pfp.bin"); MODULE_FIRMWARE("radeon/RV710_me.bin"); + +void r600_cs_legacy_get_tiling_conf(struct drm_device *dev, u32 *npipes, u32 *nbanks, u32 *group_size); +int r600_cs_legacy(struct drm_device *dev, void *data, struct drm_file *filp, + unsigned family, u32 *ib, int *l); +void r600_cs_legacy_init(void); + + # define ATI_PCIGART_PAGE_SIZE 4096 /**< PCI GART page size */ # define ATI_PCIGART_PAGE_MASK (~(ATI_PCIGART_PAGE_SIZE-1)) @@ -1880,7 +1886,7 @@ static void r600_cp_init_ring_buffer(struct drm_device *dev, } else #endif ring_start = (dev_priv->cp_ring->offset - - (unsigned long)dev->sg->vaddr> + - (unsigned long)dev->sg->vaddr + dev_priv->gart_vm_start); RADEON_WRITE(R600_CP_RB_BASE, ring_start >> 8); diff --git a/sys/dev/drm/radeon/r600_cp.h b/sys/dev/drm/radeon/r600_cp.h deleted file mode 100644 index d8601c0f9d..0000000000 --- a/sys/dev/drm/radeon/r600_cp.h +++ /dev/null @@ -1,13 +0,0 @@ -/* $FreeBSD: head/sys/dev/drm2/radeon/r600_cp.h 254885 2013-08-25 19:37:15Z dumbbell $ */ - -#ifndef __R600_CP_H__ -#define __R600_CP_H__ - -void r600_cs_legacy_get_tiling_conf(struct drm_device *dev, - u32 *npipes, u32 *nbanks, u32 *group_size); - -int r600_cs_legacy(struct drm_device *dev, void *data, struct drm_file *filp, - unsigned family, u32 *ib, int *l); -void r600_cs_legacy_init(void); - -#endif /* !defined(__R600_CP_H__) */ diff --git a/sys/dev/drm/radeon/r600_cs.c b/sys/dev/drm/radeon/r600_cs.c index 8c6061e1df..9b2ced2265 100644 --- a/sys/dev/drm/radeon/r600_cs.c +++ b/sys/dev/drm/radeon/r600_cs.c @@ -33,10 +33,10 @@ #include "radeon_asic.h" #include "r600d.h" #include "r600_reg_safe.h" -#include "r600_cp.h" -#include "r600_cs.h" static int r600_nomm; +extern void r600_cs_legacy_get_tiling_conf(struct drm_device *dev, u32 *npipes, u32 *nbanks, u32 *group_size); + struct r600_cs_track { /* configuration we miror so that we use same code btw kms/ums */ diff --git a/sys/dev/drm/radeon/r600_cs.h b/sys/dev/drm/radeon/r600_cs.h deleted file mode 100644 index af352310b2..0000000000 --- a/sys/dev/drm/radeon/r600_cs.h +++ /dev/null @@ -1,9 +0,0 @@ -/* $FreeBSD: head/sys/dev/drm2/radeon/r600_cs.h 254885 2013-08-25 19:37:15Z dumbbell $ */ - -#ifndef __R600_CS_H__ -#define __R600_CS_H__ - -int r600_dma_cs_next_reloc(struct radeon_cs_parser *p, - struct radeon_cs_reloc **cs_reloc); - -#endif /* !defined(__R600_CS_H__) */ diff --git a/sys/dev/drm/radeon/radeon_asic.h b/sys/dev/drm/radeon/radeon_asic.h index 63ac489b46..5ff9b0fb93 100644 --- a/sys/dev/drm/radeon/radeon_asic.h +++ b/sys/dev/drm/radeon/radeon_asic.h @@ -306,6 +306,8 @@ uint32_t r600_pciep_rreg(struct radeon_device *rdev, uint32_t reg); void r600_pciep_wreg(struct radeon_device *rdev, uint32_t reg, uint32_t v); int r600_cs_parse(struct radeon_cs_parser *p); int r600_dma_cs_parse(struct radeon_cs_parser *p); +int r600_dma_cs_next_reloc(struct radeon_cs_parser *p, + struct radeon_cs_reloc **cs_reloc); void r600_fence_ring_emit(struct radeon_device *rdev, struct radeon_fence *fence); void r600_semaphore_ring_emit(struct radeon_device *rdev, @@ -534,6 +536,9 @@ int evergreen_copy_dma(struct radeon_device *rdev, uint64_t src_offset, uint64_t dst_offset, unsigned num_gpu_pages, struct radeon_fence **fence); +void evergreen_pcie_gen2_enable(struct radeon_device *rdev); +void evergreen_print_gpu_status_regs(struct radeon_device *rdev); +void evergreen_program_aspm(struct radeon_device *rdev); void evergreen_fix_pci_max_read_req_size(struct radeon_device *rdev); u32 evergreen_get_number_of_dram_channels(struct radeon_device *rdev); void sumo_rlc_fini(struct radeon_device *rdev); diff --git a/sys/dev/drm/radeon/si.c b/sys/dev/drm/radeon/si.c index e27cd3300a..adf977892f 100644 --- a/sys/dev/drm/radeon/si.c +++ b/sys/dev/drm/radeon/si.c @@ -76,7 +76,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 evergreen_print_gpu_status_regs(struct radeon_device *rdev); static const u32 verde_rlc_save_restore_register_list[] = { -- 2.41.0