From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jani Nikula Subject: Re: [PATCH] drm/i915: Fix screen flickering on X Date: Thu, 07 May 2015 16:41:48 +0300 Message-ID: <87r3qs5wtf.fsf@intel.com> References: <1428792034-6131-1-git-send-email-ismael@iodev.co.uk> <20150423091532.GA21511@nuc-i3427.alporthouse.com> <87zj5g69al.fsf@intel.com> <20150507132715.GA22531@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by gabe.freedesktop.org (Postfix) with ESMTP id A21656E5DD for ; Thu, 7 May 2015 06:39:45 -0700 (PDT) In-Reply-To: <20150507132715.GA22531@intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Matt Roper , Ismael Luceno Cc: intel-gfx@lists.freedesktop.org, linux-kernel@vger.kernel.org List-Id: intel-gfx@lists.freedesktop.org T24gVGh1LCAwNyBNYXkgMjAxNSwgTWF0dCBSb3BlciA8bWF0dGhldy5kLnJvcGVyQGludGVsLmNv bT4gd3JvdGU6Cj4gT24gVGh1LCBNYXkgMDcsIDIwMTUgYXQgMTI6MTI6MThQTSArMDMwMCwgSmFu aSBOaWt1bGEgd3JvdGU6Cj4+IE9uIFRodSwgMjMgQXByIDIwMTUsIENocmlzIFdpbHNvbiA8Y2hy aXNAY2hyaXMtd2lsc29uLmNvLnVrPiB3cm90ZToKPj4gPiBbY2MnaW5nIHRoZSBhdXRob3JzXQo+ PiAKPj4gVGhpcyBoYXMgYmVlbiBwb3N0ZWQgZWFybGllciBbMV0gYW5kIGl0IGhhcyByZXZpZXcg dG8gYmUgYWRkcmVzc2VkIFsyXS4KPj4gCj4+IEJSLAo+PiBKYW5pLgo+Cj4gSSBhZ3JlZSB3aXRo IEFuZGVyJ3MgcmVzcG9uc2UgaW4gWzJdLi4ud2UgY2FuJ3QgY2FsbAo+IGludGVsX3VwZGF0ZV93 YXRlcm1hcmtzKCkgaW4gdGhlIGNvbW1pdCBmdW5jdGlvbiBiZWNhdXNlIHdlJ3JlIHVuZGVyCj4g dmJsYW5rIGV2YXNpb24uICBXZSBzaG91bGQgYWxyZWFkeSBiZSBmbGFnZ2luZyB0aGUgdHJhbnNh Y3Rpb24gYXMKPiBuZWVkaW5nIGEgd2F0ZXJtYXJrIHVwZGF0ZSBpbiBpbnRlbF9jaGVja19jdXJz b3JfcGxhbmUoKSwgYW5kIHRoYXQgZmxhZwo+IHdpbGwgYmUgYWN0ZWQgdXBvbiBpbW1lZGlhdGVs eSBhZnRlciB0aGUgY29tbWl0IGZ1bmN0aW9ucyBhcmUgZG9uZQo+IHJ1bm5pbmcsIG9uY2Ugd2Un dmUgcmUtZW5hYmxlZCBpbnRlcnJ1cHRzLgo+Cj4gTm90ZSB0aGF0IG91ciBjdXJyZW50IGNvZGVi YXNlIGxvb2tzIGEgYml0IGRpZmZlcmVudCBzaW5jZSB3ZSd2ZSBkcm9wcGVkCj4gaW50ZWxfY3J0 Yy0+Y3Vyc29yX3t3aWR0aCxoZWlnaHR9LiAgU28gdGhlIHJlbGV2YW50IGNoZWNrIGluCj4gaW50 ZWxfY2hlY2tfY3Vyc29yX3BsYW5lKCkgbm93IGxvb2tzIGxpa2U6Cj4KPiAgICAgICAgIGlmIChw bGFuZS0+c3RhdGUtPmNydGNfdyAhPSBzdGF0ZS0+YmFzZS5jcnRjX3cpCj4gICAgICAgICAgICAg ICAgIGludGVsX2NydGMtPmF0b21pYy51cGRhdGVfd20gPSB0cnVlOwo+Cj4gSXMgdGhlcmUgYSBi dWd6aWxsYSBvcGVuIG9uIHRoaXMgaXNzdWUgd2l0aCBtb3JlIGRldGFpbHM/CgpOb3QgdGhhdCBJ IGtub3cgb2YuIElzbWFlbD8KCkJSLApKYW5pLgoKCj4KPgo+IE1hdHQKPgo+PiAKPj4gCj4+IFsx XSBodHRwOi8vbWlkLmdtYW5lLm9yZy8xNDI4NzkwNjQ0LTY4MTItMS1naXQtc2VuZC1lbWFpbC1p c21hZWxAaW9kZXYuY28udWsKPj4gWzJdIGh0dHA6Ly9taWQuZ21hbmUub3JnLzE0Mjg5Mjg0MTgu MjY1NC44LmNhbWVsQGdtYWlsLmNvbQo+PiAKPj4gCj4+ID4KPj4gPiBPbiBTYXQsIEFwciAxMSwg MjAxNSBhdCAwNzo0MDozNFBNIC0wMzAwLCBJc21hZWwgTHVjZW5vIHdyb3RlOgo+PiA+PiBBIGJp c2VjdCBzaG93ZWQgdGhhdCBjb21taXQgMzJiN2VlZWM0ZDFlODYxMjMwYjA5ZDQzN2U5NWQ3NmM4 NmZmNGE2OAo+PiA+PiBpbnRyb2R1Y2VkIHRoZSBpc3N1ZS4KPj4gPj4gCj4+ID4+IFRoZSBpc3N1 ZSBzdGFydHMgYXMgc29vbiBhcyBYIHRha2VzIGNvbnRyb2wgb2YgdGhlIHNjcmVlbiwgZXZlbiBp ZiBqdXN0Cj4+ID4+IGEgcGxhaW4gWCBkb2luZyBub3RoaW5nLCBzbyBiYXNlZCBvbiB0aGUgY29k ZSB0b3VjaGVkIGJ5IHRoZSBjb21taXQgSQo+PiA+PiB0aG91Z2h0IGl0IGhhZCB0byBiZSByZWxh dGVkIHRvIHRoZSBzbyBjYWxsZWQgImhhcmR3YXJlIGN1cnNvciIuIEkKPj4gPj4gY29uZmlybWVk IGl0IHdoZW4gaGlkaW5nIHRoZSBjdXJzb3IgbWFkZSB0aGUgZmxpY2tlcmluZyBnbyBhd2F5Lgo+ PiA+PiAKPj4gPj4gVGhlIGFmb3JlbWVudGlvbmVkIGNvbW1pdCByZW1vdmVkIHNvbWUgc3VzcGlj aW91cyBjb2RlLCBhbmQgdGhlCj4+ID4+IFByb2dyYW1tZXIncyBSZWZlcmVuY2UgTWFudWFsIGNv bmZpcm1lZCBteSBzdXNwaWNpb246Cj4+ID4+IAo+PiA+PiAiSW5jb3JyZWN0bHkgcHJvZ3JhbW1l ZCB3YXRlcm1hcmsgdmFsdWVzIGNhbiByZXN1bHQgaW4gc2NyZWVuIGNvcnJ1cHRpb24uCj4+ID4+ IAo+PiA+PiBUaGUgd2F0ZXJtYXJrcyBzaG91bGQgYmUgY2FsY3VsYXRlZCBhbmQgcHJvZ3JhbW1l ZCB3aGVuIGFueSBvZiB0aGUKPj4gPj4gd2F0ZXJtYXJrIGNhbGN1bGF0aW9uIGlucHV0cyBjaGFu Z2UuIFRoaXMgaW5jbHVkZXMgcGxhbmVzIGVuYWJsaW5nIG9yCj4+ID4+IGRpc2FibGluZywgcGxh bmUgc291cmNlIGZvcm1hdCBvciBzaXplIGNoYW5naW5nLCBldGMuIgo+PiA+PiAKPj4gPj4gU28g SSdtIHJlLWFkZGluZyB0aGUgZmV3IGxpbmVzIHRoYXQgdXBkYXRlIHRoZSB3YXRlcm1hcmtzIGFm dGVyIGEgY3Vyc29yCj4+ID4+IHNpemUgY2hhbmdlLgo+PiA+PiAKPj4gPj4gU2lnbmVkLW9mZi1i eTogSXNtYWVsIEx1Y2VubyA8aXNtYWVsQGlvZGV2LmNvLnVrPgo+PiA+PiAtLS0KPj4gPj4gIGRy aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYyB8IDcgKysrKysrLQo+PiA+PiAgMSBm aWxlIGNoYW5nZWQsIDYgaW5zZXJ0aW9ucygrKSwgMSBkZWxldGlvbigtKQo+PiA+PiAKPj4gPj4g ZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYyBiL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwo+PiA+PiBpbmRleCBmNzUxNzNjLi5lMjNm MDYyIDEwMDY0NAo+PiA+PiAtLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5 LmMKPj4gPj4gKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCj4+ID4+ IEBAIC0xMjI1OCw2ICsxMjI1OCw3IEBAIGludGVsX2NvbW1pdF9jdXJzb3JfcGxhbmUoc3RydWN0 IGRybV9wbGFuZSAqcGxhbmUsCj4+ID4+ICAJc3RydWN0IGludGVsX2NydGMgKmludGVsX2NydGM7 Cj4+ID4+ICAJc3RydWN0IGludGVsX3BsYW5lICppbnRlbF9wbGFuZSA9IHRvX2ludGVsX3BsYW5l KHBsYW5lKTsKPj4gPj4gIAlzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqb2JqID0gaW50ZWxf ZmJfb2JqKHN0YXRlLT5iYXNlLmZiKTsKPj4gPj4gKwl1bnNpZ25lZCBvbGRfd2lkdGg7Cj4+ID4+ ICAJdWludDMyX3QgYWRkcjsKPj4gPj4gIAo+PiA+PiAgCWNydGMgPSBjcnRjID8gY3J0YyA6IHBs YW5lLT5jcnRjOwo+PiA+PiBAQCAtMTIyODIsMTEgKzEyMjgzLDE1IEBAIGludGVsX2NvbW1pdF9j dXJzb3JfcGxhbmUoc3RydWN0IGRybV9wbGFuZSAqcGxhbmUsCj4+ID4+ICAJaW50ZWxfY3J0Yy0+ Y3Vyc29yX2FkZHIgPSBhZGRyOwo+PiA+PiAgCWludGVsX2NydGMtPmN1cnNvcl9ibyA9IG9iajsK Pj4gPj4gIHVwZGF0ZToKPj4gPj4gKwlvbGRfd2lkdGggPSBpbnRlbF9jcnRjLT5jdXJzb3Jfd2lk dGg7Cj4+ID4+ICAJaW50ZWxfY3J0Yy0+Y3Vyc29yX3dpZHRoID0gc3RhdGUtPmJhc2UuY3J0Y193 Owo+PiA+PiAgCWludGVsX2NydGMtPmN1cnNvcl9oZWlnaHQgPSBzdGF0ZS0+YmFzZS5jcnRjX2g7 Cj4+ID4+ICAKPj4gPj4gLQlpZiAoaW50ZWxfY3J0Yy0+YWN0aXZlKQo+PiA+PiArCWlmIChpbnRl bF9jcnRjLT5hY3RpdmUpIHsKPj4gPj4gKwkJaWYgKG9sZF93aWR0aCAhPSBpbnRlbF9jcnRjLT5j dXJzb3Jfd2lkdGgpCj4+ID4+ICsJCQlpbnRlbF91cGRhdGVfd2F0ZXJtYXJrcyhjcnRjKTsKPj4g Pj4gIAkJaW50ZWxfY3J0Y191cGRhdGVfY3Vyc29yKGNydGMsIHN0YXRlLT52aXNpYmxlKTsKPj4g Pj4gKwl9Cj4+ID4+ICB9Cj4+ID4+ICAKPj4gPj4gIHN0YXRpYyBzdHJ1Y3QgZHJtX3BsYW5lICpp bnRlbF9jdXJzb3JfcGxhbmVfY3JlYXRlKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCj4+ID4+IC0t IAo+PiA+PiAyLjMuNAo+PiA+Cj4+ID4gLS0gCj4+ID4gQ2hyaXMgV2lsc29uLCBJbnRlbCBPcGVu IFNvdXJjZSBUZWNobm9sb2d5IENlbnRyZQo+PiA+IF9fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fCj4+ID4gSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdAo+PiA+IElu dGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKPj4gPiBodHRwOi8vbGlzdHMuZnJlZWRlc2t0 b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cj4+IAo+PiAtLSAKPj4gSmFuaSBOaWt1 bGEsIEludGVsIE9wZW4gU291cmNlIFRlY2hub2xvZ3kgQ2VudGVyCj4KPiAtLSAKPiBNYXR0IFJv cGVyCj4gR3JhcGhpY3MgU29mdHdhcmUgRW5naW5lZXIKPiBJb1RHIFBsYXRmb3JtIEVuYWJsaW5n ICYgRGV2ZWxvcG1lbnQKPiBJbnRlbCBDb3Jwb3JhdGlvbgo+ICg5MTYpIDM1Ni0yNzk1CgotLSAK SmFuaSBOaWt1bGEsIEludGVsIE9wZW4gU291cmNlIFRlY2hub2xvZ3kgQ2VudGVyCl9fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5n IGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwOi8vbGlzdHMuZnJlZWRl c2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg== From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751608AbbEGNjt (ORCPT ); Thu, 7 May 2015 09:39:49 -0400 Received: from mga01.intel.com ([192.55.52.88]:44885 "EHLO mga01.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750806AbbEGNjq (ORCPT ); Thu, 7 May 2015 09:39:46 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.13,384,1427785200"; d="scan'208";a="722222231" From: Jani Nikula To: Matt Roper , Ismael Luceno Cc: Chris Wilson , intel-gfx@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: Re: [Intel-gfx] [PATCH] drm/i915: Fix screen flickering on X In-Reply-To: <20150507132715.GA22531@intel.com> Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo References: <1428792034-6131-1-git-send-email-ismael@iodev.co.uk> <20150423091532.GA21511@nuc-i3427.alporthouse.com> <87zj5g69al.fsf@intel.com> <20150507132715.GA22531@intel.com> User-Agent: Notmuch/0.19+112~g77230b0 (http://notmuchmail.org) Emacs/24.4.1 (x86_64-pc-linux-gnu) Date: Thu, 07 May 2015 16:41:48 +0300 Message-ID: <87r3qs5wtf.fsf@intel.com> MIME-Version: 1.0 Content-Type: text/plain Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, 07 May 2015, Matt Roper wrote: > On Thu, May 07, 2015 at 12:12:18PM +0300, Jani Nikula wrote: >> On Thu, 23 Apr 2015, Chris Wilson wrote: >> > [cc'ing the authors] >> >> This has been posted earlier [1] and it has review to be addressed [2]. >> >> BR, >> Jani. > > I agree with Ander's response in [2]...we can't call > intel_update_watermarks() in the commit function because we're under > vblank evasion. We should already be flagging the transaction as > needing a watermark update in intel_check_cursor_plane(), and that flag > will be acted upon immediately after the commit functions are done > running, once we've re-enabled interrupts. > > Note that our current codebase looks a bit different since we've dropped > intel_crtc->cursor_{width,height}. So the relevant check in > intel_check_cursor_plane() now looks like: > > if (plane->state->crtc_w != state->base.crtc_w) > intel_crtc->atomic.update_wm = true; > > Is there a bugzilla open on this issue with more details? Not that I know of. Ismael? BR, Jani. > > > Matt > >> >> >> [1] http://mid.gmane.org/1428790644-6812-1-git-send-email-ismael@iodev.co.uk >> [2] http://mid.gmane.org/1428928418.2654.8.camel@gmail.com >> >> >> > >> > On Sat, Apr 11, 2015 at 07:40:34PM -0300, Ismael Luceno wrote: >> >> A bisect showed that commit 32b7eeec4d1e861230b09d437e95d76c86ff4a68 >> >> introduced the issue. >> >> >> >> The issue starts as soon as X takes control of the screen, even if just >> >> a plain X doing nothing, so based on the code touched by the commit I >> >> thought it had to be related to the so called "hardware cursor". I >> >> confirmed it when hiding the cursor made the flickering go away. >> >> >> >> The aforementioned commit removed some suspicious code, and the >> >> Programmer's Reference Manual confirmed my suspicion: >> >> >> >> "Incorrectly programmed watermark values can result in screen corruption. >> >> >> >> The watermarks should be calculated and programmed when any of the >> >> watermark calculation inputs change. This includes planes enabling or >> >> disabling, plane source format or size changing, etc." >> >> >> >> So I'm re-adding the few lines that update the watermarks after a cursor >> >> size change. >> >> >> >> Signed-off-by: Ismael Luceno >> >> --- >> >> drivers/gpu/drm/i915/intel_display.c | 7 ++++++- >> >> 1 file changed, 6 insertions(+), 1 deletion(-) >> >> >> >> diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c >> >> index f75173c..e23f062 100644 >> >> --- a/drivers/gpu/drm/i915/intel_display.c >> >> +++ b/drivers/gpu/drm/i915/intel_display.c >> >> @@ -12258,6 +12258,7 @@ intel_commit_cursor_plane(struct drm_plane *plane, >> >> struct intel_crtc *intel_crtc; >> >> struct intel_plane *intel_plane = to_intel_plane(plane); >> >> struct drm_i915_gem_object *obj = intel_fb_obj(state->base.fb); >> >> + unsigned old_width; >> >> uint32_t addr; >> >> >> >> crtc = crtc ? crtc : plane->crtc; >> >> @@ -12282,11 +12283,15 @@ intel_commit_cursor_plane(struct drm_plane *plane, >> >> intel_crtc->cursor_addr = addr; >> >> intel_crtc->cursor_bo = obj; >> >> update: >> >> + old_width = intel_crtc->cursor_width; >> >> intel_crtc->cursor_width = state->base.crtc_w; >> >> intel_crtc->cursor_height = state->base.crtc_h; >> >> >> >> - if (intel_crtc->active) >> >> + if (intel_crtc->active) { >> >> + if (old_width != intel_crtc->cursor_width) >> >> + intel_update_watermarks(crtc); >> >> intel_crtc_update_cursor(crtc, state->visible); >> >> + } >> >> } >> >> >> >> static struct drm_plane *intel_cursor_plane_create(struct drm_device *dev, >> >> -- >> >> 2.3.4 >> > >> > -- >> > Chris Wilson, Intel Open Source Technology Centre >> > _______________________________________________ >> > Intel-gfx mailing list >> > Intel-gfx@lists.freedesktop.org >> > http://lists.freedesktop.org/mailman/listinfo/intel-gfx >> >> -- >> Jani Nikula, Intel Open Source Technology Center > > -- > Matt Roper > Graphics Software Engineer > IoTG Platform Enabling & Development > Intel Corporation > (916) 356-2795 -- Jani Nikula, Intel Open Source Technology Center