drm/i915: Disable FBC on fastset if necessary, v2.

PATCH In review Maarten Lankhorst 3 participants 6 messages Dec 20, 2018 – Dec 21, 2018

Subsystems (2)

DRM drivers Intel i915

lore

Share & tools

lore

Maarten Lankhorst

author

2018-12-20 15:17 UTC #0 lore raw

PATCH 1/1 drm/i915: Disable FBC on fastset if necessary, v2.

Without this, we will get a dmesg-warn when enable_fbc is cleared on a fastset:
WARN_ON(!crtc_state->enable_fbc)

WARNING: CPU: 0 PID: 1090 at drivers/gpu/drm/i915/intel_fbc.c:1091 intel_fbc_enable+0x2ce/0x580 [i915]
RIP: 0010:intel_fbc_enable+0x2ce/0x580 [i915]
Call Trace:
 ? __mutex_unlock_slowpath+0x46/0x2b0
 intel_update_crtc+0x6f/0x2b0 [i915]
 skl_update_crtcs+0x1d1/0x2b0 [i915]
 intel_atomic_commit_tail+0x1ea/0xdb0 [i915]
 intel_atomic_commit+0x244/0x330 [i915]
 drm_mode_atomic_ioctl+0x85d/0x950
 ? drm_atomic_set_property+0x970/0x970
 drm_ioctl_kernel+0x81/0xf0
 drm_ioctl+0x2de/0x390
 ? drm_atomic_set_property+0x970/0x970
 ? __handle_mm_fault+0x81b/0xfc0
 do_vfs_ioctl+0xa0/0x6e0
 ? __do_page_fault+0x2a5/0x550
 ksys_ioctl+0x35/0x60
 __x64_sys_ioctl+0x11/0x20
 do_syscall_64+0x55/0x190
 entry_SYSCALL_64_after_hwframe+0x49/0xbe

Changes since v1:
- Move intel_fbc_disable to intel_update_crtc() (Hans)

Cc Hans de Goede <[email protected]>

Signed-off-by Maarten Lankhorst <[email protected]>

---
 drivers/gpu/drm/i915/intel_display.c | 4 +++-
 drivers/gpu/drm/i915/intel_fbc.c     | 2 --
 2 files changed, 3 insertions(+), 3 deletions(-)

drivers/gpu/drm/i915/intel_display.c +3 -1

index eb399c9bdf56..3a4cb752e000 100644
@@ -12757,7 +12757,9 @@ static void intel_update_crtc(struct drm_crtc *crtc,
 				       pipe_config);
 	}
 
-	if (new_plane_state)
+	if (pipe_config->update_pipe && !pipe_config->enable_fbc)
+		intel_fbc_disable(intel_crtc);
+	else if (new_plane_state)
 		intel_fbc_enable(intel_crtc, pipe_config, new_plane_state);
 
 	intel_begin_crtc_commit(crtc, old_crtc_state);

drivers/gpu/drm/i915/intel_fbc.c +0 -2

index 1d3ff026d1bc..ccd5e110a19c 100644
@@ -1129,8 +1129,6 @@ void intel_fbc_disable(struct intel_crtc *crtc)
 	if (!fbc_supported(dev_priv))
 		return;
 
-	WARN_ON(crtc->active);
-
 	mutex_lock(&fbc->lock);
 	if (fbc->crtc == crtc)
 		__intel_fbc_disable(dev_priv);

Signature · 6 lines

2.19.2

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Patchwork

2018-12-20 15:55 UTC #1 lore raw

✗ Fi.CI.CHECKPATCH: warning for drm/i915: Disable FBC on fastset if necessary, v2.

== Series Details ==

Series: drm/i915: Disable FBC on fastset if necessary, v2.
URL : https://patchwork.freedesktop.org/series/54363/
State : warning

== Summary ==

