diff options
Diffstat (limited to 'common/recipes-kernel/linux/files/0366-drm-amdgpu-merge-amdgpu_family.h-into-amd_shared.h-v.patch')
| -rw-r--r-- | common/recipes-kernel/linux/files/0366-drm-amdgpu-merge-amdgpu_family.h-into-amd_shared.h-v.patch | 802 |
1 files changed, 0 insertions, 802 deletions
diff --git a/common/recipes-kernel/linux/files/0366-drm-amdgpu-merge-amdgpu_family.h-into-amd_shared.h-v.patch b/common/recipes-kernel/linux/files/0366-drm-amdgpu-merge-amdgpu_family.h-into-amd_shared.h-v.patch deleted file mode 100644 index 5a516ca8..00000000 --- a/common/recipes-kernel/linux/files/0366-drm-amdgpu-merge-amdgpu_family.h-into-amd_shared.h-v.patch +++ /dev/null @@ -1,802 +0,0 @@ -From 2f7d10b393c83acd3eedc3d6ab94dce29ac6a890 Mon Sep 17 00:00:00 2001 -From: Jammy Zhou <Jammy.Zhou@amd.com> -Date: Wed, 22 Jul 2015 11:29:01 +0800 -Subject: [PATCH 0366/1050] drm/amdgpu: merge amdgpu_family.h into amd_shared.h - (v2) - -Make the definitions common for all driver components - -v2: fix kfd - -Signed-off-by: Jammy Zhou <Jammy.Zhou@amd.com> -Reviewed-by: Alex Deucher <alexander.deucher@amd.com> ---- - drivers/gpu/drm/amd/amdgpu/amdgpu.h | 3 +- - drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 2 +- - drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c | 4 +- - drivers/gpu/drm/amd/amdgpu/amdgpu_bios.c | 6 +- - drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 4 +- - drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 128 ++++++++++++------------- - drivers/gpu/drm/amd/amdgpu/amdgpu_drv.h | 2 +- - drivers/gpu/drm/amd/amdgpu/amdgpu_family.h | 62 ------------ - drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 6 +- - drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 2 +- - drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c | 4 +- - drivers/gpu/drm/amd/amdgpu/atombios_encoders.c | 2 +- - drivers/gpu/drm/amd/amdgpu/cik.c | 12 +-- - drivers/gpu/drm/amd/amdgpu/dce_v10_0.c | 4 +- - drivers/gpu/drm/amd/amdgpu/dce_v11_0.c | 4 +- - drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | 4 +- - drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c | 4 +- - drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 2 +- - drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c | 10 +- - drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 8 +- - drivers/gpu/drm/amd/amdgpu/vce_v3_0.c | 2 +- - drivers/gpu/drm/amd/amdgpu/vi.c | 10 +- - drivers/gpu/drm/amd/include/amd_shared.h | 27 ++++++ - 23 files changed, 138 insertions(+), 174 deletions(-) - delete mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_family.h - -diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h -index e6c26c1..a9ead97 100644 ---- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h -+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h -@@ -47,7 +47,6 @@ - #include <drm/amdgpu_drm.h> - - #include "amd_shared.h" --#include "amdgpu_family.h" - #include "amdgpu_mode.h" - #include "amdgpu_ih.h" - #include "amdgpu_irq.h" -@@ -1900,7 +1899,7 @@ struct amdgpu_device { - struct rw_semaphore exclusive_lock; - - /* ASIC */ -- enum amdgpu_asic_type asic_type; -+ enum amd_asic_type asic_type; - uint32_t family; - uint32_t rev_id; - uint32_t external_rev_id; -diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c -index bc763e0..4c7c09c 100644 ---- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c -+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c -@@ -21,7 +21,7 @@ - */ - - #include "amdgpu_amdkfd.h" --#include "amdgpu_family.h" -+#include "amd_shared.h" - #include <drm/drmP.h> - #include "amdgpu.h" - #include <linux/module.h> -diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c -index 6a58837..77f1d7c 100644 ---- a/drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c -+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c -@@ -897,7 +897,7 @@ bool amdgpu_atombios_get_asic_ss_info(struct amdgpu_device *adev, - if ((id == ASIC_INTERNAL_ENGINE_SS) || - (id == ASIC_INTERNAL_MEMORY_SS)) - ss->rate /= 100; -- if (adev->flags & AMDGPU_IS_APU) -+ if (adev->flags & AMD_IS_APU) - amdgpu_atombios_get_igp_ss_overrides(adev, ss, id); - return true; - } -@@ -1058,7 +1058,7 @@ void amdgpu_atombios_set_memory_clock(struct amdgpu_device *adev, - SET_MEMORY_CLOCK_PS_ALLOCATION args; - int index = GetIndexIntoMasterTable(COMMAND, SetMemoryClock); - -- if (adev->flags & AMDGPU_IS_APU) -+ if (adev->flags & AMD_IS_APU) - return; - - args.ulTargetMemoryClock = cpu_to_le32(mem_clock); /* 10 khz */ -diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_bios.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_bios.c -index ceb444f..02add0a 100644 ---- a/drivers/gpu/drm/amd/amdgpu/amdgpu_bios.c -+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_bios.c -@@ -48,7 +48,7 @@ static bool igp_read_bios_from_vram(struct amdgpu_device *adev) - resource_size_t vram_base; - resource_size_t size = 256 * 1024; /* ??? */ - -- if (!(adev->flags & AMDGPU_IS_APU)) -+ if (!(adev->flags & AMD_IS_APU)) - if (!amdgpu_card_posted(adev)) - return false; - -@@ -184,7 +184,7 @@ static bool amdgpu_atrm_get_bios(struct amdgpu_device *adev) - bool found = false; - - /* ATRM is for the discrete card only */ -- if (adev->flags & AMDGPU_IS_APU) -+ if (adev->flags & AMD_IS_APU) - return false; - - while ((pdev = pci_get_class(PCI_CLASS_DISPLAY_VGA << 8, pdev)) != NULL) { -@@ -246,7 +246,7 @@ static inline bool amdgpu_atrm_get_bios(struct amdgpu_device *adev) - - static bool amdgpu_read_disabled_bios(struct amdgpu_device *adev) - { -- if (adev->flags & AMDGPU_IS_APU) -+ if (adev->flags & AMD_IS_APU) - return igp_read_bios_from_vram(adev); - else - return amdgpu_asic_read_disabled_bios(adev); -diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c -index a816580..f7a67a1 100644 ---- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c -+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c -@@ -63,7 +63,7 @@ bool amdgpu_device_is_px(struct drm_device *dev) - { - struct amdgpu_device *adev = dev->dev_private; - -- if (adev->flags & AMDGPU_IS_PX) -+ if (adev->flags & AMD_IS_PX) - return true; - return false; - } -@@ -1377,7 +1377,7 @@ int amdgpu_device_init(struct amdgpu_device *adev, - adev->ddev = ddev; - adev->pdev = pdev; - adev->flags = flags; -- adev->asic_type = flags & AMDGPU_ASIC_MASK; -+ adev->asic_type = flags & AMD_ASIC_MASK; - adev->is_atom_bios = false; - adev->usec_timeout = AMDGPU_MAX_USEC_TIMEOUT; - adev->mc.gtt_size = 512 * 1024 * 1024; -diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c -index 115906f..c3f9b49 100644 ---- a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c -+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c -@@ -142,33 +142,33 @@ module_param_named(exp_hw_support, amdgpu_exp_hw_support, int, 0444); - static struct pci_device_id pciidlist[] = { - #ifdef CONFIG_DRM_AMDGPU_CIK - /* Kaveri */ -- {0x1002, 0x1304, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_KAVERI|AMDGPU_IS_MOBILITY|AMDGPU_IS_APU}, -- {0x1002, 0x1305, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_KAVERI|AMDGPU_IS_APU}, -- {0x1002, 0x1306, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_KAVERI|AMDGPU_IS_MOBILITY|AMDGPU_IS_APU}, -- {0x1002, 0x1307, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_KAVERI|AMDGPU_IS_APU}, -- {0x1002, 0x1309, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_KAVERI|AMDGPU_IS_MOBILITY|AMDGPU_IS_APU}, -- {0x1002, 0x130A, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_KAVERI|AMDGPU_IS_MOBILITY|AMDGPU_IS_APU}, -- {0x1002, 0x130B, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_KAVERI|AMDGPU_IS_MOBILITY|AMDGPU_IS_APU}, -- {0x1002, 0x130C, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_KAVERI|AMDGPU_IS_MOBILITY|AMDGPU_IS_APU}, -- {0x1002, 0x130D, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_KAVERI|AMDGPU_IS_MOBILITY|AMDGPU_IS_APU}, -- {0x1002, 0x130E, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_KAVERI|AMDGPU_IS_MOBILITY|AMDGPU_IS_APU}, -- {0x1002, 0x130F, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_KAVERI|AMDGPU_IS_APU}, -- {0x1002, 0x1310, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_KAVERI|AMDGPU_IS_APU}, -- {0x1002, 0x1311, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_KAVERI|AMDGPU_IS_APU}, -- {0x1002, 0x1312, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_KAVERI|AMDGPU_IS_APU}, -- {0x1002, 0x1313, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_KAVERI|AMDGPU_IS_APU}, -- {0x1002, 0x1315, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_KAVERI|AMDGPU_IS_APU}, -- {0x1002, 0x1316, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_KAVERI|AMDGPU_IS_APU}, -- {0x1002, 0x1317, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_KAVERI|AMDGPU_IS_MOBILITY|AMDGPU_IS_APU}, -- {0x1002, 0x1318, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_KAVERI|AMDGPU_IS_MOBILITY|AMDGPU_IS_APU}, -- {0x1002, 0x131B, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_KAVERI|AMDGPU_IS_APU}, -- {0x1002, 0x131C, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_KAVERI|AMDGPU_IS_APU}, -- {0x1002, 0x131D, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_KAVERI|AMDGPU_IS_APU}, -+ {0x1002, 0x1304, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_KAVERI|AMD_IS_MOBILITY|AMD_IS_APU}, -+ {0x1002, 0x1305, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_KAVERI|AMD_IS_APU}, -+ {0x1002, 0x1306, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_KAVERI|AMD_IS_MOBILITY|AMD_IS_APU}, -+ {0x1002, 0x1307, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_KAVERI|AMD_IS_APU}, -+ {0x1002, 0x1309, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_KAVERI|AMD_IS_MOBILITY|AMD_IS_APU}, -+ {0x1002, 0x130A, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_KAVERI|AMD_IS_MOBILITY|AMD_IS_APU}, -+ {0x1002, 0x130B, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_KAVERI|AMD_IS_MOBILITY|AMD_IS_APU}, -+ {0x1002, 0x130C, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_KAVERI|AMD_IS_MOBILITY|AMD_IS_APU}, -+ {0x1002, 0x130D, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_KAVERI|AMD_IS_MOBILITY|AMD_IS_APU}, -+ {0x1002, 0x130E, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_KAVERI|AMD_IS_MOBILITY|AMD_IS_APU}, -+ {0x1002, 0x130F, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_KAVERI|AMD_IS_APU}, -+ {0x1002, 0x1310, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_KAVERI|AMD_IS_APU}, -+ {0x1002, 0x1311, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_KAVERI|AMD_IS_APU}, -+ {0x1002, 0x1312, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_KAVERI|AMD_IS_APU}, -+ {0x1002, 0x1313, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_KAVERI|AMD_IS_APU}, -+ {0x1002, 0x1315, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_KAVERI|AMD_IS_APU}, -+ {0x1002, 0x1316, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_KAVERI|AMD_IS_APU}, -+ {0x1002, 0x1317, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_KAVERI|AMD_IS_MOBILITY|AMD_IS_APU}, -+ {0x1002, 0x1318, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_KAVERI|AMD_IS_MOBILITY|AMD_IS_APU}, -+ {0x1002, 0x131B, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_KAVERI|AMD_IS_APU}, -+ {0x1002, 0x131C, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_KAVERI|AMD_IS_APU}, -+ {0x1002, 0x131D, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_KAVERI|AMD_IS_APU}, - /* Bonaire */ -- {0x1002, 0x6640, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_BONAIRE|AMDGPU_IS_MOBILITY}, -- {0x1002, 0x6641, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_BONAIRE|AMDGPU_IS_MOBILITY}, -- {0x1002, 0x6646, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_BONAIRE|AMDGPU_IS_MOBILITY}, -- {0x1002, 0x6647, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_BONAIRE|AMDGPU_IS_MOBILITY}, -+ {0x1002, 0x6640, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_BONAIRE|AMD_IS_MOBILITY}, -+ {0x1002, 0x6641, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_BONAIRE|AMD_IS_MOBILITY}, -+ {0x1002, 0x6646, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_BONAIRE|AMD_IS_MOBILITY}, -+ {0x1002, 0x6647, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_BONAIRE|AMD_IS_MOBILITY}, - {0x1002, 0x6649, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_BONAIRE}, - {0x1002, 0x6650, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_BONAIRE}, - {0x1002, 0x6651, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_BONAIRE}, -@@ -190,39 +190,39 @@ static struct pci_device_id pciidlist[] = { - {0x1002, 0x67BA, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_HAWAII}, - {0x1002, 0x67BE, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_HAWAII}, - /* Kabini */ -- {0x1002, 0x9830, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_KABINI|AMDGPU_IS_MOBILITY|AMDGPU_IS_APU}, -- {0x1002, 0x9831, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_KABINI|AMDGPU_IS_APU}, -- {0x1002, 0x9832, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_KABINI|AMDGPU_IS_MOBILITY|AMDGPU_IS_APU}, -- {0x1002, 0x9833, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_KABINI|AMDGPU_IS_APU}, -- {0x1002, 0x9834, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_KABINI|AMDGPU_IS_MOBILITY|AMDGPU_IS_APU}, -- {0x1002, 0x9835, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_KABINI|AMDGPU_IS_APU}, -- {0x1002, 0x9836, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_KABINI|AMDGPU_IS_MOBILITY|AMDGPU_IS_APU}, -- {0x1002, 0x9837, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_KABINI|AMDGPU_IS_APU}, -- {0x1002, 0x9838, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_KABINI|AMDGPU_IS_MOBILITY|AMDGPU_IS_APU}, -- {0x1002, 0x9839, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_KABINI|AMDGPU_IS_MOBILITY|AMDGPU_IS_APU}, -- {0x1002, 0x983a, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_KABINI|AMDGPU_IS_APU}, -- {0x1002, 0x983b, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_KABINI|AMDGPU_IS_MOBILITY|AMDGPU_IS_APU}, -- {0x1002, 0x983c, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_KABINI|AMDGPU_IS_APU}, -- {0x1002, 0x983d, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_KABINI|AMDGPU_IS_APU}, -- {0x1002, 0x983e, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_KABINI|AMDGPU_IS_APU}, -- {0x1002, 0x983f, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_KABINI|AMDGPU_IS_APU}, -+ {0x1002, 0x9830, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_KABINI|AMD_IS_MOBILITY|AMD_IS_APU}, -+ {0x1002, 0x9831, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_KABINI|AMD_IS_APU}, -+ {0x1002, 0x9832, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_KABINI|AMD_IS_MOBILITY|AMD_IS_APU}, -+ {0x1002, 0x9833, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_KABINI|AMD_IS_APU}, -+ {0x1002, 0x9834, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_KABINI|AMD_IS_MOBILITY|AMD_IS_APU}, -+ {0x1002, 0x9835, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_KABINI|AMD_IS_APU}, -+ {0x1002, 0x9836, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_KABINI|AMD_IS_MOBILITY|AMD_IS_APU}, -+ {0x1002, 0x9837, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_KABINI|AMD_IS_APU}, -+ {0x1002, 0x9838, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_KABINI|AMD_IS_MOBILITY|AMD_IS_APU}, -+ {0x1002, 0x9839, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_KABINI|AMD_IS_MOBILITY|AMD_IS_APU}, -+ {0x1002, 0x983a, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_KABINI|AMD_IS_APU}, -+ {0x1002, 0x983b, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_KABINI|AMD_IS_MOBILITY|AMD_IS_APU}, -+ {0x1002, 0x983c, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_KABINI|AMD_IS_APU}, -+ {0x1002, 0x983d, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_KABINI|AMD_IS_APU}, -+ {0x1002, 0x983e, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_KABINI|AMD_IS_APU}, -+ {0x1002, 0x983f, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_KABINI|AMD_IS_APU}, - /* mullins */ -- {0x1002, 0x9850, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_MULLINS|AMDGPU_IS_MOBILITY|AMDGPU_IS_APU}, -- {0x1002, 0x9851, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_MULLINS|AMDGPU_IS_MOBILITY|AMDGPU_IS_APU}, -- {0x1002, 0x9852, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_MULLINS|AMDGPU_IS_MOBILITY|AMDGPU_IS_APU}, -- {0x1002, 0x9853, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_MULLINS|AMDGPU_IS_MOBILITY|AMDGPU_IS_APU}, -- {0x1002, 0x9854, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_MULLINS|AMDGPU_IS_MOBILITY|AMDGPU_IS_APU}, -- {0x1002, 0x9855, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_MULLINS|AMDGPU_IS_MOBILITY|AMDGPU_IS_APU}, -- {0x1002, 0x9856, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_MULLINS|AMDGPU_IS_MOBILITY|AMDGPU_IS_APU}, -- {0x1002, 0x9857, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_MULLINS|AMDGPU_IS_MOBILITY|AMDGPU_IS_APU}, -- {0x1002, 0x9858, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_MULLINS|AMDGPU_IS_MOBILITY|AMDGPU_IS_APU}, -- {0x1002, 0x9859, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_MULLINS|AMDGPU_IS_MOBILITY|AMDGPU_IS_APU}, -- {0x1002, 0x985A, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_MULLINS|AMDGPU_IS_MOBILITY|AMDGPU_IS_APU}, -- {0x1002, 0x985B, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_MULLINS|AMDGPU_IS_MOBILITY|AMDGPU_IS_APU}, -- {0x1002, 0x985C, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_MULLINS|AMDGPU_IS_MOBILITY|AMDGPU_IS_APU}, -- {0x1002, 0x985D, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_MULLINS|AMDGPU_IS_MOBILITY|AMDGPU_IS_APU}, -- {0x1002, 0x985E, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_MULLINS|AMDGPU_IS_MOBILITY|AMDGPU_IS_APU}, -- {0x1002, 0x985F, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_MULLINS|AMDGPU_IS_MOBILITY|AMDGPU_IS_APU}, -+ {0x1002, 0x9850, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_MULLINS|AMD_IS_MOBILITY|AMD_IS_APU}, -+ {0x1002, 0x9851, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_MULLINS|AMD_IS_MOBILITY|AMD_IS_APU}, -+ {0x1002, 0x9852, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_MULLINS|AMD_IS_MOBILITY|AMD_IS_APU}, -+ {0x1002, 0x9853, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_MULLINS|AMD_IS_MOBILITY|AMD_IS_APU}, -+ {0x1002, 0x9854, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_MULLINS|AMD_IS_MOBILITY|AMD_IS_APU}, -+ {0x1002, 0x9855, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_MULLINS|AMD_IS_MOBILITY|AMD_IS_APU}, -+ {0x1002, 0x9856, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_MULLINS|AMD_IS_MOBILITY|AMD_IS_APU}, -+ {0x1002, 0x9857, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_MULLINS|AMD_IS_MOBILITY|AMD_IS_APU}, -+ {0x1002, 0x9858, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_MULLINS|AMD_IS_MOBILITY|AMD_IS_APU}, -+ {0x1002, 0x9859, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_MULLINS|AMD_IS_MOBILITY|AMD_IS_APU}, -+ {0x1002, 0x985A, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_MULLINS|AMD_IS_MOBILITY|AMD_IS_APU}, -+ {0x1002, 0x985B, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_MULLINS|AMD_IS_MOBILITY|AMD_IS_APU}, -+ {0x1002, 0x985C, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_MULLINS|AMD_IS_MOBILITY|AMD_IS_APU}, -+ {0x1002, 0x985D, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_MULLINS|AMD_IS_MOBILITY|AMD_IS_APU}, -+ {0x1002, 0x985E, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_MULLINS|AMD_IS_MOBILITY|AMD_IS_APU}, -+ {0x1002, 0x985F, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_MULLINS|AMD_IS_MOBILITY|AMD_IS_APU}, - #endif - /* topaz */ - {0x1002, 0x6900, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_TOPAZ}, -@@ -241,11 +241,11 @@ static struct pci_device_id pciidlist[] = { - {0x1002, 0x6938, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_TONGA}, - {0x1002, 0x6939, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_TONGA}, - /* carrizo */ -- {0x1002, 0x9870, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_CARRIZO|AMDGPU_IS_APU}, -- {0x1002, 0x9874, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_CARRIZO|AMDGPU_IS_APU}, -- {0x1002, 0x9875, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_CARRIZO|AMDGPU_IS_APU}, -- {0x1002, 0x9876, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_CARRIZO|AMDGPU_IS_APU}, -- {0x1002, 0x9877, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_CARRIZO|AMDGPU_IS_APU}, -+ {0x1002, 0x9870, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_CARRIZO|AMD_IS_APU}, -+ {0x1002, 0x9874, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_CARRIZO|AMD_IS_APU}, -+ {0x1002, 0x9875, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_CARRIZO|AMD_IS_APU}, -+ {0x1002, 0x9876, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_CARRIZO|AMD_IS_APU}, -+ {0x1002, 0x9877, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_CARRIZO|AMD_IS_APU}, - - {0, 0, 0} - }; -@@ -281,7 +281,7 @@ static int amdgpu_pci_probe(struct pci_dev *pdev, - unsigned long flags = ent->driver_data; - int ret; - -- if ((flags & AMDGPU_EXP_HW_SUPPORT) && !amdgpu_exp_hw_support) { -+ if ((flags & AMD_EXP_HW_SUPPORT) && !amdgpu_exp_hw_support) { - DRM_INFO("This hardware requires experimental hardware support.\n" - "See modparam exp_hw_support\n"); - return -ENODEV; -diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.h -index cceeb33..e3a4f70 100644 ---- a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.h -+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.h -@@ -31,7 +31,7 @@ - #include <linux/firmware.h> - #include <linux/platform_device.h> - --#include "amdgpu_family.h" -+#include "amd_shared.h" - - /* General customization: - */ -diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_family.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_family.h -deleted file mode 100644 -index 0698764..0000000 ---- a/drivers/gpu/drm/amd/amdgpu/amdgpu_family.h -+++ /dev/null -@@ -1,62 +0,0 @@ --/* -- * Copyright 2008 Advanced Micro Devices, Inc. -- * Copyright 2008 Red Hat Inc. -- * Copyright 2009 Jerome Glisse. -- * -- * Permission is hereby granted, free of charge, to any person obtaining a -- * copy of this software and associated documentation files (the "Software"), -- * to deal in the Software without restriction, including without limitation -- * the rights to use, copy, modify, merge, publish, distribute, sublicense, -- * and/or sell copies of the Software, and to permit persons to whom the -- * Software is furnished to do so, subject to the following conditions: -- * -- * The above copyright notice and this permission notice shall be included in -- * all copies or substantial portions of the Software. -- * -- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -- * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR -- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, -- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR -- * OTHER DEALINGS IN THE SOFTWARE. -- * -- * Authors: Dave Airlie -- * Alex Deucher -- * Jerome Glisse -- */ -- --/* this file defines the CHIP_ and family flags used in the pciids, -- * its is common between kms and non-kms because duplicating it and -- * changing one place is fail. -- */ --#ifndef AMDGPU_FAMILY_H --#define AMDGPU_FAMILY_H --/* -- * Supported ASIC types -- */ --enum amdgpu_asic_type { -- CHIP_BONAIRE = 0, -- CHIP_KAVERI, -- CHIP_KABINI, -- CHIP_HAWAII, -- CHIP_MULLINS, -- CHIP_TOPAZ, -- CHIP_TONGA, -- CHIP_CARRIZO, -- CHIP_LAST, --}; -- --/* -- * Chip flags -- */ --enum amdgpu_chip_flags { -- AMDGPU_ASIC_MASK = 0x0000ffffUL, -- AMDGPU_FLAGS_MASK = 0xffff0000UL, -- AMDGPU_IS_MOBILITY = 0x00010000UL, -- AMDGPU_IS_APU = 0x00020000UL, -- AMDGPU_IS_PX = 0x00040000UL, -- AMDGPU_EXP_HW_SUPPORT = 0x00080000UL, --}; -- --#endif -diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c -index 93000af..53da3d8 100644 ---- a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c -+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c -@@ -96,8 +96,8 @@ int amdgpu_driver_load_kms(struct drm_device *dev, unsigned long flags) - - if ((amdgpu_runtime_pm != 0) && - amdgpu_has_atpx() && -- ((flags & AMDGPU_IS_APU) == 0)) -- flags |= AMDGPU_IS_PX; -+ ((flags & AMD_IS_APU) == 0)) -+ flags |= AMD_IS_PX; - - /* amdgpu_device_init should report only fatal error - * like memory allocation failure or iomapping failure, -@@ -451,7 +451,7 @@ static int amdgpu_info_ioctl(struct drm_device *dev, void *data, struct drm_file - dev_info.num_hw_gfx_contexts = adev->gfx.config.max_hw_contexts; - dev_info._pad = 0; - dev_info.ids_flags = 0; -- if (adev->flags & AMDGPU_IS_APU) -+ if (adev->flags & AMD_IS_APU) - dev_info.ids_flags |= AMDGPU_IDS_FLAGS_FUSION; - dev_info.virtual_address_offset = AMDGPU_VA_RESERVED_SIZE; - dev_info.virtual_address_max = (uint64_t)adev->vm_manager.max_pfn * AMDGPU_GPU_PAGE_SIZE; -diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c -index 8da6424..88ca79f 100644 ---- a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c -+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c -@@ -462,7 +462,7 @@ int amdgpu_bo_unpin(struct amdgpu_bo *bo) - int amdgpu_bo_evict_vram(struct amdgpu_device *adev) - { - /* late 2.6.33 fix IGP hibernate - we need pm ops to do this correct */ -- if (0 && (adev->flags & AMDGPU_IS_APU)) { -+ if (0 && (adev->flags & AMD_IS_APU)) { - /* Useless to evict on IGP chips */ - return 0; - } -diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c -index ed13baa..25b329f 100644 ---- a/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c -+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c -@@ -82,7 +82,7 @@ static ssize_t amdgpu_set_dpm_state(struct device *dev, - mutex_unlock(&adev->pm.mutex); - - /* Can't set dpm state when the card is off */ -- if (!(adev->flags & AMDGPU_IS_PX) || -+ if (!(adev->flags & AMD_IS_PX) || - (ddev->switch_power_state == DRM_SWITCH_POWER_ON)) - amdgpu_pm_compute_clocks(adev); - fail: -@@ -538,7 +538,7 @@ static void amdgpu_dpm_change_power_state_locked(struct amdgpu_device *adev) - /* vce just modifies an existing state so force a change */ - if (ps->vce_active != adev->pm.dpm.vce_active) - goto force; -- if (adev->flags & AMDGPU_IS_APU) { -+ if (adev->flags & AMD_IS_APU) { - /* for APUs if the num crtcs changed but state is the same, - * all we need to do is update the display configuration. - */ -diff --git a/drivers/gpu/drm/amd/amdgpu/atombios_encoders.c b/drivers/gpu/drm/amd/amdgpu/atombios_encoders.c -index ae8caca..cd6edc4 100644 ---- a/drivers/gpu/drm/amd/amdgpu/atombios_encoders.c -+++ b/drivers/gpu/drm/amd/amdgpu/atombios_encoders.c -@@ -812,7 +812,7 @@ amdgpu_atombios_encoder_setup_dig_transmitter(struct drm_encoder *encoder, int a - else - args.v1.ucConfig |= ATOM_TRANSMITTER_CONFIG_DIG1_ENCODER; - -- if ((adev->flags & AMDGPU_IS_APU) && -+ if ((adev->flags & AMD_IS_APU) && - (amdgpu_encoder->encoder_id == ENCODER_OBJECT_ID_INTERNAL_UNIPHY)) { - if (is_dp || - !amdgpu_dig_monitor_is_duallink(encoder, amdgpu_encoder->pixel_clock)) { -diff --git a/drivers/gpu/drm/amd/amdgpu/cik.c b/drivers/gpu/drm/amd/amdgpu/cik.c -index b3b66a0..4b6ce74 100644 ---- a/drivers/gpu/drm/amd/amdgpu/cik.c -+++ b/drivers/gpu/drm/amd/amdgpu/cik.c -@@ -838,7 +838,7 @@ static u32 cik_get_xclk(struct amdgpu_device *adev) - { - u32 reference_clock = adev->clock.spll.reference_freq; - -- if (adev->flags & AMDGPU_IS_APU) { -+ if (adev->flags & AMD_IS_APU) { - if (RREG32_SMC(ixGENERAL_PWRMGT) & GENERAL_PWRMGT__GPU_COUNTER_CLK_MASK) - return reference_clock / 2; - } else { -@@ -1235,7 +1235,7 @@ static void cik_gpu_soft_reset(struct amdgpu_device *adev, u32 reset_mask) - if (reset_mask & AMDGPU_RESET_VMC) - srbm_soft_reset |= SRBM_SOFT_RESET__SOFT_RESET_VMC_MASK; - -- if (!(adev->flags & AMDGPU_IS_APU)) { -+ if (!(adev->flags & AMD_IS_APU)) { - if (reset_mask & AMDGPU_RESET_MC) - srbm_soft_reset |= SRBM_SOFT_RESET__SOFT_RESET_MC_MASK; - } -@@ -1411,7 +1411,7 @@ static void cik_gpu_pci_config_reset(struct amdgpu_device *adev) - dev_warn(adev->dev, "Wait for MC idle timed out !\n"); - } - -- if (adev->flags & AMDGPU_IS_APU) -+ if (adev->flags & AMD_IS_APU) - kv_save_regs_for_reset(adev, &kv_save); - - /* disable BM */ -@@ -1429,7 +1429,7 @@ static void cik_gpu_pci_config_reset(struct amdgpu_device *adev) - } - - /* does asic init need to be run first??? */ -- if (adev->flags & AMDGPU_IS_APU) -+ if (adev->flags & AMD_IS_APU) - kv_restore_regs_for_reset(adev, &kv_save); - } - -@@ -1570,7 +1570,7 @@ static void cik_pcie_gen3_enable(struct amdgpu_device *adev) - if (amdgpu_pcie_gen2 == 0) - return; - -- if (adev->flags & AMDGPU_IS_APU) -+ if (adev->flags & AMD_IS_APU) - return; - - ret = drm_pcie_get_speed_cap_mask(adev->ddev, &mask); -@@ -1730,7 +1730,7 @@ static void cik_program_aspm(struct amdgpu_device *adev) - return; - - /* XXX double check APUs */ -- if (adev->flags & AMDGPU_IS_APU) -+ if (adev->flags & AMD_IS_APU) - return; - - orig = data = RREG32_PCIE(ixPCIE_LC_N_FTS_CNTL); -diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c b/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c -index e70a26f..a72254a 100644 ---- a/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c -+++ b/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c -@@ -803,11 +803,11 @@ static u32 dce_v10_0_line_buffer_adjust(struct amdgpu_device *adev, - buffer_alloc = 2; - } else if (mode->crtc_hdisplay < 4096) { - mem_cfg = 0; -- buffer_alloc = (adev->flags & AMDGPU_IS_APU) ? 2 : 4; -+ buffer_alloc = (adev->flags & AMD_IS_APU) ? 2 : 4; - } else { - DRM_DEBUG_KMS("Mode too big for LB!\n"); - mem_cfg = 0; -- buffer_alloc = (adev->flags & AMDGPU_IS_APU) ? 2 : 4; -+ buffer_alloc = (adev->flags & AMD_IS_APU) ? 2 : 4; - } - } else { - mem_cfg = 1; -diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c b/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c -index dcb402e..70eee80 100644 ---- a/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c -+++ b/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c -@@ -801,11 +801,11 @@ static u32 dce_v11_0_line_buffer_adjust(struct amdgpu_device *adev, - buffer_alloc = 2; - } else if (mode->crtc_hdisplay < 4096) { - mem_cfg = 0; -- buffer_alloc = (adev->flags & AMDGPU_IS_APU) ? 2 : 4; -+ buffer_alloc = (adev->flags & AMD_IS_APU) ? 2 : 4; - } else { - DRM_DEBUG_KMS("Mode too big for LB!\n"); - mem_cfg = 0; -- buffer_alloc = (adev->flags & AMDGPU_IS_APU) ? 2 : 4; -+ buffer_alloc = (adev->flags & AMD_IS_APU) ? 2 : 4; - } - } else { - mem_cfg = 1; -diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c b/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c -index cc050a3..c86911c 100644 ---- a/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c -+++ b/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c -@@ -770,11 +770,11 @@ static u32 dce_v8_0_line_buffer_adjust(struct amdgpu_device *adev, - buffer_alloc = 2; - } else if (mode->crtc_hdisplay < 4096) { - tmp = 0; -- buffer_alloc = (adev->flags & AMDGPU_IS_APU) ? 2 : 4; -+ buffer_alloc = (adev->flags & AMD_IS_APU) ? 2 : 4; - } else { - DRM_DEBUG_KMS("Mode too big for LB!\n"); - tmp = 0; -- buffer_alloc = (adev->flags & AMDGPU_IS_APU) ? 2 : 4; -+ buffer_alloc = (adev->flags & AMD_IS_APU) ? 2 : 4; - } - } else { - tmp = 1; -diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c -index 0d8bf2c..54a2bf8 100644 ---- a/drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c -+++ b/drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c -@@ -2173,7 +2173,7 @@ static void gfx_v7_0_gpu_init(struct amdgpu_device *adev) - - adev->gfx.config.num_tile_pipes = adev->gfx.config.max_tile_pipes; - adev->gfx.config.mem_max_burst_length_bytes = 256; -- if (adev->flags & AMDGPU_IS_APU) { -+ if (adev->flags & AMD_IS_APU) { - /* Get memory bank mapping mode. */ - tmp = RREG32(mmMC_FUS_DRAM0_BANK_ADDR_MAPPING); - dimm00_addr_map = REG_GET_FIELD(tmp, MC_FUS_DRAM0_BANK_ADDR_MAPPING, DIMM0ADDRMAP); -@@ -3758,7 +3758,7 @@ static int gfx_v7_0_rlc_init(struct amdgpu_device *adev) - int r; - - /* allocate rlc buffers */ -- if (adev->flags & AMDGPU_IS_APU) { -+ if (adev->flags & AMD_IS_APU) { - if (adev->asic_type == CHIP_KAVERI) { - adev->gfx.rlc.reg_list = spectre_rlc_save_restore_register_list; - adev->gfx.rlc.reg_list_size = -diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c -index 20e2cfd..17df5c2 100644 ---- a/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c -+++ b/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c -@@ -2078,7 +2078,7 @@ static void gfx_v8_0_gpu_init(struct amdgpu_device *adev) - - adev->gfx.config.num_tile_pipes = adev->gfx.config.max_tile_pipes; - adev->gfx.config.mem_max_burst_length_bytes = 256; -- if (adev->flags & AMDGPU_IS_APU) { -+ if (adev->flags & AMD_IS_APU) { - /* Get memory bank mapping mode. */ - tmp = RREG32(mmMC_FUS_DRAM0_BANK_ADDR_MAPPING); - dimm00_addr_map = REG_GET_FIELD(tmp, MC_FUS_DRAM0_BANK_ADDR_MAPPING, DIMM0ADDRMAP); -diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c -index ae37fce..1021882 100644 ---- a/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c -+++ b/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c -@@ -636,7 +636,7 @@ static int gmc_v7_0_vm_init(struct amdgpu_device *adev) - adev->vm_manager.nvm = AMDGPU_NUM_OF_VMIDS; - - /* base offset of vram pages */ -- if (adev->flags & AMDGPU_IS_APU) { -+ if (adev->flags & AMD_IS_APU) { - u64 tmp = RREG32(mmMC_VM_FB_OFFSET); - tmp <<= 22; - adev->vm_manager.vram_base_offset = tmp; -@@ -841,7 +841,7 @@ static int gmc_v7_0_early_init(void *handle) - gmc_v7_0_set_gart_funcs(adev); - gmc_v7_0_set_irq_funcs(adev); - -- if (adev->flags & AMDGPU_IS_APU) { -+ if (adev->flags & AMD_IS_APU) { - adev->mc.vram_type = AMDGPU_VRAM_TYPE_UNKNOWN; - } else { - u32 tmp = RREG32(mmMC_SEQ_MISC0); -@@ -957,7 +957,7 @@ static int gmc_v7_0_hw_init(void *handle) - - gmc_v7_0_mc_program(adev); - -- if (!(adev->flags & AMDGPU_IS_APU)) { -+ if (!(adev->flags & AMD_IS_APU)) { - r = gmc_v7_0_mc_load_microcode(adev); - if (r) { - DRM_ERROR("Failed to load MC firmware!\n"); -@@ -1172,7 +1172,7 @@ static int gmc_v7_0_soft_reset(void *handle) - - if (tmp & (SRBM_STATUS__MCB_BUSY_MASK | SRBM_STATUS__MCB_NON_DISPLAY_BUSY_MASK | - SRBM_STATUS__MCC_BUSY_MASK | SRBM_STATUS__MCD_BUSY_MASK)) { -- if (!(adev->flags & AMDGPU_IS_APU)) -+ if (!(adev->flags & AMD_IS_APU)) - srbm_soft_reset = REG_SET_FIELD(srbm_soft_reset, - SRBM_SOFT_RESET, SOFT_RESET_MC, 1); - } -@@ -1282,7 +1282,7 @@ static int gmc_v7_0_set_clockgating_state(void *handle, - if (state == AMD_CG_STATE_GATE) - gate = true; - -- if (!(adev->flags & AMDGPU_IS_APU)) { -+ if (!(adev->flags & AMD_IS_APU)) { - gmc_v7_0_enable_mc_mgcg(adev, gate); - gmc_v7_0_enable_mc_ls(adev, gate); - } -diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c -index 8135963..3b54ed8 100644 ---- a/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c -+++ b/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c -@@ -737,7 +737,7 @@ static int gmc_v8_0_vm_init(struct amdgpu_device *adev) - adev->vm_manager.nvm = AMDGPU_NUM_OF_VMIDS; - - /* base offset of vram pages */ -- if (adev->flags & AMDGPU_IS_APU) { -+ if (adev->flags & AMD_IS_APU) { - u64 tmp = RREG32(mmMC_VM_FB_OFFSET); - tmp <<= 22; - adev->vm_manager.vram_base_offset = tmp; -@@ -816,7 +816,7 @@ static int gmc_v8_0_early_init(void *handle) - gmc_v8_0_set_gart_funcs(adev); - gmc_v8_0_set_irq_funcs(adev); - -- if (adev->flags & AMDGPU_IS_APU) { -+ if (adev->flags & AMD_IS_APU) { - adev->mc.vram_type = AMDGPU_VRAM_TYPE_UNKNOWN; - } else { - u32 tmp = RREG32(mmMC_SEQ_MISC0); -@@ -934,7 +934,7 @@ static int gmc_v8_0_hw_init(void *handle) - - gmc_v8_0_mc_program(adev); - -- if (!(adev->flags & AMDGPU_IS_APU)) { -+ if (!(adev->flags & AMD_IS_APU)) { - r = gmc_v8_0_mc_load_microcode(adev); - if (r) { - DRM_ERROR("Failed to load MC firmware!\n"); -@@ -1147,7 +1147,7 @@ static int gmc_v8_0_soft_reset(void *handle) - - if (tmp & (SRBM_STATUS__MCB_BUSY_MASK | SRBM_STATUS__MCB_NON_DISPLAY_BUSY_MASK | - SRBM_STATUS__MCC_BUSY_MASK | SRBM_STATUS__MCD_BUSY_MASK)) { -- if (!(adev->flags & AMDGPU_IS_APU)) -+ if (!(adev->flags & AMD_IS_APU)) - srbm_soft_reset = REG_SET_FIELD(srbm_soft_reset, - SRBM_SOFT_RESET, SOFT_RESET_MC, 1); - } -diff --git a/drivers/gpu/drm/amd/amdgpu/vce_v3_0.c b/drivers/gpu/drm/amd/amdgpu/vce_v3_0.c -index d1064ca..5a5a40c 100644 ---- a/drivers/gpu/drm/amd/amdgpu/vce_v3_0.c -+++ b/drivers/gpu/drm/amd/amdgpu/vce_v3_0.c -@@ -205,7 +205,7 @@ static unsigned vce_v3_0_get_harvest_config(struct amdgpu_device *adev) - u32 tmp; - unsigned ret; - -- if (adev->flags & AMDGPU_IS_APU) -+ if (adev->flags & AMD_IS_APU) - tmp = (RREG32_SMC(ixVCE_HARVEST_FUSE_MACRO__ADDRESS) & - VCE_HARVEST_FUSE_MACRO__MASK) >> - VCE_HARVEST_FUSE_MACRO__SHIFT; -diff --git a/drivers/gpu/drm/amd/amdgpu/vi.c b/drivers/gpu/drm/amd/amdgpu/vi.c -index 0f4a4f4..2095f57 100644 ---- a/drivers/gpu/drm/amd/amdgpu/vi.c -+++ b/drivers/gpu/drm/amd/amdgpu/vi.c -@@ -261,7 +261,7 @@ static u32 vi_get_xclk(struct amdgpu_device *adev) - u32 reference_clock = adev->clock.spll.reference_freq; - u32 tmp; - -- if (adev->flags & AMDGPU_IS_APU) -+ if (adev->flags & AMD_IS_APU) - return reference_clock; - - tmp = RREG32_SMC(ixCG_CLKPIN_CNTL_2); -@@ -771,7 +771,7 @@ static void vi_gpu_soft_reset(struct amdgpu_device *adev, u32 reset_mask) - srbm_soft_reset = - REG_SET_FIELD(srbm_soft_reset, SRBM_SOFT_RESET, SOFT_RESET_VCE1, 1); - -- if (!(adev->flags & AMDGPU_IS_APU)) { -+ if (!(adev->flags & AMD_IS_APU)) { - if (reset_mask & AMDGPU_RESET_MC) - srbm_soft_reset = - REG_SET_FIELD(srbm_soft_reset, SRBM_SOFT_RESET, SOFT_RESET_MC, 1); -@@ -991,7 +991,7 @@ static void vi_pcie_gen3_enable(struct amdgpu_device *adev) - if (amdgpu_pcie_gen2 == 0) - return; - -- if (adev->flags & AMDGPU_IS_APU) -+ if (adev->flags & AMD_IS_APU) - return; - - ret = drm_pcie_get_speed_cap_mask(adev->ddev, &mask); -@@ -1019,7 +1019,7 @@ static void vi_enable_doorbell_aperture(struct amdgpu_device *adev, - u32 tmp; - - /* not necessary on CZ */ -- if (adev->flags & AMDGPU_IS_APU) -+ if (adev->flags & AMD_IS_APU) - return; - - tmp = RREG32(mmBIF_DOORBELL_APER_EN); -@@ -1268,7 +1268,7 @@ static int vi_common_early_init(void *handle) - bool smc_enabled = false; - struct amdgpu_device *adev = (struct amdgpu_device *)handle; - -- if (adev->flags & AMDGPU_IS_APU) { -+ if (adev->flags & AMD_IS_APU) { - adev->smc_rreg = &cz_smc_rreg; - adev->smc_wreg = &cz_smc_wreg; - } else { -diff --git a/drivers/gpu/drm/amd/include/amd_shared.h b/drivers/gpu/drm/amd/include/amd_shared.h -index 3698481..3b8d2fc 100644 ---- a/drivers/gpu/drm/amd/include/amd_shared.h -+++ b/drivers/gpu/drm/amd/include/amd_shared.h -@@ -34,6 +34,33 @@ - #define AMD_FAMILY_VI 130 /* Iceland, Tonga */ - #define AMD_FAMILY_CZ 135 /* Carrizo */ - -+/* -+ * Supported ASIC types -+ */ -+enum amd_asic_type { -+ CHIP_BONAIRE = 0, -+ CHIP_KAVERI, -+ CHIP_KABINI, -+ CHIP_HAWAII, -+ CHIP_MULLINS, -+ CHIP_TOPAZ, -+ CHIP_TONGA, -+ CHIP_CARRIZO, -+ CHIP_LAST, -+}; -+ -+/* -+ * Chip flags -+ */ -+enum amd_chip_flags { -+ AMD_ASIC_MASK = 0x0000ffffUL, -+ AMD_FLAGS_MASK = 0xffff0000UL, -+ AMD_IS_MOBILITY = 0x00010000UL, -+ AMD_IS_APU = 0x00020000UL, -+ AMD_IS_PX = 0x00040000UL, -+ AMD_EXP_HW_SUPPORT = 0x00080000UL, -+}; -+ - enum amd_ip_block_type { - AMD_IP_BLOCK_TYPE_COMMON, - AMD_IP_BLOCK_TYPE_GMC, --- -1.9.1 - |