From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michel Thierry Subject: Re: [PATCH 1/5] drm/i915: Cleanup some of the CSB handling Date: Wed, 6 Jan 2016 15:08:38 +0000 Message-ID: <568D2DF6.5000608@intel.com> References: <1452018609-10142-1-git-send-email-benjamin.widawsky@intel.com> <1452018609-10142-2-git-send-email-benjamin.widawsky@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8"; Format="flowed" 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 AB74A6E158 for ; Wed, 6 Jan 2016 07:08:47 -0800 (PST) In-Reply-To: <1452018609-10142-2-git-send-email-benjamin.widawsky@intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Ben Widawsky , Intel GFX List-Id: intel-gfx@lists.freedesktop.org T24gMS81LzIwMTYgNjozMCBQTSwgQmVuIFdpZGF3c2t5IHdyb3RlOgo+IEkgdGhpbmsgdGhpcyBw YXRjaCBpcyBhIHdvcnRod2hpbGUgY2xlYW51cCBldmVuIGlmIGl0IG1pZ2h0IGxvb2sgb25seSBt YXJnaW5hbGx5Cj4gdXNlZnVsLiBJdCBnZXRzIG1vcmUgdXNlZnVsIGluIHVwY29taW5nIHBhdGNo ZXMgYW5kIGZvciBoYW5kbGluZyBvZiBmdXR1cmUgR0VOCj4gcGxhdGZvcm1zLgo+Cj4gVGhlIG9u bHkgbm9uLW1lY2hhbmljYWwgcGFydCBvZiB0aGlzIGlzIHRoZSByZW1vdmFsIG9mIHRoZSBleHRy YSAmIG9wZXJhdGlvbiBvbgo+IHRoZSByaW5nLT5uZXh0X2NvbnRleHRfc3RhdHVzX2J1ZmZlci4g VGhpcyBpcyBzYWZlIGJlY2F1c2UgcmlnaHQgYWJvdmUgdGhpcywgd2UKPiBhbHJlYWR5IGRpZCBh IG1vZHVsdXMgb3BlcmF0aW9uLgo+Cj4gU2lnbmVkLW9mZi1ieTogQmVuIFdpZGF3c2t5IDxiZW5q YW1pbi53aWRhd3NreUBpbnRlbC5jb20+Cj4gLS0tCj4gICBkcml2ZXJzL2dwdS9kcm0vaTkxNS9p OTE1X2RlYnVnZnMuYyB8ICA2ICsrKy0tLQo+ICAgZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf bHJjLmMgICAgfCAxNSArKysrKysrKystLS0tLS0KPiAgIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX2xyYy5oICAgIHwgMTggKysrKysrKysrKysrKysrKy0tCj4gICAzIGZpbGVzIGNoYW5nZWQs IDI4IGluc2VydGlvbnMoKyksIDExIGRlbGV0aW9ucygtKQo+Cj4gZGlmZiAtLWdpdCBhL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2k5MTVfZGVidWdmcy5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkx NV9kZWJ1Z2ZzLmMKPiBpbmRleCAwZmMzOGJiLi4zYjA1YmQxIDEwMDY0NAo+IC0tLSBhL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2k5MTVfZGVidWdmcy5jCj4gKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaTkxNV9kZWJ1Z2ZzLmMKPiBAQCAtMjA5MiwxMyArMjA5MiwxMyBAQCBzdGF0aWMgaW50IGk5 MTVfZXhlY2xpc3RzKHN0cnVjdCBzZXFfZmlsZSAqbSwgdm9pZCAqZGF0YSkKPiAgICAgICAgICAg ICAgICAgIHNlcV9wcmludGYobSwgIlx0U3RhdHVzIHBvaW50ZXI6IDB4JTA4WFxuIiwgc3RhdHVz X3BvaW50ZXIpOwo+Cj4gICAgICAgICAgICAgICAgICByZWFkX3BvaW50ZXIgPSByaW5nLT5uZXh0 X2NvbnRleHRfc3RhdHVzX2J1ZmZlcjsKPiAtICAgICAgICAgICAgICAgd3JpdGVfcG9pbnRlciA9 IHN0YXR1c19wb2ludGVyICYgMHgwNzsKPiArICAgICAgICAgICAgICAgd3JpdGVfcG9pbnRlciA9 IEdFTjhfQ1NCX1dSSVRFX1BUUihzdGF0dXNfcG9pbnRlcik7Cj4gICAgICAgICAgICAgICAgICBp ZiAocmVhZF9wb2ludGVyID4gd3JpdGVfcG9pbnRlcikKPiAtICAgICAgICAgICAgICAgICAgICAg ICB3cml0ZV9wb2ludGVyICs9IDY7Cj4gKyAgICAgICAgICAgICAgICAgICAgICAgd3JpdGVfcG9p bnRlciArPSBHRU44X0NTQl9FTlRSSUVTOwo+ICAgICAgICAgICAgICAgICAgc2VxX3ByaW50Ziht LCAiXHRSZWFkIHBvaW50ZXI6IDB4JTA4WCwgd3JpdGUgcG9pbnRlciAweCUwOFhcbiIsCj4gICAg ICAgICAgICAgICAgICAgICAgICAgICAgIHJlYWRfcG9pbnRlciwgd3JpdGVfcG9pbnRlcik7Cj4K PiAtICAgICAgICAgICAgICAgZm9yIChpID0gMDsgaSA8IDY7IGkrKykgewo+ICsgICAgICAgICAg ICAgICBmb3IgKGkgPSAwOyBpIDwgR0VOOF9DU0JfRU5UUklFUzsgaSsrKSB7Cj4gICAgICAgICAg ICAgICAgICAgICAgICAgIHN0YXR1cyA9IEk5MTVfUkVBRChSSU5HX0NPTlRFWFRfU1RBVFVTX0JV Rl9MTyhyaW5nLCBpKSk7Cj4gICAgICAgICAgICAgICAgICAgICAgICAgIGN0eF9pZCA9IEk5MTVf UkVBRChSSU5HX0NPTlRFWFRfU1RBVFVTX0JVRl9ISShyaW5nLCBpKSk7Cj4KPiBkaWZmIC0tZ2l0 IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9scmMuYwo+IGluZGV4IDgwOTZjNmEuLjdmYjIwMzUgMTAwNjQ0Cj4gLS0tIGEvZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMKPiArKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9scmMuYwo+IEBAIC01MTYsNyArNTE2LDcgQEAgdm9pZCBpbnRlbF9scmNfaXJxX2hh bmRsZXIoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZykKPiAgICAgICAgICBzdGF0dXNfcG9p bnRlciA9IEk5MTVfUkVBRChSSU5HX0NPTlRFWFRfU1RBVFVTX1BUUihyaW5nKSk7Cj4KPiAgICAg ICAgICByZWFkX3BvaW50ZXIgPSByaW5nLT5uZXh0X2NvbnRleHRfc3RhdHVzX2J1ZmZlcjsKPiAt ICAgICAgIHdyaXRlX3BvaW50ZXIgPSBzdGF0dXNfcG9pbnRlciAmIEdFTjhfQ1NCX1BUUl9NQVNL Owo+ICsgICAgICAgd3JpdGVfcG9pbnRlciA9IEdFTjhfQ1NCX1dSSVRFX1BUUihzdGF0dXNfcG9p bnRlcik7Cj4gICAgICAgICAgaWYgKHJlYWRfcG9pbnRlciA+IHdyaXRlX3BvaW50ZXIpCj4gICAg ICAgICAgICAgICAgICB3cml0ZV9wb2ludGVyICs9IEdFTjhfQ1NCX0VOVFJJRVM7Cj4KPiBAQCAt NTU5LDEwICs1NTksMTEgQEAgdm9pZCBpbnRlbF9scmNfaXJxX2hhbmRsZXIoc3RydWN0IGludGVs X2VuZ2luZV9jcyAqcmluZykKPiAgICAgICAgICBXQVJOKHN1Ym1pdF9jb250ZXh0cyA+IDIsICJN b3JlIHRoYW4gdHdvIGNvbnRleHQgY29tcGxldGUgZXZlbnRzP1xuIik7Cj4gICAgICAgICAgcmlu Zy0+bmV4dF9jb250ZXh0X3N0YXR1c19idWZmZXIgPSB3cml0ZV9wb2ludGVyICUgR0VOOF9DU0Jf RU5UUklFUzsKPgo+ICsgICAgICAgLyogVXBkYXRlIHRoZSByZWFkIHBvaW50ZXIgdG8gdGhlIG9s ZCB3cml0ZSBwb2ludGVyLiBNYW51YWwgcmluZ2J1ZmZlcgo+ICsgICAgICAgICogbWFuYWdlbWVu dCBmdHcgPC9zYXJjYXNtPiAqLwo+ICAgICAgICAgIEk5MTVfV1JJVEUoUklOR19DT05URVhUX1NU QVRVU19QVFIocmluZyksCj4gLSAgICAgICAgICAgICAgICAgIF9NQVNLRURfRklFTEQoR0VOOF9D U0JfUFRSX01BU0sgPDwgOCwKPiAtICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAoKHUz MilyaW5nLT5uZXh0X2NvbnRleHRfc3RhdHVzX2J1ZmZlciAmCj4gLSAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIEdFTjhfQ1NCX1BUUl9NQVNLKSA8PCA4KSk7Cj4gKyAgICAgICAgICAg ICAgICAgIF9NQVNLRURfRklFTEQoR0VOOF9DU0JfUkVBRF9QVFJfTUFTSywKPiArICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICByaW5nLT5uZXh0X2NvbnRleHRfc3RhdHVzX2J1ZmZlciA8 PCA4KSk7Cj4gICB9Cj4KPiAgIHN0YXRpYyBpbnQgZXhlY2xpc3RzX2NvbnRleHRfcXVldWUoc3Ry dWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXF1ZXN0KQo+IEBAIC0xNTA2LDkgKzE1MDcsMTEg QEAgc3RhdGljIGludCBnZW44X2luaXRfY29tbW9uX3Jpbmcoc3RydWN0IGludGVsX2VuZ2luZV9j cyAqcmluZykKPiAgICAgICAgICAgKiAgICAgIHwgU3VzcGVuZC10by1pZGxlIChmcmVlemUpIHwg U3VzcGVuZC10by1SQU0gKG1lbSkgfAo+ICAgICAgICAgICAqIEJEVyAgfCBDU0IgcmVncyBub3Qg cmVzZXQgICAgICAgfCBDU0IgcmVncyByZXNldCAgICAgICB8Cj4gICAgICAgICAgICogQ0hUICB8 IENTQiByZWdzIG5vdCByZXNldCAgICAgICB8IENTQiByZWdzIG5vdCByZXNldCAgIHwKPiArICAg ICAgICAqIFNLTCAgfCAgICAgICAgID8gICAgICAgICAgICAgICAgfCAgICAgICAgID8gICAgICAg ICAgICB8Cj4gKyAgICAgICAgKiBCWFQgIHwgICAgICAgICA/ICAgICAgICAgICAgICAgIHwgICAg ICAgICA/ICAgICAgICAgICAgfAo+ICAgICAgICAgICAqLwo+IC0gICAgICAgbmV4dF9jb250ZXh0 X3N0YXR1c19idWZmZXJfaHcgPSAoSTkxNV9SRUFEKFJJTkdfQ09OVEVYVF9TVEFUVVNfUFRSKHJp bmcpKQo+IC0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICYgR0VOOF9DU0JfUFRSX01BU0spOwo+ICsgICAgICAgbmV4dF9jb250ZXh0X3N0YXR1c19idWZm ZXJfaHcgPQo+ICsgICAgICAgICAgICAgICBHRU44X0NTQl9XUklURV9QVFIoSTkxNV9SRUFEKFJJ TkdfQ09OVEVYVF9TVEFUVVNfUFRSKHJpbmcpKSk7Cj4KPiAgICAgICAgICAvKgo+ICAgICAgICAg ICAqIFdoZW4gdGhlIENTQiByZWdpc3RlcnMgYXJlIHJlc2V0IChhbHNvIGFmdGVyIHBvd2VyLXVw IC8gZ3B1IHJlc2V0KSwKPiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf bHJjLmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuaAo+IGluZGV4IGFlOTBmODYu LmRlNDFhZDYgMTAwNjQ0Cj4gLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmgK PiArKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuaAo+IEBAIC0yNSw4ICsyNSw2 IEBACj4gICAjZGVmaW5lIF9JTlRFTF9MUkNfSF8KPgo+ICAgI2RlZmluZSBHRU44X0xSX0NPTlRF WFRfQUxJR04gNDA5Ngo+IC0jZGVmaW5lIEdFTjhfQ1NCX0VOVFJJRVMgNgo+IC0jZGVmaW5lIEdF TjhfQ1NCX1BUUl9NQVNLIDB4MDcKPgo+ICAgLyogRXhlY2xpc3RzIHJlZ3MgKi8KPiAgICNkZWZp bmUgUklOR19FTFNQKHJpbmcpICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBfTU1JTygo cmluZyktPm1taW9fYmFzZSArIDB4MjMwKQo+IEBAIC00MCw2ICszOCwyMiBAQAo+ICAgI2RlZmlu ZSBSSU5HX0NPTlRFWFRfU1RBVFVTX0JVRl9ISShyaW5nLCBpKSAgICBfTU1JTygocmluZyktPm1t aW9fYmFzZSArIDB4MzcwICsgKGkpICogOCArIDQpCj4gICAjZGVmaW5lIFJJTkdfQ09OVEVYVF9T VEFUVVNfUFRSKHJpbmcpICAgICAgICAgIF9NTUlPKChyaW5nKS0+bW1pb19iYXNlICsgMHgzYTAp Cj4KPiArLyogVGhlIGRvY3Mgc3BlY2lmeSB0aGF0IHRoZSB3cml0ZSBwb2ludGVyIHdyYXBzIGFy b3VuZCBhZnRlciA1aCwgIkFmdGVyIHN0YXR1cwo+ICsgKiBpcyB3cml0dGVuIG91dCB0byB0aGUg bGFzdCBhdmFpbGFibGUgc3RhdHVzIFFXIGF0IG9mZnNldCA1aCwgdGhpcyBwb2ludGVyCj4gKyAq IHdyYXBzIHRvIDAuIgo+ICsgKgo+ICsgKiBUaGVyZWZvcmUsIG9uZSBtdXN0IGluZmVyIHRoYW4g ZXZlbiB0aG91Z2ggdGhlcmUgYXJlIDMgYml0cyBhdmFpbGFibGUsIDYgYW5kCj4gKyAqIDcgYXBw ZWFyIHRvIGJlICogcmVzZXJ2ZWQuCgpJIGFsd2F5cyBzZWUgNyAoYjExMSkgYWZ0ZXIgYm9vdC9y ZXNldCwgYnV0IGJlZm9yZSBhbnkgZXhlY2xpc3QgaGFzIGJlZW4gCnN1Ym1pdHRlZC4KCj4gKyAq Lwo+ICsjZGVmaW5lIEdFTjhfQ1NCX0VOVFJJRVMgNgo+ICsjZGVmaW5lIEdFTjhfQ1NCX1BUUl9N QVNLIDB4Nwo+ICsjZGVmaW5lIEdFTjhfQ1NCX1JFQURfUFRSX01BU0sgKEdFTjhfQ1NCX1BUUl9N QVNLIDw8IDgpCj4gKyNkZWZpbmUgR0VOOF9DU0JfV1JJVEVfUFRSX01BU0sgKEdFTjhfQ1NCX1BU Ul9NQVNLIDw8IDApCj4gKyNkZWZpbmUgR0VOOF9DU0JfV1JJVEVfUFRSKGNzYl9zdGF0dXMpIFwK PiArICAgICAgICgoKGNzYl9zdGF0dXMpICYgR0VOOF9DU0JfV1JJVEVfUFRSX01BU0spID4+IDAp Cj4gKyNkZWZpbmUgR0VOOF9DU0JfUkVBRF9QVFIoY3NiX3N0YXR1cykgXAo+ICsgICAgICAgKCgo Y3NiX3N0YXR1cykgJiBHRU44X0NTQl9SRUFEX1BUUl9NQVNLKSA+PiA4KQo+ICsKPiAgIC8qIExv Z2ljYWwgUmluZ3MgKi8KPiAgIGludCBpbnRlbF9sb2dpY2FsX3JpbmdfYWxsb2NfcmVxdWVzdF9l eHRyYXMoc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXF1ZXN0KTsKPiAgIGludCBpbnRl bF9sb2dpY2FsX3JpbmdfcmVzZXJ2ZV9zcGFjZShzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3Qg KnJlcXVlc3QpOwo+IC0tCj4gMi42LjQKClJldmlld2VkLWJ5OiBNaWNoZWwgVGhpZXJyeSA8bWlj aGVsLnRoaWVycnlAaW50ZWwuY29tPgoKPgo+IF9fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fCj4gSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdAo+IEludGVsLWdmeEBs aXN0cy5mcmVlZGVza3RvcC5vcmcKPiBodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxt YW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cj4KX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJl ZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5m by9pbnRlbC1nZngK