drm/amdgpu/display: fix the NULL pointer reference on dmucb on dcn301
Subsystems (3)
PATCH 1/2 drm/amdgpu/display: fix the NULL pointer reference on dmucb on dcn301
DCN301 needs to use dmub create abm instance instead of dce.
[ 1138.854204] BUG: kernel NULL pointer dereference, address: 0000000000000000 [ 1138.854206] #PF: supervisor instruction fetch in kernel mode [ 1138.854207] #PF: error_code(0x0010) - not-present page [ 1138.854208] PGD 0 P4D 0 [ 1138.854212] Oops: 0010 [#1] SMP NOPTI [ 1138.854216] CPU: 6 PID: 1240 Comm: modprobe Tainted: G W OE 5.9.0-rc2-custom #1 [ 1138.854217] Hardware name: AMD Chachani-VN/Chachani-VN, BIOS BAerithA104 10/01/2020 [ 1138.854221] RIP: 0010:0x0 [ 1138.854224] Code: Bad RIP value. [ 1138.854226] RSP: 0018:ffffc90001c4f638 EFLAGS: 00010286 [ 1138.854228] RAX: 0000000000000000 RBX: ffff88804f2b2800 RCX: ffffc90001c4f740 [ 1138.854229] RDX: 00000000000000e8 RSI: ffffc90001c4f640 RDI: ffff88805816f300 [ 1138.854230] RBP: ffffc90001c4f850 R08: ffffc90001c4f644 R09: ffffc90001c4f654 [ 1138.854231] R10: ffffc90001c4f72c R11: ffffc90001c4f740 R12: ffffc90001c4f640 [ 1138.854232] R13: ffffc90001c4f728 R14: 0000000000000000 R15: ffff888007296381 [ 1138.854235] FS: 00007f5f44d84540(0000) GS:ffff88805e380000(0000) knlGS:0000000000000000 [ 1138.854236] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ 1138.854237] CR2: ffffffffffffffd6 CR3: 00000000194f4000 CR4: 0000000000050ee0 [ 1138.854239] Call Trace: [ 1138.854447] dmub_init_abm_config+0x220/0x267 [amdgpu] [ 1138.854654] dm_late_init+0x197/0x1ad [amdgpu] [ 1138.854846] ? dm_late_init+0x197/0x1ad [amdgpu] [ 1138.854999] amdgpu_device_ip_late_init+0x6f/0x21b [amdgpu] [ 1138.855148] amdgpu_device_init+0x1b7f/0x1cfb [amdgpu] [ 1138.855293] amdgpu_driver_load_kms+0x2c/0x26e [amdgpu] [ 1138.855437] amdgpu_pci_probe+0x1c7/0x249 [amdgpu] [ 1138.920489] local_pci_probe+0x48/0x80 [ 1138.920492] pci_device_probe+0x10f/0x1c0
--- drivers/gpu/drm/amd/display/dc/dcn301/dcn301_resource.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/amd/display/dc/dcn301/dcn301_resource.c +1 -1
@@ -1907,7 +1907,7 @@ static bool dcn301_resource_construct(/* ABM (or ABMs for NV2x) */ /* TODO: */ for (i =0 ; i < pool->base.res_cap->num_timing_generator; i++) { - pool->base.multiple_abms[i] =dce_abm_create (ctx, + pool->base.multiple_abms[i] =dmub_abm_create (ctx, &abm_regs[i], &abm_shift, &abm_mask);
Signature · 6 lines
2.25.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 2/2 drm/amdgpu/display: enable display ip block for vangogh
This patch is to enable display IP block for vangogh platforms.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 1 + drivers/gpu/drm/amd/amdgpu/nv.c | 4 ++++ 2 files changed, 5 insertions(+)
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +1 -0
@@ -3014,6 +3014,7 @@ bool amdgpu_device_asic_has_dc_support(enum amd_asic_type asic_type)case CHIP_SIENNA_CICHLID :case CHIP_NAVY_FLOUNDER :case CHIP_DIMGREY_CAVEFISH : +case CHIP_VANGOGH :#endif return amdgpu_dc !=0 ;#endif
drivers/gpu/drm/amd/amdgpu/nv.c +4 -0
@@ -621,6 +621,10 @@ int nv_set_ip_blocks(struct amdgpu_device *adev)amdgpu_device_ip_block_add (adev, &smu_v11_0_ip_block);if (adev->enable_virtual_display ||amdgpu_sriov_vf (adev))amdgpu_device_ip_block_add (adev, &dce_virtual_ip_block); +#if defined(CONFIG_DRM_AMD_DC ) + else if (amdgpu_device_has_dc_support(adev)) + amdgpu_device_ip_block_add(adev, &dm_ip_block); +#endif amdgpu_device_ip_block_add (adev, &gfx_v10_0_ip_block);amdgpu_device_ip_block_add (adev, &sdma_v5_2_ip_block);amdgpu_device_ip_block_add (adev, &vcn_v3_0_ip_block);
Signature · 6 lines
2.25.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Re: [PATCH 2/2] drm/amdgpu/display: enable display ip block for vangogh
[AMD Official Use Only - Internal Distribution Only]
Series is:
________________________________
From: Huang, Ray <[email protected]>
Sent: Thursday, October 15, 2020 4:28 AM
To: [email protected] <[email protected]>
Cc: Wentland, Harry <[email protected]>; Li, Roman <[email protected]>; Deucher, Alexander <[email protected]>; Huang, Ray <[email protected]>
Subject: [PATCH 2/2] drm/amdgpu/display: enable display ip block for vangogh
This patch is to enable display IP block for vangogh platforms.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 1 + drivers/gpu/drm/amd/amdgpu/nv.c | 4 ++++ 2 files changed, 5 insertions(+)
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +1 -0
@@ -3014,6 +3014,7 @@ bool amdgpu_device_asic_has_dc_support(enum amd_asic_type asic_type)case CHIP_SIENNA_CICHLID :case CHIP_NAVY_FLOUNDER :case CHIP_DIMGREY_CAVEFISH : +case CHIP_VANGOGH :#endif return amdgpu_dc !=0 ;#endif
drivers/gpu/drm/amd/amdgpu/nv.c +4 -0
@@ -621,6 +621,10 @@ int nv_set_ip_blocks(struct amdgpu_device *adev)amdgpu_device_ip_block_add (adev, &smu_v11_0_ip_block);if (adev->enable_virtual_display ||amdgpu_sriov_vf (adev))amdgpu_device_ip_block_add (adev, &dce_virtual_ip_block); +#if defined(CONFIG_DRM_AMD_DC ) + else if (amdgpu_device_has_dc_support(adev)) + amdgpu_device_ip_block_add(adev, &dm_ip_block); +#endif amdgpu_device_ip_block_add (adev, &gfx_v10_0_ip_block);amdgpu_device_ip_block_add (adev, &sdma_v5_2_ip_block);amdgpu_device_ip_block_add (adev, &vcn_v3_0_ip_block);
--
2.25.1
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx