From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= Subject: Re: [PATCH] drm/i915/ilk: Wait one vblank before enabling audio Date: Mon, 23 May 2016 21:06:23 +0300 Message-ID: <20160523180623.GU4329@intel.com> References: <1463780200-22813-1-git-send-email-cpaul@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Content-Disposition: inline In-Reply-To: <1463780200-22813-1-git-send-email-cpaul@redhat.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Lyude Cc: Daniel Vetter , intel-gfx@lists.freedesktop.org, "open list:INTEL DRM DRIVERS excluding Poulsbo, Moorestow..., linux-kernel@vger.kernel.org open list" , stable@vger.kernel.org List-Id: dri-devel@lists.freedesktop.org T24gRnJpLCBNYXkgMjAsIDIwMTYgYXQgMDU6MzY6NDBQTSAtMDQwMCwgTHl1ZGUgd3JvdGU6Cj4g V2Ugbm8gbG9uZ2VyIGNhbGwgaWxrX2F1ZGlvX2NvZGVjX2VuYWJsZSgpIHdoaWxlIHdlIGhhdmUg dmJsYW5rcwo+IGRpc2FibGVkLiBBcyBzdWNoLCB3ZSBjYW4gZmluYWxseSBmaXggdGhpcyBhbmQg c3RvcCB0aGUgb2NjYXNpb25hbCBwaXBlCj4gdW5kZXJydW5zIEknbSBzZWVpbmcgb24gdGhpcyBE ZWxsIE9wdGlQbGV4IDk5MC4KCkhtbS4gQXJlIHlvdSBzdGlsbCBnZXR0aW5nIHVuZGVycnVucyBv biAtbmlnaHRseT8KCkkgYmFzaWNhbGx5IHRyaWVkIHRoaXMgc2FtZSB0aGluZyAoKyBhIGJ1bmNo IG9mIG90aGVyIHR3ZWFrcyB0byB0aGUKYXVkaW8gZW5hYmxlIHNlcXVlbmNlKSB3aGVuIEkgd2Fz IGh1bnRpbmcgdGhlIHJlbWFpbmluZyB1bmRlcnJ1bnMgb24KbXkgSUxLLCBidXQgaW4gdGhlIGVu ZCBhdWRpbyB3YXMgYSByZWQgaGVycmluZy4gU28gSSBuZXZlciBmb3VuZAphbnkgcmVhbCBiZW5l Zml0IGZyb20gZXh0cmEgdmJsYW5rIHdhaXRzIGluIHRoZSBhdWRpbyBlbmFibGUgc2VxdWVuY2Uu ClRoZXkgZGlkIGFwcGVhciB0byBoZWxwIHNvbWV0aW1lcywgYnV0IHdpdGggYSBlbm91Z2ggcmVw ZXRpdGlvbnMgaXQKc3RpbGwgZmFpbGVkLgoKPiAKPiBDYzogc3RhYmxlQHZnZXIua2VybmVsLm9y Zwo+IFNpZ25lZC1vZmYtYnk6IEx5dWRlIDxjcGF1bEByZWRoYXQuY29tPgo+IC0tLQo+ICBkcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9hdWRpby5jIHwgOCArKy0tLS0tLQo+ICAxIGZpbGUgY2hh bmdlZCwgMiBpbnNlcnRpb25zKCspLCA2IGRlbGV0aW9ucygtKQo+IAo+IGRpZmYgLS1naXQgYS9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9hdWRpby5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUv aW50ZWxfYXVkaW8uYwo+IGluZGV4IDdkMjgxYjQuLjBkNjg1ZmUgMTAwNjQ0Cj4gLS0tIGEvZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfYXVkaW8uYwo+ICsrKyBiL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX2F1ZGlvLmMKPiBAQCAtNDIzLDEyICs0MjMsOCBAQCBzdGF0aWMgdm9pZCBpbGtf YXVkaW9fY29kZWNfZW5hYmxlKHN0cnVjdCBkcm1fY29ubmVjdG9yICpjb25uZWN0b3IsCj4gIAlp ZiAoV0FSTl9PTihwb3J0ID09IFBPUlRfQSkpCj4gIAkJcmV0dXJuOwo+ICAKPiAtCS8qCj4gLQkg KiBGSVhNRTogV2UncmUgc3VwcG9zZWQgdG8gd2FpdCBmb3IgdmJsYW5rIGhlcmUsIGJ1dCB3ZSBo YXZlIHZibGFua3MKPiAtCSAqIGRpc2FibGVkIGR1cmluZyB0aGUgbW9kZSBzZXQuIFRoZSBwcm9w ZXIgZml4IHdvdWxkIGJlIHRvIHB1c2ggdGhlCj4gLQkgKiByZXN0IG9mIHRoZSBzZXR1cCBpbnRv IGEgdmJsYW5rIHdvcmsgaXRlbSwgcXVldWVkIGhlcmUsIGJ1dCB0aGUKPiAtCSAqIGluZnJhc3Ry dWN0dXJlIGlzIG5vdCB0aGVyZSB5ZXQuCj4gLQkgKi8KPiArCS8qIE5lZWQgdG8gd2FpdCBvbmUg dmJsYW5rIGJlZm9yZSBlbmFibGluZyBhdWRpbyAqLwo+ICsJaW50ZWxfd2FpdF9mb3JfdmJsYW5r KGNvbm5lY3Rvci0+ZGV2LCBwaXBlKTsKPiAgCj4gIAlpZiAoSEFTX1BDSF9JQlgoY29ubmVjdG9y LT5kZXYpKSB7Cj4gIAkJaGRtaXdfaGRtaWVkaWQgPSBJQlhfSERNSVdfSERNSUVESUQocGlwZSk7 Cj4gLS0gCj4gMi41LjUKPiAKPiBfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fXwo+IGRyaS1kZXZlbCBtYWlsaW5nIGxpc3QKPiBkcmktZGV2ZWxAbGlzdHMuZnJl ZWRlc2t0b3Aub3JnCj4gaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0 aW5mby9kcmktZGV2ZWwKCi0tIApWaWxsZSBTeXJqw6Rsw6QKSW50ZWwgT1RDCl9fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxp c3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNr dG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo= From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga14.intel.com ([192.55.52.115]:56914 "EHLO mga14.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753045AbcEWSG2 (ORCPT ); Mon, 23 May 2016 14:06:28 -0400 Date: Mon, 23 May 2016 21:06:23 +0300 From: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= To: Lyude Cc: intel-gfx@lists.freedesktop.org, stable@vger.kernel.org, "open list:INTEL DRM DRIVERS excluding Poulsbo, Moorestow..., linux-kernel@vger.kernel.org open list" , Daniel Vetter Subject: Re: [PATCH] drm/i915/ilk: Wait one vblank before enabling audio Message-ID: <20160523180623.GU4329@intel.com> References: <1463780200-22813-1-git-send-email-cpaul@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <1463780200-22813-1-git-send-email-cpaul@redhat.com> Sender: stable-owner@vger.kernel.org List-ID: On Fri, May 20, 2016 at 05:36:40PM -0400, Lyude wrote: > We no longer call ilk_audio_codec_enable() while we have vblanks > disabled. As such, we can finally fix this and stop the occasional pipe > underruns I'm seeing on this Dell OptiPlex 990. Hmm. Are you still getting underruns on -nightly? I basically tried this same thing (+ a bunch of other tweaks to the audio enable sequence) when I was hunting the remaining underruns on my ILK, but in the end audio was a red herring. So I never found any real benefit from extra vblank waits in the audio enable sequence. They did appear to help sometimes, but with a enough repetitions it still failed. > > Cc: stable@vger.kernel.org > Signed-off-by: Lyude > --- > drivers/gpu/drm/i915/intel_audio.c | 8 ++------ > 1 file changed, 2 insertions(+), 6 deletions(-) > > diff --git a/drivers/gpu/drm/i915/intel_audio.c b/drivers/gpu/drm/i915/intel_audio.c > index 7d281b4..0d685fe 100644 > --- a/drivers/gpu/drm/i915/intel_audio.c > +++ b/drivers/gpu/drm/i915/intel_audio.c > @@ -423,12 +423,8 @@ static void ilk_audio_codec_enable(struct drm_connector *connector, > if (WARN_ON(port == PORT_A)) > return; > > - /* > - * FIXME: We're supposed to wait for vblank here, but we have vblanks > - * disabled during the mode set. The proper fix would be to push the > - * rest of the setup into a vblank work item, queued here, but the > - * infrastructure is not there yet. > - */ > + /* Need to wait one vblank before enabling audio */ > + intel_wait_for_vblank(connector->dev, pipe); > > if (HAS_PCH_IBX(connector->dev)) { > hdmiw_hdmiedid = IBX_HDMIW_HDMIEDID(pipe); > -- > 2.5.5 > > _______________________________________________ > dri-devel mailing list > dri-devel@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/dri-devel -- Ville Syrj�l� Intel OTC