Alex Deucher
1a45e8a11b
drm/amdgpu/cz: silence some dpm debug output
...
Reviewed-by: Jammy Zhou <Jammy.Zhou@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2015-07-16 12:39:43 -04:00
Alex Deucher
58829aa67d
drm/amdgpu/cz: store the forced dpm level
...
So the selected forced level shows up properly in sysfs.
Reviewed-by: Jammy Zhou <Jammy.Zhou@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2015-07-16 12:39:42 -04:00
Alex Deucher
85cfe09655
drm/amdgpu/cz: unforce dpm levels before forcing to low/high
...
This is necessary to properly reset the min/max limits before
clamping them otherwise we may get improper clamping depending
on what what was the last forced level.
Reviewed-by: Jammy Zhou <Jammy.Zhou@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2015-07-16 12:39:41 -04:00
Alex Deucher
4f2d3ad686
drm/amdgpu: remove bogus check in gfx8 rb setup
...
Always respect the harvest configuration as is.
Acked-by: Christian König <christian.koenig@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2015-07-16 12:39:41 -04:00
Alex Deucher
7b92cdbfe2
drm/amdgpu: set proper index/data pair for smc regs on CZ (v2)
...
v2: squash in later fix
Reviewed-by: Christian König <christian.koenig@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2015-07-16 12:39:40 -04:00
Alex Deucher
974e6b641f
drm/amdgpu: disable the IP module if early_init returns -ENOENT (v2)
...
If we run into a part with a harvest configuration where the entire
IP block is unusable, just disable the IP block.
v2: fix logic as noted by Christian
Reviewed-by: Christian König <christian.koenig@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2015-07-16 12:39:39 -04:00
Christian König
5c2327beed
drm/amdgpu: stop context leak in the error path
...
Signed-off-by: Christian König <christian.koenig@amd.com >
Reviewed-by: Alex Deucher <alexander.deucher@amd.com >
Reviewed-by: Jammy Zhou <Jammy.Zhou@amd.com >
2015-07-16 12:39:39 -04:00
Christian König
76a1ea618f
drm/amdgpu: validate the context id in the dependencies
...
Just to make sure userspace don't send nonsense to the kernel.
Signed-off-by: Christian König <christian.koenig@amd.com >
Reviewed-by: Alex Deucher <alexander.deucher@amd.com >
Reviewed-by: Jammy Zhou <Jammy.Zhou@amd.com >
2015-07-16 12:39:38 -04:00
Christian König
0f11770417
drm/amdgpu: fix timeout calculation
...
Signed-off-by: Christian König <christian.koenig@amd.com >
Reviewed-by: Alex Deucher <alexander.deucher@amd.com >
2015-07-09 11:40:11 -04:00
Mario Kleiner
bd833144a2
drm/amdgpu: Handle irqs only based on irq ring, not irq status regs.
...
This is a translation of the patch ...
"drm/radeon: Handle irqs only based on irq ring, not irq status regs."
... for the vblank irq handling, to fix the same problem described
in that patch on the new driver.
Only compile tested due to lack of suitable hw.
Reviewed-by: Christian König <christian.koenig@amd.com >
Signed-off-by: Mario Kleiner <mario.kleiner.de@gmail.com >
CC: Michel Dänzer <michel.daenzer@amd.com >
CC: Alex Deucher <alexander.deucher@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2015-07-08 12:41:37 -04:00
Christian König
fc220f6580
drm/amdgpu: add flag to delay VM updates
...
Signed-off-by: Christian König <christian.koenig@amd.com >
Reviewed-by: Alex Deucher <alexander.deucher@amd.com >
2015-06-29 15:52:50 -04:00
Christian König
2b48d323b2
drm/amdgpu: add optional dependencies to the CS IOCTL v2
...
v2: remove unrelated whitespace change, fix C comment
Signed-off-by: Christian König <christian.koenig@amd.com >
Reviewed-by: Alex Deucher <alexander.deucher@amd.com >
2015-06-29 15:52:49 -04:00
Christian König
03507c4f2f
drm/amdgpu: recreate fence from user seq
...
And use common fence infrastructure for the wait.
Signed-off-by: Christian König <christian.koenig@amd.com >
Reviewed-by: Alex Deucher <alexander.deucher@amd.com >
Reviewed-by: Chunming Zhou <david1.zhou@amd.com >
2015-06-29 15:52:49 -04:00
Alexander Kuleshov
7cebc72817
gpu/drm/amdgpu: Fix build when CONFIG_DEBUG_FS is not set
...
If the CONFIG_DEBUG_FS is not selected, compilation of the
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c provides two warnings that
amdgpu_debugfs_regs_init and amdgpu_debugfs_regs_cleanup are used but
never defined. And as result:
ERROR: "amdgpu_debugfs_regs_cleanup" [drivers/gpu/drm/amd/amdgpu/amdgpu.ko] undefined!
ERROR: "amdgpu_debugfs_regs_init" [drivers/gpu/drm/amd/amdgpu/amdgpu.ko] undefined!
^
Reviewed-by: Christian König <christian.koenig@amd.com >
Signed-off-by: Alexander Kuleshov <kuleshovmail@gmail.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2015-06-29 15:52:48 -04:00
Sonny Jiang
9dcabece15
drm/amdgpu: disable enable_nb_ps_policy temporarily
...
Fixes a hang on resume.
Signed-off-by: Sonny Jiang <sonny.jiang@amd.com >
Reviewed-by: Alex Deucher <alexander.deucher@amd.com >
2015-06-29 11:21:53 -04:00
Sonny Jiang
966c62fb40
drm/amdgpu: correct define SMU_EnabledFeatureScoreboard_SclkDpmOn
...
Signed-off-by: Sonny Jiang <sonny.jiang@amd.com >
Reviewed-by: Alex Deucher <alexander.deucher@amd.com >
2015-06-29 11:21:52 -04:00
Alex Deucher
d8d090b711
drm/amdgpu: allocate ip_block_enabled memory in common code
...
Remove duplication across asic families and make it symmetric
with the freeing of the code in amdgpu_device.c
Reviewed-by: Christian König <christian.koenig@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2015-06-29 11:21:52 -04:00
Maninder Singh
a08c1d516f
drm/amdgpu: remove unnecessary check before kfree
...
kfree(NULL) is safe and this check is probably not required
Signed-off-by: Maninder Singh <maninder1.s@samsung.com >
Reviewed-by: Vaneet Narang <v.narang@samsung.com >
Reviewed-by: Christian Konig <christian.koenig@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2015-06-29 11:21:51 -04:00
Maninder Singh
5f0b34cc72
drm/amdgpu: use kzalloc for allocating one thing
...
Use kzalloc rather than kcalloc(1.. for allocating
one thing.
Signed-off-by: Maninder Singh <maninder1.s@samsung.com >
Reviewed-by: Vaneet Narang <v.narang@samsung.com >
Reviewed-by: Christian Konig <christian.koenig@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2015-06-29 11:21:50 -04:00
Christian König
9a5e8fb1c8
drm/amdgpu: add chunk id validity check
...
Signed-off-by: Christian König <christian.koenig@amd.com >
Reviewed-by: Alex Deucher <alexander.deucher@amd.com >
2015-06-29 11:21:49 -04:00
Christian König
b8682ac253
drm/amdgpu: fix crash on invalid CS IOCTL
...
Signed-off-by: Christian König <christian.koenig@amd.com >
Reviewed-by: Alex Deucher <alexander.deucher@amd.com >
2015-06-29 11:21:49 -04:00
Sonny Jiang
845253e78a
drm/amdgpu: reset wptr at cp compute resume (v2)
...
This patch is to resolve compute hang at resume time.
v2: (agd5f) squash in second fix
Signed-off-by: Sonny Jiang <sonny.jiang@amd.com >
Reviewed-by: Christian König <christian.koenig@amd.com >
2015-06-29 11:21:48 -04:00
Christian König
dc78330a8e
drm/amdgpu: check VCE feedback and bitstream index
...
Signed-off-by: Christian König <christian.koenig@amd.com >
Reviewed-by: Leo Liu <leo.liu@amd.com >
2015-06-29 11:21:47 -04:00
Christian König
2f4b936869
drm/amdgpu: make VCE handle check more strict
...
Port of radeon commit 29c63fe22a .
Signed-off-by: Christian König <christian.koenig@amd.com >
Reviewed-by: Leo Liu <leo.liu@amd.com >
2015-06-29 11:21:47 -04:00
Christian König
f1689ec1b0
drm/amdgpu: check VCE relocation buffer range
...
port of radeon commit 2fc5703abd .
Signed-off-by: Christian König <christian.koenig@amd.com >
Reviewed-by: Leo Liu <leo.liu@amd.com >
2015-06-29 11:21:46 -04:00
Christian König
68fdd3df79
drm/amdgpu: silence invalid error message
...
Signed-off-by: Christian König <christian.koenig@amd.com >
Reviewed-by: Leo Liu <leo.liu@amd.com >
2015-06-29 11:21:45 -04:00
monk.liu
332300b97e
drm/amdgpu: fix wrong type
...
Signed-off-by: monk.liu <monk.liu@amd.com >
Reviewed-by: Christian König <christian.koenig@amd.com >
2015-06-29 11:21:45 -04:00
Christian König
e30590e6e3
drm/amdgpu: print the bo_list in the CS trace point as well
...
Signed-off-by: Christian König <christian.koenig@amd.com >
Acked-by: Alex Deucher <aleander.deucher@amd.com >
2015-06-29 11:21:44 -04:00
Christian König
ec74407ac0
drm/amdgpu: add amdgpu_bo_list_set trace point
...
Signed-off-by: Christian König <christian.koenig@amd.com >
Acked-by: Alex Deucher <aleander.deucher@amd.com >
2015-06-29 11:21:43 -04:00
Christian König
93e3e4385b
drm/amdgpu: add BO map/unmap trace point
...
Signed-off-by: Christian König <christian.koenig@amd.com >
Acked-by: Alex Deucher <aleander.deucher@amd.com >
2015-06-29 11:21:43 -04:00
Christian König
344c19f955
drm/amdgpu: simplify fence debugfs output a bit
...
Signed-off-by: Christian König <christian.koenig@amd.com >
Reviewed-by: Alex Deucher <aleander.deucher@amd.com >
2015-06-29 11:21:42 -04:00
Ben Goz
78ad5cdd21
drm/amdgpu: Configure doorbell to maximum slots
...
Signed-off-by: Ben Goz <ben.goz@amd.com >
Acked-by: Oded Gabbay <oded.gabbay@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2015-06-29 11:21:40 -04:00
Ben Goz
cd06bf687b
drm/amdgpu: Initialize compute sdma and memory from kgd
...
v2: add missing MTYPE_NONCACHED enum
Signed-off-by: Ben Goz <ben.goz@amd.com >
Acked-by: Oded Gabbay <oded.gabbay@amd.com >
Reviewed-by: Alex Deucher <alexander.deucher@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2015-06-29 11:21:39 -04:00
Alex Deucher
e922cfb1c4
drm/amdgpu: fix hpd range check in dce_v8_0_hpd_irq()
...
Spotted by Dan Carpenter. This is a slight variant of
his fix.
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2015-06-29 11:21:38 -04:00
Sonny Jiang
6d8db6ce23
drm/amdgpu: fix a amdgpu_dpm=0 bug
...
Signed-off-by: Sonny Jiang <sonny.jiang@amd.com >
Reviewed-by: Alex Deucher <alexander.deucher@amd.com >
2015-06-10 15:05:33 -04:00
Alex Deucher
633ed3df9a
drm/amdgpu: don't enable/disable display twice on suspend/resume
...
We were doing it in the common code and in the IP specific code.
Remove the IP specific code. The common code handles the
ordering properly.
Reviewed-by: Christian König <christian.koenig@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2015-06-10 14:16:48 -04:00
Christian König
4802ce1177
drm/amdgpu: fix UVD/VCE VM emulation
...
Signed-off-by: Christian König <christian.koenig@amd.com >
Reviewed-by: Alex Deucher <alexander.deucher@amd.com >
2015-06-10 14:16:48 -04:00
Sonny Jiang
b7a0776949
drm/amdgpu: enable vce powergating
...
Enable VCE dpm and powergating. VCE dpm dynamically scales the VCE clocks on
demand.
Signed-off-by: Sonny Jiang <sonny.jiang@amd.com >
Reviewed-by: Alex Deucher <alexander.deucher@amd.com >
Reviewed-by: Christian König <christian.koenig@amd.com >
2015-06-10 11:54:16 -04:00
Alex Deucher
b97aab014c
drm/amdgpu/iceland: don't call smu_init on resume
...
smu_init allocates buffers and initializes them. It does not
touch the hw. There is no need to do it again on resume. It
should really be part of sw_init (and smu_fini should be part
of sw_fini), but we need the firmware sizes from the other IPs
for firmware loading so we have to wait until sw init is done
for all other IPs.
Reviewed-by: Sonny Jiang <Sonny.Jiang@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2015-06-10 09:32:25 -04:00
Alex Deucher
aaf4ee3c02
drm/amdgpu/tonga: don't call smu_init on resume
...
smu_init allocates buffers and initializes them. It does not
touch the hw. There is no need to do it again on resume. It
should really be part of sw_init (and smu_fini should be part
of sw_fini), but we need the firmware sizes from the other IPs
for firmware loading so we have to wait until sw init is done
for all other IPs.
Reviewed-by: Sonny Jiang <Sonny.Jiang@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2015-06-10 09:32:19 -04:00
Alex Deucher
05188312e2
drm/amdgpu/cz: don't call smu_init on resume
...
smu_init allocates buffers and initializes them. It does not
touch the hw. There is no need to do it again on resume. It
should really be part of sw_init (and smu_fini should be part
of sw_fini), but we need the firmware sizes from the other IPs
for firmware loading so we have to wait until sw init is done
for all other IPs.
Reviewed-by: Sonny Jiang <Sonny.Jiang@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2015-06-10 09:31:26 -04:00
Alex Deucher
6a00a09e49
drm/amdgpu: update to latest gfx8 golden register settings
...
Reviewed-by: Christian König <christian.koenig@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2015-06-10 09:13:35 -04:00
Alex Deucher
c61bf64927
drm/amdgpu: whitespace cleanup in gmc8 golden regs
...
Reviewed-by: Christian König <christian.koenig@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2015-06-10 09:13:28 -04:00
Alex Deucher
5732a94f18
drm/admgpu: move XDMA golden registers to dce code
...
Already moved other display registers.
Reviewed-by: Christian König <christian.koenig@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2015-06-10 09:13:21 -04:00
Alex Deucher
454fc95e84
drm/amdgpu: fix the build on big endian
...
Some leftover copy and pastes from radeon that never
got updated.
Reviewed-by: Christian König <christian.koenig@amd.com >
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2015-06-10 09:13:01 -04:00
David Zhang
147dbfbc54
drm/amdgpu: remove the VI hardware semaphore in ring sync
...
Signed-off-by: David Zhang <david1.zhang@amd.com >
Reviewed-by: Christian König <christian.koenig@amd.com >
2015-06-10 09:06:45 -04:00
Alex Deucher
bd5c97bc1a
drm/amdgpu: set the gfx config properly for all CZ variants (v2)
...
Need to adjust the number of CUs and RBs.
v2: get proper values
Reviewed-by: Christian König <christian.koenig@amd.com >
Reviewed-by: Samuel Li <samuel.li@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2015-06-08 21:42:54 -04:00
Alex Deucher
3e39ab9083
drm/amdgpu: also print the pci revision when printing the pci ids
...
The driver makes use of this information so print if to aid in
debugging.
Reviewed-by: Christian König <christian.koenig@amd.com >
Reviewed-by: Samuel Li <samuel.li@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2015-06-08 21:42:53 -04:00
Christian König
34b5f6a6d6
drm/amdgpu: cleanup VA IOCTL
...
Remove the unnecessary returned status and make the IOCTL write only.
Signed-off-by: Christian König <christian.koenig@amd.com >
Reviewed-by: Alex Deucher <alexander.deucher@amd.com >
2015-06-08 21:42:53 -04:00
Christian König
6c7fc503a4
drm/amdgpu: fix saddr handling in amdgpu_vm_bo_unmap
...
Signed-off-by: Christian König <christian.koenig@amd.com >
Reviewed-by: Alex Deucher <alexander.deucher@amd.com >
2015-06-08 21:42:52 -04:00