* [PATCH] drm/amdgpu: Reorder uvd ring init before uvd resume
@ 2018-11-16 9:34 Chris Wilson
2018-11-16 10:33 ` ✓ Fi.CI.BAT: success for " Patchwork
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Chris Wilson @ 2018-11-16 9:34 UTC (permalink / raw)
To: amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW
Cc: Alex Deucher, intel-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW,
dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW, Chris Wilson
As amd_uvd_resume() accesses the uvd ring, it must be initialised first
or else we trigger errors like:
[ 5.595963] [drm] Found UVD firmware Version: 1.87 Family ID: 17
[ 5.595969] [drm] PSP loading UVD firmware
[ 5.596266] ------------[ cut here ]------------
[ 5.596268] ODEBUG: assert_init not available (active state 0) object type: timer_list hint: (null)
[ 5.596285] WARNING: CPU: 0 PID: 507 at lib/debugobjects.c:329 debug_print_object+0x6a/0x80
[ 5.596286] Modules linked in: amdgpu(+) hid_logitech_hidpp(+) chash gpu_sched amd_iommu_v2 ttm drm_kms_helper crc32c_intel drm hid_sony ff_memless igb hid_logitech_dj nvme dca i2c_algo_bit nvme_core wmi pinctrl_amd uas usb_storage
[ 5.596299] CPU: 0 PID: 507 Comm: systemd-udevd Tainted: G W 4.20.0-0.rc1.git4.1.fc30.x86_64 #1
[ 5.596301] Hardware name: System manufacturer System Product Name/ROG STRIX X470-I GAMING, BIOS 0901 07/23/2018
[ 5.596303] RIP: 0010:debug_print_object+0x6a/0x80
[ 5.596305] Code: 8b 43 10 83 c2 01 8b 4b 14 4c 89 e6 89 15 e6 82 b0 02 4c 8b 45 00 48 c7 c7 60 fd 34 a6 48 8b 14 c5 a0 da 08 a6 e8 6a 6a b8 ff <0f> 0b 5b 83 05 d0 45 3e 01 01 5d 41 5c c3 83 05 c5 45 3e 01 01 c3
[ 5.596306] RSP: 0018:ffffa02ac863f8c0 EFLAGS: 00010282
[ 5.596307] RAX: 0000000000000000 RBX: ffffa02ac863f8e0 RCX: 0000000000000006
[ 5.596308] RDX: 0000000000000007 RSI: ffff9160e9a7bfe8 RDI: ffff9160f91d6c60
[ 5.596310] RBP: ffffffffa6742740 R08: 0000000000000002 R09: 0000000000000000
[ 5.596311] R10: 0000000000000000 R11: 0000000000000000 R12: ffffffffa634ff69
[ 5.596312] R13: 00000000000b79d0 R14: ffffffffa80f76d8 R15: 0000000000266000
[ 5.596313] FS: 00007f762abf7940(0000) GS:ffff9160f9000000(0000) knlGS:0000000000000000
[ 5.596314] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033
[ 5.596315] CR2: 000055fdc593f000 CR3: 00000007e999c000 CR4: 00000000003406f0
[ 5.596317] Call Trace:
[ 5.596321] debug_object_assert_init+0x14a/0x180
[ 5.596327] del_timer+0x2e/0x90
[ 5.596383] amdgpu_fence_process+0x47/0x100 [amdgpu]
[ 5.596430] amdgpu_uvd_resume+0xf6/0x120 [amdgpu]
[ 5.596475] uvd_v7_0_sw_init+0xe0/0x280 [amdgpu]
[ 5.596523] amdgpu_device_init.cold.30+0xf97/0x14b6 [amdgpu]
[ 5.596563] ? amdgpu_driver_load_kms+0x53/0x330 [amdgpu]
[ 5.596604] amdgpu_driver_load_kms+0x86/0x330 [amdgpu]
[ 5.596614] drm_dev_register+0x115/0x150 [drm]
[ 5.596654] amdgpu_pci_probe+0xbd/0x120 [amdgpu]
[ 5.596658] local_pci_probe+0x41/0x90
[ 5.596661] pci_device_probe+0x188/0x1a0
[ 5.596666] really_probe+0xf8/0x3b0
[ 5.596669] driver_probe_device+0xb3/0xf0
[ 5.596672] __driver_attach+0xe1/0x110
[ 5.596674] ? driver_probe_device+0xf0/0xf0
[ 5.596676] bus_for_each_dev+0x79/0xc0
[ 5.596679] bus_add_driver+0x155/0x230
[ 5.596681] ? 0xffffffffc07d9000
[ 5.596683] driver_register+0x6b/0xb0
[ 5.596685] ? 0xffffffffc07d9000
[ 5.596688] do_one_initcall+0x5d/0x2be
[ 5.596691] ? rcu_read_lock_sched_held+0x79/0x80
[ 5.596693] ? kmem_cache_alloc_trace+0x264/0x290
[ 5.596695] ? do_init_module+0x22/0x210
[ 5.596698] do_init_module+0x5a/0x210
[ 5.596701] load_module+0x2137/0x2430
[ 5.596703] ? lockdep_hardirqs_on+0xed/0x180
[ 5.596714] ? __do_sys_init_module+0x150/0x1a0
[ 5.596715] __do_sys_init_module+0x150/0x1a0
[ 5.596722] do_syscall_64+0x60/0x1f0
[ 5.596725] entry_SYSCALL_64_after_hwframe+0x49/0xbe
[ 5.596726] RIP: 0033:0x7f762b877dee
[ 5.596728] Code: 48 8b 0d 9d 20 0c 00 f7 d8 64 89 01 48 83 c8 ff c3 66 2e 0f 1f 84 00 00 00 00 00 90 f3 0f 1e fa 49 89 ca b8 af 00 00 00 0f 05 <48> 3d 01 f0 ff ff 73 01 c3 48 8b 0d 6a 20 0c 00 f7 d8 64 89 01 48
[ 5.596729] RSP: 002b:00007ffc777b8558 EFLAGS: 00000246 ORIG_RAX: 00000000000000af
[ 5.596730] RAX: ffffffffffffffda RBX: 000055fdc48da320 RCX: 00007f762b877dee
[ 5.596731] RDX: 00007f762b9f284d RSI: 00000000006c5fc6 RDI: 000055fdc527a060
[ 5.596732] RBP: 00007f762b9f284d R08: 0000000000000003 R09: 0000000000000002
[ 5.596733] R10: 000055fdc48ad010 R11: 0000000000000246 R12: 000055fdc527a060
[ 5.596734] R13: 000055fdc48dca20 R14: 0000000000020000 R15: 0000000000000000
[ 5.596740] irq event stamp: 134618
[ 5.596743] hardirqs last enabled at (134617): [<ffffffffa513d52e>] console_unlock+0x45e/0x610
[ 5.596744] hardirqs last disabled at (134618): [<ffffffffa50037e8>] trace_hardirqs_off_thunk+0x1a/0x1c
[ 5.596746] softirqs last enabled at (133146): [<ffffffffa5e00365>] __do_softirq+0x365/0x47c
[ 5.596748] softirqs last disabled at (133139): [<ffffffffa50c64f9>] irq_exit+0x119/0x120
[ 5.596749] ---[ end trace eaee508abfebccdc ]---
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=108709
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Alex Deucher <alexdeucher@gmail.com>
---
drivers/gpu/drm/amd/amdgpu/uvd_v4_2.c | 8 ++++----
drivers/gpu/drm/amd/amdgpu/uvd_v5_0.c | 8 ++++----
drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c | 8 ++++----
drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c | 8 ++++----
4 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/drivers/gpu/drm/amd/amdgpu/uvd_v4_2.c b/drivers/gpu/drm/amd/amdgpu/uvd_v4_2.c
index 1fc17bf39fed..44ca41837187 100644
--- a/drivers/gpu/drm/amd/amdgpu/uvd_v4_2.c
+++ b/drivers/gpu/drm/amd/amdgpu/uvd_v4_2.c
@@ -116,16 +116,16 @@ static int uvd_v4_2_sw_init(void *handle)
if (r)
return r;
- r = amdgpu_uvd_resume(adev);
- if (r)
- return r;
-
ring = &adev->uvd.inst->ring;
sprintf(ring->name, "uvd");
r = amdgpu_ring_init(adev, ring, 512, &adev->uvd.inst->irq, 0);
if (r)
return r;
+ r = amdgpu_uvd_resume(adev);
+ if (r)
+ return r;
+
r = amdgpu_uvd_entity_init(adev);
return r;
diff --git a/drivers/gpu/drm/amd/amdgpu/uvd_v5_0.c b/drivers/gpu/drm/amd/amdgpu/uvd_v5_0.c
index fde6ad5ac9ab..6bb05ae232b2 100644
--- a/drivers/gpu/drm/amd/amdgpu/uvd_v5_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/uvd_v5_0.c
@@ -113,16 +113,16 @@ static int uvd_v5_0_sw_init(void *handle)
if (r)
return r;
- r = amdgpu_uvd_resume(adev);
- if (r)
- return r;
-
ring = &adev->uvd.inst->ring;
sprintf(ring->name, "uvd");
r = amdgpu_ring_init(adev, ring, 512, &adev->uvd.inst->irq, 0);
if (r)
return r;
+ r = amdgpu_uvd_resume(adev);
+ if (r)
+ return r;
+
r = amdgpu_uvd_entity_init(adev);
return r;
diff --git a/drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c b/drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c
index 7a5b40275e8e..07fd96df4321 100644
--- a/drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c
@@ -416,16 +416,16 @@ static int uvd_v6_0_sw_init(void *handle)
DRM_INFO("UVD ENC is disabled\n");
}
- r = amdgpu_uvd_resume(adev);
- if (r)
- return r;
-
ring = &adev->uvd.inst->ring;
sprintf(ring->name, "uvd");
r = amdgpu_ring_init(adev, ring, 512, &adev->uvd.inst->irq, 0);
if (r)
return r;
+ r = amdgpu_uvd_resume(adev);
+ if (r)
+ return r;
+
if (uvd_v6_0_enc_support(adev)) {
for (i = 0; i < adev->uvd.num_enc_rings; ++i) {
ring = &adev->uvd.inst->ring_enc[i];
diff --git a/drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c b/drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c
index 58b39afcfb86..1ef023a7b8ec 100644
--- a/drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c
@@ -447,10 +447,6 @@ static int uvd_v7_0_sw_init(void *handle)
DRM_INFO("PSP loading UVD firmware\n");
}
- r = amdgpu_uvd_resume(adev);
- if (r)
- return r;
-
for (j = 0; j < adev->uvd.num_uvd_inst; j++) {
if (adev->uvd.harvest_config & (1 << j))
continue;
@@ -482,6 +478,10 @@ static int uvd_v7_0_sw_init(void *handle)
}
}
+ r = amdgpu_uvd_resume(adev);
+ if (r)
+ return r;
+
r = amdgpu_uvd_entity_init(adev);
if (r)
return r;
--
2.19.1
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
^ permalink raw reply related [flat|nested] 4+ messages in thread
* ✓ Fi.CI.BAT: success for drm/amdgpu: Reorder uvd ring init before uvd resume
2018-11-16 9:34 [PATCH] drm/amdgpu: Reorder uvd ring init before uvd resume Chris Wilson
@ 2018-11-16 10:33 ` Patchwork
2018-11-16 11:38 ` ✓ Fi.CI.IGT: " Patchwork
2018-11-19 8:55 ` [PATCH] " Christian König
2 siblings, 0 replies; 4+ messages in thread
From: Patchwork @ 2018-11-16 10:33 UTC (permalink / raw)
To: Chris Wilson; +Cc: intel-gfx
== Series Details ==
Series: drm/amdgpu: Reorder uvd ring init before uvd resume
URL : https://patchwork.freedesktop.org/series/52601/
State : success
== Summary ==
= CI Bug Log - changes from CI_DRM_5150 -> Patchwork_10836 =
== Summary - SUCCESS ==
No regressions found.
External URL: https://patchwork.freedesktop.org/api/1.0/series/52601/revisions/1/mbox/
== Possible new issues ==
Here are the unknown changes that may have been introduced in Patchwork_10836:
=== IGT changes ===
==== Possible regressions ====
igt@kms_chamelium@hdmi-hpd-fast:
{fi-kbl-7500u}: SKIP -> FAIL +2
==== Warnings ====
igt@kms_busy@basic-flip-c:
{fi-kbl-7500u}: PASS -> SKIP +2
igt@kms_chamelium@common-hpd-after-suspend:
{fi-kbl-7500u}: DMESG-WARN (fdo#105602, fdo#102505, fdo#105079) -> FAIL
== Known issues ==
Here are the changes found in Patchwork_10836 that come from known issues:
=== IGT changes ===
==== Issues hit ====
igt@gem_exec_suspend@basic-s3:
fi-icl-u2: PASS -> DMESG-WARN (fdo#107724)
igt@kms_chamelium@dp-hpd-fast:
{fi-kbl-7500u}: PASS -> DMESG-WARN (fdo#105602, fdo#102505)
igt@kms_frontbuffer_tracking@basic:
fi-hsw-peppy: PASS -> DMESG-WARN (fdo#102614)
==== Warnings ====
igt@gem_ctx_create@basic-files:
fi-bsw-kefka: FAIL (fdo#108656) -> INCOMPLETE (fdo#108714)
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
fdo#102505 https://bugs.freedesktop.org/show_bug.cgi?id=102505
fdo#102614 https://bugs.freedesktop.org/show_bug.cgi?id=102614
fdo#105079 https://bugs.freedesktop.org/show_bug.cgi?id=105079
fdo#105602 https://bugs.freedesktop.org/show_bug.cgi?id=105602
fdo#107724 https://bugs.freedesktop.org/show_bug.cgi?id=107724
fdo#108656 https://bugs.freedesktop.org/show_bug.cgi?id=108656
fdo#108714 https://bugs.freedesktop.org/show_bug.cgi?id=108714
== Participating hosts (50 -> 43) ==
Missing (7): fi-ilk-m540 fi-hsw-4200u fi-byt-squawks fi-snb-2520m fi-gdg-551 fi-pnv-d510 fi-icl-u
== Build changes ==
* Linux: CI_DRM_5150 -> Patchwork_10836
CI_DRM_5150: ab97324c7fb98fc8cadbe5ae4e50f36fb0137308 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_4716: 111593c49d812a4f4ff9ab0ef053a3ab88a6f73f @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_10836: 1cf7edb048f3aa57ecb5ee5ae62249c6ed0cc034 @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
1cf7edb048f3 drm/amdgpu: Reorder uvd ring init before uvd resume
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_10836/issues.html
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 4+ messages in thread
* ✓ Fi.CI.IGT: success for drm/amdgpu: Reorder uvd ring init before uvd resume
2018-11-16 9:34 [PATCH] drm/amdgpu: Reorder uvd ring init before uvd resume Chris Wilson
2018-11-16 10:33 ` ✓ Fi.CI.BAT: success for " Patchwork
@ 2018-11-16 11:38 ` Patchwork
2018-11-19 8:55 ` [PATCH] " Christian König
2 siblings, 0 replies; 4+ messages in thread
From: Patchwork @ 2018-11-16 11:38 UTC (permalink / raw)
To: Chris Wilson; +Cc: intel-gfx
== Series Details ==
Series: drm/amdgpu: Reorder uvd ring init before uvd resume
URL : https://patchwork.freedesktop.org/series/52601/
State : success
== Summary ==
= CI Bug Log - changes from CI_DRM_5150_full -> Patchwork_10836_full =
== Summary - SUCCESS ==
No regressions found.
== Known issues ==
Here are the changes found in Patchwork_10836_full that come from known issues:
=== IGT changes ===
==== Issues hit ====
igt@gem_ctx_isolation@bcs0-s3:
shard-apl: PASS -> DMESG-WARN (fdo#108566)
igt@gem_exec_schedule@pi-ringfull-bsd:
shard-skl: NOTRUN -> FAIL (fdo#103158) +1
igt@gem_exec_schedule@pi-ringfull-render:
shard-kbl: NOTRUN -> FAIL (fdo#103158)
igt@gem_ppgtt@blt-vs-render-ctxn:
shard-kbl: PASS -> INCOMPLETE (fdo#106887, fdo#106023, fdo#103665)
igt@kms_busy@extended-modeset-hang-newfb-with-reset-render-c:
shard-skl: NOTRUN -> DMESG-WARN (fdo#107956)
igt@kms_busy@extended-pageflip-modeset-hang-oldfb-render-b:
shard-snb: NOTRUN -> DMESG-WARN (fdo#107956)
igt@kms_cursor_crc@cursor-64x21-sliding:
shard-apl: PASS -> FAIL (fdo#103232) +2
igt@kms_cursor_crc@cursor-size-change:
shard-glk: PASS -> FAIL (fdo#103232) +2
igt@kms_cursor_legacy@cursorb-vs-flipb-toggle:
shard-glk: PASS -> DMESG-WARN (fdo#105763, fdo#106538) +1
igt@kms_frontbuffer_tracking@fbc-1p-primscrn-spr-indfb-draw-pwrite:
shard-apl: PASS -> FAIL (fdo#103167) +1
igt@kms_frontbuffer_tracking@fbc-1p-primscrn-spr-indfb-fullscreen:
shard-glk: PASS -> FAIL (fdo#103167) +2
igt@kms_frontbuffer_tracking@fbc-2p-scndscrn-indfb-pgflip-blt:
shard-glk: PASS -> DMESG-FAIL (fdo#105763, fdo#106538)
igt@kms_frontbuffer_tracking@fbcpsr-rgb101010-draw-mmap-wc:
shard-skl: PASS -> FAIL (fdo#103167)
igt@kms_frontbuffer_tracking@fbcpsr-stridechange:
shard-skl: NOTRUN -> FAIL (fdo#105683)
igt@kms_plane@plane-panning-bottom-right-suspend-pipe-c-planes:
shard-skl: PASS -> FAIL (fdo#103166)
igt@kms_plane_alpha_blend@pipe-a-constant-alpha-max:
shard-skl: NOTRUN -> FAIL (fdo#108145) +3
igt@kms_plane_alpha_blend@pipe-b-constant-alpha-max:
shard-kbl: NOTRUN -> FAIL (fdo#108145)
igt@kms_plane_alpha_blend@pipe-c-alpha-7efc:
shard-skl: NOTRUN -> FAIL (fdo#108145, fdo#107815) +2
igt@kms_setmode@basic:
shard-apl: PASS -> FAIL (fdo#99912)
igt@kms_sysfs_edid_timing:
shard-skl: NOTRUN -> FAIL (fdo#100047)
igt@kms_vblank@pipe-a-ts-continuation-idle-hang:
shard-kbl: PASS -> DMESG-WARN (fdo#106107)
igt@kms_vblank@pipe-c-ts-continuation-suspend:
shard-skl: NOTRUN -> INCOMPLETE (fdo#107773, fdo#104108) +1
igt@pm_backlight@fade_with_suspend:
shard-skl: NOTRUN -> FAIL (fdo#107847)
igt@pm_rpm@modeset-non-lpsp:
shard-skl: NOTRUN -> INCOMPLETE (fdo#107807)
==== Possible fixes ====
igt@drv_suspend@shrink:
shard-glk: INCOMPLETE (fdo#106886, fdo#103359, k.org#198133) -> PASS
igt@kms_available_modes_crc@available_mode_test_crc:
shard-apl: FAIL (fdo#106641) -> PASS
igt@kms_color@pipe-c-gamma:
shard-skl: FAIL (fdo#104782, fdo#108228) -> PASS
igt@kms_cursor_crc@cursor-256x256-random:
shard-apl: FAIL (fdo#103232) -> PASS +1
igt@kms_cursor_crc@cursor-64x21-onscreen:
shard-glk: FAIL (fdo#103232) -> PASS
igt@kms_cursor_crc@cursor-64x64-suspend:
shard-apl: FAIL (fdo#103191, fdo#103232) -> PASS
igt@kms_frontbuffer_tracking@fbc-1p-primscrn-cur-indfb-draw-mmap-wc:
shard-glk: FAIL (fdo#103167) -> PASS +2
igt@kms_plane_alpha_blend@pipe-b-alpha-opaque-fb:
shard-glk: FAIL (fdo#108145) -> PASS
igt@kms_plane_multiple@atomic-pipe-b-tiling-y:
shard-glk: FAIL (fdo#103166) -> PASS +1
igt@kms_plane_multiple@atomic-pipe-c-tiling-yf:
shard-apl: FAIL (fdo#103166) -> PASS +3
igt@kms_setmode@basic:
shard-kbl: FAIL (fdo#99912) -> PASS
igt@perf@oa-exponents:
shard-kbl: INCOMPLETE (fdo#103665) -> PASS
fdo#100047 https://bugs.freedesktop.org/show_bug.cgi?id=100047
fdo#103158 https://bugs.freedesktop.org/show_bug.cgi?id=103158
fdo#103166 https://bugs.freedesktop.org/show_bug.cgi?id=103166
fdo#103167 https://bugs.freedesktop.org/show_bug.cgi?id=103167
fdo#103191 https://bugs.freedesktop.org/show_bug.cgi?id=103191
fdo#103232 https://bugs.freedesktop.org/show_bug.cgi?id=103232
fdo#103359 https://bugs.freedesktop.org/show_bug.cgi?id=103359
fdo#103665 https://bugs.freedesktop.org/show_bug.cgi?id=103665
fdo#104108 https://bugs.freedesktop.org/show_bug.cgi?id=104108
fdo#104782 https://bugs.freedesktop.org/show_bug.cgi?id=104782
fdo#105683 https://bugs.freedesktop.org/show_bug.cgi?id=105683
fdo#105763 https://bugs.freedesktop.org/show_bug.cgi?id=105763
fdo#106023 https://bugs.freedesktop.org/show_bug.cgi?id=106023
fdo#106107 https://bugs.freedesktop.org/show_bug.cgi?id=106107
fdo#106538 https://bugs.freedesktop.org/show_bug.cgi?id=106538
fdo#106641 https://bugs.freedesktop.org/show_bug.cgi?id=106641
fdo#106886 https://bugs.freedesktop.org/show_bug.cgi?id=106886
fdo#106887 https://bugs.freedesktop.org/show_bug.cgi?id=106887
fdo#107773 https://bugs.freedesktop.org/show_bug.cgi?id=107773
fdo#107807 https://bugs.freedesktop.org/show_bug.cgi?id=107807
fdo#107815 https://bugs.freedesktop.org/show_bug.cgi?id=107815
fdo#107847 https://bugs.freedesktop.org/show_bug.cgi?id=107847
fdo#107956 https://bugs.freedesktop.org/show_bug.cgi?id=107956
fdo#108145 https://bugs.freedesktop.org/show_bug.cgi?id=108145
fdo#108228 https://bugs.freedesktop.org/show_bug.cgi?id=108228
fdo#108566 https://bugs.freedesktop.org/show_bug.cgi?id=108566
fdo#99912 https://bugs.freedesktop.org/show_bug.cgi?id=99912
k.org#198133 https://bugzilla.kernel.org/show_bug.cgi?id=198133
== Participating hosts (7 -> 6) ==
Missing (1): shard-iclb
== Build changes ==
* Linux: CI_DRM_5150 -> Patchwork_10836
CI_DRM_5150: ab97324c7fb98fc8cadbe5ae4e50f36fb0137308 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_4716: 111593c49d812a4f4ff9ab0ef053a3ab88a6f73f @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_10836: 1cf7edb048f3aa57ecb5ee5ae62249c6ed0cc034 @ git://anongit.freedesktop.org/gfx-ci/linux
piglit_4509: fdc5a4ca11124ab8413c7988896eec4c97336694 @ git://anongit.freedesktop.org/piglit
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_10836/shards.html
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] drm/amdgpu: Reorder uvd ring init before uvd resume
2018-11-16 9:34 [PATCH] drm/amdgpu: Reorder uvd ring init before uvd resume Chris Wilson
2018-11-16 10:33 ` ✓ Fi.CI.BAT: success for " Patchwork
2018-11-16 11:38 ` ✓ Fi.CI.IGT: " Patchwork
@ 2018-11-19 8:55 ` Christian König
2 siblings, 0 replies; 4+ messages in thread
From: Christian König @ 2018-11-19 8:55 UTC (permalink / raw)
To: Chris Wilson, amd-gfx; +Cc: intel-gfx, dri-devel
Am 16.11.18 um 10:34 schrieb Chris Wilson:
> As amd_uvd_resume() accesses the uvd ring, it must be initialised first
> or else we trigger errors like:
>
> [ 5.595963] [drm] Found UVD firmware Version: 1.87 Family ID: 17
> [ 5.595969] [drm] PSP loading UVD firmware
> [ 5.596266] ------------[ cut here ]------------
> [ 5.596268] ODEBUG: assert_init not available (active state 0) object type: timer_list hint: (null)
> [ 5.596285] WARNING: CPU: 0 PID: 507 at lib/debugobjects.c:329 debug_print_object+0x6a/0x80
> [ 5.596286] Modules linked in: amdgpu(+) hid_logitech_hidpp(+) chash gpu_sched amd_iommu_v2 ttm drm_kms_helper crc32c_intel drm hid_sony ff_memless igb hid_logitech_dj nvme dca i2c_algo_bit nvme_core wmi pinctrl_amd uas usb_storage
> [ 5.596299] CPU: 0 PID: 507 Comm: systemd-udevd Tainted: G W 4.20.0-0.rc1.git4.1.fc30.x86_64 #1
> [ 5.596301] Hardware name: System manufacturer System Product Name/ROG STRIX X470-I GAMING, BIOS 0901 07/23/2018
> [ 5.596303] RIP: 0010:debug_print_object+0x6a/0x80
> [ 5.596305] Code: 8b 43 10 83 c2 01 8b 4b 14 4c 89 e6 89 15 e6 82 b0 02 4c 8b 45 00 48 c7 c7 60 fd 34 a6 48 8b 14 c5 a0 da 08 a6 e8 6a 6a b8 ff <0f> 0b 5b 83 05 d0 45 3e 01 01 5d 41 5c c3 83 05 c5 45 3e 01 01 c3
> [ 5.596306] RSP: 0018:ffffa02ac863f8c0 EFLAGS: 00010282
> [ 5.596307] RAX: 0000000000000000 RBX: ffffa02ac863f8e0 RCX: 0000000000000006
> [ 5.596308] RDX: 0000000000000007 RSI: ffff9160e9a7bfe8 RDI: ffff9160f91d6c60
> [ 5.596310] RBP: ffffffffa6742740 R08: 0000000000000002 R09: 0000000000000000
> [ 5.596311] R10: 0000000000000000 R11: 0000000000000000 R12: ffffffffa634ff69
> [ 5.596312] R13: 00000000000b79d0 R14: ffffffffa80f76d8 R15: 0000000000266000
> [ 5.596313] FS: 00007f762abf7940(0000) GS:ffff9160f9000000(0000) knlGS:0000000000000000
> [ 5.596314] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033
> [ 5.596315] CR2: 000055fdc593f000 CR3: 00000007e999c000 CR4: 00000000003406f0
> [ 5.596317] Call Trace:
> [ 5.596321] debug_object_assert_init+0x14a/0x180
> [ 5.596327] del_timer+0x2e/0x90
> [ 5.596383] amdgpu_fence_process+0x47/0x100 [amdgpu]
> [ 5.596430] amdgpu_uvd_resume+0xf6/0x120 [amdgpu]
> [ 5.596475] uvd_v7_0_sw_init+0xe0/0x280 [amdgpu]
> [ 5.596523] amdgpu_device_init.cold.30+0xf97/0x14b6 [amdgpu]
> [ 5.596563] ? amdgpu_driver_load_kms+0x53/0x330 [amdgpu]
> [ 5.596604] amdgpu_driver_load_kms+0x86/0x330 [amdgpu]
> [ 5.596614] drm_dev_register+0x115/0x150 [drm]
> [ 5.596654] amdgpu_pci_probe+0xbd/0x120 [amdgpu]
> [ 5.596658] local_pci_probe+0x41/0x90
> [ 5.596661] pci_device_probe+0x188/0x1a0
> [ 5.596666] really_probe+0xf8/0x3b0
> [ 5.596669] driver_probe_device+0xb3/0xf0
> [ 5.596672] __driver_attach+0xe1/0x110
> [ 5.596674] ? driver_probe_device+0xf0/0xf0
> [ 5.596676] bus_for_each_dev+0x79/0xc0
> [ 5.596679] bus_add_driver+0x155/0x230
> [ 5.596681] ? 0xffffffffc07d9000
> [ 5.596683] driver_register+0x6b/0xb0
> [ 5.596685] ? 0xffffffffc07d9000
> [ 5.596688] do_one_initcall+0x5d/0x2be
> [ 5.596691] ? rcu_read_lock_sched_held+0x79/0x80
> [ 5.596693] ? kmem_cache_alloc_trace+0x264/0x290
> [ 5.596695] ? do_init_module+0x22/0x210
> [ 5.596698] do_init_module+0x5a/0x210
> [ 5.596701] load_module+0x2137/0x2430
> [ 5.596703] ? lockdep_hardirqs_on+0xed/0x180
> [ 5.596714] ? __do_sys_init_module+0x150/0x1a0
> [ 5.596715] __do_sys_init_module+0x150/0x1a0
> [ 5.596722] do_syscall_64+0x60/0x1f0
> [ 5.596725] entry_SYSCALL_64_after_hwframe+0x49/0xbe
> [ 5.596726] RIP: 0033:0x7f762b877dee
> [ 5.596728] Code: 48 8b 0d 9d 20 0c 00 f7 d8 64 89 01 48 83 c8 ff c3 66 2e 0f 1f 84 00 00 00 00 00 90 f3 0f 1e fa 49 89 ca b8 af 00 00 00 0f 05 <48> 3d 01 f0 ff ff 73 01 c3 48 8b 0d 6a 20 0c 00 f7 d8 64 89 01 48
> [ 5.596729] RSP: 002b:00007ffc777b8558 EFLAGS: 00000246 ORIG_RAX: 00000000000000af
> [ 5.596730] RAX: ffffffffffffffda RBX: 000055fdc48da320 RCX: 00007f762b877dee
> [ 5.596731] RDX: 00007f762b9f284d RSI: 00000000006c5fc6 RDI: 000055fdc527a060
> [ 5.596732] RBP: 00007f762b9f284d R08: 0000000000000003 R09: 0000000000000002
> [ 5.596733] R10: 000055fdc48ad010 R11: 0000000000000246 R12: 000055fdc527a060
> [ 5.596734] R13: 000055fdc48dca20 R14: 0000000000020000 R15: 0000000000000000
> [ 5.596740] irq event stamp: 134618
> [ 5.596743] hardirqs last enabled at (134617): [<ffffffffa513d52e>] console_unlock+0x45e/0x610
> [ 5.596744] hardirqs last disabled at (134618): [<ffffffffa50037e8>] trace_hardirqs_off_thunk+0x1a/0x1c
> [ 5.596746] softirqs last enabled at (133146): [<ffffffffa5e00365>] __do_softirq+0x365/0x47c
> [ 5.596748] softirqs last disabled at (133139): [<ffffffffa50c64f9>] irq_exit+0x119/0x120
> [ 5.596749] ---[ end trace eaee508abfebccdc ]---
>
> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=108709
> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
> Cc: Alex Deucher <alexdeucher@gmail.com>
Good catch, Reviewed-by: Christian König <christian.koenig@amd.com>.
Going to push that if nobody objects today,
Christian.
> ---
> drivers/gpu/drm/amd/amdgpu/uvd_v4_2.c | 8 ++++----
> drivers/gpu/drm/amd/amdgpu/uvd_v5_0.c | 8 ++++----
> drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c | 8 ++++----
> drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c | 8 ++++----
> 4 files changed, 16 insertions(+), 16 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/uvd_v4_2.c b/drivers/gpu/drm/amd/amdgpu/uvd_v4_2.c
> index 1fc17bf39fed..44ca41837187 100644
> --- a/drivers/gpu/drm/amd/amdgpu/uvd_v4_2.c
> +++ b/drivers/gpu/drm/amd/amdgpu/uvd_v4_2.c
> @@ -116,16 +116,16 @@ static int uvd_v4_2_sw_init(void *handle)
> if (r)
> return r;
>
> - r = amdgpu_uvd_resume(adev);
> - if (r)
> - return r;
> -
> ring = &adev->uvd.inst->ring;
> sprintf(ring->name, "uvd");
> r = amdgpu_ring_init(adev, ring, 512, &adev->uvd.inst->irq, 0);
> if (r)
> return r;
>
> + r = amdgpu_uvd_resume(adev);
> + if (r)
> + return r;
> +
> r = amdgpu_uvd_entity_init(adev);
>
> return r;
> diff --git a/drivers/gpu/drm/amd/amdgpu/uvd_v5_0.c b/drivers/gpu/drm/amd/amdgpu/uvd_v5_0.c
> index fde6ad5ac9ab..6bb05ae232b2 100644
> --- a/drivers/gpu/drm/amd/amdgpu/uvd_v5_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/uvd_v5_0.c
> @@ -113,16 +113,16 @@ static int uvd_v5_0_sw_init(void *handle)
> if (r)
> return r;
>
> - r = amdgpu_uvd_resume(adev);
> - if (r)
> - return r;
> -
> ring = &adev->uvd.inst->ring;
> sprintf(ring->name, "uvd");
> r = amdgpu_ring_init(adev, ring, 512, &adev->uvd.inst->irq, 0);
> if (r)
> return r;
>
> + r = amdgpu_uvd_resume(adev);
> + if (r)
> + return r;
> +
> r = amdgpu_uvd_entity_init(adev);
>
> return r;
> diff --git a/drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c b/drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c
> index 7a5b40275e8e..07fd96df4321 100644
> --- a/drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c
> @@ -416,16 +416,16 @@ static int uvd_v6_0_sw_init(void *handle)
> DRM_INFO("UVD ENC is disabled\n");
> }
>
> - r = amdgpu_uvd_resume(adev);
> - if (r)
> - return r;
> -
> ring = &adev->uvd.inst->ring;
> sprintf(ring->name, "uvd");
> r = amdgpu_ring_init(adev, ring, 512, &adev->uvd.inst->irq, 0);
> if (r)
> return r;
>
> + r = amdgpu_uvd_resume(adev);
> + if (r)
> + return r;
> +
> if (uvd_v6_0_enc_support(adev)) {
> for (i = 0; i < adev->uvd.num_enc_rings; ++i) {
> ring = &adev->uvd.inst->ring_enc[i];
> diff --git a/drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c b/drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c
> index 58b39afcfb86..1ef023a7b8ec 100644
> --- a/drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c
> @@ -447,10 +447,6 @@ static int uvd_v7_0_sw_init(void *handle)
> DRM_INFO("PSP loading UVD firmware\n");
> }
>
> - r = amdgpu_uvd_resume(adev);
> - if (r)
> - return r;
> -
> for (j = 0; j < adev->uvd.num_uvd_inst; j++) {
> if (adev->uvd.harvest_config & (1 << j))
> continue;
> @@ -482,6 +478,10 @@ static int uvd_v7_0_sw_init(void *handle)
> }
> }
>
> + r = amdgpu_uvd_resume(adev);
> + if (r)
> + return r;
> +
> r = amdgpu_uvd_entity_init(adev);
> if (r)
> return r;
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2018-11-19 8:55 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-11-16 9:34 [PATCH] drm/amdgpu: Reorder uvd ring init before uvd resume Chris Wilson
2018-11-16 10:33 ` ✓ Fi.CI.BAT: success for " Patchwork
2018-11-16 11:38 ` ✓ Fi.CI.IGT: " Patchwork
2018-11-19 8:55 ` [PATCH] " Christian König
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox