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>

1 files changed, 2 insertions, 2 deletions

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
index a816580fb474..f7a67a142edc 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;