From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753069AbbGNLAn (ORCPT ); Tue, 14 Jul 2015 07:00:43 -0400 Received: from mga14.intel.com ([192.55.52.115]:11912 "EHLO mga14.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751558AbbGNLAm (ORCPT ); Tue, 14 Jul 2015 07:00:42 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.15,471,1432623600"; d="scan'208";a="764090834" Message-ID: <55A4EBD7.3050406@linux.intel.com> Date: Tue, 14 Jul 2015 13:00:39 +0200 From: Maarten Lankhorst User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.7.0 MIME-Version: 1.0 To: =?UTF-8?B?SsO2cmcgT3R0ZQ==?= CC: Linus Torvalds , David Airlie , DRI , Linux Kernel Mailing List Subject: [PATCH] drm/i915: Do not call intel_crtc_disable if the crtc is already disabled. References: <20150713062222.GG3736@phenom.ffwll.local> <55A3678B.6080803@linux.intel.com> <55A36FA7.7010707@linux.intel.com> In-Reply-To: Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org When resuming with dpms off, the following warn can happen: [ 118.334082] ------------[ cut here ]------------ [ 118.334105] WARNING: CPU: 2 PID: 2274 at drivers/gpu/drm/i915/intel_display.c:6319 __intel_set_mode+0xae5/0xb90 [i915]() [ 118.334106] WARN_ON(!crtc->state->enable) [ 118.334137] Modules linked in: i915 [ 118.334139] CPU: 2 PID: 2274 Comm: kworker/u16:117 Not tainted 4.2.0-rc2-fixes+ #4148 [ 118.334140] Hardware name: LENOVO 2349AV8/2349AV8, BIOS G1ETA5WW (2.65 ) 04/15/2014 [ 118.334144] Workqueue: events_unbound async_run_entry_fn [ 118.334147] ffffffffc017eef0 ffff8800ada93998 ffffffff817aa62a 0000000080000001 [ 118.334149] ffff8800ada939e8 ffff8800ada939d8 ffffffff810807e1 ffff8800ada939c8 [ 118.334151] ffff8800cea3b3d8 0000000000000000 ffff8800ad86b008 ffff880117705668 [ 118.334151] Call Trace: [ 118.334155] [] dump_stack+0x4f/0x7b [ 118.334157] [] warn_slowpath_common+0x81/0xc0 [ 118.334158] [] warn_slowpath_fmt+0x41/0x50 [ 118.334173] [] __intel_set_mode+0xae5/0xb90 [i915] [ 118.334188] [] ? intel_modeset_compute_config+0x52/0xb40 [i915] [ 118.334191] [] ? drm_atomic_set_fb_for_plane+0x63/0x80 [ 118.334205] [] intel_set_mode+0x29/0x60 [i915] [ 118.334219] [] intel_crtc_restore_mode+0x13a/0x1f0 [i915] [ 118.334232] [] ? gen6_write16+0x250/0x250 [i915] [ 118.334246] [] intel_modeset_setup_hw_state+0x89c/0xcd0 [i915] [ 118.334248] [] ? pci_pm_thaw+0x90/0x90 [ 118.334255] [] i915_drm_resume+0xcb/0x160 [i915] [ 118.334262] [] i915_pm_resume+0x22/0x30 [i915] [ 118.334263] [] pci_pm_resume+0x63/0xa0 [ 118.334266] [] dpm_run_callback+0x70/0x420 [ 118.334267] [] device_resume+0x9d/0x1c0 [ 118.334269] [] ? initcall_debug_start+0x60/0x60 [ 118.334270] [] async_resume+0x1c/0x50 [ 118.334271] [] async_run_entry_fn+0x34/0xd0 [ 118.334273] [] process_one_work+0x1dd/0x7e0 [ 118.334275] [] ? process_one_work+0x14a/0x7e0 [ 118.334276] [] worker_thread+0x49/0x450 [ 118.334278] [] ? process_one_work+0x7e0/0x7e0 [ 118.334280] [] kthread+0xf9/0x110 [ 118.334282] [] ? insert_kthread_work+0x90/0x90 [ 118.334284] [] ret_from_fork+0x3f/0x70 [ 118.334286] [] ? insert_kthread_work+0x90/0x90 [ 118.334287] ---[ end trace 01f2cf6371b82d7a ]--- This warn is harmless, and can be fixed by not calling intel_crtc_disable when the crtc is already disabled. Reported-and-Tested-by: Jörg Otte Signed-off-by: Maarten Lankhorst --- diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 85ac6d85dc39..30e0f54ba19d 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -6315,9 +6315,6 @@ static void intel_crtc_disable(struct drm_crtc *crtc) struct drm_connector *connector; struct drm_i915_private *dev_priv = dev->dev_private; - /* crtc should still be enabled when we disable it. */ - WARN_ON(!crtc->state->enable); - intel_crtc_disable_planes(crtc); dev_priv->display.crtc_disable(crtc); dev_priv->display.off(crtc); @@ -12591,7 +12588,8 @@ static int __intel_set_mode(struct drm_crtc *modeset_crtc, continue; if (!crtc_state->enable) { - intel_crtc_disable(crtc); + if (crtc->state->enable) + intel_crtc_disable(crtc); } else if (crtc->state->enable) { intel_crtc_disable_planes(crtc); dev_priv->display.crtc_disable(crtc); From mboxrd@z Thu Jan 1 00:00:00 1970 From: Maarten Lankhorst Subject: [PATCH] drm/i915: Do not call intel_crtc_disable if the crtc is already disabled. Date: Tue, 14 Jul 2015 13:00:39 +0200 Message-ID: <55A4EBD7.3050406@linux.intel.com> References: <20150713062222.GG3736@phenom.ffwll.local> <55A3678B.6080803@linux.intel.com> <55A36FA7.7010707@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTP id A61246E42B for ; Tue, 14 Jul 2015 04:00:41 -0700 (PDT) In-Reply-To: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: =?UTF-8?B?SsO2cmcgT3R0ZQ==?= Cc: Linus Torvalds , Linux Kernel Mailing List , DRI List-Id: dri-devel@lists.freedesktop.org V2hlbiByZXN1bWluZyB3aXRoIGRwbXMgb2ZmLCB0aGUgZm9sbG93aW5nIHdhcm4gY2FuIGhhcHBl bjoKClsgIDExOC4zMzQwODJdIC0tLS0tLS0tLS0tLVsgY3V0IGhlcmUgXS0tLS0tLS0tLS0tLQpb ICAxMTguMzM0MTA1XSBXQVJOSU5HOiBDUFU6IDIgUElEOiAyMjc0IGF0IGRyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX2Rpc3BsYXkuYzo2MzE5IF9faW50ZWxfc2V0X21vZGUrMHhhZTUvMHhiOTAg W2k5MTVdKCkKWyAgMTE4LjMzNDEwNl0gV0FSTl9PTighY3J0Yy0+c3RhdGUtPmVuYWJsZSkKWyAg MTE4LjMzNDEzN10gTW9kdWxlcyBsaW5rZWQgaW46IGk5MTUKWyAgMTE4LjMzNDEzOV0gQ1BVOiAy IFBJRDogMjI3NCBDb21tOiBrd29ya2VyL3UxNjoxMTcgTm90IHRhaW50ZWQgNC4yLjAtcmMyLWZp eGVzKyAjNDE0OApbICAxMTguMzM0MTQwXSBIYXJkd2FyZSBuYW1lOiBMRU5PVk8gMjM0OUFWOC8y MzQ5QVY4LCBCSU9TIEcxRVRBNVdXICgyLjY1ICkgMDQvMTUvMjAxNApbICAxMTguMzM0MTQ0XSBX b3JrcXVldWU6IGV2ZW50c191bmJvdW5kIGFzeW5jX3J1bl9lbnRyeV9mbgpbICAxMTguMzM0MTQ3 XSAgZmZmZmZmZmZjMDE3ZWVmMCBmZmZmODgwMGFkYTkzOTk4IGZmZmZmZmZmODE3YWE2MmEgMDAw MDAwMDA4MDAwMDAwMQpbICAxMTguMzM0MTQ5XSAgZmZmZjg4MDBhZGE5MzllOCBmZmZmODgwMGFk YTkzOWQ4IGZmZmZmZmZmODEwODA3ZTEgZmZmZjg4MDBhZGE5MzljOApbICAxMTguMzM0MTUxXSAg ZmZmZjg4MDBjZWEzYjNkOCAwMDAwMDAwMDAwMDAwMDAwIGZmZmY4ODAwYWQ4NmIwMDggZmZmZjg4 MDExNzcwNTY2OApbICAxMTguMzM0MTUxXSBDYWxsIFRyYWNlOgpbICAxMTguMzM0MTU1XSAgWzxm ZmZmZmZmZjgxN2FhNjJhPl0gZHVtcF9zdGFjaysweDRmLzB4N2IKWyAgMTE4LjMzNDE1N10gIFs8 ZmZmZmZmZmY4MTA4MDdlMT5dIHdhcm5fc2xvd3BhdGhfY29tbW9uKzB4ODEvMHhjMApbICAxMTgu MzM0MTU4XSAgWzxmZmZmZmZmZjgxMDgwODYxPl0gd2Fybl9zbG93cGF0aF9mbXQrMHg0MS8weDUw ClsgIDExOC4zMzQxNzNdICBbPGZmZmZmZmZmYzAxMjAzNzU+XSBfX2ludGVsX3NldF9tb2RlKzB4 YWU1LzB4YjkwIFtpOTE1XQpbICAxMTguMzM0MTg4XSAgWzxmZmZmZmZmZmMwMTIxMzEyPl0gPyBp bnRlbF9tb2Rlc2V0X2NvbXB1dGVfY29uZmlnKzB4NTIvMHhiNDAgW2k5MTVdClsgIDExOC4zMzQx OTFdICBbPGZmZmZmZmZmODE0NGRlNTM+XSA/IGRybV9hdG9taWNfc2V0X2ZiX2Zvcl9wbGFuZSsw eDYzLzB4ODAKWyAgMTE4LjMzNDIwNV0gIFs8ZmZmZmZmZmZjMDEyNjlkOT5dIGludGVsX3NldF9t b2RlKzB4MjkvMHg2MCBbaTkxNV0KWyAgMTE4LjMzNDIxOV0gIFs8ZmZmZmZmZmZjMDEyNzMwYT5d IGludGVsX2NydGNfcmVzdG9yZV9tb2RlKzB4MTNhLzB4MWYwIFtpOTE1XQpbICAxMTguMzM0MjMy XSAgWzxmZmZmZmZmZmMwMTAxMTYwPl0gPyBnZW42X3dyaXRlMTYrMHgyNTAvMHgyNTAgW2k5MTVd ClsgIDExOC4zMzQyNDZdICBbPGZmZmZmZmZmYzAxMjgzZWM+XSBpbnRlbF9tb2Rlc2V0X3NldHVw X2h3X3N0YXRlKzB4ODljLzB4Y2QwIFtpOTE1XQpbICAxMTguMzM0MjQ4XSAgWzxmZmZmZmZmZjgx MzdkMjYwPl0gPyBwY2lfcG1fdGhhdysweDkwLzB4OTAKWyAgMTE4LjMzNDI1NV0gIFs8ZmZmZmZm ZmZjMDBhYzExYj5dIGk5MTVfZHJtX3Jlc3VtZSsweGNiLzB4MTYwIFtpOTE1XQpbICAxMTguMzM0 MjYyXSAgWzxmZmZmZmZmZmMwMGFjMWQyPl0gaTkxNV9wbV9yZXN1bWUrMHgyMi8weDMwIFtpOTE1 XQpbICAxMTguMzM0MjYzXSAgWzxmZmZmZmZmZjgxMzdkMmMzPl0gcGNpX3BtX3Jlc3VtZSsweDYz LzB4YTAKWyAgMTE4LjMzNDI2Nl0gIFs8ZmZmZmZmZmY4MTQ2NzU1MD5dIGRwbV9ydW5fY2FsbGJh Y2srMHg3MC8weDQyMApbICAxMTguMzM0MjY3XSAgWzxmZmZmZmZmZjgxNDY3Y2JkPl0gZGV2aWNl X3Jlc3VtZSsweDlkLzB4MWMwClsgIDExOC4zMzQyNjldICBbPGZmZmZmZmZmODE0NjczZDA+XSA/ IGluaXRjYWxsX2RlYnVnX3N0YXJ0KzB4NjAvMHg2MApbICAxMTguMzM0MjcwXSAgWzxmZmZmZmZm ZjgxNDY3ZGZjPl0gYXN5bmNfcmVzdW1lKzB4MWMvMHg1MApbICAxMTguMzM0MjcxXSAgWzxmZmZm ZmZmZjgxMGE2YTk0Pl0gYXN5bmNfcnVuX2VudHJ5X2ZuKzB4MzQvMHhkMApbICAxMTguMzM0Mjcz XSAgWzxmZmZmZmZmZjgxMDlkNGFkPl0gcHJvY2Vzc19vbmVfd29yaysweDFkZC8weDdlMApbICAx MTguMzM0Mjc1XSAgWzxmZmZmZmZmZjgxMDlkNDFhPl0gPyBwcm9jZXNzX29uZV93b3JrKzB4MTRh LzB4N2UwClsgIDExOC4zMzQyNzZdICBbPGZmZmZmZmZmODEwOWRhZjk+XSB3b3JrZXJfdGhyZWFk KzB4NDkvMHg0NTAKWyAgMTE4LjMzNDI3OF0gIFs8ZmZmZmZmZmY4MTA5ZGFiMD5dID8gcHJvY2Vz c19vbmVfd29yaysweDdlMC8weDdlMApbICAxMTguMzM0MjgwXSAgWzxmZmZmZmZmZjgxMGEzY2I5 Pl0ga3RocmVhZCsweGY5LzB4MTEwClsgIDExOC4zMzQyODJdICBbPGZmZmZmZmZmODEwYTNiYzA+ XSA/IGluc2VydF9rdGhyZWFkX3dvcmsrMHg5MC8weDkwClsgIDExOC4zMzQyODRdICBbPGZmZmZm ZmZmODE3YjQxNGY+XSByZXRfZnJvbV9mb3JrKzB4M2YvMHg3MApbICAxMTguMzM0Mjg2XSAgWzxm ZmZmZmZmZjgxMGEzYmMwPl0gPyBpbnNlcnRfa3RocmVhZF93b3JrKzB4OTAvMHg5MApbICAxMTgu MzM0Mjg3XSAtLS1bIGVuZCB0cmFjZSAwMWYyY2Y2MzcxYjgyZDdhIF0tLS0KClRoaXMgd2FybiBp cyBoYXJtbGVzcywgYW5kIGNhbiBiZSBmaXhlZCBieSBub3QgY2FsbGluZyBpbnRlbF9jcnRjX2Rp c2FibGUgd2hlbgp0aGUgY3J0YyBpcyBhbHJlYWR5IGRpc2FibGVkLgoKUmVwb3J0ZWQtYW5kLVRl c3RlZC1ieTogSsO2cmcgT3R0ZSA8anJnLm90dGVAZ21haWwuY29tPgpTaWduZWQtb2ZmLWJ5OiBN YWFydGVuIExhbmtob3JzdCA8bWFhcnRlbi5sYW5raG9yc3RAbGludXguaW50ZWwuY29tPgotLS0K ZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYyBiL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwppbmRleCA4NWFjNmQ4NWRjMzkuLjMwZTBm NTRiYTE5ZCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5j CisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwpAQCAtNjMxNSw5ICs2 MzE1LDYgQEAgc3RhdGljIHZvaWQgaW50ZWxfY3J0Y19kaXNhYmxlKHN0cnVjdCBkcm1fY3J0YyAq Y3J0YykKIAlzdHJ1Y3QgZHJtX2Nvbm5lY3RvciAqY29ubmVjdG9yOwogCXN0cnVjdCBkcm1faTkx NV9wcml2YXRlICpkZXZfcHJpdiA9IGRldi0+ZGV2X3ByaXZhdGU7CiAKLQkvKiBjcnRjIHNob3Vs ZCBzdGlsbCBiZSBlbmFibGVkIHdoZW4gd2UgZGlzYWJsZSBpdC4gKi8KLQlXQVJOX09OKCFjcnRj LT5zdGF0ZS0+ZW5hYmxlKTsKLQogCWludGVsX2NydGNfZGlzYWJsZV9wbGFuZXMoY3J0Yyk7CiAJ ZGV2X3ByaXYtPmRpc3BsYXkuY3J0Y19kaXNhYmxlKGNydGMpOwogCWRldl9wcml2LT5kaXNwbGF5 Lm9mZihjcnRjKTsKQEAgLTEyNTkxLDcgKzEyNTg4LDggQEAgc3RhdGljIGludCBfX2ludGVsX3Nl dF9tb2RlKHN0cnVjdCBkcm1fY3J0YyAqbW9kZXNldF9jcnRjLAogCQkJY29udGludWU7CiAKIAkJ aWYgKCFjcnRjX3N0YXRlLT5lbmFibGUpIHsKLQkJCWludGVsX2NydGNfZGlzYWJsZShjcnRjKTsK KwkJCWlmIChjcnRjLT5zdGF0ZS0+ZW5hYmxlKQorCQkJCWludGVsX2NydGNfZGlzYWJsZShjcnRj KTsKIAkJfSBlbHNlIGlmIChjcnRjLT5zdGF0ZS0+ZW5hYmxlKSB7CiAJCQlpbnRlbF9jcnRjX2Rp c2FibGVfcGxhbmVzKGNydGMpOwogCQkJZGV2X3ByaXYtPmRpc3BsYXkuY3J0Y19kaXNhYmxlKGNy dGMpOwoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KZHJp LWRldmVsIG1haWxpbmcgbGlzdApkcmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6 Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9kcmktZGV2ZWwK