From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= Subject: Re: [PATCH 1/3] drm/i915: Move watermark handling to intel_wm.c Date: Fri, 27 Feb 2015 20:51:39 +0200 Message-ID: <20150227185139.GU11371@intel.com> References: <1425056061-16292-1-git-send-email-matthew.d.roper@intel.com> <1425056061-16292-2-git-send-email-matthew.d.roper@intel.com> <20150227182107.GR11371@intel.com> <20150227184746.GT24485@phenom.ffwll.local> 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 F40B26E133 for ; Fri, 27 Feb 2015 10:51:46 -0800 (PST) Content-Disposition: inline In-Reply-To: <20150227184746.GT24485@phenom.ffwll.local> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Daniel Vetter Cc: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org T24gRnJpLCBGZWIgMjcsIDIwMTUgYXQgMDc6NDc6NDZQTSArMDEwMCwgRGFuaWVsIFZldHRlciB3 cm90ZToKPiBPbiBGcmksIEZlYiAyNywgMjAxNSBhdCAwODoyMTowN1BNICswMjAwLCBWaWxsZSBT eXJqw6Rsw6Qgd3JvdGU6Cj4gPiBPbiBGcmksIEZlYiAyNywgMjAxNSBhdCAwODo1NDoxOUFNIC0w ODAwLCBNYXR0IFJvcGVyIHdyb3RlOgo+ID4gPiBNb3ZlIHdhdGVybWFyayBoYW5kbGluZyBmcm9t IGludGVsX3BtLmMgdG8gaW50ZWxfd20uYyBhbmQgYWRkIGEgbGl0dGxlCj4gPiA+IGJpdCBvZiBr ZXJuZWxkb2MgdG8gZXhwb3J0ZWQgZnVuY3Rpb25zLiAgV2UgYWxzbyBhZGQgYSBuZXcKPiA+ID4g aW50ZWxfaW5pdF93bSgpIGZ1bmN0aW9uIHRvIHNldHVwIG1lbW9yeSB0aW1pbmcgaW5mb3JtYXRp b24gYW5kCj4gPiA+IGluaXRpYWxpemUgdGhlIHJlbGV2YW50IHdhdGVybWFyayB2ZnVuY3MuCj4g PiAKPiA+IEhvdyBhYm91dCBkZWxheWluZyBncmF0aW91cyBjb2RlIG1vdmVtZW50IHVudGlsIGEg YnVuY2ggb2YgdGhlIGluIGZsaWdodAo+ID4gV00gc3R1ZmYgaGFzIGxhbmRlZD8gVGhpcyBpcyBq dXN0IGdvaW5nIHRvIGNhdXNlIHJlYmFzZSBwYWlucyBhbGwgb3Zlci4KPiAKPiBIYW5kLWVkaXRp bmcgZGlmZnMgd29ya3MgcmVhc29uYWJsZSB3ZWxsIGltZSBmb3IgdGhlc2Uga2luZHMgb2YgZXh0 cmFjdGlvbgo+IHBhdGNoZXMuIEF0IGxlYXN0IHRoYXQncyBob3cgSSd2ZSBkb25lIGl0IHdpdGgg LWludGVybmFsLiBBbmQgZ2l0IHJlYmFzZQo+IGNhbiBzb21ldGltZXMgaGVscCB0b28gaWYgeW91 IGNyYW5rIHVwIHRoZSByZW5hbWUgZGV0ZWN0aW9uIHRocmVzaG9sZC4KCkFsbCBwb2ludGxlc3Mg ZXh0cmEgd29yay4gTW92aW5nIHRoZSBjb2RlIGRvZXNuJ3QgbWFrZSBpdCBhbnkgYmV0dGVyIHNv CkkgZmFpbCB0byBzZWUgd2h5IGl0IG5lZWRzIHRvIGJlIHJ1c2hlZCBpbi4KCj4gLURhbmllbAo+ IAo+ID4gCj4gPiA+IAo+ID4gPiBKaXJhOiBWSVotNDYxMgo+ID4gPiBTaWduZWQtb2ZmLWJ5OiBN YXR0IFJvcGVyIDxtYXR0aGV3LmQucm9wZXJAaW50ZWwuY29tPgo+ID4gPiAtLS0KPiA+ID4gIGRy aXZlcnMvZ3B1L2RybS9pOTE1L01ha2VmaWxlICAgICAgICB8ICAgIDMgKy0KPiA+ID4gIGRyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYyB8ICAgIDEgKwo+ID4gPiAgZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmggICAgIHwgICAgMyArCj4gPiA+ICBkcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF9wbS5jICAgICAgfCAzNDUwIC0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLQo+ID4gPiAgZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfd20uYyAgICAgIHwgMzUy NSArKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrCj4gPiA+ICA1IGZpbGVzIGNoYW5n ZWQsIDM1MzEgaW5zZXJ0aW9ucygrKSwgMzQ1MSBkZWxldGlvbnMoLSkKPiA+ID4gIGNyZWF0ZSBt b2RlIDEwMDY0NCBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF93bS5jCj4gPiA+IAo+ID4gPiBk aWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvTWFrZWZpbGUgYi9kcml2ZXJzL2dwdS9k cm0vaTkxNS9NYWtlZmlsZQo+ID4gPiBpbmRleCBmMDI1ZTdmLi41ZmQyMjU3IDEwMDY0NAo+ID4g PiAtLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9NYWtlZmlsZQo+ID4gPiArKysgYi9kcml2ZXJz L2dwdS9kcm0vaTkxNS9NYWtlZmlsZQo+ID4gPiBAQCAtNTUsNyArNTUsOCBAQCBpOTE1LXkgKz0g aW50ZWxfYXVkaW8ubyBcCj4gPiA+ICAJICBpbnRlbF9vdmVybGF5Lm8gXAo+ID4gPiAgCSAgaW50 ZWxfcHNyLm8gXAo+ID4gPiAgCSAgaW50ZWxfc2lkZWJhbmQubyBcCj4gPiA+IC0JICBpbnRlbF9z cHJpdGUubwo+ID4gPiArCSAgaW50ZWxfc3ByaXRlLm8gXAo+ID4gPiArCSAgaW50ZWxfd20ubwo+ ID4gPiAgaTkxNS0kKENPTkZJR19BQ1BJKQkJKz0gaW50ZWxfYWNwaS5vIGludGVsX29wcmVnaW9u Lm8KPiA+ID4gIGk5MTUtJChDT05GSUdfRFJNX0k5MTVfRkJERVYpCSs9IGludGVsX2ZiZGV2Lm8K PiA+ID4gIAo+ID4gPiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlz cGxheS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCj4gPiA+IGluZGV4 IGZhZDVmNzYuLjM3MGMxNzMgMTAwNjQ0Cj4gPiA+IC0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX2Rpc3BsYXkuYwo+ID4gPiArKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9k aXNwbGF5LmMKPiA+ID4gQEAgLTEzMjEzLDYgKzEzMjEzLDcgQEAgdm9pZCBpbnRlbF9tb2Rlc2V0 X2luaXQoc3RydWN0IGRybV9kZXZpY2UgKmRldikKPiA+ID4gIAlpbnRlbF9pbml0X3F1aXJrcyhk ZXYpOwo+ID4gPiAgCj4gPiA+ICAJaW50ZWxfaW5pdF9wbShkZXYpOwo+ID4gPiArCWludGVsX2lu aXRfd20oZGV2KTsKPiA+ID4gIAo+ID4gPiAgCWlmIChJTlRFTF9JTkZPKGRldiktPm51bV9waXBl cyA9PSAwKQo+ID4gPiAgCQlyZXR1cm47Cj4gPiA+IGRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF9kcnYuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oCj4g PiA+IGluZGV4IDFmYjE1MjkuLjk5NWQwMzAgMTAwNjQ0Cj4gPiA+IC0tLSBhL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX2Rydi5oCj4gPiA+ICsrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX2Rydi5oCj4gPiA+IEBAIC0xMjU4LDYgKzEyNTgsOSBAQCB2b2lkIGludGVsX3ByZV9kaXNh YmxlX3ByaW1hcnkoc3RydWN0IGRybV9jcnRjICpjcnRjKTsKPiA+ID4gIC8qIGludGVsX3R2LmMg Ki8KPiA+ID4gIHZvaWQgaW50ZWxfdHZfaW5pdChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KTsKPiA+ ID4gIAo+ID4gPiArLyogaW50ZWxfd20uYyAqLwo+ID4gPiArdm9pZCBpbnRlbF9pbml0X3dtKHN0 cnVjdCBkcm1fZGV2aWNlICpkZXYpOwo+ID4gPiArCj4gPiA+ICAvKiBpbnRlbF9hdG9taWMuYyAq Lwo+ID4gPiAgaW50IGludGVsX2F0b21pY19jaGVjayhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAo+ ID4gPiAgCQkgICAgICAgc3RydWN0IGRybV9hdG9taWNfc3RhdGUgKnN0YXRlKTsKPiA+ID4gZGlm ZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMgYi9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF9wbS5jCj4gPiA+IGluZGV4IDdkY2I1YjYuLmY5MDZiMDUgMTAwNjQ0Cj4g PiA+IC0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMKPiA+ID4gKysrIGIvZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYwo+ID4gPiBAQCAtOTQsMzQwMiArOTQsNiBAQCBz dGF0aWMgdm9pZCBza2xfaW5pdF9jbG9ja19nYXRpbmcoc3RydWN0IGRybV9kZXZpY2UgKmRldikK PiA+ID4gIAkJCSAgIEdFTjhfTFFTQ19ST19QRVJGX0RJUyk7Cj4gPiA+ICB9Cj4gPiA+ICAKPiA+ ID4gLXN0YXRpYyB2b2lkIGk5MTVfcGluZXZpZXdfZ2V0X21lbV9mcmVxKHN0cnVjdCBkcm1fZGV2 aWNlICpkZXYpCj4gPiA+IC17Cj4gPiA+IC0Jc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9w cml2ID0gZGV2LT5kZXZfcHJpdmF0ZTsKPiA+ID4gLQl1MzIgdG1wOwo+ID4gPiAtCj4gPiA+IC0J dG1wID0gSTkxNV9SRUFEKENMS0NGRyk7Cj4gPiA+IC0KPiA+ID4gLQlzd2l0Y2ggKHRtcCAmIENM S0NGR19GU0JfTUFTSykgewo+ID4gPiAtCWNhc2UgQ0xLQ0ZHX0ZTQl81MzM6Cj4gPiA+IC0JCWRl dl9wcml2LT5mc2JfZnJlcSA9IDUzMzsgLyogMTMzKjQgKi8KPiA+ID4gLQkJYnJlYWs7Cj4gPiA+ IC0JY2FzZSBDTEtDRkdfRlNCXzgwMDoKPiA+ID4gLQkJZGV2X3ByaXYtPmZzYl9mcmVxID0gODAw OyAvKiAyMDAqNCAqLwo+ID4gPiAtCQlicmVhazsKPiA+ID4gLQljYXNlIENMS0NGR19GU0JfNjY3 Ogo+ID4gPiAtCQlkZXZfcHJpdi0+ZnNiX2ZyZXEgPSAgNjY3OyAvKiAxNjcqNCAqLwo+ID4gPiAt CQlicmVhazsKPiA+ID4gLQljYXNlIENMS0NGR19GU0JfNDAwOgo+ID4gPiAtCQlkZXZfcHJpdi0+ ZnNiX2ZyZXEgPSA0MDA7IC8qIDEwMCo0ICovCj4gPiA+IC0JCWJyZWFrOwo+ID4gPiAtCX0KPiA+ ID4gLQo+ID4gPiAtCXN3aXRjaCAodG1wICYgQ0xLQ0ZHX01FTV9NQVNLKSB7Cj4gPiA+IC0JY2Fz ZSBDTEtDRkdfTUVNXzUzMzoKPiA+ID4gLQkJZGV2X3ByaXYtPm1lbV9mcmVxID0gNTMzOwo+ID4g PiAtCQlicmVhazsKPiA+ID4gLQljYXNlIENMS0NGR19NRU1fNjY3Ogo+ID4gPiAtCQlkZXZfcHJp di0+bWVtX2ZyZXEgPSA2Njc7Cj4gPiA+IC0JCWJyZWFrOwo+ID4gPiAtCWNhc2UgQ0xLQ0ZHX01F TV84MDA6Cj4gPiA+IC0JCWRldl9wcml2LT5tZW1fZnJlcSA9IDgwMDsKPiA+ID4gLQkJYnJlYWs7 Cj4gPiA+IC0JfQo+ID4gPiAtCj4gPiA+IC0JLyogZGV0ZWN0IHBpbmV2aWV3IEREUjMgc2V0dGlu ZyAqLwo+ID4gPiAtCXRtcCA9IEk5MTVfUkVBRChDU0hSRERSM0NUTCk7Cj4gPiA+IC0JZGV2X3By aXYtPmlzX2RkcjMgPSAodG1wICYgQ1NIUkREUjNDVExfRERSMykgPyAxIDogMDsKPiA+ID4gLX0K PiA+ID4gLQo+ID4gPiAtc3RhdGljIHZvaWQgaTkxNV9pcm9ubGFrZV9nZXRfbWVtX2ZyZXEoc3Ry dWN0IGRybV9kZXZpY2UgKmRldikKPiA+ID4gLXsKPiA+ID4gLQlzdHJ1Y3QgZHJtX2k5MTVfcHJp dmF0ZSAqZGV2X3ByaXYgPSBkZXYtPmRldl9wcml2YXRlOwo+ID4gPiAtCXUxNiBkZHJwbGwsIGNz aXBsbDsKPiA+ID4gLQo+ID4gPiAtCWRkcnBsbCA9IEk5MTVfUkVBRDE2KEREUk1QTEwxKTsKPiA+ ID4gLQljc2lwbGwgPSBJOTE1X1JFQUQxNihDU0lQTEwwKTsKPiA+ID4gLQo+ID4gPiAtCXN3aXRj aCAoZGRycGxsICYgMHhmZikgewo+ID4gPiAtCWNhc2UgMHhjOgo+ID4gPiAtCQlkZXZfcHJpdi0+ bWVtX2ZyZXEgPSA4MDA7Cj4gPiA+IC0JCWJyZWFrOwo+ID4gPiAtCWNhc2UgMHgxMDoKPiA+ID4g LQkJZGV2X3ByaXYtPm1lbV9mcmVxID0gMTA2NjsKPiA+ID4gLQkJYnJlYWs7Cj4gPiA+IC0JY2Fz ZSAweDE0Ogo+ID4gPiAtCQlkZXZfcHJpdi0+bWVtX2ZyZXEgPSAxMzMzOwo+ID4gPiAtCQlicmVh azsKPiA+ID4gLQljYXNlIDB4MTg6Cj4gPiA+IC0JCWRldl9wcml2LT5tZW1fZnJlcSA9IDE2MDA7 Cj4gPiA+IC0JCWJyZWFrOwo+ID4gPiAtCWRlZmF1bHQ6Cj4gPiA+IC0JCURSTV9ERUJVR19EUklW RVIoInVua25vd24gbWVtb3J5IGZyZXF1ZW5jeSAweCUwMnhcbiIsCj4gPiA+IC0JCQkJIGRkcnBs bCAmIDB4ZmYpOwo+ID4gPiAtCQlkZXZfcHJpdi0+bWVtX2ZyZXEgPSAwOwo+ID4gPiAtCQlicmVh azsKPiA+ID4gLQl9Cj4gPiA+IC0KPiA+ID4gLQlkZXZfcHJpdi0+aXBzLnJfdCA9IGRldl9wcml2 LT5tZW1fZnJlcTsKPiA+ID4gLQo+ID4gPiAtCXN3aXRjaCAoY3NpcGxsICYgMHgzZmYpIHsKPiA+ ID4gLQljYXNlIDB4MDBjOgo+ID4gPiAtCQlkZXZfcHJpdi0+ZnNiX2ZyZXEgPSAzMjAwOwo+ID4g PiAtCQlicmVhazsKPiA+ID4gLQljYXNlIDB4MDBlOgo+ID4gPiAtCQlkZXZfcHJpdi0+ZnNiX2Zy ZXEgPSAzNzMzOwo+ID4gPiAtCQlicmVhazsKPiA+ID4gLQljYXNlIDB4MDEwOgo+ID4gPiAtCQlk ZXZfcHJpdi0+ZnNiX2ZyZXEgPSA0MjY2Owo+ID4gPiAtCQlicmVhazsKPiA+ID4gLQljYXNlIDB4 MDEyOgo+ID4gPiAtCQlkZXZfcHJpdi0+ZnNiX2ZyZXEgPSA0ODAwOwo+ID4gPiAtCQlicmVhazsK PiA+ID4gLQljYXNlIDB4MDE0Ogo+ID4gPiAtCQlkZXZfcHJpdi0+ZnNiX2ZyZXEgPSA1MzMzOwo+ ID4gPiAtCQlicmVhazsKPiA+ID4gLQljYXNlIDB4MDE2Ogo+ID4gPiAtCQlkZXZfcHJpdi0+ZnNi X2ZyZXEgPSA1ODY2Owo+ID4gPiAtCQlicmVhazsKPiA+ID4gLQljYXNlIDB4MDE4Ogo+ID4gPiAt CQlkZXZfcHJpdi0+ZnNiX2ZyZXEgPSA2NDAwOwo+ID4gPiAtCQlicmVhazsKPiA+ID4gLQlkZWZh dWx0Ogo+ID4gPiAtCQlEUk1fREVCVUdfRFJJVkVSKCJ1bmtub3duIGZzYiBmcmVxdWVuY3kgMHgl MDR4XG4iLAo+ID4gPiAtCQkJCSBjc2lwbGwgJiAweDNmZik7Cj4gPiA+IC0JCWRldl9wcml2LT5m c2JfZnJlcSA9IDA7Cj4gPiA+IC0JCWJyZWFrOwo+ID4gPiAtCX0KPiA+ID4gLQo+ID4gPiAtCWlm IChkZXZfcHJpdi0+ZnNiX2ZyZXEgPT0gMzIwMCkgewo+ID4gPiAtCQlkZXZfcHJpdi0+aXBzLmNf bSA9IDA7Cj4gPiA+IC0JfSBlbHNlIGlmIChkZXZfcHJpdi0+ZnNiX2ZyZXEgPiAzMjAwICYmIGRl dl9wcml2LT5mc2JfZnJlcSA8PSA0ODAwKSB7Cj4gPiA+IC0JCWRldl9wcml2LT5pcHMuY19tID0g MTsKPiA+ID4gLQl9IGVsc2Ugewo+ID4gPiAtCQlkZXZfcHJpdi0+aXBzLmNfbSA9IDI7Cj4gPiA+ IC0JfQo+ID4gPiAtfQo+ID4gCj4gPiBJIGRvbid0IHRoaW5rIHRoZXNlIHR3byBmdW5jdGlvbnMg c2hvdWxkIGJlIG1vdmVkLgo+ID4gCj4gPiAtLSAKPiA+IFZpbGxlIFN5cmrDpGzDpAo+ID4gSW50 ZWwgT1RDCj4gPiBfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f Xwo+ID4gSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdAo+ID4gSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNr dG9wLm9yZwo+ID4gaHR0cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZv L2ludGVsLWdmeAo+IAo+IC0tIAo+IERhbmllbCBWZXR0ZXIKPiBTb2Z0d2FyZSBFbmdpbmVlciwg SW50ZWwgQ29ycG9yYXRpb24KPiArNDEgKDApIDc5IDM2NSA1NyA0OCAtIGh0dHA6Ly9ibG9nLmZm d2xsLmNoCgotLSAKVmlsbGUgU3lyasOkbMOkCkludGVsIE9UQwpfX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVs LWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9t YWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=