OSDN Git Service

drm/amdgpu: Get pci resource directly through adev
authorRex Zhu <Rex.Zhu@amd.com>
Fri, 23 Mar 2018 10:36:51 +0000 (18:36 +0800)
committerAlex Deucher <alexander.deucher@amd.com>
Wed, 11 Apr 2018 18:07:50 +0000 (13:07 -0500)
In order to remove the cgs wrapper function
cgs_get_pci_resource

Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Acked-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Rex Zhu <Rex.Zhu@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
drivers/gpu/drm/amd/amdgpu/amdgpu_acp.c

index a29362f..03ee367 100644 (file)
@@ -290,12 +290,11 @@ static int acp_hw_init(void *handle)
        else if (r)
                return r;
 
-       r = cgs_get_pci_resource(adev->acp.cgs_device, CGS_RESOURCE_TYPE_MMIO,
-                       0x5289, 0, &acp_base);
-       if (r == -ENODEV)
-               return 0;
-       else if (r)
-               return r;
+       if (adev->rmmio_size == 0 || adev->rmmio_size < 0x5289)
+               return -EINVAL;
+
+       acp_base = adev->rmmio_base;
+
        if (adev->asic_type != CHIP_STONEY) {
                adev->acp.acp_genpd = kzalloc(sizeof(struct acp_pm_domain), GFP_KERNEL);
                if (adev->acp.acp_genpd == NULL)