diff options
| author | Alex Deucher <alexander.deucher@amd.com> | 2016-02-05 10:56:22 -0500 |
|---|---|---|
| committer | Alex Deucher <alexander.deucher@amd.com> | 2016-02-08 10:37:47 -0500 |
| commit | e3b04bc790ecd6d08d4699bc60b4f5a76f7f7b6b (patch) | |
| tree | 978c74715ed01a721fad2e78ef825d2abdd7c29b /drivers/gpu/drm/amd/amdgpu/cik.c | |
| parent | b118af7012f9bd4bdbda12681ce66f91aabffd3f (diff) | |
drma/dmgpu: move cg and pg flags into shared headers
So they can be used by powerplay.
Reviewed-by: Eric Huang <JinHuiEric.Huang@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/cik.c')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/cik.c | 154 |
1 files changed, 77 insertions, 77 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/cik.c b/drivers/gpu/drm/amd/amdgpu/cik.c index 5c978e064f47..155965ed14a3 100644 --- a/drivers/gpu/drm/amd/amdgpu/cik.c +++ b/drivers/gpu/drm/amd/amdgpu/cik.c | |||
| @@ -2335,72 +2335,72 @@ static int cik_common_early_init(void *handle) | |||
| 2335 | switch (adev->asic_type) { | 2335 | switch (adev->asic_type) { |
| 2336 | case CHIP_BONAIRE: | 2336 | case CHIP_BONAIRE: |
| 2337 | adev->cg_flags = | 2337 | adev->cg_flags = |
| 2338 | AMDGPU_CG_SUPPORT_GFX_MGCG | | 2338 | AMD_CG_SUPPORT_GFX_MGCG | |
| 2339 | AMDGPU_CG_SUPPORT_GFX_MGLS | | 2339 | AMD_CG_SUPPORT_GFX_MGLS | |
| 2340 | /*AMDGPU_CG_SUPPORT_GFX_CGCG |*/ | 2340 | /*AMD_CG_SUPPORT_GFX_CGCG |*/ |
| 2341 | AMDGPU_CG_SUPPORT_GFX_CGLS | | 2341 | AMD_CG_SUPPORT_GFX_CGLS | |
| 2342 | AMDGPU_CG_SUPPORT_GFX_CGTS | | 2342 | AMD_CG_SUPPORT_GFX_CGTS | |
| 2343 | AMDGPU_CG_SUPPORT_GFX_CGTS_LS | | 2343 | AMD_CG_SUPPORT_GFX_CGTS_LS | |
| 2344 | AMDGPU_CG_SUPPORT_GFX_CP_LS | | 2344 | AMD_CG_SUPPORT_GFX_CP_LS | |
| 2345 | AMDGPU_CG_SUPPORT_MC_LS | | 2345 | AMD_CG_SUPPORT_MC_LS | |
| 2346 | AMDGPU_CG_SUPPORT_MC_MGCG | | 2346 | AMD_CG_SUPPORT_MC_MGCG | |
| 2347 | AMDGPU_CG_SUPPORT_SDMA_MGCG | | 2347 | AMD_CG_SUPPORT_SDMA_MGCG | |
| 2348 | AMDGPU_CG_SUPPORT_SDMA_LS | | 2348 | AMD_CG_SUPPORT_SDMA_LS | |
| 2349 | AMDGPU_CG_SUPPORT_BIF_LS | | 2349 | AMD_CG_SUPPORT_BIF_LS | |
| 2350 | AMDGPU_CG_SUPPORT_VCE_MGCG | | 2350 | AMD_CG_SUPPORT_VCE_MGCG | |
| 2351 | AMDGPU_CG_SUPPORT_UVD_MGCG | | 2351 | AMD_CG_SUPPORT_UVD_MGCG | |
| 2352 | AMDGPU_CG_SUPPORT_HDP_LS | | 2352 | AMD_CG_SUPPORT_HDP_LS | |
| 2353 | AMDGPU_CG_SUPPORT_HDP_MGCG; | 2353 | AMD_CG_SUPPORT_HDP_MGCG; |
| 2354 | adev->pg_flags = 0; | 2354 | adev->pg_flags = 0; |
| 2355 | adev->external_rev_id = adev->rev_id + 0x14; | 2355 | adev->external_rev_id = adev->rev_id + 0x14; |
| 2356 | break; | 2356 | break; |
| 2357 | case CHIP_HAWAII: | 2357 | case CHIP_HAWAII: |
| 2358 | adev->cg_flags = | 2358 | adev->cg_flags = |
| 2359 | AMDGPU_CG_SUPPORT_GFX_MGCG | | 2359 | AMD_CG_SUPPORT_GFX_MGCG | |
| 2360 | AMDGPU_CG_SUPPORT_GFX_MGLS | | 2360 | AMD_CG_SUPPORT_GFX_MGLS | |
| 2361 | /*AMDGPU_CG_SUPPORT_GFX_CGCG |*/ | 2361 | /*AMD_CG_SUPPORT_GFX_CGCG |*/ |
| 2362 | AMDGPU_CG_SUPPORT_GFX_CGLS | | 2362 | AMD_CG_SUPPORT_GFX_CGLS | |
| 2363 | AMDGPU_CG_SUPPORT_GFX_CGTS | | 2363 | AMD_CG_SUPPORT_GFX_CGTS | |
| 2364 | AMDGPU_CG_SUPPORT_GFX_CP_LS | | 2364 | AMD_CG_SUPPORT_GFX_CP_LS | |
| 2365 | AMDGPU_CG_SUPPORT_MC_LS | | 2365 | AMD_CG_SUPPORT_MC_LS | |
| 2366 | AMDGPU_CG_SUPPORT_MC_MGCG | | 2366 | AMD_CG_SUPPORT_MC_MGCG | |
| 2367 | AMDGPU_CG_SUPPORT_SDMA_MGCG | | 2367 | AMD_CG_SUPPORT_SDMA_MGCG | |
| 2368 | AMDGPU_CG_SUPPORT_SDMA_LS | | 2368 | AMD_CG_SUPPORT_SDMA_LS | |
| 2369 | AMDGPU_CG_SUPPORT_BIF_LS | | 2369 | AMD_CG_SUPPORT_BIF_LS | |
| 2370 | AMDGPU_CG_SUPPORT_VCE_MGCG | | 2370 | AMD_CG_SUPPORT_VCE_MGCG | |
| 2371 | AMDGPU_CG_SUPPORT_UVD_MGCG | | 2371 | AMD_CG_SUPPORT_UVD_MGCG | |
| 2372 | AMDGPU_CG_SUPPORT_HDP_LS | | 2372 | AMD_CG_SUPPORT_HDP_LS | |
| 2373 | AMDGPU_CG_SUPPORT_HDP_MGCG; | 2373 | AMD_CG_SUPPORT_HDP_MGCG; |
| 2374 | adev->pg_flags = 0; | 2374 | adev->pg_flags = 0; |
| 2375 | adev->external_rev_id = 0x28; | 2375 | adev->external_rev_id = 0x28; |
| 2376 | break; | 2376 | break; |
| 2377 | case CHIP_KAVERI: | 2377 | case CHIP_KAVERI: |
| 2378 | adev->cg_flags = | 2378 | adev->cg_flags = |
| 2379 | AMDGPU_CG_SUPPORT_GFX_MGCG | | 2379 | AMD_CG_SUPPORT_GFX_MGCG | |
| 2380 | AMDGPU_CG_SUPPORT_GFX_MGLS | | 2380 | AMD_CG_SUPPORT_GFX_MGLS | |
| 2381 | /*AMDGPU_CG_SUPPORT_GFX_CGCG |*/ | 2381 | /*AMD_CG_SUPPORT_GFX_CGCG |*/ |
| 2382 | AMDGPU_CG_SUPPORT_GFX_CGLS | | 2382 | AMD_CG_SUPPORT_GFX_CGLS | |
| 2383 | AMDGPU_CG_SUPPORT_GFX_CGTS | | 2383 | AMD_CG_SUPPORT_GFX_CGTS | |
| 2384 | AMDGPU_CG_SUPPORT_GFX_CGTS_LS | | 2384 | AMD_CG_SUPPORT_GFX_CGTS_LS | |
| 2385 | AMDGPU_CG_SUPPORT_GFX_CP_LS | | 2385 | AMD_CG_SUPPORT_GFX_CP_LS | |
| 2386 | AMDGPU_CG_SUPPORT_SDMA_MGCG | | 2386 | AMD_CG_SUPPORT_SDMA_MGCG | |
| 2387 | AMDGPU_CG_SUPPORT_SDMA_LS | | 2387 | AMD_CG_SUPPORT_SDMA_LS | |
| 2388 | AMDGPU_CG_SUPPORT_BIF_LS | | 2388 | AMD_CG_SUPPORT_BIF_LS | |
| 2389 | AMDGPU_CG_SUPPORT_VCE_MGCG | | 2389 | AMD_CG_SUPPORT_VCE_MGCG | |
| 2390 | AMDGPU_CG_SUPPORT_UVD_MGCG | | 2390 | AMD_CG_SUPPORT_UVD_MGCG | |
| 2391 | AMDGPU_CG_SUPPORT_HDP_LS | | 2391 | AMD_CG_SUPPORT_HDP_LS | |
| 2392 | AMDGPU_CG_SUPPORT_HDP_MGCG; | 2392 | AMD_CG_SUPPORT_HDP_MGCG; |
| 2393 | adev->pg_flags = | 2393 | adev->pg_flags = |
| 2394 | /*AMDGPU_PG_SUPPORT_GFX_PG | | 2394 | /*AMD_PG_SUPPORT_GFX_PG | |
| 2395 | AMDGPU_PG_SUPPORT_GFX_SMG | | 2395 | AMD_PG_SUPPORT_GFX_SMG | |
| 2396 | AMDGPU_PG_SUPPORT_GFX_DMG |*/ | 2396 | AMD_PG_SUPPORT_GFX_DMG |*/ |
| 2397 | AMDGPU_PG_SUPPORT_UVD | | 2397 | AMD_PG_SUPPORT_UVD | |
| 2398 | /*AMDGPU_PG_SUPPORT_VCE | | 2398 | /*AMD_PG_SUPPORT_VCE | |
| 2399 | AMDGPU_PG_SUPPORT_CP | | 2399 | AMD_PG_SUPPORT_CP | |
| 2400 | AMDGPU_PG_SUPPORT_GDS | | 2400 | AMD_PG_SUPPORT_GDS | |
| 2401 | AMDGPU_PG_SUPPORT_RLC_SMU_HS | | 2401 | AMD_PG_SUPPORT_RLC_SMU_HS | |
| 2402 | AMDGPU_PG_SUPPORT_ACP | | 2402 | AMD_PG_SUPPORT_ACP | |
| 2403 | AMDGPU_PG_SUPPORT_SAMU |*/ | 2403 | AMD_PG_SUPPORT_SAMU |*/ |
| 2404 | 0; | 2404 | 0; |
| 2405 | if (adev->pdev->device == 0x1312 || | 2405 | if (adev->pdev->device == 0x1312 || |
| 2406 | adev->pdev->device == 0x1316 || | 2406 | adev->pdev->device == 0x1316 || |
| @@ -2412,29 +2412,29 @@ static int cik_common_early_init(void *handle) | |||
| 2412 | case CHIP_KABINI: | 2412 | case CHIP_KABINI: |
| 2413 | case CHIP_MULLINS: | 2413 | case CHIP_MULLINS: |
| 2414 | adev->cg_flags = | 2414 | adev->cg_flags = |
| 2415 | AMDGPU_CG_SUPPORT_GFX_MGCG | | 2415 | AMD_CG_SUPPORT_GFX_MGCG | |
| 2416 | AMDGPU_CG_SUPPORT_GFX_MGLS | | 2416 | AMD_CG_SUPPORT_GFX_MGLS | |
| 2417 | /*AMDGPU_CG_SUPPORT_GFX_CGCG |*/ | 2417 | /*AMD_CG_SUPPORT_GFX_CGCG |*/ |
| 2418 | AMDGPU_CG_SUPPORT_GFX_CGLS | | 2418 | AMD_CG_SUPPORT_GFX_CGLS | |
| 2419 | AMDGPU_CG_SUPPORT_GFX_CGTS | | 2419 | AMD_CG_SUPPORT_GFX_CGTS | |
| 2420 | AMDGPU_CG_SUPPORT_GFX_CGTS_LS | | 2420 | AMD_CG_SUPPORT_GFX_CGTS_LS | |
| 2421 | AMDGPU_CG_SUPPORT_GFX_CP_LS | | 2421 | AMD_CG_SUPPORT_GFX_CP_LS | |
| 2422 | AMDGPU_CG_SUPPORT_SDMA_MGCG | | 2422 | AMD_CG_SUPPORT_SDMA_MGCG | |
| 2423 | AMDGPU_CG_SUPPORT_SDMA_LS | | 2423 | AMD_CG_SUPPORT_SDMA_LS | |
| 2424 | AMDGPU_CG_SUPPORT_BIF_LS | | 2424 | AMD_CG_SUPPORT_BIF_LS | |
| 2425 | AMDGPU_CG_SUPPORT_VCE_MGCG | | 2425 | AMD_CG_SUPPORT_VCE_MGCG | |
| 2426 | AMDGPU_CG_SUPPORT_UVD_MGCG | | 2426 | AMD_CG_SUPPORT_UVD_MGCG | |
| 2427 | AMDGPU_CG_SUPPORT_HDP_LS | | 2427 | AMD_CG_SUPPORT_HDP_LS | |
| 2428 | AMDGPU_CG_SUPPORT_HDP_MGCG; | 2428 | AMD_CG_SUPPORT_HDP_MGCG; |
| 2429 | adev->pg_flags = | 2429 | adev->pg_flags = |
| 2430 | /*AMDGPU_PG_SUPPORT_GFX_PG | | 2430 | /*AMD_PG_SUPPORT_GFX_PG | |
| 2431 | AMDGPU_PG_SUPPORT_GFX_SMG | */ | 2431 | AMD_PG_SUPPORT_GFX_SMG | */ |
| 2432 | AMDGPU_PG_SUPPORT_UVD | | 2432 | AMD_PG_SUPPORT_UVD | |
| 2433 | /*AMDGPU_PG_SUPPORT_VCE | | 2433 | /*AMD_PG_SUPPORT_VCE | |
| 2434 | AMDGPU_PG_SUPPORT_CP | | 2434 | AMD_PG_SUPPORT_CP | |
| 2435 | AMDGPU_PG_SUPPORT_GDS | | 2435 | AMD_PG_SUPPORT_GDS | |
| 2436 | AMDGPU_PG_SUPPORT_RLC_SMU_HS | | 2436 | AMD_PG_SUPPORT_RLC_SMU_HS | |
| 2437 | AMDGPU_PG_SUPPORT_SAMU |*/ | 2437 | AMD_PG_SUPPORT_SAMU |*/ |
| 2438 | 0; | 2438 | 0; |
| 2439 | if (adev->asic_type == CHIP_KABINI) { | 2439 | if (adev->asic_type == CHIP_KABINI) { |
| 2440 | if (adev->rev_id == 0) | 2440 | if (adev->rev_id == 0) |