$ dim checkpatch origin/drm-tip
59cca50e5e76 drm/i915: Disable FBC on fastset if necessary, v2.
-:6: WARNING:COMMIT_LOG_LONG_LINE: Possible unwrapped commit description (prefer a maximum 75 chars per line)
#6: 
Without this, we will get a dmesg-warn when enable_fbc is cleared on a fastset:

total: 0 errors, 1 warnings, 0 checks, 18 lines checked

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Patchwork

2018-12-20 16:13 UTC #2 lore raw

✓ Fi.CI.BAT: success for drm/i915: Disable FBC on fastset if necessary, v2.

In reply to Maarten Lankhorst

== Series Details ==

Series: drm/i915: Disable FBC on fastset if necessary, v2.
URL : https://patchwork.freedesktop.org/series/54363/
State : success

== Summary ==

CI Bug Log - changes from CI_DRM_5336 -> Patchwork_11139
====================================================

Summary
-------

**WARNING**

Minor unknown changes coming with Patchwork_11139 need to be verified manually.

If you think the reported changes have nothing to do with the changes introduced in Patchwork_11139, please notify your bug team to allow them to document this new failure mode, which will reduce false positives in CI.

External URL: https://patchwork.freedesktop.org/api/1.0/series/54363/revisions/1/mbox/

Possible new issues
-------------------

Here are the unknown changes that may have been introduced in Patchwork_11139:

### IGT changes ###

#### Warnings ####

* igt@kms_busy@basic-flip-a:
- fi-kbl-7567u: SKIP -> PASS +2

Known issues
------------

Here are the changes found in Patchwork_11139 that come from known issues:

### IGT changes ###

#### Issues hit ####

