From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Vetter Subject: Re: [PATCH 2/2] drm/i915: Update sprite watermarks outside vblank evasion Date: Tue, 23 Jun 2015 09:34:50 +0200 Message-ID: <20150623073450.GP25769@phenom.ffwll.local> References: <1435023033-18043-1-git-send-email-matthew.d.roper@intel.com> <1435023033-18043-3-git-send-email-matthew.d.roper@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-wi0-f180.google.com (mail-wi0-f180.google.com [209.85.212.180]) by gabe.freedesktop.org (Postfix) with ESMTP id 342B56E912 for ; Tue, 23 Jun 2015 00:32:04 -0700 (PDT) Received: by wiga1 with SMTP id a1so97480213wig.0 for ; Tue, 23 Jun 2015 00:32:03 -0700 (PDT) Content-Disposition: inline In-Reply-To: <1435023033-18043-3-git-send-email-matthew.d.roper@intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Matt Roper Cc: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org T24gTW9uLCBKdW4gMjIsIDIwMTUgYXQgMDY6MzA6MzNQTSAtMDcwMCwgTWF0dCBSb3BlciB3cm90 ZToKPiBXZSBuZXZlciByZW1vdmVkIHRoZSBzcHJpdGUgd2F0ZXJtYXJrIHVwZGF0ZXMgZnJvbSBv dXIgbG93LWxldmVsCj4gZm9vX3VwZGF0ZV9wbGFuZSgpIGZ1bmN0aW9uczsgc2luY2Ugb3VyIGhh cmR3YXJlIHVwZGF0ZXMgaGFwcGVuIHVuZGVyCj4gdmJsYW5rIGV2YXNpb24sIHdlJ3JlIG5vdCBz dXBwb3NlZCB0byBiZSBjYWxsaW5nIHBvdGVudGlhbGx5IHNsZWVwaW5nCj4gZnVuY3Rpb25zIHRo ZXJlIChzaW5jZSBpbnRlcnJ1cHRzIGFyZSBkaXNhYmxlZCkuICBXZSBkbyBhbHJlYWR5IGhhdmUg YQo+IG1lY2hhbmlzbSB0aGF0J3Mgc3VwcG9zZWQgdG8gYmUgdXNlZCB0byB1cGRhdGUgc3ByaXRl IHdhdGVybWFya3MgaW4gdGhlCj4gcG9zdC1ldmFzaW9uIGZ1bmN0aW9uIGludGVsX3Bvc3RfcGxh bmVfdXBkYXRlKCksIGJ1dCBhdCB0aGUgbW9tZW50IGl0J3MKPiBvbmx5IGJlaW5nIHVzZWQgZm9y IHVwZGF0ZXMgY2F1c2VkIGJ5IHBsYW5lIGRpc2FibGVzLgo+IAo+IFRvIGZpeCB0aGlzIG92ZXJz aWdodCB3ZSBuZWVkIHRvIG1ha2UgYSBmZXcgY2hhbmdlczoKPiAKPiAgKiBXaGVuIGludGVsX3Bs YW5lX2F0b21pY19jYWxjX2NoYW5nZXMoKSBjYWxscyBpbnRlbF93bV9uZWVkX3VwZGF0ZSgpCj4g ICAgdG8gZGV0ZXJtaW5lIHdoZXRoZXIgd2F0ZXJtYXJrcyBuZWVkIGFuIHVwZGF0ZSwgd2UgbmVl ZCB0byBzZXQgdGhlCj4gICAgJ2F0b21pYy51cGRhdGVfc3ByaXRlX3dhdGVybWFya3MnIGZsYWcg cmF0aGVyIHRoYW4gdGhlCj4gICAgJ2F0b21pYy51cGRhdGVfd20nIGZsYWcgd2hlbiB0aGUgcGxh bmUgaW4gcXVlc3Rpb24gaXMgYSBzcHJpdGUuICBTb21lCj4gICAgcGxhdGZvcm1zIGRvbid0IGNh cmUgYWJvdXQgdGhpcyBjaGFuZ2Ugc2luY2UgdGhlIHR3byB0eXBlcyBvZiB1cGRhdGUKPiAgICBk byB0aGUgc2FtZSB0aGluZywgYnV0IHNvbWUgcGxhdGZvcm1zIChlLmcuLCBJTEstc3R5bGUgd2F0 ZXJtYXJrcykKPiAgICBuZWVkIHRvIHNwZWNpZmljYWxseSB1c2UgdGhlIHNwcml0ZSB1cGRhdGUg ZnVuY3Rpb24gdG8gdXBkYXRlIGNhY2hlZAo+ICAgIHdhdGVybWFyayBwYXJhbWV0ZXJzLgo+IAo+ ICAqIGludGVsX3dtX25lZWRfdXBkYXRlKCkgbmVlZHMgdG8gYWxzbyBsb29rIGZvciBwbGFuZSBz aXplIGNoYW5nZXMKPiAgICAocHJldmlvdXNseSBpdCBvbmx5IGNoZWNrZWQgdGlsaW5nICYgcm90 YXRpb24pLgo+IAo+IFdpdGggdGhlIGFib3ZlIGNoYW5nZXMsIHRoZSBuZWVkIGZvciBzcHJpdGUg d2F0ZXJtYXJrIHVwZGF0ZXMgc2hvdWxkIGJlCj4gcHJvcGVybHkgZmxhZ2dlZCBhdCBhdG9taWMg J2NoZWNrJyB0aW1lIGFuZCBoYW5kbGVkIGF0ICdjb21taXQnIHRpbWUgaW4KPiBwb3N0LWV2YXNp b24sIHNvIHdlIGNhbiBkcm9wIHRoZSBkaXJlY3QgY2FsbHMgdG8KPiBpbnRlbF91cGRhdGVfc3By aXRlX3dhdGVybWFya3MoKSBmcm9tIGFsbCBvZiB0aGUKPiBpbnRlbF9wbGFuZS0+dXBkYXRlX3Bs YW5lKCkgaGFuZGxlcnMuICBXZSdsbCBhbHNvIHRvc3MgYQo+IFdBUk5fT04oaXJxc19kaXNhYmxl ZCgpKSBpbnRvIHRoZSB3YXRlcm1hcmsgdXBkYXRlIGZ1bmN0aW9ucyB0byBhdm9pZAo+IHN1Y2gg bWlzdGFrZXMgaW4gdGhlIGZ1dHVyZS4KPiAKPiBTaWduZWQtb2ZmLWJ5OiBNYXR0IFJvcGVyIDxt YXR0aGV3LmQucm9wZXJAaW50ZWwuY29tPgoKV2h5IGRvIGV2ZW4gc3RpbGwgbmVlZCBhIHNlcGFy YXRlIHNwcml0ZSB3bSB1cGRhdGUgaG9va3M/IEFyZW4ndCB3ZSB5ZXQKcmVjb21wdXRpbmcgd20g dmFsdWVzIGZvciBhbGwgcGxhbmVzIGlmIHNvbWV0aGluZyBjaGFuZ2VzLCB0aGVuIGRpZmZpbmcK dGhlbSB3aXRoIHRoZSBjdXJyZW50IG9uZSBhbmQgdXBkYXRpbmcgaWYgYW55dGhpbmcgY2hhbmdl ZD8gVGhhdCBzZWVtcyB0bwpiZSB3aGF0IHVwZGF0ZV9zcHJpdGVfd20gZXNzZW50aWFsbHkgZG9l cywgZXhjZXB0IGl0J3MgcHJlLWF0b21pYyBhbmQKb3Blbi1jb2RlcyB0aGUgdXBkYXRlcyAuLi4K Ck9mYyB0aGVyZSdzIHN0aWxsIHRoYXQgaWxrIHcvYSBhcm91bmQgd2hpY2ggbmVlZHMgdG8gYmUg bW92ZWQgdG8gYQpzdWl0YWJsZSBwbGFjZS4KLURhbmllbAo+IC0tLQo+ICBkcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgfCAyMyArKysrKysrKysrKysrKysrLS0tLS0tLQo+ICBk cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jICAgICAgfCAgMiArKwo+ICBkcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF9zcHJpdGUuYyAgfCAxMiAtLS0tLS0tLS0tLS0KPiAgMyBmaWxlcyBj aGFuZ2VkLCAxOCBpbnNlcnRpb25zKCspLCAxOSBkZWxldGlvbnMoLSkKPiAKPiBkaWZmIC0tZ2l0 IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jIGIvZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfZGlzcGxheS5jCj4gaW5kZXggNWU4ZTAxYy4uMTgxYWVkZCAxMDA2NDQKPiAt LS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKPiArKysgYi9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKPiBAQCAtMTE1NzUsMTMgKzExNTc1LDE3IEBA IHJldHJ5Ogo+ICBzdGF0aWMgYm9vbCBpbnRlbF93bV9uZWVkX3VwZGF0ZShzdHJ1Y3QgZHJtX3Bs YW5lICpwbGFuZSwKPiAgCQkJCSBzdHJ1Y3QgZHJtX3BsYW5lX3N0YXRlICpzdGF0ZSkKPiAgewo+ IC0JLyogVXBkYXRlIHdhdGVybWFya3Mgb24gdGlsaW5nIGNoYW5nZXMuICovCj4gKwlzdHJ1Y3Qg aW50ZWxfcGxhbmVfc3RhdGUgKm5ldyA9IHRvX2ludGVsX3BsYW5lX3N0YXRlKHN0YXRlKTsKPiAr CXN0cnVjdCBpbnRlbF9wbGFuZV9zdGF0ZSAqY3VyID0gdG9faW50ZWxfcGxhbmVfc3RhdGUocGxh bmUtPnN0YXRlKTsKPiArCj4gKwkvKiBVcGRhdGUgd2F0ZXJtYXJrcyBvbiB0aWxpbmcgY2hhbmdl cyBvciBzaXplIGNoYW5nZXMuICovCj4gIAlpZiAoIXBsYW5lLT5zdGF0ZS0+ZmIgfHwgIXN0YXRl LT5mYiB8fAo+ICAJICAgIHBsYW5lLT5zdGF0ZS0+ZmItPm1vZGlmaWVyWzBdICE9IHN0YXRlLT5m Yi0+bW9kaWZpZXJbMF0gfHwKPiAtCSAgICBwbGFuZS0+c3RhdGUtPnJvdGF0aW9uICE9IHN0YXRl LT5yb3RhdGlvbikKPiAtCQlyZXR1cm4gdHJ1ZTsKPiAtCj4gLQlpZiAocGxhbmUtPnN0YXRlLT5j cnRjX3cgIT0gc3RhdGUtPmNydGNfdykKPiArCSAgICBwbGFuZS0+c3RhdGUtPnJvdGF0aW9uICE9 IHN0YXRlLT5yb3RhdGlvbiB8fAo+ICsJICAgIGRybV9yZWN0X3dpZHRoKCZuZXctPnNyYykgIT0g ZHJtX3JlY3Rfd2lkdGgoJmN1ci0+c3JjKSB8fAo+ICsJICAgIGRybV9yZWN0X2hlaWdodCgmbmV3 LT5zcmMpICE9IGRybV9yZWN0X2hlaWdodCgmY3VyLT5zcmMpIHx8Cj4gKwkgICAgZHJtX3JlY3Rf d2lkdGgoJm5ldy0+ZHN0KSAhPSBkcm1fcmVjdF93aWR0aCgmY3VyLT5kc3QpIHx8Cj4gKwkgICAg ZHJtX3JlY3RfaGVpZ2h0KCZuZXctPmRzdCkgIT0gZHJtX3JlY3RfaGVpZ2h0KCZjdXItPmRzdCkp Cj4gIAkJcmV0dXJuIHRydWU7Cj4gIAo+ICAJcmV0dXJuIGZhbHNlOwo+IEBAIC0xMTY0NSw4ICsx MTY0OSwxMyBAQCBpbnQgaW50ZWxfcGxhbmVfYXRvbWljX2NhbGNfY2hhbmdlcyhzdHJ1Y3QgZHJt X2NydGNfc3RhdGUgKmNydGNfc3RhdGUsCj4gIAkJCSBwbGFuZS0+YmFzZS5pZCwgd2FzX3Zpc2li bGUsIHZpc2libGUsCj4gIAkJCSB0dXJuX29mZiwgdHVybl9vbiwgbW9kZV9jaGFuZ2VkKTsKPiAg Cj4gLQlpZiAoaW50ZWxfd21fbmVlZF91cGRhdGUocGxhbmUsIHBsYW5lX3N0YXRlKSkKPiAtCQlp bnRlbF9jcnRjLT5hdG9taWMudXBkYXRlX3dtID0gdHJ1ZTsKPiArCWlmIChpbnRlbF93bV9uZWVk X3VwZGF0ZShwbGFuZSwgcGxhbmVfc3RhdGUpKSB7Cj4gKwkJaWYgKHBsYW5lLT50eXBlID09IERS TV9QTEFORV9UWVBFX09WRVJMQVkpCj4gKwkJCWludGVsX2NydGMtPmF0b21pYy51cGRhdGVfc3By aXRlX3dhdGVybWFya3MgfD0KPiArCQkJCTEgPDwgaTsKPiArCQllbHNlCj4gKwkJCWludGVsX2Ny dGMtPmF0b21pYy51cGRhdGVfd20gPSB0cnVlOwo+ICsJfQo+ICAKPiAgCXN3aXRjaCAocGxhbmUt PnR5cGUpIHsKPiAgCWNhc2UgRFJNX1BMQU5FX1RZUEVfUFJJTUFSWToKPiBkaWZmIC0tZ2l0IGEv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX3BtLmMKPiBpbmRleCA0ZDNjYjcwLi4yNDcwZWRlIDEwMDY0NAo+IC0tLSBhL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2ludGVsX3BtLmMKPiArKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9wbS5jCj4gQEAgLTM3NTAsNiArMzc1MCw3IEBAIHZvaWQgaW50ZWxfdXBkYXRlX3dhdGVybWFy a3Moc3RydWN0IGRybV9jcnRjICpjcnRjKQo+ICB7Cj4gIAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0 ZSAqZGV2X3ByaXYgPSBjcnRjLT5kZXYtPmRldl9wcml2YXRlOwo+ICAKPiArCVdBUk5fT04oaXJx c19kaXNhYmxlZCgpKTsKPiAgCWlmIChkZXZfcHJpdi0+ZGlzcGxheS51cGRhdGVfd20pCj4gIAkJ ZGV2X3ByaXYtPmRpc3BsYXkudXBkYXRlX3dtKGNydGMpOwo+ICB9Cj4gQEAgLTM3NzAsNiArMzc3 MSw3IEBAIHZvaWQgaW50ZWxfdXBkYXRlX3Nwcml0ZV93YXRlcm1hcmtzKHN0cnVjdCBkcm1fcGxh bmUgKnBsYW5lLAo+ICAJdW5zaWduZWQgaW50IGRzdF9oID0gZHJtX3JlY3RfaGVpZ2h0KCZzdGF0 ZS0+ZHN0KTsKPiAgCWJvb2wgc2NhbGVkID0gKHNyY193ICE9IGRzdF93IHx8IHNyY19oICE9IGRz dF9oKTsKPiAgCj4gKwlXQVJOX09OKGlycXNfZGlzYWJsZWQoKSk7Cj4gIAlpZiAoZGV2X3ByaXYt PmRpc3BsYXkudXBkYXRlX3Nwcml0ZV93bSkKPiAgCQlkZXZfcHJpdi0+ZGlzcGxheS51cGRhdGVf c3ByaXRlX3dtKHBsYW5lLCBjcnRjLAo+ICAJCQkJCQkgICBzcHJpdGVfd2lkdGgsIHNwcml0ZV9o ZWlnaHQsCj4gZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Nwcml0ZS5j IGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfc3ByaXRlLmMKPiBpbmRleCBiNjI3MDY3Li5j ZTJmYTkyIDEwMDY0NAo+IC0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Nwcml0ZS5j Cj4gKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfc3ByaXRlLmMKPiBAQCAtMTk5LDgg KzE5OSw2IEBAIHNrbF91cGRhdGVfcGxhbmUoc3RydWN0IGRybV9wbGFuZSAqZHJtX3BsYW5lLCBz dHJ1Y3QgZHJtX2NydGMgKmNydGMsCj4gIAlyb3RhdGlvbiA9IGRybV9wbGFuZS0+c3RhdGUtPnJv dGF0aW9uOwo+ICAJcGxhbmVfY3RsIHw9IHNrbF9wbGFuZV9jdGxfcm90YXRpb24ocm90YXRpb24p Owo+ICAKPiAtCWludGVsX3VwZGF0ZV9zcHJpdGVfd2F0ZXJtYXJrcyhkcm1fcGxhbmUsIGNydGMp Owo+IC0KPiAgCXN0cmlkZV9kaXYgPSBpbnRlbF9mYl9zdHJpZGVfYWxpZ25tZW50KGRldiwgZmIt Pm1vZGlmaWVyWzBdLAo+ICAJCQkJCSAgICAgICBmYi0+cGl4ZWxfZm9ybWF0KTsKPiAgCj4gQEAg LTI4Miw4ICsyODAsNiBAQCBza2xfZGlzYWJsZV9wbGFuZShzdHJ1Y3QgZHJtX3BsYW5lICpkcGxh bmUsIHN0cnVjdCBkcm1fY3J0YyAqY3J0YykKPiAgCj4gIAlJOTE1X1dSSVRFKFBMQU5FX1NVUkYo cGlwZSwgcGxhbmUpLCAwKTsKPiAgCVBPU1RJTkdfUkVBRChQTEFORV9TVVJGKHBpcGUsIHBsYW5l KSk7Cj4gLQo+IC0JaW50ZWxfdXBkYXRlX3Nwcml0ZV93YXRlcm1hcmtzKGRwbGFuZSwgY3J0Yyk7 Cj4gIH0KPiAgCj4gIHN0YXRpYyB2b2lkCj4gQEAgLTM5OSw4ICszOTUsNiBAQCB2bHZfdXBkYXRl X3BsYW5lKHN0cnVjdCBkcm1fcGxhbmUgKmRwbGFuZSwgc3RydWN0IGRybV9jcnRjICpjcnRjLAo+ ICAJaWYgKG9iai0+dGlsaW5nX21vZGUgIT0gSTkxNV9USUxJTkdfTk9ORSkKPiAgCQlzcHJjdGwg fD0gU1BfVElMRUQ7Cj4gIAo+IC0JaW50ZWxfdXBkYXRlX3Nwcml0ZV93YXRlcm1hcmtzKGRwbGFu ZSwgY3J0Yyk7Cj4gLQo+ICAJLyogU2l6ZXMgYXJlIDAgYmFzZWQgKi8KPiAgCXNyY193LS07Cj4g IAlzcmNfaC0tOwo+IEBAIC00NjUsOCArNDU5LDYgQEAgdmx2X2Rpc2FibGVfcGxhbmUoc3RydWN0 IGRybV9wbGFuZSAqZHBsYW5lLCBzdHJ1Y3QgZHJtX2NydGMgKmNydGMpCj4gIAo+ICAJSTkxNV9X UklURShTUFNVUkYocGlwZSwgcGxhbmUpLCAwKTsKPiAgCVBPU1RJTkdfUkVBRChTUFNVUkYocGlw ZSwgcGxhbmUpKTsKPiAtCj4gLQlpbnRlbF91cGRhdGVfc3ByaXRlX3dhdGVybWFya3MoZHBsYW5l LCBjcnRjKTsKPiAgfQo+ICAKPiAgc3RhdGljIHZvaWQKPiBAQCAtNTMwLDggKzUyMiw2IEBAIGl2 Yl91cGRhdGVfcGxhbmUoc3RydWN0IGRybV9wbGFuZSAqcGxhbmUsIHN0cnVjdCBkcm1fY3J0YyAq Y3J0YywKPiAgCWlmIChJU19IQVNXRUxMKGRldikgfHwgSVNfQlJPQURXRUxMKGRldikpCj4gIAkJ c3ByY3RsIHw9IFNQUklURV9QSVBFX0NTQ19FTkFCTEU7Cj4gIAo+IC0JaW50ZWxfdXBkYXRlX3Nw cml0ZV93YXRlcm1hcmtzKHBsYW5lLCBjcnRjKTsKPiAtCj4gIAkvKiBTaXplcyBhcmUgMCBiYXNl ZCAqLwo+ICAJc3JjX3ctLTsKPiAgCXNyY19oLS07Cj4gQEAgLTY2NSw4ICs2NTUsNiBAQCBpbGtf dXBkYXRlX3BsYW5lKHN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lLCBzdHJ1Y3QgZHJtX2NydGMgKmNy dGMsCj4gIAlpZiAoSVNfR0VONihkZXYpKQo+ICAJCWR2c2NudHIgfD0gRFZTX1RSSUNLTEVfRkVF RF9ESVNBQkxFOyAvKiBtdXN0IGRpc2FibGUgKi8KPiAgCj4gLQlpbnRlbF91cGRhdGVfc3ByaXRl X3dhdGVybWFya3MocGxhbmUsIGNydGMpOwo+IC0KPiAgCS8qIFNpemVzIGFyZSAwIGJhc2VkICov Cj4gIAlzcmNfdy0tOwo+ICAJc3JjX2gtLTsKPiAtLSAKPiAyLjEuNAo+IAo+IF9fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCj4gSW50ZWwtZ2Z4IG1haWxpbmcg bGlzdAo+IEludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKPiBodHRwOi8vbGlzdHMuZnJl ZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4CgotLSAKRGFuaWVsIFZldHRl cgpTb2Z0d2FyZSBFbmdpbmVlciwgSW50ZWwgQ29ycG9yYXRpb24KaHR0cDovL2Jsb2cuZmZ3bGwu Y2gKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwt Z2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9s aXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK