From mboxrd@z Thu Jan 1 00:00:00 1970 From: Dave Gordon Subject: [PATCH 1/2] drm/i915: Don't wait twice in {__intel, logical}_ring_prepare() Date: Fri, 12 Jun 2015 21:25:37 +0100 Message-ID: <1434140738-19521-2-git-send-email-david.s.gordon@intel.com> References: <1434128948-9221-3-git-send-email-david.s.gordon@intel.com> <1434140738-19521-1-git-send-email-david.s.gordon@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 9CD076E58F for ; Fri, 12 Jun 2015 13:25:55 -0700 (PDT) In-Reply-To: <1434140738-19521-1-git-send-email-david.s.gordon@intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org SW4gdGhlIGNhc2UgdGhhdCB0aGUgcmluZ2J1ZmZlciB3YXMgbmVhci1mdWxsIEFORCAndGFpbCcg d2FzCm5lYXIgdGhlIGVuZCBvZiB0aGUgYnVmZmVyLCB3ZSBjb3VsZCBoYXZlIGVuZGVkIHVwIHdh aXRpbmcgdHdpY2U6Cm9uY2UgdG8gZ2FpbiBvd25lcnNoaXAgb2YgdGhlIHNwYWNlIGJldHdlZW4g VEFJTCBhbmQgdGhlIGVuZAood2hpY2ggd2UganVzdCB3YW50IHRvIGZpbGwgd2l0aCBwYWRkaW5n LCBzbyBhcyBub3QgdG8gc3BsaXQgYQpzaW5nbGUgY29tbWFuZCBzZXF1ZW5jZSBhY3Jvc3MgdGhl IGVuZCBvZiB0aGUgcmluZ2J1ZmZlciksIGFuZAp0aGVuIGFnYWluIHRvIGdldCBlbm91Z2ggc3Bh Y2UgZm9yIHRoZSBuZXcgZGF0YSB0aGF0IHRoZSBjYWxsZXIKd2FudHMgdG8gYWRkLgoKTm93IHdl IGp1c3QgcHJlY2FsY3VsYXRlIHRoZSB0b3RhbCBhbW91bnQgb2Ygc3BhY2Ugd2UnbGwgbmVlZAoq aW5jbHVkaW5nKiBhbnkgZm9yIHBhZGRpbmcgYXQgdGhlIGVuZCBvZiB0aGUgcmluZ2J1ZmZlciBh bmQgd2FpdApmb3IgdGhhdCBtdWNoIGluIG9uZSBnby4KClNpZ25lZC1vZmYtYnk6IERhdmUgR29y ZG9uIDxkYXZpZC5zLmdvcmRvbkBpbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUv aW50ZWxfbHJjLmMgICAgICAgIHwgICA1MiArKysrKysrKysrKysrKystLS0tLS0tLS0tLS0tLS0t CiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmMgfCAgIDUxICsrKysrKysr KysrKysrKy0tLS0tLS0tLS0tLS0tLQogMiBmaWxlcyBjaGFuZ2VkLCA1MCBpbnNlcnRpb25zKCsp LCA1MyBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9scmMuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5jCmluZGV4IDQ1NGU4MzYu LmE0YmI1ZDMgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5jCisr KyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5jCkBAIC03NDAsMzkgKzc0MCwyMiBA QCBpbnRlbF9sb2dpY2FsX3JpbmdfYWR2YW5jZV9hbmRfc3VibWl0KHN0cnVjdCBpbnRlbF9yaW5n YnVmZmVyICpyaW5nYnVmLAogCWV4ZWNsaXN0c19jb250ZXh0X3F1ZXVlKHJpbmcsIGN0eCwgcmlu Z2J1Zi0+dGFpbCwgcmVxdWVzdCk7CiB9CiAKLXN0YXRpYyBpbnQgbG9naWNhbF9yaW5nX3dyYXBf YnVmZmVyKHN0cnVjdCBpbnRlbF9yaW5nYnVmZmVyICpyaW5nYnVmLAotCQkJCSAgICBzdHJ1Y3Qg aW50ZWxfY29udGV4dCAqY3R4KQotewotCXVpbnQzMl90IF9faW9tZW0gKnZpcnQ7Ci0JaW50IHJl bSA9IHJpbmdidWYtPnNpemUgLSByaW5nYnVmLT50YWlsOwotCi0JaWYgKHJpbmdidWYtPnNwYWNl IDwgcmVtKSB7Ci0JCWludCByZXQgPSBsb2dpY2FsX3Jpbmdfd2FpdF9mb3Jfc3BhY2UocmluZ2J1 ZiwgY3R4LCByZW0pOwotCi0JCWlmIChyZXQpCi0JCQlyZXR1cm4gcmV0OwotCX0KLQotCXZpcnQg PSByaW5nYnVmLT52aXJ0dWFsX3N0YXJ0ICsgcmluZ2J1Zi0+dGFpbDsKLQlyZW0gLz0gNDsKLQl3 aGlsZSAocmVtLS0pCi0JCWlvd3JpdGUzMihNSV9OT09QLCB2aXJ0KyspOwotCi0JcmluZ2J1Zi0+ dGFpbCA9IDA7Ci0JaW50ZWxfcmluZ191cGRhdGVfc3BhY2UocmluZ2J1Zik7Ci0KLQlyZXR1cm4g MDsKLX0KLQogc3RhdGljIGludCBsb2dpY2FsX3JpbmdfcHJlcGFyZShzdHJ1Y3QgaW50ZWxfcmlu Z2J1ZmZlciAqcmluZ2J1ZiwKIAkJCQlzdHJ1Y3QgaW50ZWxfY29udGV4dCAqY3R4LCBpbnQgYnl0 ZXMpCiB7CisJaW50IGZpbGwgPSAwOwogCWludCByZXQ7CiAKKwkvKgorCSAqIElmIHRoZSByZXF1 ZXN0IHdpbGwgbm90IGZpdCBiZXR3ZWVuICd0YWlsJyBhbmQgdGhlIGVmZmVjdGl2ZQorCSAqIHNp emUgb2YgdGhlIHJpbmdidWZmZXIsIHRoZW4gd2UgbmVlZCB0byBwYWQgdGhlIGVuZCBvZiB0aGUK KwkgKiByaW5nYnVmZmVyIHdpdGggTk9PUHMsIHRoZW4gc3RhcnQgdGhlIHJlcXVlc3QgYXQgdGhl IHRvcCBvZgorCSAqIHRoZSByaW5nLiBUaGlzIGluY3JlYXNlcyB0aGUgdG90YWwgc2l6ZSB0aGF0 IHdlIG5lZWQgdG8gY2hlY2sKKwkgKiBmb3IgYnkgaG93ZXZlciBtdWNoIGlzIGxlZnQgYXQgdGhl IGVuZCBvZiB0aGUgcmluZyAuLi4KKwkgKi8KIAlpZiAodW5saWtlbHkocmluZ2J1Zi0+dGFpbCAr IGJ5dGVzID4gcmluZ2J1Zi0+ZWZmZWN0aXZlX3NpemUpKSB7Ci0JCXJldCA9IGxvZ2ljYWxfcmlu Z193cmFwX2J1ZmZlcihyaW5nYnVmLCBjdHgpOwotCQlpZiAodW5saWtlbHkocmV0KSkKLQkJCXJl dHVybiByZXQ7CisJCWZpbGwgPSByaW5nYnVmLT5zaXplIC0gcmluZ2J1Zi0+dGFpbDsKKwkJYnl0 ZXMgKz0gZmlsbDsKIAl9CiAKIAlpZiAodW5saWtlbHkocmluZ2J1Zi0+c3BhY2UgPCBieXRlcykp IHsKQEAgLTc4MSw2ICs3NjQsMjEgQEAgc3RhdGljIGludCBsb2dpY2FsX3JpbmdfcHJlcGFyZShz dHJ1Y3QgaW50ZWxfcmluZ2J1ZmZlciAqcmluZ2J1ZiwKIAkJCXJldHVybiByZXQ7CiAJfQogCisJ aWYgKHVubGlrZWx5KGZpbGwpKSB7CisJCXVpbnQzMl90IF9faW9tZW0gKnZpcnQgPSByaW5nYnVm LT52aXJ0dWFsX3N0YXJ0ICsgcmluZ2J1Zi0+dGFpbDsKKworCQkvKiB0YWlsIHNob3VsZCBub3Qg aGF2ZSBtb3ZlZCAqLworCQlpZiAoV0FSTl9PTihmaWxsICE9IHJpbmdidWYtPnNpemUgLSByaW5n YnVmLT50YWlsKSkKKwkJCWZpbGwgPSByaW5nYnVmLT5zaXplIC0gcmluZ2J1Zi0+dGFpbDsKKwor CQlkbworCQkJaW93cml0ZTMyKE1JX05PT1AsIHZpcnQrKyk7CisJCXdoaWxlICgoZmlsbCAtPSA0 KSA+IDApOworCisJCXJpbmdidWYtPnRhaWwgPSAwOworCQlpbnRlbF9yaW5nX3VwZGF0ZV9zcGFj ZShyaW5nYnVmKTsKKwl9CisKIAlyZXR1cm4gMDsKIH0KIApkaWZmIC0tZ2l0IGEvZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfcmluZ2J1ZmZlci5jCmluZGV4IGEzNDA2YjIuLjVhMWNkMjAgMTAwNjQ0Ci0tLSBhL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuYworKysgYi9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9yaW5nYnVmZmVyLmMKQEAgLTIxMzcsMjkgKzIxMzcsNiBAQCBzdGF0aWMgaW50 IHJpbmdfd2FpdF9mb3Jfc3BhY2Uoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZywgaW50IG4p CiAJcmV0dXJuIDA7CiB9CiAKLXN0YXRpYyBpbnQgaW50ZWxfd3JhcF9yaW5nX2J1ZmZlcihzdHJ1 Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nKQotewotCXVpbnQzMl90IF9faW9tZW0gKnZpcnQ7Ci0J c3RydWN0IGludGVsX3JpbmdidWZmZXIgKnJpbmdidWYgPSByaW5nLT5idWZmZXI7Ci0JaW50IHJl bSA9IHJpbmdidWYtPnNpemUgLSByaW5nYnVmLT50YWlsOwotCi0JaWYgKHJpbmdidWYtPnNwYWNl IDwgcmVtKSB7Ci0JCWludCByZXQgPSByaW5nX3dhaXRfZm9yX3NwYWNlKHJpbmcsIHJlbSk7Ci0J CWlmIChyZXQpCi0JCQlyZXR1cm4gcmV0OwotCX0KLQotCXZpcnQgPSByaW5nYnVmLT52aXJ0dWFs X3N0YXJ0ICsgcmluZ2J1Zi0+dGFpbDsKLQlyZW0gLz0gNDsKLQl3aGlsZSAocmVtLS0pCi0JCWlv d3JpdGUzMihNSV9OT09QLCB2aXJ0KyspOwotCi0JcmluZ2J1Zi0+dGFpbCA9IDA7Ci0JaW50ZWxf cmluZ191cGRhdGVfc3BhY2UocmluZ2J1Zik7Ci0KLQlyZXR1cm4gMDsKLX0KLQogaW50IGludGVs X3JpbmdfaWRsZShzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nKQogewogCXN0cnVjdCBkcm1f aTkxNV9nZW1fcmVxdWVzdCAqcmVxOwpAQCAtMjE5NywxMiArMjE3NCwxOSBAQCBzdGF0aWMgaW50 IF9faW50ZWxfcmluZ19wcmVwYXJlKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcsCiAJCQkJ aW50IGJ5dGVzKQogewogCXN0cnVjdCBpbnRlbF9yaW5nYnVmZmVyICpyaW5nYnVmID0gcmluZy0+ YnVmZmVyOworCWludCBmaWxsID0gMDsKIAlpbnQgcmV0OwogCisJLyoKKwkgKiBJZiB0aGUgcmVx dWVzdCB3aWxsIG5vdCBmaXQgYmV0d2VlbiAndGFpbCcgYW5kIHRoZSBlZmZlY3RpdmUKKwkgKiBz aXplIG9mIHRoZSByaW5nYnVmZmVyLCB0aGVuIHdlIG5lZWQgdG8gcGFkIHRoZSBlbmQgb2YgdGhl CisJICogcmluZ2J1ZmZlciB3aXRoIE5PT1BzLCB0aGVuIHN0YXJ0IHRoZSByZXF1ZXN0IGF0IHRo ZSB0b3Agb2YKKwkgKiB0aGUgcmluZy4gVGhpcyBpbmNyZWFzZXMgdGhlIHRvdGFsIHNpemUgdGhh dCB3ZSBuZWVkIHRvIGNoZWNrCisJICogZm9yIGJ5IGhvd2V2ZXIgbXVjaCBpcyBsZWZ0IGF0IHRo ZSBlbmQgb2YgdGhlIHJpbmcgLi4uCisJICovCiAJaWYgKHVubGlrZWx5KHJpbmdidWYtPnRhaWwg KyBieXRlcyA+IHJpbmdidWYtPmVmZmVjdGl2ZV9zaXplKSkgewotCQlyZXQgPSBpbnRlbF93cmFw X3JpbmdfYnVmZmVyKHJpbmcpOwotCQlpZiAodW5saWtlbHkocmV0KSkKLQkJCXJldHVybiByZXQ7 CisJCWZpbGwgPSByaW5nYnVmLT5zaXplIC0gcmluZ2J1Zi0+dGFpbDsKKwkJYnl0ZXMgKz0gZmls bDsKIAl9CiAKIAlpZiAodW5saWtlbHkocmluZ2J1Zi0+c3BhY2UgPCBieXRlcykpIHsKQEAgLTIy MTEsNiArMjE5NSwyMSBAQCBzdGF0aWMgaW50IF9faW50ZWxfcmluZ19wcmVwYXJlKHN0cnVjdCBp bnRlbF9lbmdpbmVfY3MgKnJpbmcsCiAJCQlyZXR1cm4gcmV0OwogCX0KIAorCWlmICh1bmxpa2Vs eShmaWxsKSkgeworCQl1aW50MzJfdCBfX2lvbWVtICp2aXJ0ID0gcmluZ2J1Zi0+dmlydHVhbF9z dGFydCArIHJpbmdidWYtPnRhaWw7CisKKwkJLyogdGFpbCBzaG91bGQgbm90IGhhdmUgbW92ZWQg Ki8KKwkJaWYgKFdBUk5fT04oZmlsbCAhPSByaW5nYnVmLT5zaXplIC0gcmluZ2J1Zi0+dGFpbCkp CisJCQlmaWxsID0gcmluZ2J1Zi0+c2l6ZSAtIHJpbmdidWYtPnRhaWw7CisKKwkJZG8KKwkJCWlv d3JpdGUzMihNSV9OT09QLCB2aXJ0KyspOworCQl3aGlsZSAoKGZpbGwgLT0gNCkgPiAwKTsKKwor CQlyaW5nYnVmLT50YWlsID0gMDsKKwkJaW50ZWxfcmluZ191cGRhdGVfc3BhY2UocmluZ2J1Zik7 CisJfQorCiAJcmV0dXJuIDA7CiB9CiAKLS0gCjEuNy45LjUKCl9fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwt Z2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21h aWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==