Eric Huang
4f7ec157cb
drm/amd/amdgpu: change pptable output format from ASCII to binary
...
Reviewed-by: Edward O'Callaghan <funfunctor@folklore1984.net >
Reviewed-by: Alex Deucher <alexander.deucher@amd.com >
Signed-off-by: Eric Huang <JinHuiEric.Huang@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2016-08-01 11:38:39 -04:00
Alex Deucher
903f75c895
drm/amdgpu/ci: add mullins to default case for smc ucode
...
It's already covered by the default case, but add it for
consistency.
Reviewed-by: Alexandre Demers <alexandre.f.demers@gmail.com >
Reviewed-by: Edward O'Callaghan <funfunctor@folklore1984.net >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2016-08-01 11:24:58 -04:00
Alex Deucher
7f555c8e5a
drm/amdgpu/gmc7: add missing mullins case
...
Looks like this got missed when we ported the code from radeon.
Reviewed-by: Edward O'Callaghan <funfunctor@folklore1984.net >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
Cc: stable@vger.kernel.org
2016-08-01 11:24:57 -04:00
Tom St Denis
d4ccb71d7a
drm/amd/powerplay: remove enable_clock_power_gatings_tasks from initialize and resume events
...
Setting PG state this early would cause lock ups in the IP block
initialized functions.
Signed-off-by: Tom St Denis <tom.stdenis@amd.com >
Reviewed-by: Rex Zhu <Rex.Zhu@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2016-07-29 14:37:13 -04:00
Tom St Denis
1ddeb625ce
drm/amd/powerplay: move clockgating to after ungating power in pp for uvd/vce
...
Cannot set clockgating state before ungating power.
Signed-off-by: Tom St Denis <tom.stdenis@amd.com >
Reviewed-by: Rex Zhu <Rex.Zhu@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2016-07-29 14:37:12 -04:00
Huang Rui
09fc7eff7e
drm/amdgpu: add query device id and revision id into system info entry at CGS
...
This patch adds device id and revision into system info entry at CGS,
it's able to get PCI device id and revision id from amdgpu, it might
get more info in future.
PCI device id will be also used on powerplay part at current.
Suggested-by: Alex Deucher <alexander.deucher@amd.com >
Signed-off-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-07-29 14:37:12 -04:00
Huang Rui
e595d7f03b
drm/amdgpu: add new definition in bif header
...
This patch adds new definition in bif header, and will be used on
iceland HW powertune part.
Signed-off-by: Huang Rui <ray.huang@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2016-07-29 14:37:11 -04:00
Huang Rui
778ee7e5c4
drm/amd/powerplay: rename smum header guards
...
This patch renames the smum header guards to align with the file name.
Reported-by: Edward O'Callaghan <funfunctor@folklore1984.net >
Signed-off-by: Huang Rui <ray.huang@amd.com >
Reviewed-by: Ken Wang <Qingqing.Wang@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2016-07-29 14:37:11 -04:00
Christian König
4cb5877c63
drm/amdgpu: enable UVD context buffer for older HW
...
Supported starting on certain FW versions.
Signed-off-by: Christian König <christian.koenig@amd.com >
Reviewed-by: Leo Liu <leo.liu@amd.com >
Reviewed-by: Alex Deucher <alexander.deucher@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2016-07-29 14:37:10 -04:00
Christian König
e5a6858d8a
drm/amdgpu: fix default UVD context size
...
Context buffers should be denied by default, not allowed.
Signed-off-by: Christian König <christian.koenig@amd.com >
Reviewed-by: Leo Liu <leo.liu@amd.com >
Reviewed-by: Alex Deucher <alexander.deucher@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2016-07-29 14:37:10 -04:00
Huang Rui
11f55a3ae6
drm/amdgpu: fix incorrect type of info_id
...
Signed-off-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-07-29 14:37:09 -04:00
Huang Rui
eadf954317
drm/amdgpu: make amdgpu_cgs_call_acpi_method as static
...
Signed-off-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-07-29 14:37:09 -04:00
Slava Grigorev
529d8c5ae3
drm/amdgpu: comment out unused defaults_staturn_pro static const structure to fix the build
...
Signed-off-by: Slava Grigorev <slava.grigorev@amd.com >
Reviewed-by: Alex Deucher <alexander.deucher@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2016-07-29 14:37:08 -04:00
Christian König
a05c92d1ee
drm/amdgpu: enable UVD VM only on polaris
...
Stoney support it, but doesn't has unlimited session support.
Signed-off-by: Christian König <christian.koenig@amd.com >
Reviewed-by: Leo Liu <leo.liu@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2016-07-29 14:37:07 -04:00
Chunming Zhou
bb7ad55b8a
drm/amdgpu: increase timeout of IB test
...
we should give enough time to IB test.
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-07-29 14:37:07 -04:00
Rex Zhu
99453a9e81
drm/amdgpu: add destroy session when generate VCE destroy msg.
...
Signed-off-by: David Mao <David.Mao@amd.com >
Signed-off-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-07-29 14:37:06 -04:00
Chunming Zhou
1c62cf91e6
drm/amd: fix deadlock of job_list_lock V2
...
run_job involves mutex, which could sleep.
V2: use list_for_each_entry_safe, since the job might complete
while we dropped the lock.
Signed-off-by: Chunming Zhou <David1.Zhou@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2016-07-29 14:37:06 -04:00
Chunming Zhou
bdc2eea472
drm/amd: reset hw count when reset job
...
Means the hw ring is empty after gpu reset.
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-07-29 14:37:05 -04:00
Leo Liu
cd437e37cb
drm/amdgpu: free handles after fini the context
...
This will make sure all the submissions from different contexts gets
finished, and then we close the session and free up the handles.
This will fix the issue that session clean-up is not get done properly,
when with the command `kill -9'
Signed-off-by: Leo Liu <leo.liu@amd.com >
Reviewed-by: Christian König <christian.koenig@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2016-07-29 14:37:05 -04:00
Christian König
bbec97aae6
drm/amdgpu: add a fence timeout for the IB tests v2
...
10ms should be enough for now.
v2: fix some typos in CIK code
Signed-off-by: Christian König <christian.koenig@amd.com >
Reviewed-by: Chunming Zhou <david1.zhou@amd.com >
Reviewed-by: Edward O'Callaghan <funfunctor@folklore1984.net >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2016-07-29 14:37:04 -04:00
Christian König
8de190c9f4
drm/amdgpu: move UVD IB test into common code v2
...
Since we now raise the clocks from begin_use() we don't need
a separate function for each hw generation any more.
v2: remove unintentional lowering of the UVD clocks, fix typos for CIK hw.
Signed-off-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-07-29 14:37:03 -04:00
Christian König
ebff485e93
drm/amdgpu: use begin/end_use for VCE power/clock gating
...
This fixes turning power and clock on when it is actually needed.
Signed-off-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-07-29 14:37:03 -04:00
Christian König
c4120d55ff
drm/amdgpu: use begin/end_use for UVD power/clock gating
...
This fixes turning power and clock on when it is actually needed.
Signed-off-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-07-29 14:37:02 -04:00
Christian König
f06505b8d2
drm/amdgpu: add begin/end_use ring callbacks
...
For manual UVD/VCE power and clock gating.
Signed-off-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-07-29 14:37:02 -04:00
Christian König
7c23ace2db
drm/amdgpu: remove fence_lock
...
Was never used as far as I can see.
Signed-off-by: Christian König <christian.koenig@amd.com >
Reviewed-by: Chunming Zhou <david1.zhou@amd.com >
Reviewed-by: Edward O'Callaghan <funfunctor@folklore1984.net >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2016-07-29 14:37:01 -04:00
Christian König
92c023c47f
drm/amdgpu: fix indentation in struct amdgpu_ring
...
Signed-off-by: Christian König <christian.koenig@amd.com >
Reviewed-by: Chunming Zhou <david1.zhou@amd.com >
Reviewed-by: Edward O'Callaghan <funfunctor@folklore1984.net >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2016-07-29 14:37:01 -04:00
Rex Zhu
990c70ad75
drm/amd/powerplay: fix issue can't enable vce dpm.
...
Signed-off-by: Rex Zhu <Rex.Zhu@amd.com >
Reviewed-by: Eric Huang <JinhuiEric.Huang@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2016-07-29 14:37:00 -04:00
Rex Zhu
ec38f1889a
drm/amdgpu: add bypass mode for vce3.0
...
Signed-off-by: Rex Zhu <Rex.Zhu@amd.com >
Reviewed-by: Eric Huang <JinhuiEric.Huang@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2016-07-29 14:37:00 -04:00
Rex Zhu
a93d54d842
Revert "drm/amd/powerplay: workaround issue that when uvd dpm disabled,"
...
This reverts commit <2ded8c7f04825bc5cde2624f6aa83f1ff62672c0>
As we enabled bypass mode for uvd on polaris10 when clockgating.
so no need to set uvd clock manually.
Signed-off-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-07-29 14:36:59 -04:00
Rex Zhu
0a6abefe9e
drm/amd/powerplay: fix typo error when set clock gate state.
...
Signed-off-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-07-29 14:36:59 -04:00
jimqu
b7e2e9f709
drm/amdgpu: correct coding style
...
Signed-off-by: JimQu <Jim.Qu@amd.com >
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2016-07-29 14:36:58 -04:00
Christian König
d347ce6677
drm/amdgpu: increment driver minor
...
We need to check on Polaris if UVD session context is allowed or not.
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-07-29 14:36:57 -04:00
Christian König
0f30a397d9
drm/amdgpu: implement UVD VM mode for Stoney v2
...
Starting with Stoney we support running UVD in VM mode as well.
v2: rebased, only enable on Polaris for now.
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-07-29 14:36:57 -04:00
Nils Wallménius
f8a2fdbae7
drm/amd/powerplay: Delete unused functions in ppevvmath.h
...
Signed-off-by: Nils Wallménius <nils.wallmenius@gmail.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2016-07-29 14:36:56 -04:00
Nils Wallménius
21039ac388
drm/amd/powerplay: Mark functions of ppevvmath.h static
...
This introduces some warnings due to unused functions, that are
deleted in the following commit.
Signed-off-by: Nils Wallménius <nils.wallmenius@gmail.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2016-07-29 14:36:56 -04:00
SF Markus Elfring
63edf1b469
drm/amd/powerplay: Delete an unnecessary variable initialisation in phm_dispatch_table()
...
The variable "result" will be set to an appropriate value a bit later.
Thus omit the explicit initialisation at the beginning.
Reviewed-by: Christian König <christian.koenig@amd.com >
Signed-off-by: Markus Elfring <elfring@users.sourceforge.net >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2016-07-29 14:36:55 -04:00
Markus Elfring
eb923ea6fa
drm/amd/powerplay: Change assignment for a buffer variable in phm_dispatch_table() v2
...
The variable "temp_storage" was eventually reassigned with a pointer.
Thus omit the explicit initialisation at the beginning.
v2: agd: fix coding style
Reviewed-by: Christian König <christian.koenig@amd.com >
Signed-off-by: Markus Elfring <elfring@users.sourceforge.net >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2016-07-29 14:36:54 -04:00
Markus Elfring
b4fc5972c1
drm/amdgpu: Change assignment for a variable in amdgpu_cgs_acpi_eval_object()
...
Indicate successful function execution only at the end.
Thus omit initialisation for the variable "result" at the beginning.
Reviewed-by: Christian König <christian.koenig@amd.com >
Signed-off-by: Markus Elfring <elfring@users.sourceforge.net >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2016-07-29 14:36:54 -04:00
Markus Elfring
eb09d7a7c9
drm/amdgpu: Delete an unnecessary variable initialisation in amdgpu_cgs_acpi_eval_object()
...
The variable "argument" will be set to an appropriate value a bit later.
Thus omit the explicit initialisation at the beginning.
Reviewed-by: Christian König <christian.koenig@amd.com >
Signed-off-by: Markus Elfring <elfring@users.sourceforge.net >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2016-07-29 14:36:53 -04:00
Markus Elfring
dffa6d4f80
drm/amdgpu: Delete a variable in amdgpu_cgs_acpi_eval_object()
...
The local variable "func_no" was assigned a value at two places.
But it was not read within this function. Thus delete it.
Reviewed-by: Christian König <christian.koenig@amd.com >
Signed-off-by: Markus Elfring <elfring@users.sourceforge.net >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2016-07-29 14:36:53 -04:00
Markus Elfring
1a8e5f28c9
drm/amdgpu: One function call less in amdgpu_cgs_acpi_eval_object() after error detection
...
The kfree() function was called in one case by the
amdgpu_cgs_acpi_eval_object() function during error handling
even if the passed variable "obj" contained a null pointer.
* Adjust jump targets according to the Linux coding style convention.
* Delete unnecessary initialisations for the variables "obj"
and "params" then.
Reviewed-by: Christian König <christian.koenig@amd.com >
Signed-off-by: Markus Elfring <elfring@users.sourceforge.net >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2016-07-29 14:36:52 -04:00
Markus Elfring
1721c69c33
drm/amdgpu: Delete an unnecessary check before drm_gem_object_unreference_unlocked()
...
The drm_gem_object_unreference_unlocked() function tests whether
its argument is NULL and then returns immediately.
Thus the test around the call is not needed.
This issue was detected by using the Coccinelle software.
Reviewed-by: Christian König <christian.koenig@amd.com >
Signed-off-by: Markus Elfring <elfring@users.sourceforge.net >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2016-07-29 14:36:52 -04:00
Edward O'Callaghan
538f1ef34c
drivers/amdgpu: Remove redundant itermediate return val
...
Found-by: Coccinelle
Signed-off-by: Edward O'Callaghan <funfunctor@folklore1984.net >
Reviewed-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-07-29 14:36:51 -04:00
Edward O'Callaghan
4ba27f9ba9
drivers/amdgpu: Use canonical boolean form in various predicates
...
V.2: Fixup by hand to remove a few instances of redundant '()'
left over.
Found-by: Coccinelle
Signed-off-by: Edward O'Callaghan <funfunctor@folklore1984.net >
Reviewed-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-07-29 14:36:50 -04:00
Edward O'Callaghan
5969a8c76b
drivers/amdgpu: Remove redundant casts on kzalloc() calls
...
Found-by: Coccinelle
Signed-off-by: Edward O'Callaghan <funfunctor@folklore1984.net >
Reviewed-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-07-29 14:36:50 -04:00
Edward O'Callaghan
a698e41782
drivers/amdgpu: Remove redundant NULL check before kfree()
...
Found-by: Coccinelle
Signed-off-by: Edward O'Callaghan <funfunctor@folklore1984.net >
Reviewed-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-07-29 14:36:49 -04:00
Edward O'Callaghan
004e29ccf0
drivers/amdgpu: Use canonical form in branch predicates
...
Found-by: Coccinelle
Signed-off-by: Edward O'Callaghan <funfunctor@folklore1984.net >
Reviewed-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-07-29 14:36:48 -04:00
Edward O'Callaghan
ed5121a3d8
drivers/amdgpu: Use 'true/false' for bool typed variables
...
Found-by: Coccinelle
Signed-off-by: Edward O'Callaghan <funfunctor@folklore1984.net >
Reviewed-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-07-29 14:36:48 -04:00
Edward O'Callaghan
9c3578af81
drivers/amdgpu: Remove spurious semicolons
...
Found-by: Coccinelle
Signed-off-by: Edward O'Callaghan <funfunctor@folklore1984.net >
Reviewed-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-07-29 14:36:47 -04:00
Rex Zhu
36e6b9129b
drm/amd/powerplay: enable DiDt feature for polaris10/11.
...
DIDT is a power saving feature which helps limit power
consumption in order to hit a target power allocation.
v1: delete temp file added accidentally.
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-07-29 14:36:47 -04:00