History

Merge branch 'drm-next-4.11' of git://people.freedesktop.org/~agd5f/linux into drm-next

This is the main feature pull for radeon and amdgpu for 4.11. Highlights: - Power and clockgating improvements - Preliminary SR-IOV support - ttm buffer priority support - ttm eviction fixes - Removal of the ttm lru callbacks - Remove SI DPM quirks due to MC firmware issues - Handle VFCT with multiple vbioses - Powerplay improvements - Lots of driver cleanups * 'drm-next-4.11' of git://people.freedesktop.org/~agd5f/linux: (120 commits) drm/amdgpu: fix amdgpu_bo_va_mapping flags drm/amdgpu: access stolen VRAM directly on CZ (v2) drm/amdgpu: access stolen VRAM directly on KV/KB (v2) drm/amdgpu: fix kernel panic when dpm disabled on Kv. drm/amdgpu: fix dpm bug on Kv. drm/amd/powerplay: fix regresstion issue can't set manual dpm mode. drm/amdgpu: handle vfct with multiple vbios images drm/radeon: handle vfct with multiple vbios images drm/amdgpu: move misc si headers into amdgpu drm/amdgpu: remove unused header si_reg.h drm/radeon: drop pitcairn dpm quirks drm/amdgpu: drop pitcairn dpm quirks drm: radeon: radeon_ttm: Handle return NULL error from ioremap_nocache drm/amd/amdgpu/amdgpu_ttm: Handle return NULL error from ioremap_nocache drm/amdgpu: add new virtual display ID drm/amd/amdgpu: remove the uncessary parameter for ib scheduler drm/amdgpu: Bring bo creation in line with radeon driver (v2) drm/amd/powerplay: fix misspelling in header guard drm/ttm: revert "add optional LRU removal callback v2" drm/ttm: revert "implement LRU add callbacks v2" ...

Dave Airlie committed 9 years ago

Commit 29a73d92 parents 012bbe2 268c300134 files · +4838 −6122Browse files

Showing the changes to include/uapi (1 of 134 files). Show all

Unified · Split

include/uapi/drm/amdgpu_drm.h+9−0
@@ -528,6 +528,8 @@ struct drm_amdgpu_cs_chunk_data { · 527 unmodified lines
528 #define AMDGPU_INFO_VBIOS_SIZE 0x1528 #define AMDGPU_INFO_VBIOS_SIZE 0x1
529 /* Subquery id: Query vbios image */529 /* Subquery id: Query vbios image */
530 #define AMDGPU_INFO_VBIOS_IMAGE 0x2530 #define AMDGPU_INFO_VBIOS_IMAGE 0x2
531/* Query UVD handles */
532#define AMDGPU_INFO_NUM_HANDLES 0x1C
531 533
532#define AMDGPU_INFO_MMR_SE_INDEX_SHIFT 0534#define AMDGPU_INFO_MMR_SE_INDEX_SHIFT 0
533#define AMDGPU_INFO_MMR_SE_INDEX_MASK 0xff535#define AMDGPU_INFO_MMR_SE_INDEX_MASK 0xff
@@ -719,6 +721,13 @@ struct drm_amdgpu_info_hw_ip { · 185 unmodified lines
719 __u32 _pad;721 __u32 _pad;
720};722};
721 723
724struct drm_amdgpu_info_num_handles {
725 /** Max handles as supported by firmware for UVD */
726 __u32 uvd_max_handles;
727 /** Handles currently in use for UVD */
728 __u32 uvd_used_handles;
729};
730
722#define AMDGPU_VCE_CLOCK_TABLE_ENTRIES 6731#define AMDGPU_VCE_CLOCK_TABLE_ENTRIES 6
723 732
724struct drm_amdgpu_info_vce_clock_table_entry {733struct drm_amdgpu_info_vce_clock_table_entry {

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t