From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tomas Elf Subject: Re: [PATCH 38/53] drm/i915: Update some flush helpers to take request structures Date: Mon, 09 Mar 2015 20:46:23 +0000 Message-ID: <54FE069F.9070006@intel.com> References: <1423828140-10653-1-git-send-email-John.C.Harrison@Intel.com> <1424366285-29232-1-git-send-email-John.C.Harrison@Intel.com> <1424366285-29232-39-git-send-email-John.C.Harrison@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 CDD166E5DE for ; Mon, 9 Mar 2015 13:46:25 -0700 (PDT) In-Reply-To: <1424366285-29232-39-git-send-email-John.C.Harrison@Intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: John.C.Harrison@Intel.com, Intel-GFX@Lists.FreeDesktop.Org List-Id: intel-gfx@lists.freedesktop.org T24gMTkvMDIvMjAxNSAxNzoxNywgSm9obi5DLkhhcnJpc29uQEludGVsLmNvbSB3cm90ZToKPiBG cm9tOiBKb2huIEhhcnJpc29uIDxKb2huLkMuSGFycmlzb25ASW50ZWwuY29tPgo+Cj4gVXBkYXRl ZCBpbnRlbF9lbWl0X3Bvc3Rfc3luY19ub256ZXJvX2ZsdXNoKCksIGdlbjdfcmVuZGVyX3Jpbmdf Y3Nfc3RhbGxfd2EoKSwKPiBnZW43X3JpbmdfZmJjX2ZsdXNoKCkgYW5kIGdlbjhfZW1pdF9waXBl X2NvbnRyb2woKSB0byB0YWtlIHJlcXVlc3RzIGluc3RlYWQgb2YKPiByaW5ncy4KPgo+IEZvcjog VklaLTUxMTUKPiBTaWduZWQtb2ZmLWJ5OiBKb2huIEhhcnJpc29uIDxKb2huLkMuSGFycmlzb25A SW50ZWwuY29tPgo+IC0tLQo+ICAgZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZl ci5jIHwgICAyOSArKysrKysrKysrKysrKysrLS0tLS0tLS0tLS0tLQo+ICAgMSBmaWxlIGNoYW5n ZWQsIDE2IGluc2VydGlvbnMoKyksIDEzIGRlbGV0aW9ucygtKQo+Cj4gZGlmZiAtLWdpdCBhL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuYyBiL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX3JpbmdidWZmZXIuYwo+IGluZGV4IGNhOGYwMzkuLjQ3MGZhOTMgMTAwNjQ0Cj4g LS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5jCj4gKysrIGIvZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5jCj4gQEAgLTIxNCw4ICsyMTQsOSBA QCBnZW40X3JlbmRlcl9yaW5nX2ZsdXNoKHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVx LAo+ICAgICogcmVhbGx5IG91ciBidXNpbmVzcy4gIFRoYXQgbGVhdmVzIG9ubHkgc3RhbGwgYXQg c2NvcmVib2FyZC4KPiAgICAqLwo+ICAgc3RhdGljIGludAo+IC1pbnRlbF9lbWl0X3Bvc3Rfc3lu Y19ub256ZXJvX2ZsdXNoKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcpCj4gK2ludGVsX2Vt aXRfcG9zdF9zeW5jX25vbnplcm9fZmx1c2goc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpy ZXEpCj4gICB7Cj4gKwlzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nID0gcmVxLT5yaW5nOwo+ ICAgCXUzMiBzY3JhdGNoX2FkZHIgPSByaW5nLT5zY3JhdGNoLmd0dF9vZmZzZXQgKyAyICogQ0FD SEVMSU5FX0JZVEVTOwo+ICAgCWludCByZXQ7Cj4KPiBAQCAtMjU4LDcgKzI1OSw3IEBAIGdlbjZf cmVuZGVyX3JpbmdfZmx1c2goc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXEsCj4gICAJ aW50IHJldDsKPgo+ICAgCS8qIEZvcmNlIFNOQiB3b3JrYXJvdW5kcyBmb3IgUElQRV9DT05UUk9M IGZsdXNoZXMgKi8KPiAtCXJldCA9IGludGVsX2VtaXRfcG9zdF9zeW5jX25vbnplcm9fZmx1c2go cmluZyk7Cj4gKwlyZXQgPSBpbnRlbF9lbWl0X3Bvc3Rfc3luY19ub256ZXJvX2ZsdXNoKHJlcSk7 Cj4gICAJaWYgKHJldCkKPiAgIAkJcmV0dXJuIHJldDsKPgo+IEBAIC0zMDIsOCArMzAzLDkgQEAg Z2VuNl9yZW5kZXJfcmluZ19mbHVzaChzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcSwK PiAgIH0KPgo+ICAgc3RhdGljIGludAo+IC1nZW43X3JlbmRlcl9yaW5nX2NzX3N0YWxsX3dhKHN0 cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcpCj4gK2dlbjdfcmVuZGVyX3JpbmdfY3Nfc3RhbGxf d2Eoc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXEpCj4gICB7Cj4gKwlzdHJ1Y3QgaW50 ZWxfZW5naW5lX2NzICpyaW5nID0gcmVxLT5yaW5nOwo+ICAgCWludCByZXQ7Cj4KPiAgIAlyZXQg PSBpbnRlbF9yaW5nX2JlZ2luKHJpbmcsIDQpOwo+IEBAIC0zMjAsOCArMzIyLDkgQEAgZ2VuN19y ZW5kZXJfcmluZ19jc19zdGFsbF93YShzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nKQo+ICAg CXJldHVybiAwOwo+ICAgfQo+Cj4gLXN0YXRpYyBpbnQgZ2VuN19yaW5nX2ZiY19mbHVzaChzdHJ1 Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nLCB1MzIgdmFsdWUpCj4gK3N0YXRpYyBpbnQgZ2VuN19y aW5nX2ZiY19mbHVzaChzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcSwgdTMyIHZhbHVl KQo+ICAgewo+ICsJc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZyA9IHJlcS0+cmluZzsKPiAg IAlpbnQgcmV0Owo+Cj4gICAJaWYgKCFyaW5nLT5mYmNfZGlydHkpCj4gQEAgLTM4OSw3ICszOTIs NyBAQCBnZW43X3JlbmRlcl9yaW5nX2ZsdXNoKHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAq cmVxLAo+ICAgCQkvKiBXb3JrYXJvdW5kOiB3ZSBtdXN0IGlzc3VlIGEgcGlwZV9jb250cm9sIHdp dGggQ1Mtc3RhbGwgYml0Cj4gICAJCSAqIHNldCBiZWZvcmUgYSBwaXBlX2NvbnRyb2wgY29tbWFu ZCB0aGF0IGhhcyB0aGUgc3RhdGUgY2FjaGUKPiAgIAkJICogaW52YWxpZGF0ZSBiaXQgc2V0LiAq Lwo+IC0JCWdlbjdfcmVuZGVyX3JpbmdfY3Nfc3RhbGxfd2EocmluZyk7Cj4gKwkJZ2VuN19yZW5k ZXJfcmluZ19jc19zdGFsbF93YShyZXEpOwo+ICAgCX0KPgo+ICAgCXJldCA9IGludGVsX3Jpbmdf YmVnaW4ocmluZywgNCk7Cj4gQEAgLTQwMywxNSArNDA2LDE2IEBAIGdlbjdfcmVuZGVyX3Jpbmdf Zmx1c2goc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXEsCj4gICAJaW50ZWxfcmluZ19h ZHZhbmNlKHJpbmcpOwo+Cj4gICAJaWYgKCFpbnZhbGlkYXRlX2RvbWFpbnMgJiYgZmx1c2hfZG9t YWlucykKPiAtCQlyZXR1cm4gZ2VuN19yaW5nX2ZiY19mbHVzaChyaW5nLCBGQkNfUkVORF9OVUtF KTsKPiArCQlyZXR1cm4gZ2VuN19yaW5nX2ZiY19mbHVzaChyZXEsIEZCQ19SRU5EX05VS0UpOwo+ Cj4gICAJcmV0dXJuIDA7Cj4gICB9Cj4KPiAgIHN0YXRpYyBpbnQKPiAtZ2VuOF9lbWl0X3BpcGVf Y29udHJvbChzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nLAo+ICtnZW44X2VtaXRfcGlwZV9j b250cm9sKHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVxLAo+ICAgCQkgICAgICAgdTMy IGZsYWdzLCB1MzIgc2NyYXRjaF9hZGRyKQo+ICAgewo+ICsJc3RydWN0IGludGVsX2VuZ2luZV9j cyAqcmluZyA9IHJlcS0+cmluZzsKPiAgIAlpbnQgcmV0Owo+Cj4gICAJcmV0ID0gaW50ZWxfcmlu Z19iZWdpbihyaW5nLCA2KTsKPiBAQCAtNDMzLDkgKzQzNyw4IEBAIHN0YXRpYyBpbnQKPiAgIGdl bjhfcmVuZGVyX3JpbmdfZmx1c2goc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXEsCj4g ICAJCSAgICAgICB1MzIgaW52YWxpZGF0ZV9kb21haW5zLCB1MzIgZmx1c2hfZG9tYWlucykKPiAg IHsKPiAtCXN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcgPSByZXEtPnJpbmc7Cj4gICAJdTMy IGZsYWdzID0gMDsKPiAtCXUzMiBzY3JhdGNoX2FkZHIgPSByaW5nLT5zY3JhdGNoLmd0dF9vZmZz ZXQgKyAyICogQ0FDSEVMSU5FX0JZVEVTOwo+ICsJdTMyIHNjcmF0Y2hfYWRkciA9IHJlcS0+cmlu Zy0+c2NyYXRjaC5ndHRfb2Zmc2V0ICsgMiAqIENBQ0hFTElORV9CWVRFUzsKPiAgIAlpbnQgcmV0 Owo+Cj4gICAJZmxhZ3MgfD0gUElQRV9DT05UUk9MX0NTX1NUQUxMOwo+IEBAIC00NTUsNyArNDU4 LDcgQEAgZ2VuOF9yZW5kZXJfcmluZ19mbHVzaChzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3Qg KnJlcSwKPiAgIAkJZmxhZ3MgfD0gUElQRV9DT05UUk9MX0dMT0JBTF9HVFRfSVZCOwo+Cj4gICAJ CS8qIFdhQ3NTdGFsbEJlZm9yZVN0YXRlQ2FjaGVJbnZhbGlkYXRlOmJkdyxjaHYgKi8KPiAtCQly ZXQgPSBnZW44X2VtaXRfcGlwZV9jb250cm9sKHJpbmcsCj4gKwkJcmV0ID0gZ2VuOF9lbWl0X3Bp cGVfY29udHJvbChyZXEsCj4gICAJCQkJCSAgICAgUElQRV9DT05UUk9MX0NTX1NUQUxMIHwKPiAg IAkJCQkJICAgICBQSVBFX0NPTlRST0xfU1RBTExfQVRfU0NPUkVCT0FSRCwKPiAgIAkJCQkJICAg ICAwKTsKPiBAQCAtNDYzLDEyICs0NjYsMTIgQEAgZ2VuOF9yZW5kZXJfcmluZ19mbHVzaChzdHJ1 Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcSwKPiAgIAkJCXJldHVybiByZXQ7Cj4gICAJfQo+ Cj4gLQlyZXQgPSBnZW44X2VtaXRfcGlwZV9jb250cm9sKHJpbmcsIGZsYWdzLCBzY3JhdGNoX2Fk ZHIpOwo+ICsJcmV0ID0gZ2VuOF9lbWl0X3BpcGVfY29udHJvbChyZXEsIGZsYWdzLCBzY3JhdGNo X2FkZHIpOwo+ICAgCWlmIChyZXQpCj4gICAJCXJldHVybiByZXQ7Cj4KPiAgIAlpZiAoIWludmFs aWRhdGVfZG9tYWlucyAmJiBmbHVzaF9kb21haW5zKQo+IC0JCXJldHVybiBnZW43X3JpbmdfZmJj X2ZsdXNoKHJpbmcsIEZCQ19SRU5EX05VS0UpOwo+ICsJCXJldHVybiBnZW43X3JpbmdfZmJjX2Zs dXNoKHJlcSwgRkJDX1JFTkRfTlVLRSk7Cj4KPiAgIAlyZXR1cm4gMDsKPiAgIH0KPiBAQCAtMjQ4 Miw3ICsyNDg1LDcgQEAgc3RhdGljIGludCBnZW42X3JpbmdfZmx1c2goc3RydWN0IGRybV9pOTE1 X2dlbV9yZXF1ZXN0ICpyZXEsCj4KPiAgIAlpZiAoIWludmFsaWRhdGUgJiYgZmx1c2gpIHsKPiAg IAkJaWYgKElTX0dFTjcoZGV2KSkKPiAtCQkJcmV0dXJuIGdlbjdfcmluZ19mYmNfZmx1c2gocmlu ZywgRkJDX1JFTkRfQ0FDSEVfQ0xFQU4pOwo+ICsJCQlyZXR1cm4gZ2VuN19yaW5nX2ZiY19mbHVz aChyZXEsIEZCQ19SRU5EX0NBQ0hFX0NMRUFOKTsKPiAgIAkJZWxzZSBpZiAoSVNfQlJPQURXRUxM KGRldikpCj4gICAJCQlkZXZfcHJpdi0+ZmJjLm5lZWRfc3dfY2FjaGVfY2xlYW4gPSB0cnVlOwo+ ICAgCX0KPgoKUmV2aWV3ZWQtYnk6IFRvbWFzIEVsZiA8dG9tYXMuZWxmQGludGVsLmNvbT4KClRo YW5rcywKVG9tYXMKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3Jn Cmh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK