From mboxrd@z Thu Jan 1 00:00:00 1970 From: Dave Gordon Subject: Re: [PATCH 055/190] drm/i915: Unify intel_logical_ring_emit and intel_ring_emit Date: Tue, 12 Jan 2016 17:29:36 +0000 Message-ID: <56953800.9030504@intel.com> References: <1452503961-14837-1-git-send-email-chris@chris-wilson.co.uk> <1452503961-14837-55-git-send-email-chris@chris-wilson.co.uk> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8"; Format="flowed" Content-Transfer-Encoding: base64 Return-path: Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by gabe.freedesktop.org (Postfix) with ESMTP id 7BF056E6BE for ; Tue, 12 Jan 2016 09:30:01 -0800 (PST) In-Reply-To: <1452503961-14837-55-git-send-email-chris@chris-wilson.co.uk> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Chris Wilson , intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org T24gMTEvMDEvMTYgMDk6MTcsIENocmlzIFdpbHNvbiB3cm90ZToKPiBCb3RoIHBlcmZvcm0gdGhl IHNhbWUgYWN0aW9ucyB3aXRoIG1vcmUgb3IgbGVzcyBpbmRpcmVjdGlvbiwgc28ganVzdAo+IHVu aWZ5IHRoZSBjb2RlLgo+Cj4gU2lnbmVkLW9mZi1ieTogQ2hyaXMgV2lsc29uIDxjaHJpc0BjaHJp cy13aWxzb24uY28udWs+Cj4gLS0tCj4gICBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5j ICAgICAgICAgICAgfCAgIDIgKy0KPiAgIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2Nv bnRleHQuYyAgICB8ICAgOCArLQo+ICAgZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZXhl Y2J1ZmZlci5jIHwgIDM0ICsrKystLS0tLQo+ICAgZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9n ZW1fZ3R0LmMgICAgICAgIHwgIDI2ICsrKy0tLS0KPiAgIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX2Rpc3BsYXkuYyAgICAgICB8ICAyNiArKystLS0tCj4gICBkcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9scmMuYyAgICAgICAgICAgfCAxMTQgKysrKysrKysrKysrKystLS0tLS0tLS0tLS0t LS0KPiAgIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5oICAgICAgICAgICB8ICAyNiAt LS0tLS0tCj4gICBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9tb2NzLmMgICAgICAgICAgfCAg MzAgKysrKy0tLS0KPiAgIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX292ZXJsYXkuYyAgICAg ICB8ICA0MiArKysrKy0tLS0tLQo+ICAgZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1 ZmZlci5jICAgIHwgMTAxICsrKysrKysrKysrKy0tLS0tLS0tLS0tLS0KPiAgIGRyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuaCAgICB8ICAyMSArKy0tLS0KPiAgIDExIGZpbGVz IGNoYW5nZWQsIDE5NCBpbnNlcnRpb25zKCspLCAyMzYgZGVsZXRpb25zKC0pCj4KPiBkaWZmIC0t Z2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYyBiL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2k5MTVfZ2VtLmMKPiBpbmRleCBjMmExZWM4YWJjMTEuLjI0NzczMTY3MmNiMSAxMDA2NDQK PiAtLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jCj4gKysrIGIvZHJpdmVycy9n cHUvZHJtL2k5MTUvaTkxNV9nZW0uYwo+IEBAIC00MDY4LDcgKzQwNjgsNyBAQCBlcnI6Cj4KPiAg IGludCBpOTE1X2dlbV9sM19yZW1hcChzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcSwg aW50IHNsaWNlKQo+ICAgewo+IC0Jc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZyA9IHJlcS0+ cmluZzsKPiArCXN0cnVjdCBpbnRlbF9yaW5nYnVmZmVyICpyaW5nID0gcmVxLT5yaW5nYnVmOwoK TkFLLiAocmVnYXJkbGVzcyBvZiB0aGUgZmFjdCB0aGF0IEknZCBsaWtlIHRoZW0gdW5pZmllZCEp CgpVbnRpbCB5b3UgaGF2ZSBwdXJnZWQgdGhlIGxhc3QgdXNlIG9mIHRoZSBuYW1lICJyaW5nIiBh cyBhIHJlZmVyZW5jZSB0byAKYW4gZW5naW5lLCBhZGRpbmcgbmV3IHRoaW5ncyBjYWxsZWQgInJp bmciIGJ1dCBvZiBhIGRpZmZlcmVudCB0eXBlIHdpbGwgCmJlIHRvbyBjb25mdXNpbmcuCgpUaGUg dmFyaWFibGUsIGF0IGxlYXN0IGZvciBub3csIHNob3VsZCBiZSBjYWxsZWQgInJpbmdidWYiLCB3 aGljaCBtYWtlcyAKaXQgb2J2aW91cyB0aGF0IGl0IGNhY2hlcyB0aGUgJ3JlcS0+cmluZ2J1Zicg ZmllbGQgYW5kIE5PVCB0aGUKICAgICAgICAgc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZzsK dGhhdCBpcyBhbHNvIGZvdW5kIGluIHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdC4KCllvdSBj YW4gb25seSBzdGFydCByZXVzaW5nIG5hbWVzIHdpdGggYSBuZXcgbWVhbmluZyAvYWZ0ZXIvIHRo ZSBvbGQgCm1lYW5pbmcgaGFzIGJlZW4gZWxpbWluYXRlZCBmcm9tIHRoZSBjb2RlLCBidXQgc29t ZSBpbnRlcnZhbCBmb3IgCmV2ZXJ5b25lJ3MgbWVudGFsIGNhY2hlIHRvIGJlIHVwZGF0ZWQuIEJ1 dCBwcm9iYWJseSBiZXR0ZXIgbmV2ZXIgdG8gCnJldXNlIGFuIG9sZCBuYW1lIGZvciBhIGRpZmZl cmVudCB0aGluZywgd2h5IG5vdCBqdXN0IG1ha2UgdXAgYSBuZXcgb25lLCAKYXMgd2UgZGlkIHdp dGggImVuZ2luZSIuCgo+ICAgCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHJl cS0+aTkxNTsKPiAgIAl1MzIgKnJlbWFwX2luZm8gPSBkZXZfcHJpdi0+bDNfcGFyaXR5LnJlbWFw X2luZm9bc2xpY2VdOwo+ICAgCWludCBpLCByZXQ7Cj4gZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2k5MTVfZ2VtX2NvbnRleHQuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVf Z2VtX2NvbnRleHQuYwo+IGluZGV4IDNlM2I0YmYzZmVkMS4uZDU4ZGU3ZTA4NGRjIDEwMDY0NAo+ IC0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2NvbnRleHQuYwo+ICsrKyBiL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2NvbnRleHQuYwo+IEBAIC01MTksNyArNTE5LDcg QEAgaTkxNV9nZW1fY29udGV4dF9nZXQoc3RydWN0IGRybV9pOTE1X2ZpbGVfcHJpdmF0ZSAqZmls ZV9wcml2LCB1MzIgaWQpCj4gICBzdGF0aWMgaW5saW5lIGludAo+ICAgbWlfc2V0X2NvbnRleHQo c3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXEsIHUzMiBod19mbGFncykKPiAgIHsKPiAt CXN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcgPSByZXEtPnJpbmc7Cj4gKwlzdHJ1Y3QgaW50 ZWxfcmluZ2J1ZmZlciAqcmluZyA9IHJlcS0+cmluZ2J1ZjsKPiAgIAl1MzIgZmxhZ3MgPSBod19m bGFncyB8IE1JX01NX1NQQUNFX0dUVDsKPiAgIAljb25zdCBpbnQgbnVtX3JpbmdzID0KPiAgIAkJ LyogVXNlIGFuIGV4dGVuZGVkIHcvYSBvbiBpdmIrIGlmIHNpZ25hbGxpbmcgZnJvbSBvdGhlciBy aW5ncyAqLwo+IEBAIC01MzQsNyArNTM0LDcgQEAgbWlfc2V0X2NvbnRleHQoc3RydWN0IGRybV9p OTE1X2dlbV9yZXF1ZXN0ICpyZXEsIHUzMiBod19mbGFncykKPiAgIAkgKiBpdGxiX2JlZm9yZV9j dHhfc3dpdGNoLgo+ICAgCSAqLwo+ICAgCWlmIChJU19HRU42KHJlcS0+aTkxNSkpIHsKPiAtCQly ZXQgPSByaW5nLT5mbHVzaChyZXEsIEk5MTVfR0VNX0dQVV9ET01BSU5TLCAwKTsKPiArCQlyZXQg PSByZXEtPnJpbmctPmZsdXNoKHJlcSwgSTkxNV9HRU1fR1BVX0RPTUFJTlMsIDApOwoKSG1tIC4u LiB3aGF0IGlzIHRoaXMgInJpbmciPyBPaCwgdGhpcyBvbmUncyBub3QgYSByaW5nYnVmZmVyLCBp dCdzIGFuIApFTkdJTkUhCgo+ICAgCQlpZiAocmV0KQo+ICAgCQkJcmV0dXJuIHJldDsKPiAgIAl9 Cj4gQEAgLTU2Miw3ICs1NjIsNyBAQCBtaV9zZXRfY29udGV4dChzdHJ1Y3QgZHJtX2k5MTVfZ2Vt X3JlcXVlc3QgKnJlcSwgdTMyIGh3X2ZsYWdzKQo+Cj4gICAJCQlpbnRlbF9yaW5nX2VtaXQocmlu ZywgTUlfTE9BRF9SRUdJU1RFUl9JTU0obnVtX3JpbmdzKSk7Cj4gICAJCQlmb3JfZWFjaF9yaW5n KHNpZ25hbGxlciwgcmVxLT5pOTE1LCBpKSB7Cj4gLQkJCQlpZiAoc2lnbmFsbGVyID09IHJpbmcp Cj4gKwkJCQlpZiAoc2lnbmFsbGVyID09IHJlcS0+cmluZykKCmFub3RoZXIgZW5naW5lCgo+ICAg CQkJCQljb250aW51ZTsKPgo+ICAgCQkJCWludGVsX3JpbmdfZW1pdF9yZWcocmluZywgUklOR19Q U01JX0NUTChzaWduYWxsZXItPm1taW9fYmFzZSkpOwo+IEBAIC01ODcsNyArNTg3LDcgQEAgbWlf c2V0X2NvbnRleHQoc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXEsIHUzMiBod19mbGFn cykKPgo+ICAgCQkJaW50ZWxfcmluZ19lbWl0KHJpbmcsIE1JX0xPQURfUkVHSVNURVJfSU1NKG51 bV9yaW5ncykpOwo+ICAgCQkJZm9yX2VhY2hfcmluZyhzaWduYWxsZXIsIHJlcS0+aTkxNSwgaSkg ewo+IC0JCQkJaWYgKHNpZ25hbGxlciA9PSByaW5nKQo+ICsJCQkJaWYgKHNpZ25hbGxlciA9PSBy ZXEtPnJpbmcpCgphbmQgdGhpcyBvbmUgdG9vCgo+ICAgCQkJCQljb250aW51ZTsKPgo+ICAgCQkJ CWludGVsX3JpbmdfZW1pdF9yZWcocmluZywgUklOR19QU01JX0NUTChzaWduYWxsZXItPm1taW9f YmFzZSkpOwo+IGRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9leGVj YnVmZmVyLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9leGVjYnVmZmVyLmMKPiBp bmRleCA3OGI0NjI5NTZjNzguLjYwM2EyNDdhYzMzMyAxMDA2NDQKPiAtLS0gYS9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pOTE1X2dlbV9leGVjYnVmZmVyLmMKPiArKysgYi9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pOTE1X2dlbV9leGVjYnVmZmVyLmMKPiBAQCAtMTE0NiwxNCArMTE0NiwxMiBAQCBpOTE1 X2dlbV9leGVjYnVmZmVyX3JldGlyZV9jb21tYW5kcyhzdHJ1Y3QgaTkxNV9leGVjYnVmZmVyX3Bh cmFtcyAqcGFyYW1zKQo+ICAgfQo+Cj4gICBzdGF0aWMgaW50Cj4gLWk5MTVfcmVzZXRfZ2VuN19z b2xfb2Zmc2V0cyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAo+IC0JCQkgICAgc3RydWN0IGRybV9p OTE1X2dlbV9yZXF1ZXN0ICpyZXEpCj4gK2k5MTVfcmVzZXRfZ2VuN19zb2xfb2Zmc2V0cyhzdHJ1 Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcSkKPiAgIHsKPiAtCXN0cnVjdCBpbnRlbF9lbmdp bmVfY3MgKnJpbmcgPSByZXEtPnJpbmc7Cj4gLQlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2 X3ByaXYgPSBkZXYtPmRldl9wcml2YXRlOwo+ICsJc3RydWN0IGludGVsX3JpbmdidWZmZXIgKnJp bmcgPSByZXEtPnJpbmdidWY7CgpCdXQgdGhpcyAncmluZycgaXMgYSByaW5nYnVmZmVyIC4uLgoK PiAgIAlpbnQgcmV0LCBpOwo+Cj4gLQlpZiAoIUlTX0dFTjcoZGV2KSB8fCByaW5nICE9ICZkZXZf cHJpdi0+cmluZ1tSQ1NdKSB7Cj4gKwlpZiAoIUlTX0dFTjcocmVxLT5pOTE1KSB8fCByZXEtPnJp bmctPmlkICE9IFJDUykgewoKLi4uIGFuZCB0aGlzIG9uZSwgaW4gdGhlIHNhbWUgZnVuY3Rpb24s IGlzIGFuIGVuZ2luZSEKCj4gICAJCURSTV9ERUJVRygic29sIHJlc2V0IGlzIGdlbjcvcmNzIG9u bHlcbiIpOwo+ICAgCQlyZXR1cm4gLUVJTlZBTDsKPiAgIAl9CgpTbyBwbGVhc2Ugc3VibWl0IGEg dmVyc2lvbiB0aGF0IGRvZXMganVzdCB3aGF0IGl0IHNheXMgKCdjb3MgSSB0aGluayAKdW5pZmlj YXRpb24gd291bGQgYmUgZ29vZCkgYnV0IHdpdGhvdXQgdGhlIGNvbmZ1c2luZyByZXB1cnBvc2lu ZyBvZiAKbG9jYWwgdmFyaWFibGUgbmFtZXMuCgouRGF2ZS4KX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1n ZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFp bG1hbi9saXN0aW5mby9pbnRlbC1nZngK