* igt@i915_selftest@live_hangcheck:
- fi-bwr-2160: PASS -> DMESG-FAIL [fdo#108735]
- fi-kbl-7560u: PASS -> INCOMPLETE [fdo#108044]

* igt@kms_flip@basic-flip-vs-modeset:
- fi-skl-6700hq: NOTRUN -> DMESG-WARN [fdo#105998]

* igt@kms_frontbuffer_tracking@basic:
- fi-hsw-peppy: PASS -> DMESG-WARN [fdo#102614]

* igt@kms_pipe_crc_basic@nonblocking-crc-pipe-b:
- fi-byt-clapper: PASS -> FAIL [fdo#107362]

* igt@kms_pipe_crc_basic@nonblocking-crc-pipe-b-frame-sequence:
- fi-byt-clapper: PASS -> FAIL [fdo#103191] / [fdo#107362]

* igt@kms_pipe_crc_basic@suspend-read-crc-pipe-b:
- fi-skl-6700k2: PASS -> FAIL [fdo#103375] +1

* {igt@runner@aborted}:
- fi-bsw-kefka: NOTRUN -> FAIL [fdo#108656]

#### Possible fixes ####

* igt@gem_exec_suspend@basic-s4-devices:
- fi-blb-e6850: INCOMPLETE [fdo#107718] -> PASS

* igt@gem_mmap_gtt@basic-small-copy-xy:
- fi-glk-dsi: INCOMPLETE [fdo#103359] / [k.org#198133] -> PASS

* igt@prime_vgem@basic-fence-flip:
- fi-gdg-551: FAIL [fdo#103182] -> PASS

#### Warnings ####

* igt@gem_ctx_create@basic-files:
- fi-bsw-kefka: INCOMPLETE [fdo#105876] / [fdo#108714] -> DMESG-FAIL [fdo#108656]

{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).

Participating hosts (49 -> 43)
------------------------------

Additional (1): fi-skl-6700hq
Missing (7): fi-kbl-soraka fi-hsw-4770r fi-ilk-m540 fi-byt-squawks fi-bsw-cyan fi-ctg-p8600 fi-pnv-d510

Build changes
-------------

* Linux: CI_DRM_5336 -> Patchwork_11139

CI_DRM_5336: 9fd194c1f8bd36cb623d842f5ed52b2ca2c83d18 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_4752: 321fe77d32fef32ef820f53924045fe6ef0cf6ed @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_11139: 59cca50e5e76b68acfe6d35585e69c218c8fc530 @ git://anongit.freedesktop.org/gfx-ci/linux

== Linux commits ==

59cca50e5e76 drm/i915: Disable FBC on fastset if necessary, v2.

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_11139/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Hans de Goede

Reviewed-by on v1 1/1

2018-12-20 18:55 UTC #3 lore raw

In reply to Maarten Lankhorst

Hi,

Quoted 23 lines · Maarten Lankhorst

Without this, we will get a dmesg-warn when enable_fbc is cleared on a fastset:
WARN_ON(!crtc_state->enable_fbc)

WARNING: CPU: 0 PID: 1090 at drivers/gpu/drm/i915/intel_fbc.c:1091 intel_fbc_enable+0x2ce/0x580 [i915]
RIP: 0010:intel_fbc_enable+0x2ce/0x580 [i915]
Call Trace:
  ? __mutex_unlock_slowpath+0x46/0x2b0
  intel_update_crtc+0x6f/0x2b0 [i915]
  skl_update_crtcs+0x1d1/0x2b0 [i915]
  intel_atomic_commit_tail+0x1ea/0xdb0 [i915]
  intel_atomic_commit+0x244/0x330 [i915]
  drm_mode_atomic_ioctl+0x85d/0x950
  ? drm_atomic_set_property+0x970/0x970
  drm_ioctl_kernel+0x81/0xf0
  drm_ioctl+0x2de/0x390
  ? drm_atomic_set_property+0x970/0x970
  ? __handle_mm_fault+0x81b/0xfc0
  do_vfs_ioctl+0xa0/0x6e0
  ? __do_page_fault+0x2a5/0x550
  ksys_ioctl+0x35/0x60
  __x64_sys_ioctl+0x11/0x20
  do_syscall_64+0x55/0x190
  entry_SYSCALL_64_after_hwframe+0x49/0xbe

Quoted 5 lines

Changes since v1:
- Move intel_fbc_disable to intel_update_crtc() (Hans)
Cc Hans de Goede <[email protected]>
Signed-off-by Maarten Lankhorst <[email protected]>

Patch looks good to me:

Reviewed-by Hans de Goede <[email protected]>

Regards,

Hans

Quoted 26 lines

---
  drivers/gpu/drm/i915/intel_display.c | 4 +++-
  drivers/gpu/drm/i915/intel_fbc.c     | 2 --
  2 files changed, 3 insertions(+), 3 deletions(-)

drivers/gpu/drm/i915/intel_display.c +3 -1

index eb399c9bdf56..3a4cb752e000 100644
@@ -12757,7 +12757,9 @@ static void intel_update_crtc(struct drm_crtc *crtc,
  				       pipe_config);
  	}
 
-	if (new_plane_state)
+	if (pipe_config->update_pipe && !pipe_config->enable_fbc)
+		intel_fbc_disable(intel_crtc);
+	else if (new_plane_state)
  		intel_fbc_enable(intel_crtc, pipe_config, new_plane_state);
 
  	intel_begin_crtc_commit(crtc, old_crtc_state);

drivers/gpu/drm/i915/intel_fbc.c +0 -0

index 1d3ff026d1bc..ccd5e110a19c 100644

drivers/gpu/drm/i915/intel_fbc.c void intel_fbc_disable(struct intel_crtc *crtc) · line 1134

Quoted 8 lines

drivers/gpu/drm/i915/intel_fbc.c +0 -2

@@ -1129,8 +1129,6 @@ void intel_fbc_disable(struct intel_crtc *crtc)
  	if (!fbc_supported(dev_priv))
  		return;
 
-	WARN_ON(crtc->active);
-
  	mutex_lock(&fbc->lock);
  	if (fbc->crtc == crtc)
  		__intel_fbc_disable(dev_priv);

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Maarten Lankhorst

author

2018-12-21 13:22 UTC #4 lore raw

Op 20-12-2018 om 19:55 schreef Hans de Goede:

Quoted 29 lines

Hi,

Quoted 26 lines · Maarten Lankhorst

Without this, we will get a dmesg-warn when enable_fbc is cleared on a fastset:
WARN_ON(!crtc_state->enable_fbc)

WARNING: CPU: 0 PID: 1090 at drivers/gpu/drm/i915/intel_fbc.c:1091 intel_fbc_enable+0x2ce/0x580 [i915]
RIP: 0010:intel_fbc_enable+0x2ce/0x580 [i915]
Call Trace:
  ? __mutex_unlock_slowpath+0x46/0x2b0
  intel_update_crtc+0x6f/0x2b0 [i915]
  skl_update_crtcs+0x1d1/0x2b0 [i915]
  intel_atomic_commit_tail+0x1ea/0xdb0 [i915]
  intel_atomic_commit+0x244/0x330 [i915]
  drm_mode_atomic_ioctl+0x85d/0x950
  ? drm_atomic_set_property+0x970/0x970
  drm_ioctl_kernel+0x81/0xf0
  drm_ioctl+0x2de/0x390
  ? drm_atomic_set_property+0x970/0x970
  ? __handle_mm_fault+0x81b/0xfc0
  do_vfs_ioctl+0xa0/0x6e0
  ? __do_page_fault+0x2a5/0x550
  ksys_ioctl+0x35/0x60
  __x64_sys_ioctl+0x11/0x20
  do_syscall_64+0x55/0x190
  entry_SYSCALL_64_after_hwframe+0x49/0xbe

Changes since v1:
- Move intel_fbc_disable to intel_update_crtc() (Hans)

Quoted 6 lines

Quoted 2 lines
Cc Hans de Goede <[email protected]>
Signed-off-by Maarten Lankhorst <[email protected]>
Patch looks good to me:
Reviewed-by Hans de Goede <[email protected]>

Thanks, pushed. :)

~Maarten

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Patchwork

2018-12-21 14:50 UTC #5 lore raw

✓ Fi.CI.IGT: success for drm/i915: Disable FBC on fastset if necessary, v2.

In reply to Maarten Lankhorst

== Series Details ==

Series: drm/i915: Disable FBC on fastset if necessary, v2.
URL : https://patchwork.freedesktop.org/series/54363/
State : success

== Summary ==

CI Bug Log - changes from CI_DRM_5336_full -> Patchwork_11139_full
====================================================

Summary
-------

**WARNING**

Minor unknown changes coming with Patchwork_11139_full need to be verified manually.

If you think the reported changes have nothing to do with the changes introduced in Patchwork_11139_full, please notify your bug team to allow them to document this new failure mode, which will reduce false positives in CI.

Possible new issues
-------------------

Here are the unknown changes that may have been introduced in Patchwork_11139_full:

### IGT changes ###

#### Warnings ####

* igt@kms_cursor_legacy@basic-busy-flip-before-cursor-atomic:
- shard-snb: PASS -> SKIP +1

Known issues
------------

Here are the changes found in Patchwork_11139_full that come from known issues:

### IGT changes ###

#### Issues hit ####

* igt@gem_exec_schedule@pi-ringfull-blt:
- shard-skl: NOTRUN -> FAIL [fdo#103158]

* igt@gem_workarounds@suspend-resume-fd:
- shard-iclb: PASS -> INCOMPLETE [fdo#107713]

* igt@i915_suspend@shrink:
- shard-skl: NOTRUN -> DMESG-WARN [fdo#108784]

* igt@kms_busy@extended-modeset-hang-newfb-with-reset-render-c:
- shard-skl: NOTRUN -> DMESG-WARN [fdo#107956] +1

* igt@kms_busy@extended-modeset-hang-oldfb-with-reset-render-a:
- shard-iclb: PASS -> DMESG-WARN [fdo#107724] +33

* igt@kms_busy@extended-pageflip-hang-newfb-render-c:
- shard-glk: PASS -> DMESG-WARN [fdo#107956]

* igt@kms_color@pipe-c-ctm-max:
- shard-apl: PASS -> FAIL [fdo#108147]

* igt@kms_cursor_crc@cursor-128x42-onscreen:
- shard-skl: NOTRUN -> FAIL [fdo#103232]

* igt@kms_cursor_crc@cursor-256x256-sliding:
- shard-iclb: NOTRUN -> FAIL [fdo#103232] +2

* igt@kms_cursor_legacy@pipe-c-torture-bo:
- shard-kbl: PASS -> DMESG-WARN [fdo#103558] / [fdo#105602] +6

* igt@kms_draw_crc@draw-method-xrgb8888-mmap-cpu-untiled:
- shard-iclb: PASS -> WARN [fdo#108336] +2

* igt@kms_fbcon_fbt@fbc-suspend:
- shard-skl: PASS -> INCOMPLETE [fdo#104108] / [fdo#107773]

* igt@kms_frontbuffer_tracking@fbc-1p-primscrn-spr-indfb-draw-mmap-gtt:
- shard-apl: PASS -> FAIL [fdo#103167] +3

* igt@kms_frontbuffer_tracking@fbc-1p-primscrn-spr-indfb-move:
- shard-glk: PASS -> FAIL [fdo#103167]

* igt@kms_frontbuffer_tracking@fbc-suspend:
- shard-iclb: PASS -> DMESG-FAIL [fdo#107724] +15

* igt@kms_frontbuffer_tracking@psr-1p-offscren-pri-indfb-draw-mmap-wc:
- shard-iclb: PASS -> DMESG-WARN [fdo#107724] / [fdo#108336] +19

* igt@kms_frontbuffer_tracking@psr-1p-primscrn-spr-indfb-draw-mmap-gtt:
- shard-iclb: PASS -> FAIL [fdo#103167] +7

* igt@kms_pipe_crc_basic@suspend-read-crc-pipe-a:
- shard-skl: NOTRUN -> INCOMPLETE [fdo#104108] / [fdo#107773]

* igt@kms_plane@pixel-format-pipe-b-planes-source-clamping:
- shard-skl: NOTRUN -> DMESG-WARN [fdo#106885] +1

* igt@kms_plane@plane-panning-bottom-right-suspend-pipe-c-planes:
- shard-iclb: PASS -> DMESG-FAIL [fdo#103166] / [fdo#107724]

* igt@kms_plane@plane-position-covered-pipe-b-planes:
- shard-apl: PASS -> FAIL [fdo#103166]

* igt@kms_plane_alpha_blend@pipe-a-alpha-basic:
- shard-skl: NOTRUN -> FAIL [fdo#107815] / [fdo#108145]

* igt@kms_plane_alpha_blend@pipe-b-constant-alpha-max:
- shard-skl: NOTRUN -> FAIL [fdo#108145]

* igt@kms_plane_multiple@atomic-pipe-c-tiling-x:
- shard-glk: PASS -> FAIL [fdo#103166] +2

* igt@kms_plane_multiple@atomic-pipe-c-tiling-yf:
- shard-iclb: PASS -> FAIL [fdo#103166] +3

* igt@kms_rotation_crc@sprite-rotation-90:
- shard-kbl: PASS -> DMESG-FAIL [fdo#103558] / [fdo#105602]

* igt@kms_setmode@basic:
- shard-kbl: PASS -> FAIL [fdo#99912]

* igt@pm_rpm@fences-dpms:
- shard-skl: PASS -> INCOMPLETE [fdo#107807]

* igt@pm_rpm@modeset-pc8-residency-stress:
- shard-iclb: SKIP -> INCOMPLETE [fdo#108840]

* igt@pm_rpm@modeset-stress-extra-wait:
- shard-iclb: PASS -> DMESG-WARN [fdo#108654]

#### Possible fixes ####

* igt@gem_eio@unwedge-stress:
- shard-glk: FAIL [fdo#105957] -> PASS

* igt@kms_atomic_transition@plane-all-modeset-transition-internal-panels:
- shard-iclb: DMESG-WARN [fdo#107724] -> PASS +9

* igt@kms_cursor_crc@cursor-128x128-dpms:
- shard-apl: FAIL [fdo#103232] -> PASS +1

* igt@kms_cursor_crc@cursor-128x42-offscreen:
- shard-glk: INCOMPLETE [fdo#103359] / [k.org#198133] -> PASS

* igt@kms_cursor_crc@cursor-64x64-offscreen:
- shard-skl: FAIL [fdo#103232] -> PASS

* igt@kms_draw_crc@draw-method-xrgb2101010-blt-untiled:
- shard-iclb: WARN [fdo#108336] -> PASS

* igt@kms_flip@flip-vs-expired-vblank-interruptible:
- shard-skl: FAIL [fdo#105363] -> PASS

* igt@kms_frontbuffer_tracking@fbc-1p-primscrn-cur-indfb-draw-mmap-wc:
- shard-apl: FAIL [fdo#103167] -> PASS

* igt@kms_frontbuffer_tracking@fbc-2p-primscrn-spr-indfb-onoff:
- shard-glk: FAIL [fdo#103167] -> PASS +1

* igt@kms_frontbuffer_tracking@fbcpsr-rgb101010-draw-mmap-wc:
- shard-iclb: DMESG-WARN [fdo#107724] / [fdo#108336] -> PASS +8

* igt@kms_pipe_crc_basic@suspend-read-crc-pipe-c:
- shard-skl: INCOMPLETE [fdo#104108] / [fdo#107773] -> PASS

* igt@kms_plane@pixel-format-pipe-b-planes-source-clamping:
- shard-apl: DMESG-WARN [fdo#103558] / [fdo#105602] -> PASS +12

* igt@kms_plane@plane-position-covered-pipe-a-planes:
- shard-glk: FAIL [fdo#103166] -> PASS

* igt@kms_plane@plane-position-covered-pipe-c-planes:
- shard-apl: FAIL [fdo#103166] -> PASS +2

* igt@kms_plane_alpha_blend@pipe-b-coverage-7efc:
- shard-skl: FAIL [fdo#107815] -> PASS

* igt@kms_plane_alpha_blend@pipe-c-alpha-transparant-fb:
- shard-iclb: DMESG-FAIL [fdo#107724] -> PASS +7

* igt@kms_plane_multiple@atomic-pipe-c-tiling-x:
- shard-iclb: FAIL [fdo#103166] -> PASS

* igt@kms_rotation_crc@multiplane-rotation-cropping-top:
- shard-kbl: DMESG-WARN [fdo#105604] -> PASS
- shard-glk: DMESG-FAIL [fdo#105763] / [fdo#106538] -> PASS

* igt@pm_rpm@gem-evict-pwrite:
- shard-skl: INCOMPLETE [fdo#107807] -> PASS +1

* igt@pm_rpm@legacy-planes:
- shard-iclb: DMESG-WARN [fdo#108654] -> PASS

* igt@pm_rpm@system-suspend-execbuf:
- shard-skl: INCOMPLETE [fdo#104108] / [fdo#107773] / [fdo#107807] -> PASS

#### Warnings ####

* igt@i915_selftest@live_contexts:
- shard-iclb: INCOMPLETE [fdo#108315] -> DMESG-FAIL [fdo#108569]

* igt@i915_suspend@shrink:
- shard-snb: INCOMPLETE [fdo#105411] / [fdo#106886] -> DMESG-WARN [fdo#108784]

* igt@kms_ccs@pipe-c-crc-primary-basic:
- shard-iclb: FAIL [fdo#107725] -> DMESG-WARN [fdo#107724] / [fdo#108336]

* igt@kms_cursor_crc@cursor-64x21-sliding:
- shard-iclb: FAIL [fdo#103232] -> DMESG-WARN [fdo#107724] / [fdo#108336] +1

Participating hosts (7 -> 7)
------------------------------

No changes in participating hosts

Build changes
-------------

* Linux: CI_DRM_5336 -> Patchwork_11139

== Logs ==