Rex Zhu
cd4d74648b
drm/amdgpu: unify the interface of amd_pm_funcs
...
put amd_pm_funcs table in struct powerplay for all
asics.
Signed-off-by: Rex Zhu <Rex.Zhu@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2017-09-18 23:30:35 -04:00
Rex Zhu
cfa289fd49
drm/amdgpu: rename amdgpu_dpm_funcs to amd_pm_funcs
...
renamed amdgpu_dpm_funcs and moved to amd_shared.h
so can shared with powerplay.
Reviewed-by: Alex Deucher <alexander.deucher@amd.com >
Signed-off-by: Rex Zhu <Rex.Zhu@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2017-09-18 23:30:34 -04:00
Jim Qu
5cb818b861
drm/amd/amdgpu: fix si_enable_smc_cac() failed issue
...
Signed-off-by: Jim Qu <Jim.Qu@amd.com >
Reviewed-by: Alex Deucher <alexander.deucher@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2017-07-14 11:06:41 -04:00
Masahiro Yamada
248a1d6f1a
drm/amd: fix include notation and remove -Iinclude/drm flag
...
Include <drm/*.h> instead of relative path from include/drm, then
remove the -Iinclude/drm compiler flag.
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com >
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com >
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch >
Link: http://patchwork.freedesktop.org/patch/msgid/1493009447-31524-4-git-send-email-yamada.masahiro@socionext.com
2017-05-16 17:17:41 +02:00
Alex Deucher
d766e6a393
drm/amdgpu: switch ih handling to two levels (v3)
...
Newer asics have a two levels of irq ids now:
client id - the IP
src id - the interrupt src within the IP
v2: integrated Christian's comments.
v3: fix rebase fail in SI and CIK
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
Signed-off-by: Ken Wang <Qingqing.Wang@amd.com >
Reviewed-by: Ken Wang <Qingqing.Wang@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2017-03-29 23:53:37 -04:00
Samuel Pitoiset
d6c29695e6
drm/amdgpu: implement read_sensor() for pre-powerplay chips
...
Add the GPU temperature, the shader clock and eventually the
memory clock (as well as the GPU load on CI). The main goal is
to expose this info to the userspace like Radeon.
v2: - add AMDGPU_PP_SENSOR_GPU_LOAD on CI
- update the commit description
Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2017-03-29 23:53:03 -04:00
Alex Deucher
e11ddff68a
drm/amdgpu: reinstate oland workaround for sclk
...
Higher sclks seem to be unstable on some boards.
bug: https://bugs.freedesktop.org/show_bug.cgi?id=100222
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
Cc: stable@vger.kernel.org
2017-03-16 10:06:11 -04:00
Alex Deucher
18a8de1bc3
drm/amdgpu/si: add dpm quirk for Oland
...
OLAND 0x1002:0x6604 0x1028:0x066F 0x00 seems to have problems
with higher sclks.
Acked-by: Christian König <christian.koenig@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
Cc: stable@vger.kernel.org
2017-03-15 16:21:03 -04:00
Alex Deucher
689957b12b
drm/amdgpu: move misc si headers into amdgpu
...
Move these to the amdgpu directory to match what we
do for other asics.
Acked-by: Christian König <christian.koenig@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2017-01-27 12:20:41 -05:00
Alex Deucher
85d2fce605
drm/amdgpu: drop pitcairn dpm quirks
...
No longer necessary with the new 58 mc ucode.
Reviewed-by: Christian König <christian.koenig@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2017-01-27 12:20:39 -05:00
Rex Zhu
9d273495e6
drm/amdgpu: delete dead definitions of dpm_ip_funcs
...
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 >
2017-01-27 11:12:56 -05:00
Rex Zhu
e5d03ac2b8
drm/amd/powerplay: Unify dpm level defines
...
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 >
2017-01-27 11:12:53 -05:00
Alex Deucher
17324b6add
drm/amdgpu: add support for new hainan variants
...
New hainan parts require updated smc firmware.
Cc: Sonny Jiang <sonny.jiang@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2017-01-17 15:25:41 -05:00
Alex Deucher
5cc6f520ac
drm/amdgpu: drop the mclk quirk for hainan
...
fixed by the new 58 mc firmware.
Acked-by: Edward O'Callaghan <funfunctor@folklore1984.net >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2017-01-12 17:36:58 -05:00
Alex Deucher
89d5595a6f
drm/amdgpu: drop oland quirks
...
Fixed by the new 58 MC firmware.
Acked-by: Edward O'Callaghan <funfunctor@folklore1984.net >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2017-01-12 17:36:43 -05:00
Alex Deucher
7192c54a68
drm/amdgpu: drop verde dpm quirks
...
Port of radeon change to amdgpu.
Acked-by: Edward O'Callaghan <funfunctor@folklore1984.net >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
Cc: stable@vger.kernel.org
2017-01-06 17:43:38 -05:00
Flora Cui
5165484b02
drm/amdgpu: update si kicker smc firmware
...
Use the appropriate smc firmware for each chip revision.
Using the wrong one can cause stability issues.
Acked-by: Edward O'Callaghan <funfunctor@folklore1984.net >
Signed-off-by: Flora Cui <Flora.Cui@amd.com >
Reviewed-by: Junwei Zhang <Jerry.Zhang@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
Cc: stable@vger.kernel.org
2017-01-06 17:43:23 -05:00
Alex Deucher
5a23f27205
drm/amdgpu/si: load the proper firmware on 0x87 oland boards
...
New variant.
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
Cc: stable@vger.kernel.org
2016-12-06 18:08:40 -05:00
Alex Deucher
ce66cb1e9c
drm/amdgpu: add additional pci revision to dpm workaround
...
New variant.
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
Cc: stable@vger.kernel.org
2016-12-06 18:08:40 -05:00
Dave Airlie
7b624ad8fe
Backmerge tag 'v4.9-rc4' into drm-next
...
Linux 4.9-rc4
This is needed for nouveau development.
2016-11-07 09:37:09 +10:00
Alex Deucher
71451bdfc2
drm/amdgpu/si_dpm: workaround for SI kickers
...
Consolidate existing quirks. Fixes stability issues
on some kickers.
Acked-by: Huang Rui <ray.huang@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
Cc: stable@vger.kernel.org
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2016-10-27 13:59:24 -04:00
Rex Zhu
8c8e2c30d2
drm/amdgpu: update current ps/requeset ps in adev with real ps.
...
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-10-25 14:38:53 -04:00
Rex Zhu
3411717501
drm/amdgpu: add an implement for check_power_state equal for Si.
...
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-10-25 14:38:52 -04:00
Alex Deucher
a125510721
drm/amdgpu: rework IP block registration (v2)
...
This makes it easier to replace specific IP blocks on
asics for handling virtual_dce, DAL, etc. and for building
IP lists for hw or tables. This also stored the status
information in the same structure.
v2: split out spelling fix into a separate patch
add a function to add IPs to the list
Reviewed-by: Christian König <christian.koenig@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2016-10-25 14:38:45 -04:00
Alex Deucher
825cc9974d
drm/amdgpu/dpm: add an implementation for get_vce_clock_state (v2)
...
Used by the non-powerplay dpm code.
v2: update to the new API
Reviewed-by: Rex Zhu <Rex.Zhu@amd.com >
Reviewed-by: Christian König <christian.koenig@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2016-10-25 14:38:41 -04:00
Rex Zhu
66ba1afd85
drm/amdgpu: save number of vce states in dpm struct.
...
Reviewed-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 >
2016-10-25 14:38:40 -04:00
Rex Zhu
0d8de7ca0b
drm/amdgpu: use same vce state definition in dpm and powerplay
...
Reviewed-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 >
2016-10-25 14:38:39 -04:00
Alex Deucher
4560738a8e
drm/amdgpu/dpm: flush any thermal work on fini
...
Flush any outstanding thermal work before tearing down
the dpm driver.
Reviewed-by: Christian König <christian.koenig@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2016-10-24 17:00:10 -04:00
Tom St Denis
aee3960a0c
drm/amdgpu/si_dpm: Limit clocks on HD86xx part
...
Limit clocks on a specific HD86xx part to avoid
crashes (while awaiting an appropriate PP fix).
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-10-13 19:18:57 -04:00
Alex Deucher
bdbdb571c8
drm/amdgpu/si/dpm: fix phase shedding setup
...
Used the wrong index to setup the phase shedding mask.
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2016-09-28 16:13:17 -04:00
Alex Deucher
9909a7956f
drm/amdgpu/si/dpm: sync up quirks from radeon
...
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2016-09-28 16:13:15 -04:00
Alex Deucher
6861c837e2
drm/amdgpu/si/dpm: fix symbol conflicts with radeon
...
Acked-by: Huang Rui <ray.huang@amd.com >
Reviewed-by: Edward O'Callaghan <funfunctor@folklore1984.net >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2016-09-14 15:10:40 -04:00
Alex Deucher
a104777732
drm/amdgpu/si/dpm: make a bunch of things static
...
remnants of the port from radeon.
Acked-by: Huang Rui <ray.huang@amd.com >
Reviewed-by: Edward O'Callaghan <funfunctor@folklore1984.net >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2016-09-14 15:10:39 -04:00
Tom St Denis
ad2473af27
drm/amd/amdgpu: Fix return values in SI DPM code
...
Fix a couple of spots where errors were not returned as
well as add some error messages to
si_patch_dependency_based_on_leakage() which were not being
read.
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-09-14 15:10:26 -04:00
Tom St Denis
e5c5304f13
drm/amd/amdgpu: Comment out currently unused SI DPM struct
...
The tahiti_le structure is not currently used. Comment it out
to avoid warnings.
Signed-off-by: Tom St Denis <tom.stdenis@amd.com >
Acked-by: Edward O'Callaghan <funfunctor@folklore1984.net >
Reviewed-by: Huang Rui <ray.huang@amd.com >
Reviewed-by: Alex Deucher <alexander.deucher@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2016-09-14 09:43:40 -04:00
Tom St Denis
f80c738c61
drm/amd/amdgpu: Tidy up SI SMC code (v2)
...
As well as merge SMC clock functions into one to reduce LOC.
v2: Fix swapped ck enable bit
bug: https://bugs.freedesktop.org/show_bug.cgi?id=97801
Signed-off-by: Tom St Denis <tom.stdenis@amd.com >
Reviewed-by: Edward O'Callaghan <funfunctor@folklore1984.net >
Reviewed-by: Huang Rui <ray.huang@amd.com >
Reviewed-by: Alex Deucher <alexander.deucher@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2016-09-14 09:43:39 -04:00
Tom St Denis
77d318a6b9
drm/amd/amdgpu: Correct whitespace in SI DPM code
...
Replace 8 spaces with tabs, correct {} braces, etc.
Signed-off-by: Tom St Denis <tom.stdenis@amd.com >
Reviewed-by: Edward O'Callaghan <funfunctor@folklore1984.net >
Reviewed-by: Huang Rui <ray.huang@amd.com >
Reviewed-by: Alex Deucher <alexander.deucher@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2016-09-12 18:12:21 -04:00
Tom St Denis
c3d9864585
drm/amd/amdgpu: Clean up SI DPM table assignments
...
Hoist common assignments out of cases.
Signed-off-by: Tom St Denis <tom.stdenis@amd.com >
Reviewed-by: Edward O'Callaghan <funfunctor@folklore1984.net >
Reviewed-by: Huang Rui <ray.huang@amd.com >
Reviewed-by: Alex Deucher <alexander.deucher@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2016-09-12 18:12:21 -04:00
Tom St Denis
9623e4bfaa
drm/amd/amdgpu: Allow calling si_dpm_fini at any point
...
Allow calling fini even if ps array is not allocated.
Signed-off-by: Tom St Denis <tom.stdenis@amd.com >
Reviewed-by: Edward O'Callaghan <funfunctor@folklore1984.net >
Reviewed-by: Huang Rui <ray.huang@amd.com >
Reviewed-by: Alex Deucher <alexander.deucher@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2016-09-12 18:12:20 -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
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