drm/i915: Do not turn off IPS twice.
Subsystems (2)
PATCH 1/2 drm/i915: Do not turn off IPS twice.
This is done through pre_disable_primary and hsw_disable_ips. They're both set on the same conditions, so leave the check of disable_ips in pre_disable_primary.
--- drivers/gpu/drm/i915/intel_display.c | 16 +--------------- drivers/gpu/drm/i915/intel_drv.h | 1 - 2 files changed, 1 insertion(+), 16 deletions(-)
drivers/gpu/drm/i915/intel_display.c +1 -15
@@ -4790,9 +4790,6 @@ static void intel_pre_plane_update(struct intel_crtc *crtc)if (atomic->disable_fbc)intel_fbc_disable_crtc (crtc); -if (crtc->atomic.disable_ips) -hsw_disable_ips (crtc); -if (atomic->pre_disable_primary)intel_pre_disable_primary (&crtc->base);
@@ -11726,19 +11723,8 @@ int intel_plane_atomic_calc_changes(struct drm_crtc_state *crtc_state, intel_crtc->atomic.pre_disable_primary = turn_off; intel_crtc->atomic.post_enable_primary = turn_on; -if (turn_off) { -/* -* FIXME: Actually if we will still have any other -* plane enabled on the pipe we could let IPS enabled -* still, but for now lets consider that when we make -* primary invisible by setting DSPCNTR to 0 on -* update_primary_plane function IPS needs to be -* disable. -*/ - intel_crtc->atomic.disable_ips = true; - +if (turn_off) intel_crtc->atomic.disable_fbc = true; - }/* * FBC does not work on some platforms for rotated
drivers/gpu/drm/i915/intel_drv.h +0 -1
@@ -493,7 +493,6 @@ struct intel_crtc_atomic_commit {/* Sleepable operations to perform before commit */ bool wait_for_flips;bool disable_fbc; -bool disable_ips;bool disable_cxsr;bool pre_disable_primary;bool update_wm_pre, update_wm_post;
Signature · 6 lines
2.1.0 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 2/2 drm/i915: Do not enable IPS with the primary plane disabled.
This fixes kms_universal_plane.universal-plane-pipe-A-functional.
IPS gets enabled even though the primary plane is disabled. This is not supported, and results in warnings like below:
------------[ cut here ]------------ WARNING: CPU: 0 PID: 1707 at drivers/gpu/drm/i915/intel_display.c:1354 assert_plane.constprop.66+0x70/0xa0 [i915]() plane A assertion failure (expected on, current off) Modules linked in: i915 CPU: 0 PID: 1707 Comm: kms_universal_p Tainted: G W 4.2.0-rc2-patser+ #4288 Hardware name: NUC5i7RYB,
BIOS RYBDWi35.86A.0246.2015.0309.1355 03/09/2015
ffffffffc01d3278 ffff8800ccc37c88 ffffffff816f6e74 0000000080000000 ffff8800ccc37cd8 ffff8800ccc37cc8 ffffffff8107bfe1 ffff8800ccc37ca8 0000000000000000 ffff880117aa4520 ffff8800d7435388 ffff8800d5170000
Call Trace: [<ffffffff816f6e74>] dump_stack+0x4f/0x7b [<ffffffff8107bfe1>] warn_slowpath_common+0x81/0xc0 [<ffffffff8107c061>] warn_slowpath_fmt+0x41/0x50 [<ffffffffc016a270>] assert_plane.constprop.66+0x70/0xa0 [i915] [<ffffffffc0173510>] hsw_enable_ips+0x50/0x150 [i915] [<ffffffffc0128a63>] display_crc_ctl_write+0x623/0xbf0 [i915] [<ffffffff81192153>] __vfs_write+0x23/0xe0 [<ffffffff81195334>] ? __sb_start_write+0x44/0xf0 [<ffffffff81277718>] ? security_file_permission+0x38/0xc0 [<ffffffff81192b34>] vfs_write+0xa4/0x190 [<ffffffff810d73de>] ? do_setitimer+0x12e/0x220 [<ffffffff81193741>] SyS_write+0x41/0xa0 [<ffffffff816fdad7>] entry_SYSCALL_64_fastpath+0x12/0x6a ---[ end trace 264b7f8804a754c3 ]---
This can be fixed easily by checking primary->visible.
--- drivers/gpu/drm/i915/i915_debugfs.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-)
drivers/gpu/drm/i915/i915_debugfs.c +13 -3
@@ -3799,7 +3799,13 @@ static int pipe_crc_set_source(struct drm_device *dev, enum pipe pipe,* user space can't make reliable use of the CRCs, so let's just * completely disable it. */ -hsw_disable_ips (crtc); + +if (HAS_IPS (dev) && pipe ==PIPE_A ) { +drm_modeset_lock (&crtc->base.primary->mutex,NULL ); +if (to_intel_plane_state (crtc->base.primary->state)->visible) +hsw_disable_ips (crtc); +drm_modeset_unlock (&crtc->base.primary->mutex); + }spin_lock_irq (&pipe_crc->lock);kfree (pipe_crc->entries);
@@ -3843,8 +3849,12 @@ static int pipe_crc_set_source(struct drm_device *dev, enum pipe pipe,vlv_undo_pipe_scramble_reset (dev, pipe); else if (IS_HASWELL(dev) && pipe == PIPE_A) hsw_undo_trans_edp_pipe_A_crc_wa(dev); - -hsw_enable_ips (crtc ); + else if (HAS_IPS(dev) && pipe == PIPE_A) { +drm_modeset_lock (&crtc->base.primary->mutex,NULL ); +if (to_intel_plane_state (crtc->base.primary->state)->visible) +hsw_enable_ips (crtc); +drm_modeset_unlock (&crtc->base.primary->mutex); + } }return 0 ;
Signature · 6 lines
2.1.0 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 2/2] drm/i915: Do not enable IPS with the primary plane disabled.
Task id: 7260 -------------------------------------Summary-------------------------------------
Platform Delta drm-intel-nightly Series Applied
ILK 302/302 302/302 SNB 315/315 315/315 IVB 336/336 336/336 BYT 283/283 283/283 HSW 378/378 378/378
-------------------------------------Detailed-------------------------------------
Platform Test drm-intel-nightly Series Applied
Note: You need to pay more attention to line start with '*'
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Jani Nikula
maintainerRe: [PATCH 2/2] drm/i915: Do not enable IPS with the primary plane disabled.
In reply to Maarten LankhorstQuoted 33 lines · Maarten Lankhorst
This fixes kms_universal_plane.universal-plane-pipe-A-functional.
IPS gets enabled even though the primary plane is disabled. This is not supported, and results in warnings like below:
------------[ cut here ]------------ WARNING: CPU: 0 PID: 1707 at drivers/gpu/drm/i915/intel_display.c:1354 assert_plane.constprop.66+0x70/0xa0 [i915]() plane A assertion failure (expected on, current off) Modules linked in: i915 CPU: 0 PID: 1707 Comm: kms_universal_p Tainted: G W 4.2.0-rc2-patser+ #4288 Hardware name: NUC5i7RYB,BIOS RYBDWi35.86A.0246.2015.0309.1355 03/09/2015
ffffffffc01d3278ffff8800ccc37c88ffffffff816f6e740000000080000000ffff8800ccc37cd8ffff8800ccc37cc8ffffffff8107bfe1ffff8800ccc37ca80000000000000000ffff880117aa4520ffff8800d7435388ffff8800d5170000Call Trace: [<ffffffff816f6e74>] dump_stack+0x4f/0x7b [<ffffffff8107bfe1>] warn_slowpath_common+0x81/0xc0 [<ffffffff8107c061>] warn_slowpath_fmt+0x41/0x50 [<ffffffffc016a270>] assert_plane.constprop.66+0x70/0xa0 [i915] [<ffffffffc0173510>] hsw_enable_ips+0x50/0x150 [i915] [<ffffffffc0128a63>] display_crc_ctl_write+0x623/0xbf0 [i915] [<ffffffff81192153>] __vfs_write+0x23/0xe0 [<ffffffff81195334>] ? __sb_start_write+0x44/0xf0 [<ffffffff81277718>] ? security_file_permission+0x38/0xc0 [<ffffffff81192b34>] vfs_write+0xa4/0x190 [<ffffffff810d73de>] ? do_setitimer+0x12e/0x220 [<ffffffff81193741>] SyS_write+0x41/0xa0 [<ffffffff816fdad7>] entry_SYSCALL_64_fastpath+0x12/0x6a ---[ end trace 264b7f8804a754c3 ]---
Quoted 3 lines
This can be fixed easily by checking
primary->visible.Signed-off-by Maarten Lankhorst <[email protected]>
Maarten, this series has no reviews and it no longer applies to v4.3 cleanly. Please rebase and repost if it's still valid.
BR,
Jani.
Quoted 45 lines
--- drivers/gpu/drm/i915/i915_debugfs.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-)drivers/gpu/drm/i915/i915_debugfs.c +13
-3@@ -3799,7 +3799,13 @@ static int pipe_crc_set_source(struct drm_device *dev, enum pipe pipe,* user space can't make reliable use of the CRCs, so let's just * completely disable it. */ -hsw_disable_ips (crtc); + +if (HAS_IPS (dev) && pipe ==PIPE_A ) { +drm_modeset_lock (&crtc->base.primary->mutex,NULL ); +if (to_intel_plane_state (crtc->base.primary->state)->visible) +hsw_disable_ips (crtc); +drm_modeset_unlock (&crtc->base.primary->mutex); + }spin_lock_irq (&pipe_crc->lock);kfree (pipe_crc->entries);@@ -3843,8 +3849,12 @@ static int pipe_crc_set_source(struct drm_device *dev, enum pipe pipe,vlv_undo_pipe_scramble_reset (dev, pipe); else if (IS_HASWELL(dev) && pipe == PIPE_A) hsw_undo_trans_edp_pipe_A_crc_wa(dev); - -hsw_enable_ips (crtc ); + else if (HAS_IPS(dev) && pipe == PIPE_A) { +drm_modeset_lock (&crtc->base.primary->mutex,NULL ); +if (to_intel_plane_state (crtc->base.primary->state)->visible) +hsw_enable_ips (crtc); +drm_modeset_unlock (&crtc->base.primary->mutex); + } }return 0 ;Signature · 6 lines
2.1.0 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 5 lines
Jani Nikula, Intel Open Source Technology Center _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx