From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= Subject: Re: [PATCH] Revert "drm/i915: Don't skip request retirement if the active list is empty" Date: Mon, 15 Jun 2015 13:37:04 +0300 Message-ID: <20150615103704.GH5176@intel.com> References: <1434362377-17489-1-git-send-email-jani.nikula@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 ESMTP id B1D4C6E740 for ; Mon, 15 Jun 2015 03:37:16 -0700 (PDT) Content-Disposition: inline In-Reply-To: <1434362377-17489-1-git-send-email-jani.nikula@intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Jani Nikula Cc: intel-gfx@lists.freedesktop.org, stable@vger.kernel.org List-Id: intel-gfx@lists.freedesktop.org T24gTW9uLCBKdW4gMTUsIDIwMTUgYXQgMTI6NTk6MzdQTSArMDMwMCwgSmFuaSBOaWt1bGEgd3Jv dGU6Cj4gVGhpcyByZXZlcnRzIGNvbW1pdCAwYWVkYjE2MjY1NjZlZmQ3MmIzNjljMDE5OTJlZTc0 MTNjODJhMGM1Lgo+IAo+IEkgbWVzc2VkIHRoaW5ncyB1cCB3aGlsZSBhcHBseWluZyBbMV0gdG8g ZHJtLWludGVsLWZpeGVzLiBSZWN0aWZ5Lgo+IAo+IFsxXcKgaHR0cDovL21pZC5nbWFuZS5vcmcv MTQzMjgyNzE1Ni05NjA1LTEtZ2l0LXNlbmQtZW1haWwtdmlsbGUuc3lyamFsYUBsaW51eC5pbnRl bC5jb20KPiAKPiBGaXhlczogMGFlZGIxNjI2NTY2ICgiZHJtL2k5MTU6IERvbid0IHNraXAgcmVx dWVzdCByZXRpcmVtZW50IGlmIHRoZSBhY3RpdmUgbGlzdCBpcyBlbXB0eSIpCj4gQ2M6IHN0YWJs ZUB2Z2VyLmtlcm5lbC5vcmcKPiBTaWduZWQtb2ZmLWJ5OiBKYW5pIE5pa3VsYSA8amFuaS5uaWt1 bGFAaW50ZWwuY29tPgo+CgpBY2tlZC1ieTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxh QGxpbnV4LmludGVsLmNvbT4KCkhvd2V2ZXIgdGhpcyBsZWF2ZXMgdXMgd2l0aCBhbiBlYXJseSBi YWlsb3V0IGlmIHJlcXVlc3RfbGlzdCBpcyBlbXB0eS4KSG9wZWZ1bGx5IHRoYXQgd29uJ3QgY2F1 c2Ugb3RoZXIgaXNzdWVzLiBJIHN1cHBvc2Ugd2Ugc2hvdWxkbid0IGhhdmUKc3R1ZmYgb24gdGhl IGFjdGl2ZV9saXN0IHcvbyBhbnkgcGVuZGluZyByZXF1ZXN0cy4KCj4gLS0tCj4gCj4gTm90ZSB0 byBzdGFibGUgdGVhbTogcGxlYXNlIGRvICpub3QqIGJhY2twb3J0Cj4gCj4gY29tbWl0IDBhZWRi MTYyNjU2NmVmZDcyYjM2OWMwMTk5MmVlNzQxM2M4MmEwYzUKPiBBdXRob3I6IFZpbGxlIFN5cmrD pGzDpCA8dmlsbGUuc3lyamFsYUBsaW51eC5pbnRlbC5jb20+Cj4gRGF0ZTogICBUaHUgTWF5IDI4 IDE4OjMyOjM2IDIwMTUgKzAzMDAKPiAKPiAgICAgZHJtL2k5MTU6IERvbid0IHNraXAgcmVxdWVz dCByZXRpcmVtZW50IGlmIHRoZSBhY3RpdmUgbGlzdCBpcyBlbXB0eQo+IAo+IGJ1dCBpZiB5b3Ug ZGlkLCBwbGVhc2UgYmFja3BvcnQgdGhpcyByZXZlcnQgYXMgd2VsbC4KPiAKPiBUaGFua3MsIGFu ZCBzb3JyeS4KPiAKPiBCUiwKPiBKYW5pLgo+IC0tLQo+ICBkcml2ZXJzL2dwdS9kcm0vaTkxNS9p OTE1X2dlbS5jIHwgMyArKysKPiAgMSBmaWxlIGNoYW5nZWQsIDMgaW5zZXJ0aW9ucygrKQo+IAo+ IGRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jIGIvZHJpdmVycy9n cHUvZHJtL2k5MTUvaTkxNV9nZW0uYwo+IGluZGV4IGMzODA2YzY2NjUwYS4uMmQwOTk1ZTdhZmMz IDEwMDY0NAo+IC0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMKPiArKysgYi9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jCj4gQEAgLTI2NTYsNiArMjY1Niw5IEBAIHZv aWQgaTkxNV9nZW1fcmVzZXQoc3RydWN0IGRybV9kZXZpY2UgKmRldikKPiAgdm9pZAo+ICBpOTE1 X2dlbV9yZXRpcmVfcmVxdWVzdHNfcmluZyhzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nKQo+ ICB7Cj4gKwlpZiAobGlzdF9lbXB0eSgmcmluZy0+cmVxdWVzdF9saXN0KSkKPiArCQlyZXR1cm47 Cj4gKwo+ICAJV0FSTl9PTihpOTE1X3ZlcmlmeV9saXN0cyhyaW5nLT5kZXYpKTsKPiAgCj4gIAkv KiBSZXRpcmUgcmVxdWVzdHMgZmlyc3QgYXMgd2UgdXNlIGl0IGFib3ZlIGZvciB0aGUgZWFybHkg cmV0dXJuLgo+IC0tIAo+IDIuMS40CgotLSAKVmlsbGUgU3lyasOkbMOkCkludGVsIE9UQwpfX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFp bGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cDovL2xpc3RzLmZy ZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo= From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga02.intel.com ([134.134.136.20]:32832 "EHLO mga02.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753861AbbFOKhQ (ORCPT ); Mon, 15 Jun 2015 06:37:16 -0400 Date: Mon, 15 Jun 2015 13:37:04 +0300 From: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= To: Jani Nikula Cc: intel-gfx@lists.freedesktop.org, stable@vger.kernel.org Subject: Re: [PATCH] Revert "drm/i915: Don't skip request retirement if the active list is empty" Message-ID: <20150615103704.GH5176@intel.com> References: <1434362377-17489-1-git-send-email-jani.nikula@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <1434362377-17489-1-git-send-email-jani.nikula@intel.com> Sender: stable-owner@vger.kernel.org List-ID: On Mon, Jun 15, 2015 at 12:59:37PM +0300, Jani Nikula wrote: > This reverts commit 0aedb1626566efd72b369c01992ee7413c82a0c5. > > I messed things up while applying [1] to drm-intel-fixes. Rectify. > > [1]�http://mid.gmane.org/1432827156-9605-1-git-send-email-ville.syrjala@linux.intel.com > > Fixes: 0aedb1626566 ("drm/i915: Don't skip request retirement if the active list is empty") > Cc: stable@vger.kernel.org > Signed-off-by: Jani Nikula > Acked-by: Ville Syrj�l� However this leaves us with an early bailout if request_list is empty. Hopefully that won't cause other issues. I suppose we shouldn't have stuff on the active_list w/o any pending requests. > --- > > Note to stable team: please do *not* backport > > commit 0aedb1626566efd72b369c01992ee7413c82a0c5 > Author: Ville Syrj�l� > Date: Thu May 28 18:32:36 2015 +0300 > > drm/i915: Don't skip request retirement if the active list is empty > > but if you did, please backport this revert as well. > > Thanks, and sorry. > > BR, > Jani. > --- > drivers/gpu/drm/i915/i915_gem.c | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c > index c3806c66650a..2d0995e7afc3 100644 > --- a/drivers/gpu/drm/i915/i915_gem.c > +++ b/drivers/gpu/drm/i915/i915_gem.c > @@ -2656,6 +2656,9 @@ void i915_gem_reset(struct drm_device *dev) > void > i915_gem_retire_requests_ring(struct intel_engine_cs *ring) > { > + if (list_empty(&ring->request_list)) > + return; > + > WARN_ON(i915_verify_lists(ring->dev)); > > /* Retire requests first as we use it above for the early return. > -- > 2.1.4 -- Ville Syrj�l� Intel OTC