* [PATCH] drm/amd/display: set panel orientation before drm_dev_register
@ 2022-08-03 16:24 Melissa Wen
2022-08-03 16:29 ` Melissa Wen
2022-08-03 21:02 ` Harry Wentland
0 siblings, 2 replies; 7+ messages in thread
From: Melissa Wen @ 2022-08-03 16:24 UTC (permalink / raw)
To: Harry Wentland, Leo Li, Rodrigo Siqueira, Alex Deucher,
christian.koenig, Xinhui.Pan, sungjoon.kim, nikola.cornij
Cc: kernel-dev, amd-gfx
To set the panel orientation property with quirk, we need the mode size
provided by EDID. This info is available after EDID is read by dc_link_detect()
and updated by amdgpu_dm_update_connector_after_detect(). The detection
happens at driver load in amdgpu_dm_initialize_drm_device() and,
therefore, we can get modes and set panel orientation before
drm_dev_register() to avoid DRM warns on creating the connector property
after device registration:
[ 2.563969] ------------[ cut here ]------------
[ 2.563971] WARNING: CPU: 6 PID: 325 at drivers/gpu/drm/drm_mode_object.c:45 drm_mode_object_add+0x72/0x80 [drm]
[ 2.563997] Modules linked in: btusb btrtl btbcm btintel btmtk bluetooth rfkill ecdh_generic ecc usbhid crc16 amdgpu(+) drm_ttm_helper ttm agpgart gpu_sched i2c_algo_bit drm_display_helper drm_kms_helper syscopyarea sysfillrect sysimgblt fb_sys_fops drm serio_raw sdhci_pci atkbd libps2 cqhci vivaldi_fmap ccp sdhci i8042 crct10dif_pclmul crc32_pclmul hid_multitouch ghash_clmulni_intel aesni_intel crypto_simd cryptd wdat_wdt mmc_core cec xhci_pci sp5100_tco rng_core xhci_pci_renesas serio 8250_dw i2c_hid_acpi i2c_hid btrfs blake2b_generic libcrc32c crc32c_generic crc32c_intel xor raid6_pq dm_mirror dm_region_hash dm_log dm_mod pkcs8_key_parser crypto_user
[ 2.564032] CPU: 6 PID: 325 Comm: systemd-udevd Not tainted 5.18.0-amd-staging-drm-next+ #67
[ 2.564034] Hardware name: Valve Jupiter/Jupiter, BIOS F7A0105 03/21/2022
[ 2.564036] RIP: 0010:drm_mode_object_add+0x72/0x80 [drm]
[ 2.564053] Code: f0 89 c3 85 c0 78 07 89 45 00 44 89 65 04 4c 89 ef e8 e2 99 04 f1 31 c0 85 db 0f 4e c3 5b 5d 41 5c 41 5d c3 80 7f 50 00 74 ac <0f> 0b eb a8 66 2e 0f 1f 84 00 00 00 00 00 0f 1f 44 00 00 41 54 4c
[ 2.564055] RSP: 0018:ffffb2e880413860 EFLAGS: 00010202
[ 2.564056] RAX: ffffffffc0ba1440 RBX: ffff99508a860010 RCX: 0000000000000001
[ 2.564057] RDX: 00000000b0b0b0b0 RSI: ffff99508c050110 RDI: ffff99508a860010
[ 2.564058] RBP: ffff99508c050110 R08: 0000000000000020 R09: ffff99508c292c20
[ 2.564059] R10: 0000000000000000 R11: ffff99508c0507d8 R12: 00000000b0b0b0b0
[ 2.564060] R13: 0000000000000004 R14: ffffffffc068a4b6 R15: ffffffffc068a47f
[ 2.564061] FS: 00007fc69b5f1a40(0000) GS:ffff9953aff80000(0000) knlGS:0000000000000000
[ 2.564063] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033
[ 2.564063] CR2: 00007f9506804000 CR3: 0000000107f92000 CR4: 0000000000350ee0
[ 2.564065] Call Trace:
[ 2.564068] <TASK>
[ 2.564070] drm_property_create+0xc9/0x170 [drm]
[ 2.564088] drm_property_create_enum+0x1f/0x70 [drm]
[ 2.564105] drm_connector_set_panel_orientation_with_quirk+0x96/0xc0 [drm]
[ 2.564123] get_modes+0x4fb/0x530 [amdgpu]
[ 2.564378] drm_helper_probe_single_connector_modes+0x1ad/0x850 [drm_kms_helper]
[ 2.564390] drm_client_modeset_probe+0x229/0x1400 [drm]
[ 2.564411] ? xas_store+0x52/0x5e0
[ 2.564416] ? kmem_cache_alloc_trace+0x177/0x2c0
[ 2.564420] __drm_fb_helper_initial_config_and_unlock+0x44/0x4e0 [drm_kms_helper]
[ 2.564430] drm_fbdev_client_hotplug+0x173/0x210 [drm_kms_helper]
[ 2.564438] drm_fbdev_generic_setup+0xa5/0x166 [drm_kms_helper]
[ 2.564446] amdgpu_pci_probe+0x35e/0x370 [amdgpu]
[ 2.564621] local_pci_probe+0x45/0x80
[ 2.564625] ? pci_match_device+0xd7/0x130
[ 2.564627] pci_device_probe+0xbf/0x220
[ 2.564629] ? sysfs_do_create_link_sd+0x69/0xd0
[ 2.564633] really_probe+0x19c/0x380
[ 2.564637] __driver_probe_device+0xfe/0x180
[ 2.564639] driver_probe_device+0x1e/0x90
[ 2.564641] __driver_attach+0xc0/0x1c0
[ 2.564643] ? __device_attach_driver+0xe0/0xe0
[ 2.564644] ? __device_attach_driver+0xe0/0xe0
[ 2.564646] bus_for_each_dev+0x78/0xc0
[ 2.564648] bus_add_driver+0x149/0x1e0
[ 2.564650] driver_register+0x8f/0xe0
[ 2.564652] ? 0xffffffffc1023000
[ 2.564654] do_one_initcall+0x44/0x200
[ 2.564657] ? kmem_cache_alloc_trace+0x177/0x2c0
[ 2.564659] do_init_module+0x4c/0x250
[ 2.564663] __do_sys_init_module+0x12e/0x1b0
[ 2.564666] do_syscall_64+0x3b/0x90
[ 2.564670] entry_SYSCALL_64_after_hwframe+0x44/0xae
[ 2.564673] RIP: 0033:0x7fc69bff232e
[ 2.564674] Code: 48 8b 0d 45 0b 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 12 0b 0c 00 f7 d8 64 89 01 48
[ 2.564676] RSP: 002b:00007ffe872ba3e8 EFLAGS: 00000246 ORIG_RAX: 00000000000000af
[ 2.564677] RAX: ffffffffffffffda RBX: 000055873f797820 RCX: 00007fc69bff232e
[ 2.564678] RDX: 000055873f7bf390 RSI: 0000000001155e81 RDI: 00007fc699e4d010
[ 2.564679] RBP: 00007fc699e4d010 R08: 000055873f7bfe20 R09: 0000000001155e90
[ 2.564680] R10: 000000055873f7bf R11: 0000000000000246 R12: 000055873f7bf390
[ 2.564681] R13: 000000000000000d R14: 000055873f7c4cb0 R15: 000055873f797820
[ 2.564683] </TASK>
[ 2.564683] ---[ end trace 0000000000000000 ]---
[ 2.564696] ------------[ cut here ]------------
[ 2.564696] WARNING: CPU: 6 PID: 325 at drivers/gpu/drm/drm_mode_object.c:242 drm_object_attach_property+0x52/0x80 [drm]
[ 2.564717] Modules linked in: btusb btrtl btbcm btintel btmtk bluetooth rfkill ecdh_generic ecc usbhid crc16 amdgpu(+) drm_ttm_helper ttm agpgart gpu_sched i2c_algo_bit drm_display_helper drm_kms_helper syscopyarea sysfillrect sysimgblt fb_sys_fops drm serio_raw sdhci_pci atkbd libps2 cqhci vivaldi_fmap ccp sdhci i8042 crct10dif_pclmul crc32_pclmul hid_multitouch ghash_clmulni_intel aesni_intel crypto_simd cryptd wdat_wdt mmc_core cec xhci_pci sp5100_tco rng_core xhci_pci_renesas serio 8250_dw i2c_hid_acpi i2c_hid btrfs blake2b_generic libcrc32c crc32c_generic crc32c_intel xor raid6_pq dm_mirror dm_region_hash dm_log dm_mod pkcs8_key_parser crypto_user
[ 2.564738] CPU: 6 PID: 325 Comm: systemd-udevd Tainted: G W 5.18.0-amd-staging-drm-next+ #67
[ 2.564740] Hardware name: Valve Jupiter/Jupiter, BIOS F7A0105 03/21/2022
[ 2.564741] RIP: 0010:drm_object_attach_property+0x52/0x80 [drm]
[ 2.564759] Code: 2d 83 f8 18 74 33 48 89 74 c1 08 48 8b 4f 08 48 89 94 c1 c8 00 00 00 48 8b 47 08 83 00 01 c3 4d 85 d2 75 dd 83 7f 58 01 75 d7 <0f> 0b eb d3 41 80 78 50 00 74 cc 0f 0b eb c8 44 89 ce 48 c7 c7 28
[ 2.564760] RSP: 0018:ffffb2e8804138d8 EFLAGS: 00010246
[ 2.564761] RAX: 0000000000000010 RBX: ffff99508c1a2000 RCX: ffff99508c1a2180
[ 2.564762] RDX: 0000000000000003 RSI: ffff99508c050100 RDI: ffff99508c1a2040
[ 2.564763] RBP: 00000000ffffffff R08: ffff99508a860010 R09: 00000000c0c0c0c0
[ 2.564763] R10: 0000000000000000 R11: 0000000000000020 R12: ffff99508a860010
[ 2.564764] R13: ffff995088733008 R14: ffff99508c1a2000 R15: ffffffffc068a47f
[ 2.564765] FS: 00007fc69b5f1a40(0000) GS:ffff9953aff80000(0000) knlGS:0000000000000000
[ 2.564766] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033
[ 2.564767] CR2: 00007f9506804000 CR3: 0000000107f92000 CR4: 0000000000350ee0
[ 2.564768] Call Trace:
[ 2.564769] <TASK>
[ 2.564770] drm_connector_set_panel_orientation_with_quirk+0x4a/0xc0 [drm]
[ 2.564789] get_modes+0x4fb/0x530 [amdgpu]
[ 2.565024] drm_helper_probe_single_connector_modes+0x1ad/0x850 [drm_kms_helper]
[ 2.565036] drm_client_modeset_probe+0x229/0x1400 [drm]
[ 2.565056] ? xas_store+0x52/0x5e0
[ 2.565060] ? kmem_cache_alloc_trace+0x177/0x2c0
[ 2.565062] __drm_fb_helper_initial_config_and_unlock+0x44/0x4e0 [drm_kms_helper]
[ 2.565072] drm_fbdev_client_hotplug+0x173/0x210 [drm_kms_helper]
[ 2.565080] drm_fbdev_generic_setup+0xa5/0x166 [drm_kms_helper]
[ 2.565088] amdgpu_pci_probe+0x35e/0x370 [amdgpu]
[ 2.565261] local_pci_probe+0x45/0x80
[ 2.565263] ? pci_match_device+0xd7/0x130
[ 2.565265] pci_device_probe+0xbf/0x220
[ 2.565267] ? sysfs_do_create_link_sd+0x69/0xd0
[ 2.565268] really_probe+0x19c/0x380
[ 2.565270] __driver_probe_device+0xfe/0x180
[ 2.565272] driver_probe_device+0x1e/0x90
[ 2.565274] __driver_attach+0xc0/0x1c0
[ 2.565276] ? __device_attach_driver+0xe0/0xe0
[ 2.565278] ? __device_attach_driver+0xe0/0xe0
[ 2.565279] bus_for_each_dev+0x78/0xc0
[ 2.565281] bus_add_driver+0x149/0x1e0
[ 2.565283] driver_register+0x8f/0xe0
[ 2.565285] ? 0xffffffffc1023000
[ 2.565286] do_one_initcall+0x44/0x200
[ 2.565288] ? kmem_cache_alloc_trace+0x177/0x2c0
[ 2.565290] do_init_module+0x4c/0x250
[ 2.565291] __do_sys_init_module+0x12e/0x1b0
[ 2.565294] do_syscall_64+0x3b/0x90
[ 2.565296] entry_SYSCALL_64_after_hwframe+0x44/0xae
[ 2.565297] RIP: 0033:0x7fc69bff232e
[ 2.565298] Code: 48 8b 0d 45 0b 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 12 0b 0c 00 f7 d8 64 89 01 48
[ 2.565299] RSP: 002b:00007ffe872ba3e8 EFLAGS: 00000246 ORIG_RAX: 00000000000000af
[ 2.565301] RAX: ffffffffffffffda RBX: 000055873f797820 RCX: 00007fc69bff232e
[ 2.565302] RDX: 000055873f7bf390 RSI: 0000000001155e81 RDI: 00007fc699e4d010
[ 2.565303] RBP: 00007fc699e4d010 R08: 000055873f7bfe20 R09: 0000000001155e90
[ 2.565303] R10: 000000055873f7bf R11: 0000000000000246 R12: 000055873f7bf390
[ 2.565304] R13: 000000000000000d R14: 000055873f7c4cb0 R15: 000055873f797820
[ 2.565306] </TASK>
[ 2.565307] ---[ end trace 0000000000000000 ]---
Fixes: d77de7880e0e0 ("amd/display: enable panel orientation quirks")
Signed-off-by: Melissa Wen <mwen@igalia.com>
---
.../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 18 +++++++++++++++---
1 file changed, 15 insertions(+), 3 deletions(-)
diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
index 0d54c1486739..c2806695589a 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
@@ -4133,6 +4133,7 @@ static void register_backlight_device(struct amdgpu_display_manager *dm,
}
}
+static void amdgpu_set_panel_orientation(struct amdgpu_dm_connector *aconnector);
/*
* In this architecture, the association
@@ -4324,6 +4325,7 @@ static int amdgpu_dm_initialize_drm_device(struct amdgpu_device *adev)
adev_to_drm(adev)->vblank_disable_immediate = false;
}
}
+ amdgpu_set_panel_orientation(aconnector);
}
/* Software is initialized. Now we can register interrupt handlers. */
@@ -6672,16 +6674,28 @@ static void amdgpu_dm_connector_add_common_modes(struct drm_encoder *encoder,
}
}
-static void amdgpu_set_panel_orientation(struct drm_connector *connector)
+static void amdgpu_dm_connector_ddc_get_modes(struct drm_connector *connector,
+ struct edid *edid);
+
+static void amdgpu_set_panel_orientation(struct amdgpu_dm_connector *aconnector)
{
struct drm_encoder *encoder;
+ struct drm_connector *connector = &aconnector->base;
struct amdgpu_encoder *amdgpu_encoder;
const struct drm_display_mode *native_mode;
+ struct edid *edid = aconnector->edid;
if (connector->connector_type != DRM_MODE_CONNECTOR_eDP &&
connector->connector_type != DRM_MODE_CONNECTOR_LVDS)
return;
+ if (!drm_edid_is_valid(edid))
+ return;
+
+ mutex_lock(&connector->dev->mode_config.mutex);
+ amdgpu_dm_connector_ddc_get_modes(connector, edid);
+ mutex_unlock(&connector->dev->mode_config.mutex);
+
encoder = amdgpu_dm_connector_to_encoder(connector);
if (!encoder)
return;
@@ -6726,8 +6740,6 @@ static void amdgpu_dm_connector_ddc_get_modes(struct drm_connector *connector,
* restored here.
*/
amdgpu_dm_update_freesync_caps(connector, edid);
-
- amdgpu_set_panel_orientation(connector);
} else {
amdgpu_dm_connector->num_modes = 0;
}
--
2.35.1
^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH] drm/amd/display: set panel orientation before drm_dev_register
2022-08-03 16:24 [PATCH] drm/amd/display: set panel orientation before drm_dev_register Melissa Wen
@ 2022-08-03 16:29 ` Melissa Wen
2022-08-05 17:34 ` Simon Ser
2022-08-03 21:02 ` Harry Wentland
1 sibling, 1 reply; 7+ messages in thread
From: Melissa Wen @ 2022-08-03 16:29 UTC (permalink / raw)
To: Harry Wentland, Leo Li, Rodrigo Siqueira, Alex Deucher,
christian.koenig, Xinhui.Pan, sungjoon.kim, nikola.cornij
Cc: contact, kernel-dev, amd-gfx
[-- Attachment #1: Type: text/plain, Size: 12398 bytes --]
On 08/03, Melissa Wen wrote:
> To set the panel orientation property with quirk, we need the mode size
> provided by EDID. This info is available after EDID is read by dc_link_detect()
> and updated by amdgpu_dm_update_connector_after_detect(). The detection
> happens at driver load in amdgpu_dm_initialize_drm_device() and,
> therefore, we can get modes and set panel orientation before
> drm_dev_register() to avoid DRM warns on creating the connector property
> after device registration:
+ cc'ing: Simon Ser
>
> [ 2.563969] ------------[ cut here ]------------
> [ 2.563971] WARNING: CPU: 6 PID: 325 at drivers/gpu/drm/drm_mode_object.c:45 drm_mode_object_add+0x72/0x80 [drm]
> [ 2.563997] Modules linked in: btusb btrtl btbcm btintel btmtk bluetooth rfkill ecdh_generic ecc usbhid crc16 amdgpu(+) drm_ttm_helper ttm agpgart gpu_sched i2c_algo_bit drm_display_helper drm_kms_helper syscopyarea sysfillrect sysimgblt fb_sys_fops drm serio_raw sdhci_pci atkbd libps2 cqhci vivaldi_fmap ccp sdhci i8042 crct10dif_pclmul crc32_pclmul hid_multitouch ghash_clmulni_intel aesni_intel crypto_simd cryptd wdat_wdt mmc_core cec xhci_pci sp5100_tco rng_core xhci_pci_renesas serio 8250_dw i2c_hid_acpi i2c_hid btrfs blake2b_generic libcrc32c crc32c_generic crc32c_intel xor raid6_pq dm_mirror dm_region_hash dm_log dm_mod pkcs8_key_parser crypto_user
> [ 2.564032] CPU: 6 PID: 325 Comm: systemd-udevd Not tainted 5.18.0-amd-staging-drm-next+ #67
> [ 2.564034] Hardware name: Valve Jupiter/Jupiter, BIOS F7A0105 03/21/2022
> [ 2.564036] RIP: 0010:drm_mode_object_add+0x72/0x80 [drm]
> [ 2.564053] Code: f0 89 c3 85 c0 78 07 89 45 00 44 89 65 04 4c 89 ef e8 e2 99 04 f1 31 c0 85 db 0f 4e c3 5b 5d 41 5c 41 5d c3 80 7f 50 00 74 ac <0f> 0b eb a8 66 2e 0f 1f 84 00 00 00 00 00 0f 1f 44 00 00 41 54 4c
> [ 2.564055] RSP: 0018:ffffb2e880413860 EFLAGS: 00010202
> [ 2.564056] RAX: ffffffffc0ba1440 RBX: ffff99508a860010 RCX: 0000000000000001
> [ 2.564057] RDX: 00000000b0b0b0b0 RSI: ffff99508c050110 RDI: ffff99508a860010
> [ 2.564058] RBP: ffff99508c050110 R08: 0000000000000020 R09: ffff99508c292c20
> [ 2.564059] R10: 0000000000000000 R11: ffff99508c0507d8 R12: 00000000b0b0b0b0
> [ 2.564060] R13: 0000000000000004 R14: ffffffffc068a4b6 R15: ffffffffc068a47f
> [ 2.564061] FS: 00007fc69b5f1a40(0000) GS:ffff9953aff80000(0000) knlGS:0000000000000000
> [ 2.564063] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033
> [ 2.564063] CR2: 00007f9506804000 CR3: 0000000107f92000 CR4: 0000000000350ee0
> [ 2.564065] Call Trace:
> [ 2.564068] <TASK>
> [ 2.564070] drm_property_create+0xc9/0x170 [drm]
> [ 2.564088] drm_property_create_enum+0x1f/0x70 [drm]
> [ 2.564105] drm_connector_set_panel_orientation_with_quirk+0x96/0xc0 [drm]
> [ 2.564123] get_modes+0x4fb/0x530 [amdgpu]
> [ 2.564378] drm_helper_probe_single_connector_modes+0x1ad/0x850 [drm_kms_helper]
> [ 2.564390] drm_client_modeset_probe+0x229/0x1400 [drm]
> [ 2.564411] ? xas_store+0x52/0x5e0
> [ 2.564416] ? kmem_cache_alloc_trace+0x177/0x2c0
> [ 2.564420] __drm_fb_helper_initial_config_and_unlock+0x44/0x4e0 [drm_kms_helper]
> [ 2.564430] drm_fbdev_client_hotplug+0x173/0x210 [drm_kms_helper]
> [ 2.564438] drm_fbdev_generic_setup+0xa5/0x166 [drm_kms_helper]
> [ 2.564446] amdgpu_pci_probe+0x35e/0x370 [amdgpu]
> [ 2.564621] local_pci_probe+0x45/0x80
> [ 2.564625] ? pci_match_device+0xd7/0x130
> [ 2.564627] pci_device_probe+0xbf/0x220
> [ 2.564629] ? sysfs_do_create_link_sd+0x69/0xd0
> [ 2.564633] really_probe+0x19c/0x380
> [ 2.564637] __driver_probe_device+0xfe/0x180
> [ 2.564639] driver_probe_device+0x1e/0x90
> [ 2.564641] __driver_attach+0xc0/0x1c0
> [ 2.564643] ? __device_attach_driver+0xe0/0xe0
> [ 2.564644] ? __device_attach_driver+0xe0/0xe0
> [ 2.564646] bus_for_each_dev+0x78/0xc0
> [ 2.564648] bus_add_driver+0x149/0x1e0
> [ 2.564650] driver_register+0x8f/0xe0
> [ 2.564652] ? 0xffffffffc1023000
> [ 2.564654] do_one_initcall+0x44/0x200
> [ 2.564657] ? kmem_cache_alloc_trace+0x177/0x2c0
> [ 2.564659] do_init_module+0x4c/0x250
> [ 2.564663] __do_sys_init_module+0x12e/0x1b0
> [ 2.564666] do_syscall_64+0x3b/0x90
> [ 2.564670] entry_SYSCALL_64_after_hwframe+0x44/0xae
> [ 2.564673] RIP: 0033:0x7fc69bff232e
> [ 2.564674] Code: 48 8b 0d 45 0b 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 12 0b 0c 00 f7 d8 64 89 01 48
> [ 2.564676] RSP: 002b:00007ffe872ba3e8 EFLAGS: 00000246 ORIG_RAX: 00000000000000af
> [ 2.564677] RAX: ffffffffffffffda RBX: 000055873f797820 RCX: 00007fc69bff232e
> [ 2.564678] RDX: 000055873f7bf390 RSI: 0000000001155e81 RDI: 00007fc699e4d010
> [ 2.564679] RBP: 00007fc699e4d010 R08: 000055873f7bfe20 R09: 0000000001155e90
> [ 2.564680] R10: 000000055873f7bf R11: 0000000000000246 R12: 000055873f7bf390
> [ 2.564681] R13: 000000000000000d R14: 000055873f7c4cb0 R15: 000055873f797820
> [ 2.564683] </TASK>
> [ 2.564683] ---[ end trace 0000000000000000 ]---
> [ 2.564696] ------------[ cut here ]------------
> [ 2.564696] WARNING: CPU: 6 PID: 325 at drivers/gpu/drm/drm_mode_object.c:242 drm_object_attach_property+0x52/0x80 [drm]
> [ 2.564717] Modules linked in: btusb btrtl btbcm btintel btmtk bluetooth rfkill ecdh_generic ecc usbhid crc16 amdgpu(+) drm_ttm_helper ttm agpgart gpu_sched i2c_algo_bit drm_display_helper drm_kms_helper syscopyarea sysfillrect sysimgblt fb_sys_fops drm serio_raw sdhci_pci atkbd libps2 cqhci vivaldi_fmap ccp sdhci i8042 crct10dif_pclmul crc32_pclmul hid_multitouch ghash_clmulni_intel aesni_intel crypto_simd cryptd wdat_wdt mmc_core cec xhci_pci sp5100_tco rng_core xhci_pci_renesas serio 8250_dw i2c_hid_acpi i2c_hid btrfs blake2b_generic libcrc32c crc32c_generic crc32c_intel xor raid6_pq dm_mirror dm_region_hash dm_log dm_mod pkcs8_key_parser crypto_user
> [ 2.564738] CPU: 6 PID: 325 Comm: systemd-udevd Tainted: G W 5.18.0-amd-staging-drm-next+ #67
> [ 2.564740] Hardware name: Valve Jupiter/Jupiter, BIOS F7A0105 03/21/2022
> [ 2.564741] RIP: 0010:drm_object_attach_property+0x52/0x80 [drm]
> [ 2.564759] Code: 2d 83 f8 18 74 33 48 89 74 c1 08 48 8b 4f 08 48 89 94 c1 c8 00 00 00 48 8b 47 08 83 00 01 c3 4d 85 d2 75 dd 83 7f 58 01 75 d7 <0f> 0b eb d3 41 80 78 50 00 74 cc 0f 0b eb c8 44 89 ce 48 c7 c7 28
> [ 2.564760] RSP: 0018:ffffb2e8804138d8 EFLAGS: 00010246
> [ 2.564761] RAX: 0000000000000010 RBX: ffff99508c1a2000 RCX: ffff99508c1a2180
> [ 2.564762] RDX: 0000000000000003 RSI: ffff99508c050100 RDI: ffff99508c1a2040
> [ 2.564763] RBP: 00000000ffffffff R08: ffff99508a860010 R09: 00000000c0c0c0c0
> [ 2.564763] R10: 0000000000000000 R11: 0000000000000020 R12: ffff99508a860010
> [ 2.564764] R13: ffff995088733008 R14: ffff99508c1a2000 R15: ffffffffc068a47f
> [ 2.564765] FS: 00007fc69b5f1a40(0000) GS:ffff9953aff80000(0000) knlGS:0000000000000000
> [ 2.564766] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033
> [ 2.564767] CR2: 00007f9506804000 CR3: 0000000107f92000 CR4: 0000000000350ee0
> [ 2.564768] Call Trace:
> [ 2.564769] <TASK>
> [ 2.564770] drm_connector_set_panel_orientation_with_quirk+0x4a/0xc0 [drm]
> [ 2.564789] get_modes+0x4fb/0x530 [amdgpu]
> [ 2.565024] drm_helper_probe_single_connector_modes+0x1ad/0x850 [drm_kms_helper]
> [ 2.565036] drm_client_modeset_probe+0x229/0x1400 [drm]
> [ 2.565056] ? xas_store+0x52/0x5e0
> [ 2.565060] ? kmem_cache_alloc_trace+0x177/0x2c0
> [ 2.565062] __drm_fb_helper_initial_config_and_unlock+0x44/0x4e0 [drm_kms_helper]
> [ 2.565072] drm_fbdev_client_hotplug+0x173/0x210 [drm_kms_helper]
> [ 2.565080] drm_fbdev_generic_setup+0xa5/0x166 [drm_kms_helper]
> [ 2.565088] amdgpu_pci_probe+0x35e/0x370 [amdgpu]
> [ 2.565261] local_pci_probe+0x45/0x80
> [ 2.565263] ? pci_match_device+0xd7/0x130
> [ 2.565265] pci_device_probe+0xbf/0x220
> [ 2.565267] ? sysfs_do_create_link_sd+0x69/0xd0
> [ 2.565268] really_probe+0x19c/0x380
> [ 2.565270] __driver_probe_device+0xfe/0x180
> [ 2.565272] driver_probe_device+0x1e/0x90
> [ 2.565274] __driver_attach+0xc0/0x1c0
> [ 2.565276] ? __device_attach_driver+0xe0/0xe0
> [ 2.565278] ? __device_attach_driver+0xe0/0xe0
> [ 2.565279] bus_for_each_dev+0x78/0xc0
> [ 2.565281] bus_add_driver+0x149/0x1e0
> [ 2.565283] driver_register+0x8f/0xe0
> [ 2.565285] ? 0xffffffffc1023000
> [ 2.565286] do_one_initcall+0x44/0x200
> [ 2.565288] ? kmem_cache_alloc_trace+0x177/0x2c0
> [ 2.565290] do_init_module+0x4c/0x250
> [ 2.565291] __do_sys_init_module+0x12e/0x1b0
> [ 2.565294] do_syscall_64+0x3b/0x90
> [ 2.565296] entry_SYSCALL_64_after_hwframe+0x44/0xae
> [ 2.565297] RIP: 0033:0x7fc69bff232e
> [ 2.565298] Code: 48 8b 0d 45 0b 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 12 0b 0c 00 f7 d8 64 89 01 48
> [ 2.565299] RSP: 002b:00007ffe872ba3e8 EFLAGS: 00000246 ORIG_RAX: 00000000000000af
> [ 2.565301] RAX: ffffffffffffffda RBX: 000055873f797820 RCX: 00007fc69bff232e
> [ 2.565302] RDX: 000055873f7bf390 RSI: 0000000001155e81 RDI: 00007fc699e4d010
> [ 2.565303] RBP: 00007fc699e4d010 R08: 000055873f7bfe20 R09: 0000000001155e90
> [ 2.565303] R10: 000000055873f7bf R11: 0000000000000246 R12: 000055873f7bf390
> [ 2.565304] R13: 000000000000000d R14: 000055873f7c4cb0 R15: 000055873f797820
> [ 2.565306] </TASK>
> [ 2.565307] ---[ end trace 0000000000000000 ]---
>
> Fixes: d77de7880e0e0 ("amd/display: enable panel orientation quirks")
> Signed-off-by: Melissa Wen <mwen@igalia.com>
> ---
> .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 18 +++++++++++++++---
> 1 file changed, 15 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
> index 0d54c1486739..c2806695589a 100644
> --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
> +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
> @@ -4133,6 +4133,7 @@ static void register_backlight_device(struct amdgpu_display_manager *dm,
> }
> }
>
> +static void amdgpu_set_panel_orientation(struct amdgpu_dm_connector *aconnector);
>
> /*
> * In this architecture, the association
> @@ -4324,6 +4325,7 @@ static int amdgpu_dm_initialize_drm_device(struct amdgpu_device *adev)
> adev_to_drm(adev)->vblank_disable_immediate = false;
> }
> }
> + amdgpu_set_panel_orientation(aconnector);
> }
>
> /* Software is initialized. Now we can register interrupt handlers. */
> @@ -6672,16 +6674,28 @@ static void amdgpu_dm_connector_add_common_modes(struct drm_encoder *encoder,
> }
> }
>
> -static void amdgpu_set_panel_orientation(struct drm_connector *connector)
> +static void amdgpu_dm_connector_ddc_get_modes(struct drm_connector *connector,
> + struct edid *edid);
> +
> +static void amdgpu_set_panel_orientation(struct amdgpu_dm_connector *aconnector)
> {
> struct drm_encoder *encoder;
> + struct drm_connector *connector = &aconnector->base;
> struct amdgpu_encoder *amdgpu_encoder;
> const struct drm_display_mode *native_mode;
> + struct edid *edid = aconnector->edid;
>
> if (connector->connector_type != DRM_MODE_CONNECTOR_eDP &&
> connector->connector_type != DRM_MODE_CONNECTOR_LVDS)
> return;
>
> + if (!drm_edid_is_valid(edid))
> + return;
> +
> + mutex_lock(&connector->dev->mode_config.mutex);
> + amdgpu_dm_connector_ddc_get_modes(connector, edid);
> + mutex_unlock(&connector->dev->mode_config.mutex);
> +
> encoder = amdgpu_dm_connector_to_encoder(connector);
> if (!encoder)
> return;
> @@ -6726,8 +6740,6 @@ static void amdgpu_dm_connector_ddc_get_modes(struct drm_connector *connector,
> * restored here.
> */
> amdgpu_dm_update_freesync_caps(connector, edid);
> -
> - amdgpu_set_panel_orientation(connector);
> } else {
> amdgpu_dm_connector->num_modes = 0;
> }
> --
> 2.35.1
>
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] drm/amd/display: set panel orientation before drm_dev_register
2022-08-03 16:24 [PATCH] drm/amd/display: set panel orientation before drm_dev_register Melissa Wen
2022-08-03 16:29 ` Melissa Wen
@ 2022-08-03 21:02 ` Harry Wentland
1 sibling, 0 replies; 7+ messages in thread
From: Harry Wentland @ 2022-08-03 21:02 UTC (permalink / raw)
To: Melissa Wen, Leo Li, Rodrigo Siqueira, Alex Deucher,
christian.koenig, Xinhui.Pan, sungjoon.kim, nikola.cornij
Cc: kernel-dev, amd-gfx
On 2022-08-03 12:24, Melissa Wen wrote:
> To set the panel orientation property with quirk, we need the mode size
> provided by EDID. This info is available after EDID is read by dc_link_detect()
> and updated by amdgpu_dm_update_connector_after_detect(). The detection
> happens at driver load in amdgpu_dm_initialize_drm_device() and,
> therefore, we can get modes and set panel orientation before
> drm_dev_register() to avoid DRM warns on creating the connector property
> after device registration:
>
> [ 2.563969] ------------[ cut here ]------------
> [ 2.563971] WARNING: CPU: 6 PID: 325 at drivers/gpu/drm/drm_mode_object.c:45 drm_mode_object_add+0x72/0x80 [drm]
> [ 2.563997] Modules linked in: btusb btrtl btbcm btintel btmtk bluetooth rfkill ecdh_generic ecc usbhid crc16 amdgpu(+) drm_ttm_helper ttm agpgart gpu_sched i2c_algo_bit drm_display_helper drm_kms_helper syscopyarea sysfillrect sysimgblt fb_sys_fops drm serio_raw sdhci_pci atkbd libps2 cqhci vivaldi_fmap ccp sdhci i8042 crct10dif_pclmul crc32_pclmul hid_multitouch ghash_clmulni_intel aesni_intel crypto_simd cryptd wdat_wdt mmc_core cec xhci_pci sp5100_tco rng_core xhci_pci_renesas serio 8250_dw i2c_hid_acpi i2c_hid btrfs blake2b_generic libcrc32c crc32c_generic crc32c_intel xor raid6_pq dm_mirror dm_region_hash dm_log dm_mod pkcs8_key_parser crypto_user
> [ 2.564032] CPU: 6 PID: 325 Comm: systemd-udevd Not tainted 5.18.0-amd-staging-drm-next+ #67
> [ 2.564034] Hardware name: Valve Jupiter/Jupiter, BIOS F7A0105 03/21/2022
> [ 2.564036] RIP: 0010:drm_mode_object_add+0x72/0x80 [drm]
> [ 2.564053] Code: f0 89 c3 85 c0 78 07 89 45 00 44 89 65 04 4c 89 ef e8 e2 99 04 f1 31 c0 85 db 0f 4e c3 5b 5d 41 5c 41 5d c3 80 7f 50 00 74 ac <0f> 0b eb a8 66 2e 0f 1f 84 00 00 00 00 00 0f 1f 44 00 00 41 54 4c
> [ 2.564055] RSP: 0018:ffffb2e880413860 EFLAGS: 00010202
> [ 2.564056] RAX: ffffffffc0ba1440 RBX: ffff99508a860010 RCX: 0000000000000001
> [ 2.564057] RDX: 00000000b0b0b0b0 RSI: ffff99508c050110 RDI: ffff99508a860010
> [ 2.564058] RBP: ffff99508c050110 R08: 0000000000000020 R09: ffff99508c292c20
> [ 2.564059] R10: 0000000000000000 R11: ffff99508c0507d8 R12: 00000000b0b0b0b0
> [ 2.564060] R13: 0000000000000004 R14: ffffffffc068a4b6 R15: ffffffffc068a47f
> [ 2.564061] FS: 00007fc69b5f1a40(0000) GS:ffff9953aff80000(0000) knlGS:0000000000000000
> [ 2.564063] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033
> [ 2.564063] CR2: 00007f9506804000 CR3: 0000000107f92000 CR4: 0000000000350ee0
> [ 2.564065] Call Trace:
> [ 2.564068] <TASK>
> [ 2.564070] drm_property_create+0xc9/0x170 [drm]
> [ 2.564088] drm_property_create_enum+0x1f/0x70 [drm]
> [ 2.564105] drm_connector_set_panel_orientation_with_quirk+0x96/0xc0 [drm]
> [ 2.564123] get_modes+0x4fb/0x530 [amdgpu]
> [ 2.564378] drm_helper_probe_single_connector_modes+0x1ad/0x850 [drm_kms_helper]
> [ 2.564390] drm_client_modeset_probe+0x229/0x1400 [drm]
> [ 2.564411] ? xas_store+0x52/0x5e0
> [ 2.564416] ? kmem_cache_alloc_trace+0x177/0x2c0
> [ 2.564420] __drm_fb_helper_initial_config_and_unlock+0x44/0x4e0 [drm_kms_helper]
> [ 2.564430] drm_fbdev_client_hotplug+0x173/0x210 [drm_kms_helper]
> [ 2.564438] drm_fbdev_generic_setup+0xa5/0x166 [drm_kms_helper]
> [ 2.564446] amdgpu_pci_probe+0x35e/0x370 [amdgpu]
> [ 2.564621] local_pci_probe+0x45/0x80
> [ 2.564625] ? pci_match_device+0xd7/0x130
> [ 2.564627] pci_device_probe+0xbf/0x220
> [ 2.564629] ? sysfs_do_create_link_sd+0x69/0xd0
> [ 2.564633] really_probe+0x19c/0x380
> [ 2.564637] __driver_probe_device+0xfe/0x180
> [ 2.564639] driver_probe_device+0x1e/0x90
> [ 2.564641] __driver_attach+0xc0/0x1c0
> [ 2.564643] ? __device_attach_driver+0xe0/0xe0
> [ 2.564644] ? __device_attach_driver+0xe0/0xe0
> [ 2.564646] bus_for_each_dev+0x78/0xc0
> [ 2.564648] bus_add_driver+0x149/0x1e0
> [ 2.564650] driver_register+0x8f/0xe0
> [ 2.564652] ? 0xffffffffc1023000
> [ 2.564654] do_one_initcall+0x44/0x200
> [ 2.564657] ? kmem_cache_alloc_trace+0x177/0x2c0
> [ 2.564659] do_init_module+0x4c/0x250
> [ 2.564663] __do_sys_init_module+0x12e/0x1b0
> [ 2.564666] do_syscall_64+0x3b/0x90
> [ 2.564670] entry_SYSCALL_64_after_hwframe+0x44/0xae
> [ 2.564673] RIP: 0033:0x7fc69bff232e
> [ 2.564674] Code: 48 8b 0d 45 0b 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 12 0b 0c 00 f7 d8 64 89 01 48
> [ 2.564676] RSP: 002b:00007ffe872ba3e8 EFLAGS: 00000246 ORIG_RAX: 00000000000000af
> [ 2.564677] RAX: ffffffffffffffda RBX: 000055873f797820 RCX: 00007fc69bff232e
> [ 2.564678] RDX: 000055873f7bf390 RSI: 0000000001155e81 RDI: 00007fc699e4d010
> [ 2.564679] RBP: 00007fc699e4d010 R08: 000055873f7bfe20 R09: 0000000001155e90
> [ 2.564680] R10: 000000055873f7bf R11: 0000000000000246 R12: 000055873f7bf390
> [ 2.564681] R13: 000000000000000d R14: 000055873f7c4cb0 R15: 000055873f797820
> [ 2.564683] </TASK>
> [ 2.564683] ---[ end trace 0000000000000000 ]---
> [ 2.564696] ------------[ cut here ]------------
> [ 2.564696] WARNING: CPU: 6 PID: 325 at drivers/gpu/drm/drm_mode_object.c:242 drm_object_attach_property+0x52/0x80 [drm]
> [ 2.564717] Modules linked in: btusb btrtl btbcm btintel btmtk bluetooth rfkill ecdh_generic ecc usbhid crc16 amdgpu(+) drm_ttm_helper ttm agpgart gpu_sched i2c_algo_bit drm_display_helper drm_kms_helper syscopyarea sysfillrect sysimgblt fb_sys_fops drm serio_raw sdhci_pci atkbd libps2 cqhci vivaldi_fmap ccp sdhci i8042 crct10dif_pclmul crc32_pclmul hid_multitouch ghash_clmulni_intel aesni_intel crypto_simd cryptd wdat_wdt mmc_core cec xhci_pci sp5100_tco rng_core xhci_pci_renesas serio 8250_dw i2c_hid_acpi i2c_hid btrfs blake2b_generic libcrc32c crc32c_generic crc32c_intel xor raid6_pq dm_mirror dm_region_hash dm_log dm_mod pkcs8_key_parser crypto_user
> [ 2.564738] CPU: 6 PID: 325 Comm: systemd-udevd Tainted: G W 5.18.0-amd-staging-drm-next+ #67
> [ 2.564740] Hardware name: Valve Jupiter/Jupiter, BIOS F7A0105 03/21/2022
> [ 2.564741] RIP: 0010:drm_object_attach_property+0x52/0x80 [drm]
> [ 2.564759] Code: 2d 83 f8 18 74 33 48 89 74 c1 08 48 8b 4f 08 48 89 94 c1 c8 00 00 00 48 8b 47 08 83 00 01 c3 4d 85 d2 75 dd 83 7f 58 01 75 d7 <0f> 0b eb d3 41 80 78 50 00 74 cc 0f 0b eb c8 44 89 ce 48 c7 c7 28
> [ 2.564760] RSP: 0018:ffffb2e8804138d8 EFLAGS: 00010246
> [ 2.564761] RAX: 0000000000000010 RBX: ffff99508c1a2000 RCX: ffff99508c1a2180
> [ 2.564762] RDX: 0000000000000003 RSI: ffff99508c050100 RDI: ffff99508c1a2040
> [ 2.564763] RBP: 00000000ffffffff R08: ffff99508a860010 R09: 00000000c0c0c0c0
> [ 2.564763] R10: 0000000000000000 R11: 0000000000000020 R12: ffff99508a860010
> [ 2.564764] R13: ffff995088733008 R14: ffff99508c1a2000 R15: ffffffffc068a47f
> [ 2.564765] FS: 00007fc69b5f1a40(0000) GS:ffff9953aff80000(0000) knlGS:0000000000000000
> [ 2.564766] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033
> [ 2.564767] CR2: 00007f9506804000 CR3: 0000000107f92000 CR4: 0000000000350ee0
> [ 2.564768] Call Trace:
> [ 2.564769] <TASK>
> [ 2.564770] drm_connector_set_panel_orientation_with_quirk+0x4a/0xc0 [drm]
> [ 2.564789] get_modes+0x4fb/0x530 [amdgpu]
> [ 2.565024] drm_helper_probe_single_connector_modes+0x1ad/0x850 [drm_kms_helper]
> [ 2.565036] drm_client_modeset_probe+0x229/0x1400 [drm]
> [ 2.565056] ? xas_store+0x52/0x5e0
> [ 2.565060] ? kmem_cache_alloc_trace+0x177/0x2c0
> [ 2.565062] __drm_fb_helper_initial_config_and_unlock+0x44/0x4e0 [drm_kms_helper]
> [ 2.565072] drm_fbdev_client_hotplug+0x173/0x210 [drm_kms_helper]
> [ 2.565080] drm_fbdev_generic_setup+0xa5/0x166 [drm_kms_helper]
> [ 2.565088] amdgpu_pci_probe+0x35e/0x370 [amdgpu]
> [ 2.565261] local_pci_probe+0x45/0x80
> [ 2.565263] ? pci_match_device+0xd7/0x130
> [ 2.565265] pci_device_probe+0xbf/0x220
> [ 2.565267] ? sysfs_do_create_link_sd+0x69/0xd0
> [ 2.565268] really_probe+0x19c/0x380
> [ 2.565270] __driver_probe_device+0xfe/0x180
> [ 2.565272] driver_probe_device+0x1e/0x90
> [ 2.565274] __driver_attach+0xc0/0x1c0
> [ 2.565276] ? __device_attach_driver+0xe0/0xe0
> [ 2.565278] ? __device_attach_driver+0xe0/0xe0
> [ 2.565279] bus_for_each_dev+0x78/0xc0
> [ 2.565281] bus_add_driver+0x149/0x1e0
> [ 2.565283] driver_register+0x8f/0xe0
> [ 2.565285] ? 0xffffffffc1023000
> [ 2.565286] do_one_initcall+0x44/0x200
> [ 2.565288] ? kmem_cache_alloc_trace+0x177/0x2c0
> [ 2.565290] do_init_module+0x4c/0x250
> [ 2.565291] __do_sys_init_module+0x12e/0x1b0
> [ 2.565294] do_syscall_64+0x3b/0x90
> [ 2.565296] entry_SYSCALL_64_after_hwframe+0x44/0xae
> [ 2.565297] RIP: 0033:0x7fc69bff232e
> [ 2.565298] Code: 48 8b 0d 45 0b 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 12 0b 0c 00 f7 d8 64 89 01 48
> [ 2.565299] RSP: 002b:00007ffe872ba3e8 EFLAGS: 00000246 ORIG_RAX: 00000000000000af
> [ 2.565301] RAX: ffffffffffffffda RBX: 000055873f797820 RCX: 00007fc69bff232e
> [ 2.565302] RDX: 000055873f7bf390 RSI: 0000000001155e81 RDI: 00007fc699e4d010
> [ 2.565303] RBP: 00007fc699e4d010 R08: 000055873f7bfe20 R09: 0000000001155e90
> [ 2.565303] R10: 000000055873f7bf R11: 0000000000000246 R12: 000055873f7bf390
> [ 2.565304] R13: 000000000000000d R14: 000055873f7c4cb0 R15: 000055873f797820
> [ 2.565306] </TASK>
> [ 2.565307] ---[ end trace 0000000000000000 ]---
>
> Fixes: d77de7880e0e0 ("amd/display: enable panel orientation quirks")
> Signed-off-by: Melissa Wen <mwen@igalia.com>
> ---
> .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 18 +++++++++++++++---
> 1 file changed, 15 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
> index 0d54c1486739..c2806695589a 100644
> --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
> +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
> @@ -4133,6 +4133,7 @@ static void register_backlight_device(struct amdgpu_display_manager *dm,
> }
> }
>
> +static void amdgpu_set_panel_orientation(struct amdgpu_dm_connector *aconnector);
>
> /*
> * In this architecture, the association
> @@ -4324,6 +4325,7 @@ static int amdgpu_dm_initialize_drm_device(struct amdgpu_device *adev)
> adev_to_drm(adev)->vblank_disable_immediate = false;
> }
> }
> + amdgpu_set_panel_orientation(aconnector);
> }
>
> /* Software is initialized. Now we can register interrupt handlers. */
> @@ -6672,16 +6674,28 @@ static void amdgpu_dm_connector_add_common_modes(struct drm_encoder *encoder,
> }
> }
>
> -static void amdgpu_set_panel_orientation(struct drm_connector *connector)
> +static void amdgpu_dm_connector_ddc_get_modes(struct drm_connector *connector,
> + struct edid *edid);
> +
> +static void amdgpu_set_panel_orientation(struct amdgpu_dm_connector *aconnector)
> {
> struct drm_encoder *encoder;
> + struct drm_connector *connector = &aconnector->base;
> struct amdgpu_encoder *amdgpu_encoder;
> const struct drm_display_mode *native_mode;
> + struct edid *edid = aconnector->edid;
>
> if (connector->connector_type != DRM_MODE_CONNECTOR_eDP &&
> connector->connector_type != DRM_MODE_CONNECTOR_LVDS)
> return;
>
> + if (!drm_edid_is_valid(edid))
> + return;
> +
> + mutex_lock(&connector->dev->mode_config.mutex);
> + amdgpu_dm_connector_ddc_get_modes(connector, edid);
Might be best to call amdgpu_dm_connector_get_modes which initializes
all modes. This will likely get called anyways later but I would hate
if this lead to confusion when people debug this code later.
Harry
> + mutex_unlock(&connector->dev->mode_config.mutex);
> +
> encoder = amdgpu_dm_connector_to_encoder(connector);
> if (!encoder)
> return;
> @@ -6726,8 +6740,6 @@ static void amdgpu_dm_connector_ddc_get_modes(struct drm_connector *connector,
> * restored here.
> */
> amdgpu_dm_update_freesync_caps(connector, edid);
> -
> - amdgpu_set_panel_orientation(connector);
> } else {
> amdgpu_dm_connector->num_modes = 0;
> }
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] drm/amd/display: set panel orientation before drm_dev_register
2022-08-03 16:29 ` Melissa Wen
@ 2022-08-05 17:34 ` Simon Ser
2022-08-08 11:20 ` Hans de Goede
2022-08-08 18:48 ` Melissa Wen
0 siblings, 2 replies; 7+ messages in thread
From: Simon Ser @ 2022-08-05 17:34 UTC (permalink / raw)
To: Melissa Wen
Cc: Leo Li, Xinhui.Pan, Rodrigo Siqueira, amd-gfx, nikola.cornij,
Hans de Goede, Sean Paul, kernel-dev, Alex Deucher,
Harry Wentland, christian.koenig, sungjoon.kim
Hi,
Have you seen [1] and [2]? CC'ing Sean and Hans, it seems like there's
a disagreement regarding probing early vs. setting the initial value to
UNKNOWN.
If a driver doesn't fetch EDIDs before exposing them to user-space,
then there is an amount of time where the connectors are exposed as
CONNECTED but their EDID and mode list isn't properly set. But maybe
that's what the GETCONNECTOR IOCTLs is supposed to do: probe the
connector, fetch its EDID, return the proper mode list. So maybe
drivers shouldn't probe early and should let user-space request probes?
In which case we could create the panel orientation prop with "Normal",
and update it accordingly when probing.
At any rate, I've tested v2 on the Deck and it works properly.
Tested-by: Simon Ser <contact@emersion.fr>
Thanks,
Simon
[1]: https://lore.kernel.org/dri-devel/CAMavQKJUpYP8jo2JDGMYNBGtbPSSO7z9BAComm5JQoty=HPtJg@mail.gmail.com/
[2]: https://lore.kernel.org/dri-devel/20220530081910.3947168-1-hsinyi@chromium.org/
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] drm/amd/display: set panel orientation before drm_dev_register
2022-08-05 17:34 ` Simon Ser
@ 2022-08-08 11:20 ` Hans de Goede
2022-08-08 18:51 ` Melissa Wen
2022-08-08 18:48 ` Melissa Wen
1 sibling, 1 reply; 7+ messages in thread
From: Hans de Goede @ 2022-08-08 11:20 UTC (permalink / raw)
To: Simon Ser, Melissa Wen
Cc: Leo Li, Xinhui.Pan, Rodrigo Siqueira, amd-gfx, nikola.cornij,
Sean Paul, kernel-dev, Alex Deucher, Harry Wentland,
christian.koenig, sungjoon.kim
Hi,
On 8/5/22 19:34, Simon Ser wrote:
> Hi,
>
> Have you seen [1] and [2]? CC'ing Sean and Hans, it seems like there's
> a disagreement regarding probing early vs. setting the initial value to
> UNKNOWN.
At least for the discussions I've been involved in so far
(see the links in the originak email) it was possible to retreive
the panel orientation before calling drm_dev_register() and IIRC some
changes were merged (I've at least reviewed them) to add a new
callback to the panel drivers to get the orientation from the panel
driver before registering the connector fixing the ordering problem
for those cases.
> If a driver doesn't fetch EDIDs before exposing them to user-space,
> then there is an amount of time where the connectors are exposed as
> CONNECTED but their EDID and mode list isn't properly set. But maybe
> that's what the GETCONNECTOR IOCTLs is supposed to do: probe the
> connector, fetch its EDID, return the proper mode list. So maybe
> drivers shouldn't probe early and should let user-space request probes?
> In which case we could create the panel orientation prop with "Normal",
> and update it accordingly when probing.
I guess that if in some cases it really is not possible to get
the orientation before calling drm_dev_register() then this is
an acceptable solution, as long as the orientation gets set
properly before the first GETCONNECTOR IOCTL finishes then
userspace will never know the difference since it needs to do
the GETCONNECTOR to enumerate the connectors properties anyways.
> At any rate, I've tested v2 on the Deck and it works properly.
>
> Tested-by: Simon Ser <contact@emersion.fr>
I'm not aware of which patch's v2 you are talking about here, link ?
Regards,
Hans
>
> Thanks,
>
> Simon
>
> [1]: https://lore.kernel.org/dri-devel/CAMavQKJUpYP8jo2JDGMYNBGtbPSSO7z9BAComm5JQoty=HPtJg@mail.gmail.com/
> [2]: https://lore.kernel.org/dri-devel/20220530081910.3947168-1-hsinyi@chromium.org/
>
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] drm/amd/display: set panel orientation before drm_dev_register
2022-08-05 17:34 ` Simon Ser
2022-08-08 11:20 ` Hans de Goede
@ 2022-08-08 18:48 ` Melissa Wen
1 sibling, 0 replies; 7+ messages in thread
From: Melissa Wen @ 2022-08-08 18:48 UTC (permalink / raw)
To: Simon Ser
Cc: Leo Li, Xinhui.Pan, Rodrigo Siqueira, amd-gfx, nikola.cornij,
Hans de Goede, Sean Paul, kernel-dev, Alex Deucher,
Harry Wentland, christian.koenig, sungjoon.kim
[-- Attachment #1: Type: text/plain, Size: 1608 bytes --]
On 08/05, Simon Ser wrote:
> Hi,
>
> Have you seen [1] and [2]? CC'ing Sean and Hans, it seems like there's
> a disagreement regarding probing early vs. setting the initial value to
> UNKNOWN.
>
> If a driver doesn't fetch EDIDs before exposing them to user-space,
> then there is an amount of time where the connectors are exposed as
> CONNECTED but their EDID and mode list isn't properly set. But maybe
> that's what the GETCONNECTOR IOCTLs is supposed to do: probe the
> connector, fetch its EDID, return the proper mode list. So maybe
> drivers shouldn't probe early and should let user-space request probes?
> In which case we could create the panel orientation prop with "Normal",
> and update it accordingly when probing.
Hi Simon,
I've followed these discussions but AFAIU the AMD display issue is not
exactly the same discussed in other drivers because here we are already
able to read EDID and get mode size needed for a quirk orientation
before drm device registration. So, I understand there isn't the need of
setting an initial value to the immutable property and update it later
(and all the issues this later update might cause). Am I missing
something?
>
> At any rate, I've tested v2 on the Deck and it works properly.
>
> Tested-by: Simon Ser <contact@emersion.fr>
Thanks for testing it!
Best regards,
Melissa
>
> Thanks,
>
> Simon
>
> [1]: https://lore.kernel.org/dri-devel/CAMavQKJUpYP8jo2JDGMYNBGtbPSSO7z9BAComm5JQoty=HPtJg@mail.gmail.com/
> [2]: https://lore.kernel.org/dri-devel/20220530081910.3947168-1-hsinyi@chromium.org/
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] drm/amd/display: set panel orientation before drm_dev_register
2022-08-08 11:20 ` Hans de Goede
@ 2022-08-08 18:51 ` Melissa Wen
0 siblings, 0 replies; 7+ messages in thread
From: Melissa Wen @ 2022-08-08 18:51 UTC (permalink / raw)
To: Hans de Goede
Cc: Leo Li, Simon Ser, Xinhui.Pan, Rodrigo Siqueira, amd-gfx,
nikola.cornij, Sean Paul, kernel-dev, Alex Deucher,
Harry Wentland, christian.koenig, sungjoon.kim
[-- Attachment #1: Type: text/plain, Size: 2329 bytes --]
On 08/08, Hans de Goede wrote:
> Hi,
>
> On 8/5/22 19:34, Simon Ser wrote:
> > Hi,
> >
> > Have you seen [1] and [2]? CC'ing Sean and Hans, it seems like there's
> > a disagreement regarding probing early vs. setting the initial value to
> > UNKNOWN.
>
> At least for the discussions I've been involved in so far
> (see the links in the originak email) it was possible to retreive
> the panel orientation before calling drm_dev_register() and IIRC some
> changes were merged (I've at least reviewed them) to add a new
> callback to the panel drivers to get the orientation from the panel
> driver before registering the connector fixing the ordering problem
> for those cases.
>
> > If a driver doesn't fetch EDIDs before exposing them to user-space,
> > then there is an amount of time where the connectors are exposed as
> > CONNECTED but their EDID and mode list isn't properly set. But maybe
> > that's what the GETCONNECTOR IOCTLs is supposed to do: probe the
> > connector, fetch its EDID, return the proper mode list. So maybe
> > drivers shouldn't probe early and should let user-space request probes?
> > In which case we could create the panel orientation prop with "Normal",
> > and update it accordingly when probing.
>
> I guess that if in some cases it really is not possible to get
> the orientation before calling drm_dev_register() then this is
> an acceptable solution, as long as the orientation gets set
> properly before the first GETCONNECTOR IOCTL finishes then
> userspace will never know the difference since it needs to do
> the GETCONNECTOR to enumerate the connectors properties anyways.
>
> > At any rate, I've tested v2 on the Deck and it works properly.
> >
> > Tested-by: Simon Ser <contact@emersion.fr>
>
> I'm not aware of which patch's v2 you are talking about here, link ?
Hi Hans,
Here is v2: https://lore.kernel.org/amd-gfx/20220804161349.3561177-1-mwen@igalia.com/
Anyway, let me cc'ing you all there.
Best Regards,
Melissa
>
> Regards,
>
> Hans
>
>
>
>
>
> >
> > Thanks,
> >
> > Simon
> >
> > [1]: https://lore.kernel.org/dri-devel/CAMavQKJUpYP8jo2JDGMYNBGtbPSSO7z9BAComm5JQoty=HPtJg@mail.gmail.com/
> > [2]: https://lore.kernel.org/dri-devel/20220530081910.3947168-1-hsinyi@chromium.org/
> >
>
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2022-08-08 19:00 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-08-03 16:24 [PATCH] drm/amd/display: set panel orientation before drm_dev_register Melissa Wen
2022-08-03 16:29 ` Melissa Wen
2022-08-05 17:34 ` Simon Ser
2022-08-08 11:20 ` Hans de Goede
2022-08-08 18:51 ` Melissa Wen
2022-08-08 18:48 ` Melissa Wen
2022-08-03 21:02 ` Harry Wentland
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.