diff options
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3361-drm-amdgpu-remove-RREG64-WREG64.patch')
| -rw-r--r-- | meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3361-drm-amdgpu-remove-RREG64-WREG64.patch | 87 |
1 files changed, 87 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3361-drm-amdgpu-remove-RREG64-WREG64.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3361-drm-amdgpu-remove-RREG64-WREG64.patch new file mode 100644 index 00000000..8815dd96 --- /dev/null +++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3361-drm-amdgpu-remove-RREG64-WREG64.patch @@ -0,0 +1,87 @@ +From 45d69e65a7f8fcc979cd0856026c5852ca99d8ca Mon Sep 17 00:00:00 2001 +From: Tao Zhou <tao.zhou1@amd.com> +Date: Fri, 9 Aug 2019 11:51:24 +0800 +Subject: [PATCH 3361/4256] drm/amdgpu: remove RREG64/WREG64 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +atomic 64 bits REG operations are useless currently + +Signed-off-by: Tao Zhou <tao.zhou1@amd.com> +Reviewed-by: Hawking Zhang <Hawking.Zhang@amd.com> +Reviewed-by: Christian König <christian.koenig@amd.com> +--- + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 4 --- + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 33 ---------------------- + 2 files changed, 37 deletions(-) + +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h +index 1bbe7589af7a..0d68005ceef7 100644 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h +@@ -1079,8 +1079,6 @@ void amdgpu_mm_wreg(struct amdgpu_device *adev, uint32_t reg, uint32_t v, + uint32_t acc_flags); + void amdgpu_mm_wreg8(struct amdgpu_device *adev, uint32_t offset, uint8_t value); + uint8_t amdgpu_mm_rreg8(struct amdgpu_device *adev, uint32_t offset); +-uint64_t amdgpu_mm_rreg64(struct amdgpu_device *adev, uint32_t reg); +-void amdgpu_mm_wreg64(struct amdgpu_device *adev, uint32_t reg, uint64_t v); + + u32 amdgpu_io_rreg(struct amdgpu_device *adev, u32 reg); + void amdgpu_io_wreg(struct amdgpu_device *adev, u32 reg, u32 v); +@@ -1108,8 +1106,6 @@ int emu_soc_asic_init(struct amdgpu_device *adev); + #define DREG32(reg) printk(KERN_INFO "REGISTER: " #reg " : 0x%08X\n", amdgpu_mm_rreg(adev, (reg), 0)) + #define WREG32(reg, v) amdgpu_mm_wreg(adev, (reg), (v), 0) + #define WREG32_IDX(reg, v) amdgpu_mm_wreg(adev, (reg), (v), AMDGPU_REGS_IDX) +-#define RREG64(reg) amdgpu_mm_rreg64(adev, (reg)) +-#define WREG64(reg, v) amdgpu_mm_wreg64(adev, (reg), (v)) + #define REG_SET(FIELD, v) (((v) << FIELD##_SHIFT) & FIELD##_MASK) + #define REG_GET(FIELD, v) (((v) << FIELD##_SHIFT) & FIELD##_MASK) + #define RREG32_PCIE(reg) adev->pcie_rreg(adev, (reg)) +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +index 5bfc5391155b..b4e950504a0e 100644 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +@@ -262,39 +262,6 @@ void amdgpu_mm_wreg(struct amdgpu_device *adev, uint32_t reg, uint32_t v, + } + } + +-/** +- * amdgpu_mm_rreg64 - read a 64 bit memory mapped IO register +- * +- * @adev: amdgpu_device pointer +- * @reg: dword aligned register offset +- * +- * Returns the 64 bit value from the offset specified. +- */ +-uint64_t amdgpu_mm_rreg64(struct amdgpu_device *adev, uint32_t reg) +-{ +- if ((reg * 4) < adev->rmmio_size) +- return atomic64_read((atomic64_t *)(adev->rmmio + (reg * 4))); +- else +- BUG(); +-} +- +-/** +- * amdgpu_mm_wreg64 - write to a 64 bit memory mapped IO register +- * +- * @adev: amdgpu_device pointer +- * @reg: dword aligned register offset +- * @v: 64 bit value to write to the register +- * +- * Writes the value specified to the offset specified. +- */ +-void amdgpu_mm_wreg64(struct amdgpu_device *adev, uint32_t reg, uint64_t v) +-{ +- if ((reg * 4) < adev->rmmio_size) +- atomic64_set((atomic64_t *)(adev->rmmio + (reg * 4)), v); +- else +- BUG(); +-} +- + /** + * amdgpu_io_rreg - read an IO register + * +-- +2.17.1 + |