From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jani Nikula Subject: Re: [PATCH] drm/i915/ilk: Wait one vblank before enabling audio Date: Mon, 23 May 2016 09:32:17 +0300 Message-ID: <871t4te13i.fsf@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: 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 , intel-gfx@lists.freedesktop.org Cc: "Syrjala, Ville" , David Airlie , "open list:INTEL DRM DRIVERS (excluding Poulsbo, Moorestow...), linux-kernel@vger.kernel.org (open list)" , stable@vger.kernel.org, Daniel Vetter List-Id: dri-devel@lists.freedesktop.org T24gU2F0LCAyMSBNYXkgMjAxNiwgTHl1ZGUgPGNwYXVsQHJlZGhhdC5jb20+IHdyb3RlOgo+IFdl IG5vIGxvbmdlciBjYWxsIGlsa19hdWRpb19jb2RlY19lbmFibGUoKSB3aGlsZSB3ZSBoYXZlIHZi bGFua3MKPiBkaXNhYmxlZC4gQXMgc3VjaCwgd2UgY2FuIGZpbmFsbHkgZml4IHRoaXMgYW5kIHN0 b3AgdGhlIG9jY2FzaW9uYWwgcGlwZQo+IHVuZGVycnVucyBJJ20gc2VlaW5nIG9uIHRoaXMgRGVs bCBPcHRpUGxleCA5OTAuCj4KPiBDYzogc3RhYmxlQHZnZXIua2VybmVsLm9yZwoKRXZlbiBpZiB0 aGlzIHdlcmUgdGhlIHJpZ2h0IGZpeCBub3csIEknZCBiZSB3YXJ5IG9mIGFkZGluZyBhIGJsYW5r ZXQgY2M6CnN0YWJsZSB0byBrZXJuZWxzIHdoZXJlIHdlIHN0aWxsIGhhdmUgdmJsYW5rcyBkaXNh YmxlZCB3aGVuIHRoaXMKZnVuY3Rpb24gZ2V0cyBjYWxsZWQuCgpXaG9ldmVyIHB1c2hlcyB0aGlz LCBwbGVhc2UgZW5zdXJlIHRoZSBjYzogc3RhYmxlIGdldHMgZHJvcHBlZCBmcm9tIHRoZQpjb21t aXQuCgpUaGFua3MsCkphbmkuCgo+IFNpZ25lZC1vZmYtYnk6IEx5dWRlIDxjcGF1bEByZWRoYXQu Y29tPgo+IC0tLQo+ICBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9hdWRpby5jIHwgOCArKy0t LS0tLQo+ICAxIGZpbGUgY2hhbmdlZCwgMiBpbnNlcnRpb25zKCspLCA2IGRlbGV0aW9ucygtKQo+ Cj4gZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2F1ZGlvLmMgYi9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9hdWRpby5jCj4gaW5kZXggN2QyODFiNC4uMGQ2ODVmZSAx MDA2NDQKPiAtLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9hdWRpby5jCj4gKysrIGIv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfYXVkaW8uYwo+IEBAIC00MjMsMTIgKzQyMyw4IEBA IHN0YXRpYyB2b2lkIGlsa19hdWRpb19jb2RlY19lbmFibGUoc3RydWN0IGRybV9jb25uZWN0b3Ig KmNvbm5lY3RvciwKPiAgCWlmIChXQVJOX09OKHBvcnQgPT0gUE9SVF9BKSkKPiAgCQlyZXR1cm47 Cj4gIAo+IC0JLyoKPiAtCSAqIEZJWE1FOiBXZSdyZSBzdXBwb3NlZCB0byB3YWl0IGZvciB2Ymxh bmsgaGVyZSwgYnV0IHdlIGhhdmUgdmJsYW5rcwo+IC0JICogZGlzYWJsZWQgZHVyaW5nIHRoZSBt b2RlIHNldC4gVGhlIHByb3BlciBmaXggd291bGQgYmUgdG8gcHVzaCB0aGUKPiAtCSAqIHJlc3Qg b2YgdGhlIHNldHVwIGludG8gYSB2Ymxhbmsgd29yayBpdGVtLCBxdWV1ZWQgaGVyZSwgYnV0IHRo ZQo+IC0JICogaW5mcmFzdHJ1Y3R1cmUgaXMgbm90IHRoZXJlIHlldC4KPiAtCSAqLwo+ICsJLyog TmVlZCB0byB3YWl0IG9uZSB2YmxhbmsgYmVmb3JlIGVuYWJsaW5nIGF1ZGlvICovCj4gKwlpbnRl bF93YWl0X2Zvcl92YmxhbmsoY29ubmVjdG9yLT5kZXYsIHBpcGUpOwo+ICAKPiAgCWlmIChIQVNf UENIX0lCWChjb25uZWN0b3ItPmRldikpIHsKPiAgCQloZG1pd19oZG1pZWRpZCA9IElCWF9IRE1J V19IRE1JRURJRChwaXBlKTsKCi0tIApKYW5pIE5pa3VsYSwgSW50ZWwgT3BlbiBTb3VyY2UgVGVj aG5vbG9neSBDZW50ZXIKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Au b3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwt Z2Z4Cg== From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga01.intel.com ([192.55.52.88]:5615 "EHLO mga01.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752958AbcEWGco (ORCPT ); Mon, 23 May 2016 02:32:44 -0400 From: Jani Nikula To: Lyude , intel-gfx@lists.freedesktop.org Cc: Lyude , stable@vger.kernel.org, Daniel Vetter , David Airlie , "open list\:INTEL DRM DRIVERS \(excluding Poulsbo\, Moorestow...\)\, linux-kernel\@vger.kernel.org \(open list\)" , "Syrjala\, Ville" Subject: Re: [PATCH] drm/i915/ilk: Wait one vblank before enabling audio In-Reply-To: <1463780200-22813-1-git-send-email-cpaul@redhat.com> References: <1463780200-22813-1-git-send-email-cpaul@redhat.com> Date: Mon, 23 May 2016 09:32:17 +0300 Message-ID: <871t4te13i.fsf@intel.com> MIME-Version: 1.0 Content-Type: text/plain Sender: stable-owner@vger.kernel.org List-ID: On Sat, 21 May 2016, 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. > > Cc: stable@vger.kernel.org Even if this were the right fix now, I'd be wary of adding a blanket cc: stable to kernels where we still have vblanks disabled when this function gets called. Whoever pushes this, please ensure the cc: stable gets dropped from the commit. Thanks, Jani. > 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); -- Jani Nikula, Intel Open Source Technology Center