diff options
| author | Dave Airlie <airlied@redhat.com> | 2018-10-18 12:05:08 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2018-10-18 12:05:11 +1000 |
| commit | c13bbf4a78aafed144de0250a3c71265672c9bda (patch) | |
| tree | 54edb601a81ce803d42e1fe55c93b6a7f7f42741 /include | |
| parent | 28b32b9f61fe73e7625ed30c35afd6d8a0ed2b6e (diff) | |
| parent | 8e16695b4eb819881774b8c06eb164dc1fb74275 (diff) | |
| download | cachepc-linux-c13bbf4a78aafed144de0250a3c71265672c9bda.tar.gz cachepc-linux-c13bbf4a78aafed144de0250a3c71265672c9bda.zip | |
Merge branch 'drm-next-4.20' of git://people.freedesktop.org/~agd5f/linux into drm-next
Fixes for 4.20. Highlights:
- VCN DPG fixes for Picasso
- Add support for the latest vega20 vbios
- Scheduler timeout fix
- License fixes for radeon and amdgpu
- Misc other fixes
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Alex Deucher <alexdeucher@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20181017215427.2804-1-alexander.deucher@amd.com
Diffstat (limited to 'include')
| -rw-r--r-- | include/drm/drm_pciids.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/drm/drm_pciids.h b/include/drm/drm_pciids.h index 683742826511..b7e899ce44f0 100644 --- a/include/drm/drm_pciids.h +++ b/include/drm/drm_pciids.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: MIT */ #define radeon_PCI_IDS \ {0x1002, 0x1304, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_KAVERI|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \ {0x1002, 0x1305, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_KAVERI|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \ |