Tom St Denis
e7706b422c
drm/amd/amdgpu: Merge get_rptr functions in gfx8
...
Signed-off-by: Tom St Denis <tom.stdenis@amd.com >
Reviewed-by: Alex Deucher <alexander.deucher@amd.com >
Reviewed-by: Christian König <christian.koenig@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2016-09-02 11:33:15 -04:00
Tom St Denis
f1c0efc537
drm/amd/amdgpu: Merge get_rptr functions in gfx7
...
Signed-off-by: Tom St Denis <tom.stdenis@amd.com >
Reviewed-by: Alex Deucher <alexander.deucher@amd.com >
Reviewed-by: Christian König <christian.koenig@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2016-09-02 11:33:05 -04:00
Tom St Denis
6f924e2026
drm/amd/amdgpu: Merge get_rptr functions in gfx6
...
Signed-off-by: Tom St Denis <tom.stdenis@amd.com >
Reviewed-by: Alex Deucher <alexander.deucher@amd.com >
Reviewed-by: Christian König <christian.koenig@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2016-09-02 11:32:55 -04:00
Tom St Denis
4aeacf0f9a
drm/amd/amdgpu: Various tidy ups for gfx6
...
Various whitespace and logical simplifications for gfx6.
Signed-off-by: Tom St Denis <tom.stdenis@amd.com >
Reviewed-by: Christian König <christian.koenig@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2016-09-02 11:32:45 -04:00
Tom St Denis
142333dbb9
drm/amd/amdgpu: Simplify mask creation in gfx6
...
Signed-off-by: Tom St Denis <tom.stdenis@amd.com >
Reviewed-by: Christian König <christian.koenig@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2016-09-02 11:32:35 -04:00
Tom St Denis
deca1d1f16
drm/amd/amdgpu: Add GRBM lock to various SI functions
...
Add missing lock around SE/SH/INSTANCE selections.
Signed-off-by: Tom St Denis <tom.stdenis@amd.com >
Reviewed-by: Christian König <christian.koenig@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2016-09-02 11:32:26 -04:00
Rex Zhu
48fad3aff6
drm/amd/powerplay: original power state table should not be changed.
...
power state table was set based on vbios and should not be changed.
when client need to change power state, just make a copy and send to
smu.
Signed-off-by: Rex Zhu <Rex.Zhu@amd.com >
Reviewed-by: Alex Deucher <alexander.deucher@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2016-09-02 11:32:09 -04:00
Rex Zhu
cfcc283cee
drm/amd/powerplay: refine struct name for coding style reason.
...
delete useless member.
Signed-off-by: Rex Zhu <Rex.Zhu@amd.com >
Reviewed-by: Alex Deucher <alexander.deucher@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2016-09-02 11:31:43 -04:00
Rex Zhu
48d7b759a8
drm/amd/powerplay: add vce state tables initialize for ppt v1.
...
Signed-off-by: Rex Zhu <Rex.Zhu@amd.com >
Reviewed-by: Alex Deucher <alexander.deucher@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2016-09-02 11:31:39 -04:00
Rex Zhu
791a57db3e
drm/amd/powerplay: refine struct name for code style reason.
...
Signed-off-by: Rex Zhu <Rex.Zhu@amd.com >
Reviewed-by: Alex Deucher <alexander.deucher@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2016-09-02 11:31:34 -04:00
Christian König
662bfa61ff
drm/amdgpu: prevent command submission failures under memory pressure v2
...
As last resort try to evict BOs from the current working set into other
memory domains. This effectively prevents command submission failures when
VM page tables have been swapped out.
v2: fix typos
Signed-off-by: Christian König <christian.koenig@amd.com >
Reviewed-by: Alex Deucher <alexander.deucher@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2016-09-02 11:30:41 -04:00
Christian König
1abdc3d73d
drm/amdgpu: only try again if we actually run into -ENOMEM
...
All other errors can't be fixed by using a different memory domain.
Signed-off-by: Christian König <christian.koenig@amd.com >
Reviewed-by: Alex Deucher <alexander.deucher@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2016-09-02 11:30:33 -04:00
Alex Deucher
61e113067b
drm/amdgpu: wire up a pci shutdown callback
...
Normally on shutdown or reboot we don't care about necessarily
making sure the hw is in a good state because the system is about
to be powered down or reset. However, after a shutdown or reboot
in a VM, it's best to tear down the hw properly otherwise there
can be problems with the next VM use.
Reviewed-by: Christian König <christian.koenig@amd.com >
Reviewed-by: Edward O'Callaghan <funfunctor@folklore1984.net >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2016-09-02 10:35:47 -04:00
Alex Deucher
d6bda7b4b4
drm/amdgpu: handle runtime pm in drm pre/post close
...
Close was not handled correctly.
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2016-09-02 10:34:48 -04:00
Alex Deucher
dc08267ac4
drm/amdgpu: handle runtime pm correctly in amdgpu_driver_open_kms
...
Need to fix the error paths.
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2016-09-02 10:34:47 -04:00
Alex Deucher
f46cf3735f
drm/amdgpu: skip suspend/resume on DRM_SWITCH_POWER_DYNAMIC_OFF
...
Missed this case previously. No need to do anything if the
device is already off. runtime pm will handle it.
Acked-by: Michel Dänzer <michel.daenzer@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2016-09-02 10:34:45 -04:00
Alex Deucher
85e154c22e
drm/amdgpu: set runtime pm state to active on resume
...
The sbios always powers up the dGPU on resume.
Acked-by: Michel Dänzer <michel.daenzer@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2016-09-02 10:34:45 -04:00
Alex Deucher
e6c71b48c9
drm/amdgpu/gfx6: drop some dead code
...
The mqd is only used on CI and newer.
Reviewed-by: Edward O'Callaghan <funfunctor@folklore1984.net >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2016-09-02 10:34:30 -04:00
Chunming Zhou
2c0d7318c8
drm/amdgpu: add gart recovery by gtt list V2
...
V2:
a. gart recovery should be ahead of ring test.
b. rename to amdgpu_ttm_recover_gart
Signed-off-by: Chunming Zhou <David1.Zhou@amd.com >
Reviewed-by: Christian König <christian.koenig@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2016-08-31 15:21:13 -04:00
Chunming Zhou
5c1354bd30
drm/amdgpu: link all gtt when binding them V2
...
V2:
spin lock instead of mutex for gtt list
Signed-off-by: Chunming Zhou <David1.Zhou@amd.com >
Reviewed-by: Christian König <christian.koenig@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2016-08-31 15:21:12 -04:00
Ken Wang
78fbb6859b
drm/amdgpu: add si pciids v2
...
Acked-by: Christian König <christian.koenig@amd.com >
Signed-off-by: Ken Wang <Qingqing.Wang@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2016-08-31 15:21:11 -04:00
Alex Deucher
a8c65c1378
drm/amdgpu/si: Add updated smc firmware for SI kickers
...
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2016-08-31 15:21:11 -04:00
Ken Wang
295d0dafd3
drm/amdgpu: Add SI Family information
...
Signed-off-by: Ken Wang <Qingqing.Wang@amd.com >
Reviewed-by: Alex Deucher <alexander.deucher@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2016-08-31 15:21:10 -04:00
Maruthi Srinivas Bayyavarapu
1919696eed
drm/amdgpu: enable SI DPM
...
Signed-off-by: Maruthi Bayyavarapu <maruthi.bayyavarapu@amd.com >
Reviewed-by: Alex Deucher <alexander.deucher@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2016-08-31 15:21:10 -04:00
Huang Rui
84b77336ee
drm/amdgpu: use DRM print instead of printk
...
Acked-by: Christian König <christian.koenig@amd.com >
Reviewed-by: Alex Deucher <alexander.deucher@amd.com >
Signed-off-by: Huang Rui <ray.huang@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2016-08-31 15:21:09 -04:00
Maruthi Bayyavarapu
841686df9f
drm/amdgpu: add SI DPM support (v4)
...
v2: corrected register offset shift
v3: rebase fixes
v4: fix firmware paths
add SI smc firmware versions for sysfs dump
remove unused function forward define
fix the tahiti specific value of DEEP_SLEEP_CLK_SEL field
fix to miss adding thermal controller
use vram_type instead of checking mem_gddr5 flag
fix incorrect index of CG_FFCT_0 register
fix incorrect reading method at si_get_current_pcie_speed
Signed-off-by: Maruthi Bayyavarapu <maruthi.bayyavarapu@amd.com >
Reviewed-by: Alex Deucher <alexander.deucher@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2016-08-31 15:21:09 -04:00
Maruthi Srinivas Bayyavarapu
0c34f45368
drm/amdgpu: add SI SMC support
...
Signed-off-by: Maruthi Bayyavarapu <maruthi.bayyavarapu@amd.com >
Reviewed-by: Alex Deucher <alexander.deucher@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2016-08-31 15:21:08 -04:00
Maruthi Srinivas Bayyavarapu
9139d731fd
drm/amdgpu: add si dpm support in amdgpu_atombios
...
v2: renamed _atom_ to _atombios_ for consistency
added ulClockParams to _COMPUTE_MEMORY_ENGINE_PLL_PARAMETERS_V3 and
_COMPUTE_MEMORY_ENGINE_PLL_PARAMETERS_V5 to avoid build break
Signed-off-by: Maruthi Bayyavarapu <maruthi.bayyavarapu@amd.com >
Reviewed-by: Alex Deucher <alexander.deucher@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2016-08-31 15:21:07 -04:00
Ken Wang
da69c16144
drm/amdgpu: add si specific logic into the device initialize function v3
...
v3: guard doorbell_fini as well
Reviewed-by: Christian König <christian.koenig@amd.com >
Signed-off-by: Ken Wang <Qingqing.Wang@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2016-08-31 15:21:07 -04:00
Chunming Zhou
1f703e6679
drm/amdgpu: record error code when ring test failed
...
Otherwise we may miss errors.
Signed-off-by: Chunming Zhou <David1.Zhou@amd.com >
Reviewed-by: Christian König <christian.koenig@amd.com >
Reviewed-by: Alex Deucher <alexander.deucher@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
Cc: stable@vger.kernel.org
2016-08-31 12:45:56 -04:00
jimqu
53960b4f89
drm/amd/amdgpu: compute ring test fail during S4 on CI
...
unhalt Instrction Fetch Unit after all rings are inited.
Signed-off-by: JimQu <Jim.Qu@amd.com >
Reviewed-by: Alex Deucher <alexander.deucher@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
Cc: stable@vger.kernel.org
2016-08-31 12:45:17 -04:00
jimqu
10ea943406
drm/amd/amdgpu: sdma resume fail during S4 on CI
...
SDMA could be fail in the thaw() and restore() processes, do software reset
if each SDMA engine is busy.
Signed-off-by: JimQu <Jim.Qu@amd.com >
Reviewed-by: Alex Deucher <alexander.deucher@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
Cc: stable@vger.kernel.org
2016-08-31 12:44:45 -04:00
Ken Wang
33f3480268
drm/amdgpu: add si ip blocks setup v3
...
Reviewed-by: Christian König <christian.koenig@amd.com >
Signed-off-by: Ken Wang <Qingqing.Wang@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2016-08-31 12:11:21 -04:00
Ken Wang
a036db18c6
drm/amdgpu: add all the components for si into Makefile/kconfig v3
...
Reviewed-by: Christian König <christian.koenig@amd.com >
Signed-off-by: Ken Wang <Qingqing.Wang@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2016-08-31 12:11:20 -04:00
Huang Rui
36b9a952bb
drm/amdgpu: introduce pcie port read/write entry
...
This patch adds pcie port read/write entry, because it will be also
used on si dpm part.
Acked-by: Christian König <christian.koenig@amd.com >
Reviewed-by: Alex Deucher <alexander.deucher@amd.com >
Signed-off-by: Huang Rui <ray.huang@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2016-08-31 12:11:20 -04:00
Ken Wang
62a3755341
drm/amdgpu: add si implementation v10
...
v5: rebase fixes
v6: add mgcg arrays
v7: rebase fixes
v8: rebase fixes
v9: add get_disabled_bios(), make get_xclk static
v10: fix oland and hainan asic specific handle at si_program_aspm
Signed-off-by: Ken Wang <Qingqing.Wang@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2016-08-31 12:11:19 -04:00
Ken Wang
30d1574fa4
drm/amdgpu: add DMA implementation for si v8
...
v4: rebase fixes
v5: use the generic nop fill
v6: rebase fixes
v7: rebase fixes
copy count fixes from Jonathan
general cleanup
add fill buffer implementation
v8: adapt write_pte and copy_pte to latest changes
Signed-off-by: Ken Wang <Qingqing.Wang@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2016-08-31 12:10:51 -04:00
Ken Wang
2cd46ad223
drm/amdgpu: add graphic pipeline implementation for si v8
...
v5: rebase fixes
v6: rebase fixes
v7: rebase fixes
fix tile reg offset as noticed by Jonathan
Drop some debugging remnants
v8: add gfx v6 firmware versions for sysfs dump
Acked-by: Christian König <christian.koenig@amd.com >
Signed-off-by: Ken Wang <Qingqing.Wang@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2016-08-31 12:10:50 -04:00
Ken Wang
098e4b6a90
drm/amdgpu: atombios change for dce6 to work v3
...
v3: white space fixes
Reviewed-by: Christian König <christian.koenig@amd.com >
Signed-off-by: Ken Wang <Qingqing.Wang@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2016-08-31 12:10:20 -04:00
Ken Wang
e2cdf640cb
drm/amdgpu: add display controller implementation for si v10
...
v4: rebase fixups
v5: more fixes based on dce8 code
v6: squash in dmif offset fix
v7: rebase fixups
v8: rebase fixups, drop some debugging remnants
v9: fix BE build
v10: include Marek's tiling fixes, add support for
page_flip_target, set MASTER_UDPATE_MODE=0,
fix cursor
Acked-by: Christian König <christian.koenig@amd.com >
Signed-off-by: Ken Wang <Qingqing.Wang@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2016-08-31 12:10:19 -04:00
Ken Wang
27ae10641e
drm/amdgpu: add interupt handler implementation for si v3
...
v3: rebase fixups
Reviewed-by: Christian König <christian.koenig@amd.com >
Signed-off-by: Ken Wang <Qingqing.Wang@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2016-08-31 12:10:19 -04:00
Ken Wang
df70502eef
drm/amdgpu: add graphic memory controller implementation for si v7
...
v4: rebase fixups
v5: rebase fixups
v5: rebase fixups
v6: rebase fixups for gart size changes
v7: add gmc v6 firmware versions for sysfs dump
Signed-off-by: Ken Wang <Qingqing.Wang@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2016-08-31 12:10:18 -04:00
Ken Wang
0f27e46258
drm/amdgpu: add si header files v4
...
v4: drop unused DCE6 macro
Acked-by: Christian König <christian.koenig@amd.com >
Signed-off-by: Ken Wang <Qingqing.Wang@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2016-08-31 12:09:08 -04:00
Ken Wang
26d721c5f5
drm/amdgpu: add SI asics types v2
...
Reviewed-by: Christian König <christian.koenig@amd.com >
Signed-off-by: Ken Wang <Qingqing.Wang@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2016-08-30 18:02:02 -04:00
Monk Liu
c2167a659c
drm/amdgpu:add switch buffer to end of CS (v2)
...
sync switch buffer scheme with windows kmd for gfx v8,
step1: append a switch_buffer to the end of CS
v2:rebase on latest staging
Signed-off-by: Monk Liu <Monk.Liu@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2016-08-30 17:55:45 -04:00
Tom St Denis
6fc0deaf58
drm/amd/amdgpu: debugfs SMC addresses are byte addresses
...
Signed-off-by: Tom St Denis <tom.stdenis@amd.com >
Reviewed-by: Christian König <christian.koenig@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2016-08-30 17:55:31 -04:00
Jordan Lazare
738d98c994
drm/amd/powerplay: Remove unused variable causing compile warning
...
If treating warnings as errors this causes a build error
Signed-off-by: Jordan Lazare <Jordan.Lazare@amd.com >
Reviewed-by: Alex Deucher <Alexander.Deucher@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2016-08-30 17:55:20 -04:00
Tom St Denis
83667ed698
drm/amd/powerplay: Only load SDMA0/MEC firmware once on Stoney (v2)
...
Only load the SDMA0/MEC1 firmware once in the Carrizo SMU manager
driver.
(v2) Avoid loading SDMA0 twice too.
Signed-off-by: Tom St Denis <tom.stdenis@amd.com >
Reviewed-by: Alex Deucher <alexander.deucher@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2016-08-30 17:55:08 -04:00
Tom St Denis
610ecfd6b4
drm/amd/powerplay: Fix up return codes in cz SMU manager
...
Signed-off-by: Tom St Denis <tom.stdenis@amd.com >
Reviewed-by: Alex Deucher <alexander.deucher@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2016-08-30 17:54:58 -04:00
Tom St Denis
a3477255b7
drm/amd/powerplay: Tidy up cz SMU manager
...
Signed-off-by: Tom St Denis <tom.stdenis@amd.com >
Reviewed-by: Alex Deucher <alexander.deucher@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2016-08-30 17:54:50 -04:00