mirror of
https://github.com/torvalds/linux.git
synced 2026-04-30 20:42:33 -04:00
Merge tag 'amd-drm-next-5.14-2021-06-02' of https://gitlab.freedesktop.org/agd5f/linux into drm-next
amd-drm-next-5.14-2021-06-02:
amdgpu:
- GC/MM register access macro clean up for SR-IOV
- Beige Goby updates
- W=1 Fixes
- Aldebaran fixes
- Misc display fixes
- ACPI ATCS/ATIF handling rework
- SR-IOV fixes
- RAS fixes
- 16bpc fixed point format support
- Initial smartshift support
- RV/PCO power tuning fixes for suspend/resume
- More buffer object subclassing work
- Add new INFO query for additional vbios information
- Add new placement for preemptable SG buffers
amdkfd:
- Misc fixes
radeon:
- W=1 Fixes
- Misc cleanups
UAPI:
- Add new INFO query for additional vbios information
Useful for debugging vbios related issues. Proposed umr patch:
https://patchwork.freedesktop.org/patch/433297/
- 16bpc fixed point format support
IGT test:
https://lists.freedesktop.org/archives/igt-dev/2021-May/031507.html
Proposed Vulkan patch:
a25d480207
- Add a new GEM flag which is only used internally in the kernel driver. Userspace
is not allowed to set it.
drm:
- 16bpc fixed point format fourcc
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Alex Deucher <alexander.deucher@amd.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210602214009.4553-1-alexander.deucher@amd.com
This commit is contained in:
@@ -7439,7 +7439,7 @@ static void cik_irq_disable(struct radeon_device *rdev)
|
||||
}
|
||||
|
||||
/**
|
||||
* cik_irq_disable - disable interrupts for suspend
|
||||
* cik_irq_suspend - disable interrupts for suspend
|
||||
*
|
||||
* @rdev: radeon_device pointer
|
||||
*
|
||||
|
||||
@@ -45,7 +45,6 @@ void sumo_rlc_fini(struct radeon_device *rdev);
|
||||
int sumo_rlc_init(struct radeon_device *rdev);
|
||||
void evergreen_gpu_pci_config_reset(struct radeon_device *rdev);
|
||||
u32 evergreen_get_number_of_dram_channels(struct radeon_device *rdev);
|
||||
void evergreen_print_gpu_status_regs(struct radeon_device *rdev);
|
||||
u32 evergreen_gpu_check_soft_reset(struct radeon_device *rdev);
|
||||
int evergreen_rlc_resume(struct radeon_device *rdev);
|
||||
struct evergreen_power_info *evergreen_get_pi(struct radeon_device *rdev);
|
||||
|
||||
@@ -1406,7 +1406,7 @@ int r100_cs_parse_packet0(struct radeon_cs_parser *p,
|
||||
}
|
||||
|
||||
/**
|
||||
* r100_cs_packet_next_vline() - parse userspace VLINE packet
|
||||
* r100_cs_packet_parse_vline() - parse userspace VLINE packet
|
||||
* @p: parser structure holding parsing context.
|
||||
*
|
||||
* Userspace sends a special sequence for VLINE waits.
|
||||
|
||||
@@ -187,7 +187,6 @@ extern int rv370_pcie_gart_init(struct radeon_device *rdev);
|
||||
extern void rv370_pcie_gart_fini(struct radeon_device *rdev);
|
||||
extern int rv370_pcie_gart_enable(struct radeon_device *rdev);
|
||||
extern void rv370_pcie_gart_disable(struct radeon_device *rdev);
|
||||
extern int r300_mc_wait_for_idle(struct radeon_device *rdev);
|
||||
|
||||
/*
|
||||
* r420,r423,rv410
|
||||
@@ -404,7 +403,6 @@ void r600_hdmi_update_ACR(struct drm_encoder *encoder, uint32_t clock);
|
||||
void r600_hdmi_audio_workaround(struct drm_encoder *encoder);
|
||||
int r600_hdmi_buffer_status_changed(struct drm_encoder *encoder);
|
||||
void r600_hdmi_update_audio_settings(struct drm_encoder *encoder);
|
||||
int r600_mc_wait_for_idle(struct radeon_device *rdev);
|
||||
u32 r600_get_xclk(struct radeon_device *rdev);
|
||||
uint64_t r600_get_gpu_clock_counter(struct radeon_device *rdev);
|
||||
int rv6xx_get_temp(struct radeon_device *rdev);
|
||||
|
||||
@@ -405,7 +405,7 @@ static int cmp_size_smaller_first(void *priv, const struct list_head *a,
|
||||
}
|
||||
|
||||
/**
|
||||
* cs_parser_fini() - clean parser states
|
||||
* radeon_cs_parser_fini() - clean parser states
|
||||
* @parser: parser structure holding parsing context.
|
||||
* @error: error number
|
||||
* @backoff: indicator to backoff the reservation
|
||||
|
||||
@@ -51,7 +51,7 @@
|
||||
*/
|
||||
|
||||
/**
|
||||
* radeon_vm_num_pde - return the number of page directory entries
|
||||
* radeon_vm_num_pdes - return the number of page directory entries
|
||||
*
|
||||
* @rdev: radeon_device pointer
|
||||
*
|
||||
@@ -626,7 +626,7 @@ static uint32_t radeon_vm_page_flags(uint32_t flags)
|
||||
}
|
||||
|
||||
/**
|
||||
* radeon_vm_update_pdes - make sure that page directory is valid
|
||||
* radeon_vm_update_page_directory - make sure that page directory is valid
|
||||
*
|
||||
* @rdev: radeon_device pointer
|
||||
* @vm: requested vm
|
||||
|
||||
Reference in New Issue
Block a user