Revert "drm/fbdev: Fallback to non tiled mode if all tiles not present"
Subsystems (2)
PATCH 1/1 Revert "drm/fbdev: Fallback to non tiled mode if all tiles not present"
This reverts commit f25c7a006cd1c07254780e3406e45cee4842b933.
2p2c display configuration blows up dmesg when one connector is disconnected, causing issues in CI.
Below are the sample errors thrown in logs:
[IGT] core_getversion: executing
[IGT] core_getversion: exiting, ret=0
Setting dangerous option reset - tainting kernel drm:drm_atomic_helper_wait_for_dependencies] ERROR [CRTC:152:pipe B] flip_done timed out drm:drm_atomic_helper_wait_for_dependencies] ERROR [CONNECTOR:299:DP-2] flip_done timed out drm:drm_atomic_helper_wait_for_dependencies] ERROR [PLANE:92:plane 1B] flip_done timed out [drm:drm_atomic_helper_wait_for_flip_done] ERROR [CRTC:152:pipe B] flip_done timed out [drm:drm_atomic_helper_wait_for_dependencies] ERROR [CRTC:152:pipe B] flip_done timed out [drm:drm_atomic_helper_wait_for_dependencies] ERROR [CONNECTOR:299:DP-2] flip_done timed out [drm:drm_atomic_helper_wait_for_dependencies] ERROR [PLANE:92:plane 1B] flip_done timed out [drm:drm_atomic_helper_wait_for_flip_done] ERROR [CRTC:152:pipe B] flip_done timed out
Console: switching to colour frame buffer device 480x135 [drm:drm_atomic_helper_wait_for_dependencies] ERROR [CRTC:152:pipe B] flip_done timed out [drm:drm_atomic_helper_wait_for_dependencies] ERROR [CONNECTOR:299:DP-2] flip_done timed out
Reverting the change for now to unblock CI execution.
--- drivers/gpu/drm/drm_client_modeset.c | 70 ---------------------------- 1 file changed, 70 deletions(-)
drivers/gpu/drm/drm_client_modeset.c +0 -70
@@ -114,33 +114,6 @@ drm_client_find_modeset(struct drm_client_dev *client, struct drm_crtc *crtc)return NULL ; } -static struct drm_display_mode * -drm_connector_get_tiled_mode (struct drm_connector *connector) -{ -struct drm_display_mode *mode; - -list_for_each_entry (mode, &connector->modes, head) { -if (mode->hdisplay == connector->tile_h_size && - mode->vdisplay == connector->tile_v_size) -return mode; - } -return NULL ; -} - -static struct drm_display_mode * -drm_connector_fallback_non_tiled_mode (struct drm_connector *connector) -{ -struct drm_display_mode *mode; - -list_for_each_entry (mode, &connector->modes, head) { -if (mode->hdisplay == connector->tile_h_size && - mode->vdisplay == connector->tile_v_size) -continue ; -return mode; - } -return NULL ; -} -static struct drm_display_mode *drm_connector_has_preferred_mode (struct drm_connector *connector,int width,int height) {
@@ -375,14 +348,8 @@ static bool drm_client_target_preferred(struct drm_connector **connectors,struct drm_connector *connector;u64 conn_configured =0 ;int tile_pass =0 ; -int num_tiled_conns =0 ;int i; -for (i =0 ; i < connector_count; i++) { -if (connectors[i]->has_tile) - num_tiled_conns++; - } - retry:for (i =0 ; i < connector_count; i++) { connector = connectors[i];
@@ -432,28 +399,6 @@ static bool drm_client_target_preferred(struct drm_connector **connectors,list_for_each_entry (modes[i], &connector->modes, head)break ; } -/* -* In case of tiled mode if all tiles not present fallback to -* first available non tiled mode. -* After all tiles are present, try to find the tiled mode -* for all and if tiled mode not present due to fbcon size -* limitations, use first non tiled mode only for -* tile 0,0 and set to no mode for all other tiles. -*/ -if (connector->has_tile) { -if (num_tiled_conns < - connector->num_h_tile * connector->num_v_tile || - (connector->tile_h_loc ==0 && - connector->tile_v_loc ==0 && - !drm_connector_get_tiled_mode (connector))) { -DRM_DEBUG_KMS ("Falling back to non tiled mode on Connector %d\n" , - connector->base.id); - modes[i] =drm_connector_fallback_non_tiled_mode (connector); - }else { - modes[i] =drm_connector_get_tiled_mode (connector); - } - } -DRM_DEBUG_KMS ("found mode %s\n" , modes[i] ? modes[i]->name :"none" ); conn_configured |=BIT_ULL (i);
@@ -570,7 +515,6 @@ static bool drm_client_firmware_config(struct drm_client_dev *client,bool fallback = true, ret = true;int num_connectors_enabled =0 ;int num_connectors_detected =0 ; -int num_tiled_conns =0 ;struct drm_modeset_acquire_ctx ctx;if (!drm_drv_uses_atomic_modeset (dev))
@@ -588,10 +532,6 @@ static bool drm_client_firmware_config(struct drm_client_dev *client,memcpy (save_enabled, enabled, count); mask =GENMASK (count -1 ,0 ); conn_configured =0 ; -for (i =0 ; i < count; i++) { -if (connectors[i]->has_tile) - num_tiled_conns++; - } retry: conn_seq = conn_configured;for (i =0 ; i < count; i++) {
@@ -691,16 +631,6 @@ static bool drm_client_firmware_config(struct drm_client_dev *client, connector->name); modes[i] = &connector->state->crtc->mode; } -/* -* In case of tiled modes, if all tiles are not present -* then fallback to a non tiled mode. -*/ -if (connector->has_tile && - num_tiled_conns < connector->num_h_tile * connector->num_v_tile) { -DRM_DEBUG_KMS ("Falling back to non tiled mode on Connector %d\n" , - connector->base.id); - modes[i] =drm_connector_fallback_non_tiled_mode (connector); - } crtcs[i] = new_crtc; DRM_DEBUG_KMS("connector %s on [CRTC:%d:%s]: %dx%d%s\n",
Signature · 6 lines
2.22.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.CHECKPATCH: warning for Revert "drm/fbdev: Fallback to non tiled mode if all tiles not present"
== Series Details ==
== Series Details ==
Series: Revert "drm/fbdev: Fallback to non tiled mode if all tiles not present"
URL : https://patchwork.freedesktop.org/series/69924/
State : warning
== Summary ==
$ dim checkpatch origin/drm-tip e9d74e9fcd0f Revert "drm/fbdev: Fallback to non tiled mode if all tiles not present" -:20: WARNING:COMMIT_LOG_LONG_LINE: Possible unwrapped commit description (prefer a maximum 75 chars per line) #20: drm:drm_atomic_helper_wait_for_dependencies] ERROR [CRTC:152:pipe B] flip_done timed out
total: 0 errors, 1 warnings, 0 checks, 108 lines checked
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.BAT: success for Revert "drm/fbdev: Fallback to non tiled mode if all tiles not present"
In reply to Uma Shankar== Series Details ==
== Series Details ==
Series: Revert "drm/fbdev: Fallback to non tiled mode if all tiles not present"
URL : https://patchwork.freedesktop.org/series/69924/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_7409 -> Patchwork_15405
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15405/index.html
Known issues
------------
Here are the changes found in Patchwork_15405 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@i915_selftest@live_gem_contexts:
- fi-bsw-n3050: [PASS][1] -> [INCOMPLETE][2] ([fdo# 111542])
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7409/fi-bsw-n3050/igt@i915_selftest@live_gem_contexts.html
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15405/fi-bsw-n3050/igt@i915_selftest@live_gem_contexts.html
* igt@i915_selftest@live_hangcheck:
- fi-icl-y: [PASS][3] -> [INCOMPLETE][4] ([fdo#107713] / [fdo#108569])
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7409/fi-icl-y/igt@i915_selftest@live_hangcheck.html
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15405/fi-icl-y/igt@i915_selftest@live_hangcheck.html
* igt@kms_chamelium@dp-crc-fast:
- fi-icl-u2: [PASS][5] -> [DMESG-WARN][6] ([fdo#106107])
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7409/fi-icl-u2/igt@[email protected]
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15405/fi-icl-u2/igt@[email protected]
* igt@kms_chamelium@hdmi-hpd-fast:
- fi-kbl-7500u: [PASS][7] -> [FAIL][8] ([fdo#111407])
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7409/fi-kbl-7500u/igt@[email protected]
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15405/fi-kbl-7500u/igt@[email protected]
#### Possible fixes ####
* igt@i915_module_load@reload-no-display:
- fi-skl-lmem: [DMESG-WARN][9] ([fdo#112261]) -> [PASS][10]
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7409/fi-skl-lmem/igt@[email protected]
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15405/fi-skl-lmem/igt@[email protected]
* igt@kms_addfb_basic@addfb25-y-tiled:
- fi-icl-dsi: [DMESG-WARN][11] ([fdo#106107]) -> [PASS][12]
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7409/fi-icl-dsi/igt@[email protected]
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15405/fi-icl-dsi/igt@[email protected]
#### Warnings ####
* igt@i915_pm_rpm@basic-pci-d3-state:
- fi-kbl-x1275: [DMESG-WARN][13] ([fdo#103558] / [fdo#105602]) -> [DMESG-WARN][14] ([fdo#103558] / [fdo#105602] / [fdo#105763]) +2 similar issues
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7409/fi-kbl-x1275/igt@[email protected]
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15405/fi-kbl-x1275/igt@[email protected]
* igt@kms_cursor_legacy@basic-busy-flip-before-cursor-legacy:
- fi-kbl-x1275: [DMESG-WARN][15] ([fdo#103558] / [fdo#105602] / [fdo#105763]) -> [DMESG-WARN][16] ([fdo#103558] / [fdo#105602]) +7 similar issues
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7409/fi-kbl-x1275/igt@[email protected]
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15405/fi-kbl-x1275/igt@[email protected]
[fdo# 111542]: https://bugs.freedesktop.org/show_bug.cgi?id= 111542 [fdo#103558]: https://bugs.freedesktop.org/show_bug.cgi?id=103558
[fdo#105602]: https://bugs.freedesktop.org/show_bug.cgi?id=105602
[fdo#105763]: https://bugs.freedesktop.org/show_bug.cgi?id=105763
[fdo#106107]: https://bugs.freedesktop.org/show_bug.cgi?id=106107
[fdo#107713]: https://bugs.freedesktop.org/show_bug.cgi?id=107713
[fdo#108569]: https://bugs.freedesktop.org/show_bug.cgi?id=108569
[fdo#111407]: https://bugs.freedesktop.org/show_bug.cgi?id=111407
[fdo#112261]: https://bugs.freedesktop.org/show_bug.cgi?id=112261
Participating hosts (50 -> 39)
------------------------------
Missing (11): fi-kbl-soraka fi-ilk-m540 fi-hsw-4200u fi-byt-j1900 fi-byt-squawks fi-bsw-cyan fi-ctg-p8600 fi-gdg-551 fi-kbl-8809g fi-byt-n2820 fi-bdw-samus
Build changes
-------------
* CI: CI-20190529 -> None
* Linux: CI_DRM_7409 -> Patchwork_15405
CI-20190529: 20190529
CI_DRM_7409: a00b5b72443d01a635ab02f55c589aa42ca04bcc @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_5301: 3fa72891269b16943e6511166aeebee094206791 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_15405: e9d74e9fcd0f4563ddabeade0261eede3ff4061a @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
e9d74e9fcd0f Revert "drm/fbdev: Fallback to non tiled mode if all tiles not present"
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15405/index.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.IGT: success for Revert "drm/fbdev: Fallback to non tiled mode if all tiles not present"
In reply to Uma Shankar== Series Details ==
== Series Details ==
Series: Revert "drm/fbdev: Fallback to non tiled mode if all tiles not present"
URL : https://patchwork.freedesktop.org/series/69924/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_7409_full -> Patchwork_15405_full
====================================================
Summary
-------
**SUCCESS**
No regressions found.
Known issues
------------
Here are the changes found in Patchwork_15405_full that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_ctx_isolation@vecs0-s3:
- shard-tglb: [PASS][1] -> [INCOMPLETE][2] ([fdo#111832])
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7409/shard-tglb1/igt@[email protected]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15405/shard-tglb5/igt@[email protected]
* igt@gem_ctx_persistence@vcs1-hostile:
- shard-iclb: [PASS][3] -> [SKIP][4] ([fdo#109276] / [fdo#112080])
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7409/shard-iclb1/igt@[email protected]
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15405/shard-iclb5/igt@[email protected]
* igt@gem_eio@suspend:
- shard-tglb: [PASS][5] -> [INCOMPLETE][6] ([fdo#111850])
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7409/shard-tglb6/igt@[email protected]
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15405/shard-tglb8/igt@[email protected]
* igt@gem_exec_nop@basic-series:
- shard-tglb: [PASS][7] -> [INCOMPLETE][8] ([fdo#111747])
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7409/shard-tglb9/igt@[email protected]
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15405/shard-tglb6/igt@[email protected]
* igt@gem_exec_schedule@preempt-other-chain-bsd:
- shard-iclb: [PASS][9] -> [SKIP][10] ([fdo#112146]) +3 similar issues
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7409/shard-iclb3/igt@[email protected]
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15405/shard-iclb4/igt@[email protected]
* igt@gem_exec_schedule@preempt-queue-bsd2:
- shard-iclb: [PASS][11] -> [SKIP][12] ([fdo#109276]) +8 similar issues
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7409/shard-iclb1/igt@[email protected]
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15405/shard-iclb3/igt@[email protected]
* igt@gem_persistent_relocs@forked-faulting-reloc-thrashing:
- shard-hsw: [PASS][13] -> [TIMEOUT][14] ([fdo#112068 ])
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7409/shard-hsw2/igt@[email protected]
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15405/shard-hsw6/igt@[email protected]
* igt@gem_userptr_blits@sync-unmap-after-close:
- shard-hsw: [PASS][15] -> [DMESG-WARN][16] ([fdo#111870])
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7409/shard-hsw7/igt@[email protected]
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15405/shard-hsw2/igt@[email protected]
- shard-snb: [PASS][17] -> [DMESG-WARN][18] ([fdo#111870])
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7409/shard-snb7/igt@[email protected]
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15405/shard-snb2/igt@[email protected]
* igt@i915_suspend@fence-restore-tiled2untiled:
- shard-tglb: [PASS][19] -> [INCOMPLETE][20] ([fdo#111832] / [fdo#111850]) +6 similar issues
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7409/shard-tglb7/igt@[email protected]
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15405/shard-tglb7/igt@[email protected]
* igt@kms_color@pipe-a-ctm-0-25:
- shard-skl: [PASS][21] -> [DMESG-WARN][22] ([fdo#106107])
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7409/shard-skl5/igt@[email protected]
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15405/shard-skl7/igt@[email protected]
* igt@kms_flip@flip-vs-expired-vblank:
- shard-skl: [PASS][23] -> [FAIL][24] ([fdo#105363]) +1 similar issue
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7409/shard-skl10/igt@[email protected]
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15405/shard-skl6/igt@[email protected]
* igt@kms_frontbuffer_tracking@fbc-1p-primscrn-cur-indfb-draw-mmap-cpu:
- shard-iclb: [PASS][25] -> [FAIL][26] ([fdo#103167]) +4 similar issues
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7409/shard-iclb5/igt@kms_frontbuffer_tracking@fbc-1p-primscrn-cur-indfb-draw-mmap-cpu.html
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15405/shard-iclb6/igt@kms_frontbuffer_tracking@fbc-1p-primscrn-cur-indfb-draw-mmap-cpu.html
* igt@kms_frontbuffer_tracking@fbc-suspend:
- shard-apl: [PASS][27] -> [DMESG-WARN][28] ([fdo#108566]) +3 similar issues
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7409/shard-apl7/igt@[email protected]
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15405/shard-apl1/igt@[email protected]
* igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-indfb-pgflip-blt:
- shard-tglb: [PASS][29] -> [FAIL][30] ([fdo#103167]) +1 similar issue
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7409/shard-tglb3/igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-indfb-pgflip-blt.html
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15405/shard-tglb4/igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-indfb-pgflip-blt.html
* igt@kms_plane@plane-panning-bottom-right-suspend-pipe-c-planes:
- shard-skl: [PASS][31] -> [INCOMPLETE][32] ([fdo#104108])
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7409/shard-skl1/igt@[email protected]
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15405/shard-skl10/igt@[email protected]
* igt@kms_psr@psr2_primary_page_flip:
- shard-iclb: [PASS][33] -> [SKIP][34] ([fdo#109441])
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7409/shard-iclb2/igt@kms_psr@psr2_primary_page_flip.html
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15405/shard-iclb4/igt@kms_psr@psr2_primary_page_flip.html
* igt@kms_setmode@basic:
- shard-skl: [PASS][35] -> [FAIL][36] ([fdo#99912])
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7409/shard-skl9/igt@[email protected]
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15405/shard-skl9/igt@[email protected]
* igt@kms_vblank@pipe-a-ts-continuation-suspend:
- shard-kbl: [PASS][37] -> [DMESG-WARN][38] ([fdo#108566]) +4 similar issues
[37]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7409/shard-kbl7/igt@[email protected]
[38]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15405/shard-kbl3/igt@[email protected]
* igt@perf@gen8-unprivileged-single-ctx-counters:
- shard-skl: [PASS][39] -> [TIMEOUT][40] ([fdo#111732 ])
[39]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7409/shard-skl2/igt@[email protected]
[40]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15405/shard-skl2/igt@[email protected]
* igt@perf_pmu@busy-no-semaphores-vcs1:
- shard-iclb: [PASS][41] -> [SKIP][42] ([fdo#112080]) +6 similar issues
[41]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7409/shard-iclb1/igt@[email protected]
[42]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15405/shard-iclb5/igt@[email protected]
#### Possible fixes ####
* igt@gem_ctx_isolation@rcs0-s3:
- shard-kbl: [DMESG-WARN][43] ([fdo#108566]) -> [PASS][44] +3 similar issues
[43]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7409/shard-kbl7/igt@[email protected]
[44]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15405/shard-kbl2/igt@[email protected]
- shard-apl: [DMESG-WARN][45] ([fdo#108566]) -> [PASS][46] +2 similar issues
[45]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7409/shard-apl4/igt@[email protected]
[46]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15405/shard-apl4/igt@[email protected]
* igt@gem_ctx_persistence@vcs1-hostile-preempt:
- shard-iclb: [SKIP][47] ([fdo#109276] / [fdo#112080]) -> [PASS][48] +3 similar issues
[47]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7409/shard-iclb5/igt@[email protected]
[48]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15405/shard-iclb2/igt@[email protected]
* igt@gem_ctx_shared@exec-single-timeline-bsd:
- shard-iclb: [SKIP][49] ([fdo#110841]) -> [PASS][50]
[49]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7409/shard-iclb2/igt@[email protected]
[50]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15405/shard-iclb3/igt@[email protected]
* igt@gem_ctx_switch@all-heavy:
- shard-tglb: [INCOMPLETE][51] ([fdo#111998]) -> [PASS][52]
[51]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7409/shard-tglb6/igt@[email protected]
[52]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15405/shard-tglb6/igt@[email protected]
* igt@gem_ctx_switch@vcs1-heavy:
- shard-iclb: [SKIP][53] ([fdo#112080]) -> [PASS][54] +10 similar issues
[53]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7409/shard-iclb5/igt@[email protected]
[54]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15405/shard-iclb2/igt@[email protected]
* igt@gem_exec_schedule@in-order-bsd:
- shard-iclb: [SKIP][55] ([fdo#112146]) -> [PASS][56] +5 similar issues
[55]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7409/shard-iclb1/igt@[email protected]
[56]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15405/shard-iclb3/igt@[email protected]
* igt@gem_userptr_blits@dmabuf-sync:
- shard-snb: [DMESG-WARN][57] ([fdo#111870]) -> [PASS][58] +1 similar issue
[57]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7409/shard-snb2/igt@[email protected]
[58]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15405/shard-snb4/igt@[email protected]
- shard-hsw: [DMESG-WARN][59] ([fdo#111870]) -> [PASS][60]
[59]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7409/shard-hsw2/igt@[email protected]
[60]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15405/shard-hsw5/igt@[email protected]
* igt@i915_pm_dc@dc5-dpms:
- shard-iclb: [FAIL][61] ([fdo#111795 ]) -> [PASS][62]
[61]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7409/shard-iclb3/igt@[email protected]
[62]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15405/shard-iclb8/igt@[email protected]
* igt@i915_pm_dc@dc6-dpms:
- shard-iclb: [FAIL][63] ([fdo#111830 ]) -> [PASS][64] +1 similar issue
[63]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7409/shard-iclb3/igt@[email protected]
[64]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15405/shard-iclb4/igt@[email protected]
* igt@kms_big_fb@yf-tiled-32bpp-rotate-90:
- shard-skl: [INCOMPLETE][65] ([fdo#112347]) -> [PASS][66]
[65]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7409/shard-skl9/igt@[email protected]
[66]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15405/shard-skl3/igt@[email protected]
* igt@kms_color@pipe-b-ctm-0-5:
- shard-skl: [DMESG-WARN][67] ([fdo#106107]) -> [PASS][68]
[67]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7409/shard-skl8/igt@[email protected]
[68]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15405/shard-skl4/igt@[email protected]
* igt@kms_cursor_legacy@2x-long-cursor-vs-flip-legacy:
- shard-hsw: [FAIL][69] ([fdo#105767]) -> [PASS][70]
[69]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7409/shard-hsw5/igt@[email protected]
[70]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15405/shard-hsw7/igt@[email protected]
* igt@kms_fbcon_fbt@fbc-suspend:
- shard-tglb: [INCOMPLETE][71] ([fdo#111747] / [fdo#111832] / [fdo#111850]) -> [PASS][72]
[71]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7409/shard-tglb4/igt@[email protected]
[72]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15405/shard-tglb5/igt@[email protected]
* igt@kms_flip@flip-vs-expired-vblank:
- shard-glk: [FAIL][73] ([fdo#105363]) -> [PASS][74]
[73]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7409/shard-glk5/igt@[email protected]
[74]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15405/shard-glk5/igt@[email protected]
* igt@kms_flip@flip-vs-suspend:
- shard-tglb: [INCOMPLETE][75] ([fdo#111850] / [fdo#112031]) -> [PASS][76]
[75]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7409/shard-tglb2/igt@[email protected]
[76]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15405/shard-tglb9/igt@[email protected]
* igt@kms_flip@flip-vs-suspend-interruptible:
- shard-hsw: [INCOMPLETE][77] ([fdo#103540]) -> [PASS][78]
[77]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7409/shard-hsw4/igt@[email protected]
[78]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15405/shard-hsw5/igt@[email protected]
* igt@kms_flip@plain-flip-fb-recreate:
- shard-glk: [FAIL][79] ([fdo#100368]) -> [PASS][80]
[79]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7409/shard-glk4/igt@[email protected]
[80]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15405/shard-glk2/igt@[email protected]
* igt@kms_frontbuffer_tracking@fbc-1p-primscrn-indfb-msflip-blt:
- shard-tglb: [FAIL][81] ([fdo#103167]) -> [PASS][82] +1 similar issue
[81]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7409/shard-tglb8/igt@[email protected]
[82]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15405/shard-tglb6/igt@[email protected]
* igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-pri-indfb-draw-blt:
- shard-iclb: [FAIL][83] ([fdo#103167]) -> [PASS][84] +2 similar issues
[83]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7409/shard-iclb4/igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-pri-indfb-draw-blt.html
[84]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15405/shard-iclb2/igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-pri-indfb-draw-blt.html
* igt@kms_plane_alpha_blend@pipe-c-coverage-7efc:
- shard-skl: [FAIL][85] ([fdo#108145] / [fdo#110403]) -> [PASS][86]
[85]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7409/shard-skl10/igt@[email protected]
[86]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15405/shard-skl2/igt@[email protected]
* igt@kms_psr@no_drrs:
- shard-iclb: [FAIL][87] ([fdo#108341]) -> [PASS][88]
[87]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7409/shard-iclb1/igt@kms_psr@no_drrs.html
[88]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15405/shard-iclb5/igt@kms_psr@no_drrs.html
* igt@kms_psr@psr2_primary_mmap_cpu:
- shard-iclb: [SKIP][89] ([fdo#109441]) -> [PASS][90] +1 similar issue
[89]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7409/shard-iclb6/igt@kms_psr@psr2_primary_mmap_cpu.html
[90]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15405/shard-iclb2/igt@kms_psr@psr2_primary_mmap_cpu.html
* igt@kms_setmode@basic:
- shard-apl: [FAIL][91] ([fdo#99912]) -> [PASS][92]
[91]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7409/shard-apl8/igt@[email protected]
[92]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15405/shard-apl4/igt@[email protected]
- shard-hsw: [FAIL][93] ([fdo#99912]) -> [PASS][94]
[93]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7409/shard-hsw7/igt@[email protected]
[94]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15405/shard-hsw7/igt@[email protected]
* igt@kms_vblank@pipe-c-ts-continuation-suspend:
- shard-tglb: [INCOMPLETE][95] ([fdo#111832] / [fdo#111850]) -> [PASS][96]
[95]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7409/shard-tglb4/igt@[email protected]
[96]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15405/shard-tglb2/igt@[email protected]
* igt@kms_vblank@pipe-d-ts-continuation-suspend:
- shard-tglb: [INCOMPLETE][97] ([fdo#111850]) -> [PASS][98]
[97]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7409/shard-tglb2/igt@[email protected]
[98]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15405/shard-tglb6/igt@[email protected]
* igt@prime_busy@hang-bsd2:
- shard-iclb: [SKIP][99] ([fdo#109276]) -> [PASS][100] +15 similar issues
[99]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7409/shard-iclb6/igt@[email protected]
[100]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15405/shard-iclb2/igt@[email protected]
#### Warnings ####
* igt@gem_ctx_isolation@vcs1-nonpriv-switch:
- shard-iclb: [FAIL][101] ([fdo#111329]) -> [SKIP][102] ([fdo#109276] / [fdo#112080])
[101]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7409/shard-iclb1/igt@[email protected]
[102]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15405/shard-iclb3/igt@[email protected]
* igt@gem_ctx_isolation@vcs2-dirty-switch:
- shard-tglb: [SKIP][103] ([fdo#112080]) -> [SKIP][104] ([fdo#111912] / [fdo#112080])
[103]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7409/shard-tglb9/igt@[email protected]
[104]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15405/shard-tglb8/igt@[email protected]
* igt@gem_exec_schedule@deep-bsd1:
- shard-tglb: [FAIL][105] ([fdo#111646]) -> [INCOMPLETE][106] ([fdo#111671])
[105]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7409/shard-tglb9/igt@[email protected]
[106]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15405/shard-tglb8/igt@[email protected]
* igt@gem_exec_schedule@deep-bsd2:
- shard-tglb: [INCOMPLETE][107] ([fdo#111671]) -> [FAIL][108] ([fdo#111646]) +1 similar issue
[107]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7409/shard-tglb8/igt@[email protected]
[108]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15405/shard-tglb6/igt@[email protected]
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[fdo#100368]: https://bugs.freedesktop.org/sho
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15405/index.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Jani Nikula
AppliedQuoted 22 lines · Uma Shankar
This reverts commit
f25c7a006cd1c07254780e3406e45cee4842b933.2p2c display configuration blows up dmesg when one connector is disconnected, causing issues in CI.
Below are the sample errors thrown in logs:
[IGT]
core_getversion: executing
[IGT]core_getversion: exiting, ret=0
Setting dangerous option reset - tainting kernel drm:drm_atomic_helper_wait_for_dependencies] ERROR [CRTC:152:pipe B]flip_donetimed out drm:drm_atomic_helper_wait_for_dependencies] ERROR [CONNECTOR:299:DP-2]flip_donetimed out drm:drm_atomic_helper_wait_for_dependencies] ERROR [PLANE:92:plane 1B]flip_donetimed out [drm:drm_atomic_helper_wait_for_flip_done] ERROR [CRTC:152:pipe B]flip_donetimed out [drm:drm_atomic_helper_wait_for_dependencies] ERROR [CRTC:152:pipe B]flip_donetimed out [drm:drm_atomic_helper_wait_for_dependencies] ERROR [CONNECTOR:299:DP-2]flip_donetimed out [drm:drm_atomic_helper_wait_for_dependencies] ERROR [PLANE:92:plane 1B]flip_donetimed out [drm:drm_atomic_helper_wait_for_flip_done] ERROR [CRTC:152:pipe B]flip_donetimed out
Console: switching to colour frame buffer device 480x135 [drm:drm_atomic_helper_wait_for_dependencies] ERROR [CRTC:152:pipe B]flip_donetimed out [drm:drm_atomic_helper_wait_for_dependencies] ERROR [CONNECTOR:299:DP-2]flip_donetimed out
Quoted 7 lines
Reverting the change for now to unblock CI execution.
Cc Ville Syrjälä <[email protected]>Cc Dave Airlie <[email protected]>Cc Jani Nikula <[email protected]>Cc Manasi Navare <[email protected]>Signed-off-by Uma Shankar <[email protected]>
Pushed to drm-misc-next with Daniel's irc ack. Thanks for the revert. Back to the drawing board.
I was about to add the Bugzilla: reference, but this being a gitlab issue instead, I opted for the gitlab Closes: tag:
We should probably align on what we want to use going forward. And do we want to keep using Bugzilla for bugzilla bugs?
BR,
Jani.
Quoted 122 lines
--- drivers/gpu/drm/drm_client_modeset.c | 70 ---------------------------- 1 file changed, 70 deletions(-)drivers/gpu/drm/drm_client_modeset.c +0
-70@@ -114,33 +114,6 @@ drm_client_find_modeset(struct drm_client_dev *client, struct drm_crtc *crtc)return NULL ; } -static struct drm_display_mode * -drm_connector_get_tiled_mode (struct drm_connector *connector) -{ -struct drm_display_mode *mode; - -list_for_each_entry (mode, &connector->modes, head) { -if (mode->hdisplay == connector->tile_h_size && - mode->vdisplay == connector->tile_v_size) -return mode; - } -return NULL ; -} - -static struct drm_display_mode * -drm_connector_fallback_non_tiled_mode (struct drm_connector *connector) -{ -struct drm_display_mode *mode; - -list_for_each_entry (mode, &connector->modes, head) { -if (mode->hdisplay == connector->tile_h_size && - mode->vdisplay == connector->tile_v_size) -continue ; -return mode; - } -return NULL ; -} -static struct drm_display_mode *drm_connector_has_preferred_mode (struct drm_connector *connector,int width,int height) {@@ -375,14 +348,8 @@ static bool drm_client_target_preferred(struct drm_connector **connectors,struct drm_connector *connector;u64 conn_configured =0 ;int tile_pass =0 ; -int num_tiled_conns =0 ;int i; -for (i =0 ; i < connector_count; i++) { -if (connectors[i]->has_tile) - num_tiled_conns++; - } - retry:for (i =0 ; i < connector_count; i++) { connector = connectors[i];@@ -432,28 +399,6 @@ static bool drm_client_target_preferred(struct drm_connector **connectors,list_for_each_entry (modes[i], &connector->modes, head)break ; } -/* -* In case of tiled mode if all tiles not present fallback to -* first available non tiled mode. -* After all tiles are present, try to find the tiled mode -* for all and if tiled mode not present due to fbcon size -* limitations, use first non tiled mode only for -* tile 0,0 and set to no mode for all other tiles. -*/ -if (connector->has_tile) { -if (num_tiled_conns < - connector->num_h_tile * connector->num_v_tile || - (connector->tile_h_loc ==0 && - connector->tile_v_loc ==0 && - !drm_connector_get_tiled_mode (connector))) { -DRM_DEBUG_KMS ("Falling back to non tiled mode on Connector %d\n" , - connector->base.id); - modes[i] =drm_connector_fallback_non_tiled_mode (connector); - }else { - modes[i] =drm_connector_get_tiled_mode (connector); - } - } -DRM_DEBUG_KMS ("found mode %s\n" , modes[i] ? modes[i]->name :"none" ); conn_configured |=BIT_ULL (i);@@ -570,7 +515,6 @@ static bool drm_client_firmware_config(struct drm_client_dev *client,bool fallback = true, ret = true;int num_connectors_enabled =0 ;int num_connectors_detected =0 ; -int num_tiled_conns =0 ;struct drm_modeset_acquire_ctx ctx;if (!drm_drv_uses_atomic_modeset (dev))@@ -588,10 +532,6 @@ static bool drm_client_firmware_config(struct drm_client_dev *client,memcpy (save_enabled, enabled, count); mask =GENMASK (count -1 ,0 ); conn_configured =0 ; -for (i =0 ; i < count; i++) { -if (connectors[i]->has_tile) - num_tiled_conns++; - } retry: conn_seq = conn_configured;for (i =0 ; i < count; i++) {@@ -691,16 +631,6 @@ static bool drm_client_firmware_config(struct drm_client_dev *client, connector->name); modes[i] = &connector->state->crtc->mode; } -/* -* In case of tiled modes, if all tiles are not present -* then fallback to a non tiled mode. -*/ -if (connector->has_tile && - num_tiled_conns < connector->num_h_tile * connector->num_v_tile) { -DRM_DEBUG_KMS ("Falling back to non tiled mode on Connector %d\n" , - connector->base.id); - modes[i] =drm_connector_fallback_non_tiled_mode (connector); - } crtcs[i] = new_crtc; DRM_DEBUG_KMS("connector %s on [CRTC:%d:%s]: %dx%d%s\n",
Signature · 5 lines
Jani Nikula, Intel Open Source Graphics Center _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 34 lines · Jani Nikula
Quoted 22 lines · Uma Shankar
This reverts commit
f25c7a006cd1c07254780e3406e45cee4842b933.2p2c display configuration blows up dmesg when one connector is disconnected, causing issues in CI.
Below are the sample errors thrown in logs:
[IGT]
core_getversion: executing
[IGT]core_getversion: exiting, ret=0
Setting dangerous option reset - tainting kernel drm:drm_atomic_helper_wait_for_dependencies] ERROR [CRTC:152:pipe B]flip_donetimed out drm:drm_atomic_helper_wait_for_dependencies] ERROR [CONNECTOR:299:DP-2]flip_donetimed out drm:drm_atomic_helper_wait_for_dependencies] ERROR [PLANE:92:plane 1B]flip_donetimed out [drm:drm_atomic_helper_wait_for_flip_done] ERROR [CRTC:152:pipe B]flip_donetimed out [drm:drm_atomic_helper_wait_for_dependencies] ERROR [CRTC:152:pipe B]flip_donetimed out [drm:drm_atomic_helper_wait_for_dependencies] ERROR [CONNECTOR:299:DP-2]flip_donetimed out [drm:drm_atomic_helper_wait_for_dependencies] ERROR [PLANE:92:plane 1B]flip_donetimed out [drm:drm_atomic_helper_wait_for_flip_done] ERROR [CRTC:152:pipe B]flip_donetimed out
Console: switching to colour frame buffer device 480x135 [drm:drm_atomic_helper_wait_for_dependencies] ERROR [CRTC:152:pipe B]flip_donetimed out [drm:drm_atomic_helper_wait_for_dependencies] ERROR [CONNECTOR:299:DP-2]flip_donetimed outQuoted 7 lines
Reverting the change for now to unblock CI execution.
Cc Ville Syrjälä <[email protected]>Cc Dave Airlie <[email protected]>Cc Jani Nikula <[email protected]>Cc Manasi Navare <[email protected]>Signed-off-by Uma Shankar <[email protected]>Pushed to drm-misc-next with Daniel's irc ack. Thanks for the revert. Back to the drawing board.
Quoted 7 lines
I was about to add the Bugzilla: reference, but this being a gitlab issue instead, I opted for the gitlab Closes: tag:
We should probably align on what we want to use going forward. And do we want to keep using Bugzilla for bugzilla bugs?
I guess we could/should have that discussion once we have the git repos on gitlab too. Right now I don't think the above does anything ...
Aside from that I think this makes sense.
-Daniel
Quoted 130 lines
BR,
Jani.Quoted 122 lines
--- drivers/gpu/drm/drm_client_modeset.c | 70 ---------------------------- 1 file changed, 70 deletions(-)drivers/gpu/drm/drm_client_modeset.c +0
-70@@ -114,33 +114,6 @@ drm_client_find_modeset(struct drm_client_dev *client, struct drm_crtc *crtc)return NULL ; } -static struct drm_display_mode * -drm_connector_get_tiled_mode (struct drm_connector *connector) -{ -struct drm_display_mode *mode; - -list_for_each_entry (mode, &connector->modes, head) { -if (mode->hdisplay == connector->tile_h_size && - mode->vdisplay == connector->tile_v_size) -return mode; - } -return NULL ; -} - -static struct drm_display_mode * -drm_connector_fallback_non_tiled_mode (struct drm_connector *connector) -{ -struct drm_display_mode *mode; - -list_for_each_entry (mode, &connector->modes, head) { -if (mode->hdisplay == connector->tile_h_size && - mode->vdisplay == connector->tile_v_size) -continue ; -return mode; - } -return NULL ; -} -static struct drm_display_mode *drm_connector_has_preferred_mode (struct drm_connector *connector,int width,int height) {@@ -375,14 +348,8 @@ static bool drm_client_target_preferred(struct drm_connector **connectors,struct drm_connector *connector;u64 conn_configured =0 ;int tile_pass =0 ; -int num_tiled_conns =0 ;int i; -for (i =0 ; i < connector_count; i++) { -if (connectors[i]->has_tile) - num_tiled_conns++; - } - retry:for (i =0 ; i < connector_count; i++) { connector = connectors[i];@@ -432,28 +399,6 @@ static bool drm_client_target_preferred(struct drm_connector **connectors,list_for_each_entry (modes[i], &connector->modes, head)break ; } -/* -* In case of tiled mode if all tiles not present fallback to -* first available non tiled mode. -* After all tiles are present, try to find the tiled mode -* for all and if tiled mode not present due to fbcon size -* limitations, use first non tiled mode only for -* tile 0,0 and set to no mode for all other tiles. -*/ -if (connector->has_tile) { -if (num_tiled_conns < - connector->num_h_tile * connector->num_v_tile || - (connector->tile_h_loc ==0 && - connector->tile_v_loc ==0 && - !drm_connector_get_tiled_mode (connector))) { -DRM_DEBUG_KMS ("Falling back to non tiled mode on Connector %d\n" , - connector->base.id); - modes[i] =drm_connector_fallback_non_tiled_mode (connector); - }else { - modes[i] =drm_connector_get_tiled_mode (connector); - } - } -DRM_DEBUG_KMS ("found mode %s\n" , modes[i] ? modes[i]->name :"none" ); conn_configured |=BIT_ULL (i);@@ -570,7 +515,6 @@ static bool drm_client_firmware_config(struct drm_client_dev *client,bool fallback = true, ret = true;int num_connectors_enabled =0 ;int num_connectors_detected =0 ; -int num_tiled_conns =0 ;struct drm_modeset_acquire_ctx ctx;if (!drm_drv_uses_atomic_modeset (dev))@@ -588,10 +532,6 @@ static bool drm_client_firmware_config(struct drm_client_dev *client,memcpy (save_enabled, enabled, count); mask =GENMASK (count -1 ,0 ); conn_configured =0 ; -for (i =0 ; i < count; i++) { -if (connectors[i]->has_tile) - num_tiled_conns++; - } retry: conn_seq = conn_configured;for (i =0 ; i < count; i++) {@@ -691,16 +631,6 @@ static bool drm_client_firmware_config(struct drm_client_dev *client, connector->name); modes[i] = &connector->state->crtc->mode; } -/* -* In case of tiled modes, if all tiles are not present -* then fallback to a non tiled mode. -*/ -if (connector->has_tile && - num_tiled_conns < connector->num_h_tile * connector->num_v_tile) { -DRM_DEBUG_KMS ("Falling back to non tiled mode on Connector %d\n" , - connector->base.id); - modes[i] =drm_connector_fallback_non_tiled_mode (connector); - } crtcs[i] = new_crtc; DRM_DEBUG_KMS("connector %s on [CRTC:%d:%s]: %dx%d%s\n",Signature · 1 line
Jani Nikula, Intel Open Source Graphics Center
Signature · 7 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx