From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= Subject: Re: [PATCH] drm/i915: Avoid spurious WARNs about the wrong pipe in the PPS code Date: Fri, 10 Feb 2017 18:52:41 +0200 Message-ID: <20170210165241.GG31595@intel.com> References: <20170208175254.10958-1-ville.syrjala@linux.intel.com> <20170209102904.GA10814@ideak-desk.fi.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTPS id 110246ED5F for ; Fri, 10 Feb 2017 16:52:45 +0000 (UTC) Content-Disposition: inline In-Reply-To: <20170209102904.GA10814@ideak-desk.fi.intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Imre Deak Cc: intel-gfx@lists.freedesktop.org, stable@vger.kernel.org List-Id: intel-gfx@lists.freedesktop.org T24gVGh1LCBGZWIgMDksIDIwMTcgYXQgMTI6Mjk6MDRQTSArMDIwMCwgSW1yZSBEZWFrIHdyb3Rl Ogo+IE9uIFdlZCwgRmViIDA4LCAyMDE3IGF0IDA3OjUyOjU0UE0gKzAyMDAsIHZpbGxlLnN5cmph bGFAbGludXguaW50ZWwuY29tIHdyb3RlOgo+ID4gRnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxs ZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KPiA+IAo+ID4gVW50aWwgcmVjZW50bHkgdmx2X3N0 ZWFsX3Bvd2VyX3NlcXVlbmNlcigpIHdhc24ndCBiZWluZyBjYWxsZWQgZm9yCj4gPiBub3JtYWwg RFAgcG9ydHMsIGFuZCBoZW5jZSBpdCBjb3VsZCBhc3NlcnQgdGhhdCBpdCBzaG91bGQgb25seSBi ZQo+ID4gY2FsbGVkIGZvciBwaXBlIEEgYW5kIEIgKHNpbmNlIHBpcGUgQyBkb2Vzbid0IHN1cHBv cnQgZURQKS4gSG93ZXZlcgo+ID4gdGhhdCBjaGFuZ2VkIHdoZW4gd2Ugc3RhcnRlZCB0byBjb25z aWRlciBub3JtYWwgRFAgcG9ydHMgYXMgd2VsbCB3aGVuCj4gPiBjaG9vc2luZyBhIFBQUy4gU28g d2Ugd2lsbCBub3cgZ2V0IHNwdXJpb3VzIHdhcm5pbmdzIHdoZW4KPiA+IHZsdl9zdGVhbF9wb3dl cl9zZXF1ZW5jZXIoKSBkb2VzIGdldCBjYWxsZWQgZm9yIHBpcGUgQy4gQXZvaWQgdGhpcyBieQo+ ID4gbW92aW5nIHRoZSBXQVJOIGRvd24gaW50byB2bHZfZGV0YWNoX3Bvd2VyX3NlcXVlbmNlcigp IHdoZXJlIHRoaXMKPiA+IGFzc2VydGlvbiBzaG91bGQgc3RpbGwgaG9sZC4KPiA+IAo+ID4gQ2M6 IEltcmUgRGVhayA8aW1yZS5kZWFrQGludGVsLmNvbT4KPiA+IENjOiBzdGFibGVAdmdlci5rZXJu ZWwub3JnCj4gPiBGaXhlczogOWYyYmRiMDA2YTdlICgiZHJtL2k5MTU6IFByZXZlbnQgUFBTIHN0 ZWFsaW5nIGZyb20gYSBub3JtYWwgRFAgcG9ydCBvbiBWTFYvQ0hWIikKPiA+IFJlZmVyZW5jZXM6 IGh0dHBzOi8vYnVncy5mcmVlZGVza3RvcC5vcmcvc2hvd19idWcuY2dpP2lkPTk1Mjg3Cj4gPiBT aWduZWQtb2ZmLWJ5OiBWaWxsZSBTeXJqw6Rsw6QgPHZpbGxlLnN5cmphbGFAbGludXguaW50ZWwu Y29tPgo+ID4gLS0tCj4gPiAgZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHAuYyB8IDYgKysr LS0tCj4gPiAgMSBmaWxlIGNoYW5nZWQsIDMgaW5zZXJ0aW9ucygrKSwgMyBkZWxldGlvbnMoLSkK PiA+IAo+ID4gZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2RwLmMgYi9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcC5jCj4gPiBpbmRleCAwZjE0ZTk3ZTUxOWIuLjIz OTUwNDZlMTljZSAxMDA2NDQKPiA+IC0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rw LmMKPiA+ICsrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2RwLmMKPiA+IEBAIC0yOTA1 LDYgKzI5MDUsOSBAQCBzdGF0aWMgdm9pZCB2bHZfZGV0YWNoX3Bvd2VyX3NlcXVlbmNlcihzdHJ1 Y3QgaW50ZWxfZHAgKmludGVsX2RwKQo+ID4gIAo+ID4gIAlXQVJOX09OKGludGVsX2RwLT5hY3Rp dmVfcGlwZSAhPSBJTlZBTElEX1BJUEUpOwo+ID4gIAo+ID4gKwlpZiAoV0FSTl9PTihwaXBlICE9 IFBJUEVfQSAmJiBwaXBlICE9IFBJUEVfQikpCj4gPiArCQlyZXR1cm47Cj4gPiArCj4gCj4gWWVw LCBtaXNzZWQgdGhpczoKPiBSZXZpZXdlZC1ieTogSW1yZSBEZWFrIDxpbXJlLmRlYWtAaW50ZWwu Y29tPgo+IAo+IFNvIHRoZSBhYm92ZSBpcyBjYWxsZWQgb25seSBmb3IgZURQLCBjaGVja2luZyBm b3IgdGhhdCB0b28gd291bGQgbWFrZQo+IHRoaW5ncyBjbGVhcmVyIGltby4KCldlIHNob3VsZCBo YXZlIHNvbWUgaXNfZWRwKCkgd2FybnMgaW4gdGhlIGV2ZW4gbG93ZXIgbGV2ZWwgc3R1ZmYsCkkg dGhpbmsuIE5vdCBzdXJlIGlmIHdlIHNob3VsZCBoYXZlIG1vdmVkIHRoZSBwaXBlIGNoZWNrIGV2 ZW4gbG93ZXIgYXMKd2VsbC4gT2ggd2VsbCwgYXQgbGVhc3QgdGhpcyBzaG91bGQgc2h1dCB1cCB0 aGUgc3B1cmlvdXMgd2FybnMuCgpQdXNoZWQgdG8gZGlucSwgdGhhbmtzIGZvciB0aGUgcmV2aWV3 LgoKPiAKPiA+ICAJZWRwX3BhbmVsX3ZkZF9vZmZfc3luYyhpbnRlbF9kcCk7Cj4gPiAgCj4gPiAg CS8qCj4gPiBAQCAtMjkzMiw5ICsyOTM1LDYgQEAgc3RhdGljIHZvaWQgdmx2X3N0ZWFsX3Bvd2Vy X3NlcXVlbmNlcihzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAo+ID4gIAo+ID4gIAlsb2NrZGVwX2Fz c2VydF9oZWxkKCZkZXZfcHJpdi0+cHBzX211dGV4KTsKPiA+ICAKPiA+IC0JaWYgKFdBUk5fT04o cGlwZSAhPSBQSVBFX0EgJiYgcGlwZSAhPSBQSVBFX0IpKQo+ID4gLQkJcmV0dXJuOwo+ID4gLQo+ ID4gIAlmb3JfZWFjaF9pbnRlbF9lbmNvZGVyKGRldiwgZW5jb2Rlcikgewo+ID4gIAkJc3RydWN0 IGludGVsX2RwICppbnRlbF9kcDsKPiA+ICAJCWVudW0gcG9ydCBwb3J0Owo+ID4gLS0gCj4gPiAy LjEwLjIKPiA+IAoKLS0gClZpbGxlIFN5cmrDpGzDpApJbnRlbCBPVEMKX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJ bnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Au b3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg== From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga14.intel.com ([192.55.52.115]:58406 "EHLO mga14.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751639AbdBJQyN (ORCPT ); Fri, 10 Feb 2017 11:54:13 -0500 Date: Fri, 10 Feb 2017 18:52:41 +0200 From: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= To: Imre Deak Cc: intel-gfx@lists.freedesktop.org, stable@vger.kernel.org Subject: Re: [PATCH] drm/i915: Avoid spurious WARNs about the wrong pipe in the PPS code Message-ID: <20170210165241.GG31595@intel.com> References: <20170208175254.10958-1-ville.syrjala@linux.intel.com> <20170209102904.GA10814@ideak-desk.fi.intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20170209102904.GA10814@ideak-desk.fi.intel.com> Sender: stable-owner@vger.kernel.org List-ID: On Thu, Feb 09, 2017 at 12:29:04PM +0200, Imre Deak wrote: > On Wed, Feb 08, 2017 at 07:52:54PM +0200, ville.syrjala@linux.intel.com wrote: > > From: Ville Syrj�l� > > > > Until recently vlv_steal_power_sequencer() wasn't being called for > > normal DP ports, and hence it could assert that it should only be > > called for pipe A and B (since pipe C doesn't support eDP). However > > that changed when we started to consider normal DP ports as well when > > choosing a PPS. So we will now get spurious warnings when > > vlv_steal_power_sequencer() does get called for pipe C. Avoid this by > > moving the WARN down into vlv_detach_power_sequencer() where this > > assertion should still hold. > > > > Cc: Imre Deak > > Cc: stable@vger.kernel.org > > Fixes: 9f2bdb006a7e ("drm/i915: Prevent PPS stealing from a normal DP port on VLV/CHV") > > References: https://bugs.freedesktop.org/show_bug.cgi?id=95287 > > Signed-off-by: Ville Syrj�l� > > --- > > drivers/gpu/drm/i915/intel_dp.c | 6 +++--- > > 1 file changed, 3 insertions(+), 3 deletions(-) > > > > diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c > > index 0f14e97e519b..2395046e19ce 100644 > > --- a/drivers/gpu/drm/i915/intel_dp.c > > +++ b/drivers/gpu/drm/i915/intel_dp.c > > @@ -2905,6 +2905,9 @@ static void vlv_detach_power_sequencer(struct intel_dp *intel_dp) > > > > WARN_ON(intel_dp->active_pipe != INVALID_PIPE); > > > > + if (WARN_ON(pipe != PIPE_A && pipe != PIPE_B)) > > + return; > > + > > Yep, missed this: > Reviewed-by: Imre Deak > > So the above is called only for eDP, checking for that too would make > things clearer imo. We should have some is_edp() warns in the even lower level stuff, I think. Not sure if we should have moved the pipe check even lower as well. Oh well, at least this should shut up the spurious warns. Pushed to dinq, thanks for the review. > > > edp_panel_vdd_off_sync(intel_dp); > > > > /* > > @@ -2932,9 +2935,6 @@ static void vlv_steal_power_sequencer(struct drm_device *dev, > > > > lockdep_assert_held(&dev_priv->pps_mutex); > > > > - if (WARN_ON(pipe != PIPE_A && pipe != PIPE_B)) > > - return; > > - > > for_each_intel_encoder(dev, encoder) { > > struct intel_dp *intel_dp; > > enum port port; > > -- > > 2.10.2 > > -- Ville Syrj�l� Intel OTC