Remove frontbuffer tracking from the gem code
Subsystems (3)
cover Remove frontbuffer tracking from the gem code
We should now rely on userspace doing dirtyfb. There is no need to have separate frontbuffer tracking hooks in gem code.
It was found out that fbdev code calling intel_frontbuffer_invalidate caused psr being left disabled. Tackle this by removing intel_frontbuffer_invalidate calls from intel_fbdev code.
Jouni Högander (2):
drm/i915/fbdev: Remove frontbuffer tracking calls drm/i915: Remove all frontbuffer tracking calls from the gem code
drivers/gpu/drm/i915/display/intel_fbdev.c | 62 ++------------------ drivers/gpu/drm/i915/display/intel_overlay.c | 2 - drivers/gpu/drm/i915/gem/i915_gem_clflush.c | 2 - drivers/gpu/drm/i915/gem/i915_gem_domain.c | 5 -- drivers/gpu/drm/i915/gem/i915_gem_object.c | 24 -------- drivers/gpu/drm/i915/gem/i915_gem_object.h | 16 ----- drivers/gpu/drm/i915/gem/i915_gem_phys.c | 7 --- drivers/gpu/drm/i915/i915_gem.c | 5 -- 8 files changed, 4 insertions(+), 119 deletions(-)
Signature · 1 line
2.25.1
RFC PATCH 1/2 drm/i915/fbdev: Remove frontbuffer tracking calls
Intel_fbdev can use drm_helper functions which are calling dirtyfb callback.
--- drivers/gpu/drm/i915/display/intel_fbdev.c | 62 ++-------------------- 1 file changed, 4 insertions(+), 58 deletions(-)
drivers/gpu/drm/i915/display/intel_fbdev.c +4 -58
@@ -67,68 +67,15 @@ struct intel_fbdev {struct mutex hpd_lock; }; -static struct intel_frontbuffer *to_frontbuffer (struct intel_fbdev *ifbdev) -{ -return ifbdev->fb->frontbuffer; -} - -static void intel_fbdev_invalidate (struct intel_fbdev *ifbdev) -{ -intel_frontbuffer_invalidate (to_frontbuffer (ifbdev),ORIGIN_CPU ); -} - -static int intel_fbdev_set_par (struct fb_info *info) -{ -struct drm_fb_helper *fb_helper = info->par; -struct intel_fbdev *ifbdev = - container_of(fb_helper, struct intel_fbdev, helper); -int ret; - - ret =drm_fb_helper_set_par (info); -if (ret ==0 ) -intel_fbdev_invalidate (ifbdev); - -return ret; -} - -static int intel_fbdev_blank (int blank,struct fb_info *info) -{ -struct drm_fb_helper *fb_helper = info->par; -struct intel_fbdev *ifbdev = - container_of(fb_helper, struct intel_fbdev, helper); -int ret; - - ret =drm_fb_helper_blank (blank, info); -if (ret ==0 ) -intel_fbdev_invalidate (ifbdev); - -return ret; -} - -static int intel_fbdev_pan_display (struct fb_var_screeninfo *var, -struct fb_info *info) -{ -struct drm_fb_helper *fb_helper = info->par; -struct intel_fbdev *ifbdev = - container_of(fb_helper, struct intel_fbdev, helper); -int ret; - - ret =drm_fb_helper_pan_display (var, info); -if (ret ==0 ) -intel_fbdev_invalidate (ifbdev); - -return ret; -} -static const struct fb_ops intelfb_ops = { .owner =THIS_MODULE ,DRM_FB_HELPER_DEFAULT_OPS , - .fb_set_par = intel_fbdev_set_par, + .fb_set_par = drm_fb_helper_set_par, .fb_fillrect = drm_fb_helper_cfb_fillrect, .fb_copyarea = drm_fb_helper_cfb_copyarea, .fb_imageblit = drm_fb_helper_cfb_imageblit, - .fb_pan_display = intel_fbdev_pan_display, - .fb_blank = intel_fbdev_blank, + .fb_pan_display = drm_fb_helper_pan_display, + .fb_blank = drm_fb_helper_blank, }; static int intelfb_alloc(struct drm_fb_helper *helper,
@@ -694,8 +641,7 @@ void intel_fbdev_restore_mode(struct drm_device *dev)if (!ifbdev->vma)return ; -if (drm_fb_helper_restore_fbdev_mode_unlocked (&ifbdev->helper) ==0 ) -intel_fbdev_invalidate (ifbdev); +drm_fb_helper_restore_fbdev_mode_unlocked (&ifbdev->helper); }struct intel_framebuffer *intel_fbdev_framebuffer (struct intel_fbdev *fbdev)
Signature · 1 line
2.25.1
RFC PATCH 2/2 drm/i915: Remove all frontbuffer tracking calls from the gem code
In reply to Jouni HöganderWe should now rely on userspace doing dirtyfb. There is no need to have separate frontbuffer tracking hooks in gem code.
This patch is removing all frontbuffer tracking calls from the gem code.
--- drivers/gpu/drm/i915/display/intel_overlay.c | 2 -- drivers/gpu/drm/i915/gem/i915_gem_clflush.c | 2 -- drivers/gpu/drm/i915/gem/i915_gem_domain.c | 5 ---- drivers/gpu/drm/i915/gem/i915_gem_object.c | 24 -------------------- drivers/gpu/drm/i915/gem/i915_gem_object.h | 16 ------------- drivers/gpu/drm/i915/gem/i915_gem_phys.c | 7 ------ drivers/gpu/drm/i915/i915_gem.c | 5 ---- 7 files changed, 61 deletions(-)
drivers/gpu/drm/i915/display/intel_overlay.c +0 -2
@@ -810,8 +810,6 @@ static int intel_overlay_do_put_image(struct intel_overlay *overlay, goto out_pin_section; } -i915_gem_object_flush_frontbuffer (new_bo,ORIGIN_DIRTYFB ); -if (!overlay->active) {const struct intel_crtc_state *crtc_state = overlay->crtc->config;
drivers/gpu/drm/i915/gem/i915_gem_clflush.c +0 -2
@@ -22,8 +22,6 @@ static void __do_clflush(struct drm_i915_gem_object *obj) {GEM_BUG_ON (!i915_gem_object_has_pages (obj));drm_clflush_sg (obj->mm.pages); - -i915_gem_object_flush_frontbuffer (obj,ORIGIN_CPU ); }static void clflush_work (struct dma_fence_work *base)
drivers/gpu/drm/i915/gem/i915_gem_domain.c +0 -5
@@ -64,7 +64,6 @@ flush_write_domain(struct drm_i915_gem_object *obj, unsigned int flush_domains) }spin_unlock (&obj->vma.lock); -i915_gem_object_flush_frontbuffer (obj,ORIGIN_CPU );break ;case I915_GEM_DOMAIN_WC :
@@ -616,9 +615,6 @@ i915_gem_set_domain_ioctl(struct drm_device *dev, void *data, out_unlock:i915_gem_object_unlock (obj); -if (!err && write_domain) -i915_gem_object_invalidate_frontbuffer (obj,ORIGIN_CPU ); - out:i915_gem_object_put (obj);return err;
@@ -729,7 +725,6 @@ int i915_gem_object_prepare_write(struct drm_i915_gem_object *obj, } out: -i915_gem_object_invalidate_frontbuffer (obj,ORIGIN_CPU ); obj->mm.dirty = true;/* return with the pages pinned */ return 0 ;
drivers/gpu/drm/i915/gem/i915_gem_object.c +0 -24
@@ -393,30 +393,6 @@ static void i915_gem_free_object(struct drm_gem_object *gem_obj)queue_delayed_work (i915->wq, &i915->mm.free_work,0 ); } -void __i915_gem_object_flush_frontbuffer (struct drm_i915_gem_object *obj, -enum fb_op_origin origin) -{ -struct intel_frontbuffer *front; - - front =__intel_frontbuffer_get (obj); -if (front) { -intel_frontbuffer_flush (front, origin); -intel_frontbuffer_put (front); - } -} - -void __i915_gem_object_invalidate_frontbuffer (struct drm_i915_gem_object *obj, -enum fb_op_origin origin) -{ -struct intel_frontbuffer *front; - - front =__intel_frontbuffer_get (obj); -if (front) { -intel_frontbuffer_invalidate (front, origin); -intel_frontbuffer_put (front); - } -} -static void i915_gem_object_read_from_page_kmap (struct drm_i915_gem_object *obj,u64 offset,void *dst,int size) {
drivers/gpu/drm/i915/gem/i915_gem_object.h +0 -16
@@ -578,22 +578,6 @@ void __i915_gem_object_flush_frontbuffer(struct drm_i915_gem_object *obj,void __i915_gem_object_invalidate_frontbuffer (struct drm_i915_gem_object *obj,enum fb_op_origin origin); -static inline void -i915_gem_object_flush_frontbuffer (struct drm_i915_gem_object *obj, -enum fb_op_origin origin) -{ -if (unlikely (rcu_access_pointer (obj->frontbuffer))) -__i915_gem_object_flush_frontbuffer (obj, origin); -} - -static inline void -i915_gem_object_invalidate_frontbuffer (struct drm_i915_gem_object *obj, -enum fb_op_origin origin) -{ -if (unlikely (rcu_access_pointer (obj->frontbuffer))) -__i915_gem_object_invalidate_frontbuffer (obj, origin); -} -int i915_gem_object_read_from_page (struct drm_i915_gem_object *obj,u64 offset,void *dst,int size);bool i915_gem_object_is_shmem (const struct drm_i915_gem_object *obj);
drivers/gpu/drm/i915/gem/i915_gem_phys.c +0 -7
@@ -151,19 +151,12 @@ int i915_gem_object_pwrite_phys(struct drm_i915_gem_object *obj,if (err)return err; -/* -* We manually control the domain here and pretend that it -* remains coherent i.e. in the GTT domain, like shmem_pwrite. -*/ -i915_gem_object_invalidate_frontbuffer (obj,ORIGIN_CPU ); -if (copy_from_user (vaddr, user_data, args->size))return -EFAULT ;drm_clflush_virt_range (vaddr, args->size);intel_gt_chipset_flush (to_gt (i915)); -i915_gem_object_flush_frontbuffer (obj,ORIGIN_CPU );return 0 ; }
drivers/gpu/drm/i915/i915_gem.c +0 -5
@@ -566,8 +566,6 @@ i915_gem_gtt_pwrite_fast(struct drm_i915_gem_object *obj, goto out_rpm; } -i915_gem_object_invalidate_frontbuffer (obj,ORIGIN_CPU ); - user_data =u64_to_user_ptr (args->data_ptr); offset = args->offset; remain = args->size;
@@ -610,7 +608,6 @@ i915_gem_gtt_pwrite_fast(struct drm_i915_gem_object *obj, }intel_gt_flush_ggtt_writes (ggtt->vm.gt); -i915_gem_object_flush_frontbuffer (obj,ORIGIN_CPU );i915_gem_gtt_cleanup (obj, &node, vma); out_rpm:
@@ -697,8 +694,6 @@ i915_gem_shmem_pwrite(struct drm_i915_gem_object *obj, offset =0 ; } -i915_gem_object_flush_frontbuffer (obj,ORIGIN_CPU ); -i915_gem_object_unpin_pages (obj);return ret;
Signature · 1 line
2.25.1
Patchwork
CI[Intel-gfx] ✗ Fi.CI.SPARSE: warning for Remove frontbuffer tracking from the gem code
In reply to Jouni Högander== Series Details ==
== Series Details ==
Series: Remove frontbuffer tracking from the gem code
URL : https://patchwork.freedesktop.org/series/100950/
State : warning
== Summary ==
$ dim sparse --fast origin/drm-tip Sparse version: v0.6.2 Fast mode used, each commit won't be checked separately.
Patchwork
CI[Intel-gfx] ✗ Fi.CI.BAT: failure for Remove frontbuffer tracking from the gem code
In reply to Jouni Högander== Series Details ==
== Series Details ==
Series: Remove frontbuffer tracking from the gem code
URL : https://patchwork.freedesktop.org/series/100950/
State : failure
== Summary ==
CI Bug Log - changes from CI_DRM_11311 -> Patchwork_22463
====================================================
Summary
-------
**FAILURE**
Serious unknown changes coming with Patchwork_22463 absolutely need to be verified manually.
If you think the reported changes have nothing to do with the changes introduced in Patchwork_22463, please notify your bug team to allow them to document this new failure mode, which will reduce false positives in CI.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22463/index.html
Participating hosts (48 -> 43)
------------------------------
Additional (1): fi-kbl-8809g
Missing (6): shard-tglu fi-hsw-4200u fi-bsw-cyan fi-ctg-p8600 fi-pnv-d510 fi-bdw-samus
Possible new issues
-------------------
Here are the unknown changes that may have been introduced in Patchwork_22463:
### IGT changes ###
#### Possible regressions ####
* igt@i915_pm_rpm@basic-pci-d3-state:
- fi-skl-6600u: NOTRUN -> [FAIL][1]
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22463/fi-skl-6600u/igt@[email protected]
Known issues
------------
Here are the changes found in Patchwork_22463 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_exec_suspend@basic-s0@smem:
- fi-kbl-8809g: NOTRUN -> [DMESG-WARN][2] ([i915#4962]) +1 similar issue
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22463/fi-kbl-8809g/igt@gem_exec_suspend@[email protected]
* igt@gem_huc_copy@huc-copy:
- fi-skl-6600u: NOTRUN -> [SKIP][3] ([fdo#109271] / [i915#2190])
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22463/fi-skl-6600u/igt@[email protected]
- fi-kbl-8809g: NOTRUN -> [SKIP][4] ([fdo#109271] / [i915#2190])
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22463/fi-kbl-8809g/igt@[email protected]
* igt@gem_lmem_swapping@random-engines:
- fi-kbl-8809g: NOTRUN -> [SKIP][5] ([fdo#109271] / [i915#4613]) +3 similar issues
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22463/fi-kbl-8809g/igt@[email protected]
* igt@gem_lmem_swapping@verify-random:
- fi-skl-6600u: NOTRUN -> [SKIP][6] ([fdo#109271] / [i915#4613]) +3 similar issues
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22463/fi-skl-6600u/igt@[email protected]
* igt@i915_pm_rpm@basic-rte:
- fi-kbl-8809g: NOTRUN -> [SKIP][7] ([fdo#109271]) +54 similar issues
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22463/fi-kbl-8809g/igt@[email protected]
* igt@i915_selftest@live:
- fi-skl-6600u: NOTRUN -> [FAIL][8] ([i915#4547])
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22463/fi-skl-6600u/igt@[email protected]
* igt@i915_selftest@live@hangcheck:
- fi-hsw-4770: [PASS][9] -> [INCOMPLETE][10] ([i915#4785])
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11311/fi-hsw-4770/igt@i915_selftest@[email protected]
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22463/fi-hsw-4770/igt@i915_selftest@[email protected]
- fi-bdw-5557u: NOTRUN -> [INCOMPLETE][11] ([i915#3921])
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22463/fi-bdw-5557u/igt@i915_selftest@[email protected]
- fi-snb-2600: [PASS][12] -> [INCOMPLETE][13] ([i915#3921])
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11311/fi-snb-2600/igt@i915_selftest@[email protected]
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22463/fi-snb-2600/igt@i915_selftest@[email protected]
* igt@i915_selftest@live@workarounds:
- fi-rkl-guc: [PASS][14] -> [INCOMPLETE][15] ([i915#4983])
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11311/fi-rkl-guc/igt@i915_selftest@[email protected]
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22463/fi-rkl-guc/igt@i915_selftest@[email protected]
* igt@kms_chamelium@hdmi-edid-read:
- fi-kbl-8809g: NOTRUN -> [SKIP][16] ([fdo#109271] / [fdo#111827]) +8 similar issues
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22463/fi-kbl-8809g/igt@[email protected]
* igt@kms_chamelium@vga-edid-read:
- fi-skl-6600u: NOTRUN -> [SKIP][17] ([fdo#109271] / [fdo#111827]) +8 similar issues
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22463/fi-skl-6600u/igt@[email protected]
- fi-bdw-5557u: NOTRUN -> [SKIP][18] ([fdo#109271] / [fdo#111827]) +8 similar issues
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22463/fi-bdw-5557u/igt@[email protected]
* igt@kms_cursor_legacy@basic-busy-flip-before-cursor-legacy:
- fi-skl-6600u: NOTRUN -> [SKIP][19] ([fdo#109271]) +3 similar issues
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22463/fi-skl-6600u/igt@[email protected]
* igt@kms_pipe_crc_basic@compare-crc-sanitycheck-pipe-d:
- fi-skl-6600u: NOTRUN -> [SKIP][20] ([fdo#109271] / [i915#533])
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22463/fi-skl-6600u/igt@[email protected]
- fi-kbl-8809g: NOTRUN -> [SKIP][21] ([fdo#109271] / [i915#533])
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22463/fi-kbl-8809g/igt@[email protected]
* igt@kms_psr@cursor_plane_move:
- fi-bdw-5557u: NOTRUN -> [SKIP][22] ([fdo#109271]) +13 similar issues
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22463/fi-bdw-5557u/igt@kms_psr@cursor_plane_move.html
* igt@runner@aborted:
- fi-hsw-4770: NOTRUN -> [FAIL][23] ([fdo#109271] / [i915#1436] / [i915#4312])
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22463/fi-hsw-4770/igt@[email protected]
- fi-skl-6600u: NOTRUN -> [FAIL][24] ([i915#1436] / [i915#4312])
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22463/fi-skl-6600u/igt@[email protected]
#### Possible fixes ####
* igt@gem_busy@busy@all:
- {bat-dg2-9}: [DMESG-WARN][25] -> [PASS][26]
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11311/bat-dg2-9/igt@gem_busy@[email protected]
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22463/bat-dg2-9/igt@gem_busy@[email protected]
* igt@gem_exec_suspend@basic-s3@smem:
- fi-skl-6600u: [INCOMPLETE][27] ([i915#4547]) -> [PASS][28]
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11311/fi-skl-6600u/igt@gem_exec_suspend@[email protected]
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22463/fi-skl-6600u/igt@gem_exec_suspend@[email protected]
* igt@i915_selftest@live@reset:
- {bat-adlp-6}: [DMESG-FAIL][29] ([i915#4983]) -> [PASS][30]
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11311/bat-adlp-6/igt@i915_selftest@[email protected]
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22463/bat-adlp-6/igt@i915_selftest@[email protected]
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[fdo#111827]: https://bugs.freedesktop.org/show_bug.cgi?id=111827
[i915#1436]: https://gitlab.freedesktop.org/drm/intel/issues/1436
[i915#2190]: https://gitlab.freedesktop.org/drm/intel/issues/2190
[i915#3576]: https://gitlab.freedesktop.org/drm/intel/issues/3576
[i915#3595]: https://gitlab.freedesktop.org/drm/intel/issues/3595
[i915#3921]: https://gitlab.freedesktop.org/drm/intel/issues/3921
[i915#4077]: https://gitlab.freedesktop.org/drm/intel/issues/4077
[i915#4079]: https://gitlab.freedesktop.org/drm/intel/issues/4079
[i915#4083]: https://gitlab.freedesktop.org/drm/intel/issues/4083
[i915#4212]: https://gitlab.freedesktop.org/drm/intel/issues/4212
[i915#4215]: https://gitlab.freedesktop.org/drm/intel/issues/4215
[i915#4312]: https://gitlab.freedesktop.org/drm/intel/issues/4312
[i915#4547]: https://gitlab.freedesktop.org/drm/intel/issues/4547
[i915#4613]: https://gitlab.freedesktop.org/drm/intel/issues/4613
[i915#4785]: https://gitlab.freedesktop.org/drm/intel/issues/4785
[i915#4936]: https://gitlab.freedesktop.org/drm/intel/issues/4936
[i915#4962]: https://gitlab.freedesktop.org/drm/intel/issues/4962
[i915#4983]: https://gitlab.freedesktop.org/drm/intel/issues/4983
[i915#5127]: https://gitlab.freedesktop.org/drm/intel/issues/5127
[i915#5190]: https://gitlab.freedesktop.org/drm/intel/issues/5190
[i915#5191]: https://gitlab.freedesktop.org/drm/intel/issues/5191
[i915#5192]: https://gitlab.freedesktop.org/drm/intel/issues/5192
[i915#5193]: https://gitlab.freedesktop.org/drm/intel/issues/5193
[i915#5194]: https://gitlab.freedesktop.org/drm/intel/issues/5194
[i915#533]: https://gitlab.freedesktop.org/drm/intel/issues/533
Build changes
-------------
* Linux: CI_DRM_11311 -> Patchwork_22463
CI-20190529: 20190529
CI_DRM_11311: 45895e480b1bbf55042a457a0181051727261fc8 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_6361: 2372a4beb6a33c5f0799a4a8ccbb93794f52dbca @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git
Patchwork_22463: 5b6686b92b42572409834ea887149fd174ff2303 @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
5b6686b92b42 drm/i915: Remove all frontbuffer tracking calls from the gem code 9f49dd1778a1 drm/i915/fbdev: Remove frontbuffer tracking calls
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22463/index.html