From: Daniel Vetter Subject: Re: [PATCH 1/3] drm/i915: Move watermark handling to intel_wm.c Date: Fri, 27 Feb 2015 19:47:46 +0100 Message-ID: <20150227184746.GT24485@phenom.ffwll.local> 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> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-we0-f171.google.com (mail-we0-f171.google.com [74.125.82.171]) by gabe.freedesktop.org (Postfix) with ESMTP id 130526E94D for ; Fri, 27 Feb 2015 10:46:39 -0800 (PST) Received: by wevk48 with SMTP id k48so22113619wev.0 for ; Fri, 27 Feb 2015 10:46:37 -0800 (PST) Content-Disposition: inline In-Reply-To: <20150227182107.GR11371@intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= Cc: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org T24gRnJpLCBGZWIgMjcsIDIwMTUgYXQgMDg6MjE6MDdQTSArMDIwMCwgVmlsbGUgU3lyasOkbMOk IHdyb3RlOgo+IE9uIEZyaSwgRmViIDI3LCAyMDE1IGF0IDA4OjU0OjE5QU0gLTA4MDAsIE1hdHQg Um9wZXIgd3JvdGU6Cj4gPiBNb3ZlIHdhdGVybWFyayBoYW5kbGluZyBmcm9tIGludGVsX3BtLmMg dG8gaW50ZWxfd20uYyBhbmQgYWRkIGEgbGl0dGxlCj4gPiBiaXQgb2Yga2VybmVsZG9jIHRvIGV4 cG9ydGVkIGZ1bmN0aW9ucy4gIFdlIGFsc28gYWRkIGEgbmV3Cj4gPiBpbnRlbF9pbml0X3dtKCkg ZnVuY3Rpb24gdG8gc2V0dXAgbWVtb3J5IHRpbWluZyBpbmZvcm1hdGlvbiBhbmQKPiA+IGluaXRp YWxpemUgdGhlIHJlbGV2YW50IHdhdGVybWFyayB2ZnVuY3MuCj4gCj4gSG93IGFib3V0IGRlbGF5 aW5nIGdyYXRpb3VzIGNvZGUgbW92ZW1lbnQgdW50aWwgYSBidW5jaCBvZiB0aGUgaW4gZmxpZ2h0 Cj4gV00gc3R1ZmYgaGFzIGxhbmRlZD8gVGhpcyBpcyBqdXN0IGdvaW5nIHRvIGNhdXNlIHJlYmFz ZSBwYWlucyBhbGwgb3Zlci4KCkhhbmQtZWRpdGluZyBkaWZmcyB3b3JrcyByZWFzb25hYmxlIHdl bGwgaW1lIGZvciB0aGVzZSBraW5kcyBvZiBleHRyYWN0aW9uCnBhdGNoZXMuIEF0IGxlYXN0IHRo YXQncyBob3cgSSd2ZSBkb25lIGl0IHdpdGggLWludGVybmFsLiBBbmQgZ2l0IHJlYmFzZQpjYW4g c29tZXRpbWVzIGhlbHAgdG9vIGlmIHlvdSBjcmFuayB1cCB0aGUgcmVuYW1lIGRldGVjdGlvbiB0 aHJlc2hvbGQuCi1EYW5pZWwKCj4gCj4gPiAKPiA+IEppcmE6IFZJWi00NjEyCj4gPiBTaWduZWQt b2ZmLWJ5OiBNYXR0IFJvcGVyIDxtYXR0aGV3LmQucm9wZXJAaW50ZWwuY29tPgo+ID4gLS0tCj4g PiAgZHJpdmVycy9ncHUvZHJtL2k5MTUvTWFrZWZpbGUgICAgICAgIHwgICAgMyArLQo+ID4gIGRy aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYyB8ICAgIDEgKwo+ID4gIGRyaXZlcnMv Z3B1L2RybS9pOTE1L2ludGVsX2Rydi5oICAgICB8ICAgIDMgKwo+ID4gIGRyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX3BtLmMgICAgICB8IDM0NTAgLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tCj4gPiAgZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfd20uYyAgICAgIHwgMzUyNSAr KysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrCj4gPiAgNSBmaWxlcyBjaGFuZ2VkLCAz NTMxIGluc2VydGlvbnMoKyksIDM0NTEgZGVsZXRpb25zKC0pCj4gPiAgY3JlYXRlIG1vZGUgMTAw NjQ0IGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3dtLmMKPiA+IAo+ID4gZGlmZiAtLWdpdCBh L2RyaXZlcnMvZ3B1L2RybS9pOTE1L01ha2VmaWxlIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvTWFr ZWZpbGUKPiA+IGluZGV4IGYwMjVlN2YuLjVmZDIyNTcgMTAwNjQ0Cj4gPiAtLS0gYS9kcml2ZXJz L2dwdS9kcm0vaTkxNS9NYWtlZmlsZQo+ID4gKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvTWFr ZWZpbGUKPiA+IEBAIC01NSw3ICs1NSw4IEBAIGk5MTUteSArPSBpbnRlbF9hdWRpby5vIFwKPiA+ ICAJICBpbnRlbF9vdmVybGF5Lm8gXAo+ID4gIAkgIGludGVsX3Bzci5vIFwKPiA+ICAJICBpbnRl bF9zaWRlYmFuZC5vIFwKPiA+IC0JICBpbnRlbF9zcHJpdGUubwo+ID4gKwkgIGludGVsX3Nwcml0 ZS5vIFwKPiA+ICsJICBpbnRlbF93bS5vCj4gPiAgaTkxNS0kKENPTkZJR19BQ1BJKQkJKz0gaW50 ZWxfYWNwaS5vIGludGVsX29wcmVnaW9uLm8KPiA+ICBpOTE1LSQoQ09ORklHX0RSTV9JOTE1X0ZC REVWKQkrPSBpbnRlbF9mYmRldi5vCj4gPiAgCj4gPiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlz cGxheS5jCj4gPiBpbmRleCBmYWQ1Zjc2Li4zNzBjMTczIDEwMDY0NAo+ID4gLS0tIGEvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCj4gPiArKysgYi9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9kaXNwbGF5LmMKPiA+IEBAIC0xMzIxMyw2ICsxMzIxMyw3IEBAIHZvaWQgaW50 ZWxfbW9kZXNldF9pbml0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCj4gPiAgCWludGVsX2luaXRf cXVpcmtzKGRldik7Cj4gPiAgCj4gPiAgCWludGVsX2luaXRfcG0oZGV2KTsKPiA+ICsJaW50ZWxf aW5pdF93bShkZXYpOwo+ID4gIAo+ID4gIAlpZiAoSU5URUxfSU5GTyhkZXYpLT5udW1fcGlwZXMg PT0gMCkKPiA+ICAJCXJldHVybjsKPiA+IGRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9kcnYuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oCj4gPiBpbmRl eCAxZmIxNTI5Li45OTVkMDMwIDEwMDY0NAo+ID4gLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUv aW50ZWxfZHJ2LmgKPiA+ICsrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oCj4g PiBAQCAtMTI1OCw2ICsxMjU4LDkgQEAgdm9pZCBpbnRlbF9wcmVfZGlzYWJsZV9wcmltYXJ5KHN0 cnVjdCBkcm1fY3J0YyAqY3J0Yyk7Cj4gPiAgLyogaW50ZWxfdHYuYyAqLwo+ID4gIHZvaWQgaW50 ZWxfdHZfaW5pdChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KTsKPiA+ICAKPiA+ICsvKiBpbnRlbF93 bS5jICovCj4gPiArdm9pZCBpbnRlbF9pbml0X3dtKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpOwo+ ID4gKwo+ID4gIC8qIGludGVsX2F0b21pYy5jICovCj4gPiAgaW50IGludGVsX2F0b21pY19jaGVj ayhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAo+ID4gIAkJICAgICAgIHN0cnVjdCBkcm1fYXRvbWlj X3N0YXRlICpzdGF0ZSk7Cj4gPiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfcG0uYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMKPiA+IGluZGV4IDdkY2I1 YjYuLmY5MDZiMDUgMTAwNjQ0Cj4gPiAtLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9w bS5jCj4gPiArKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jCj4gPiBAQCAtOTQs MzQwMiArOTQsNiBAQCBzdGF0aWMgdm9pZCBza2xfaW5pdF9jbG9ja19nYXRpbmcoc3RydWN0IGRy bV9kZXZpY2UgKmRldikKPiA+ICAJCQkgICBHRU44X0xRU0NfUk9fUEVSRl9ESVMpOwo+ID4gIH0K PiA+ICAKPiA+IC1zdGF0aWMgdm9pZCBpOTE1X3BpbmV2aWV3X2dldF9tZW1fZnJlcShzdHJ1Y3Qg ZHJtX2RldmljZSAqZGV2KQo+ID4gLXsKPiA+IC0Jc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRl dl9wcml2ID0gZGV2LT5kZXZfcHJpdmF0ZTsKPiA+IC0JdTMyIHRtcDsKPiA+IC0KPiA+IC0JdG1w ID0gSTkxNV9SRUFEKENMS0NGRyk7Cj4gPiAtCj4gPiAtCXN3aXRjaCAodG1wICYgQ0xLQ0ZHX0ZT Ql9NQVNLKSB7Cj4gPiAtCWNhc2UgQ0xLQ0ZHX0ZTQl81MzM6Cj4gPiAtCQlkZXZfcHJpdi0+ZnNi X2ZyZXEgPSA1MzM7IC8qIDEzMyo0ICovCj4gPiAtCQlicmVhazsKPiA+IC0JY2FzZSBDTEtDRkdf RlNCXzgwMDoKPiA+IC0JCWRldl9wcml2LT5mc2JfZnJlcSA9IDgwMDsgLyogMjAwKjQgKi8KPiA+ IC0JCWJyZWFrOwo+ID4gLQljYXNlIENMS0NGR19GU0JfNjY3Ogo+ID4gLQkJZGV2X3ByaXYtPmZz Yl9mcmVxID0gIDY2NzsgLyogMTY3KjQgKi8KPiA+IC0JCWJyZWFrOwo+ID4gLQljYXNlIENMS0NG R19GU0JfNDAwOgo+ID4gLQkJZGV2X3ByaXYtPmZzYl9mcmVxID0gNDAwOyAvKiAxMDAqNCAqLwo+ ID4gLQkJYnJlYWs7Cj4gPiAtCX0KPiA+IC0KPiA+IC0Jc3dpdGNoICh0bXAgJiBDTEtDRkdfTUVN X01BU0spIHsKPiA+IC0JY2FzZSBDTEtDRkdfTUVNXzUzMzoKPiA+IC0JCWRldl9wcml2LT5tZW1f ZnJlcSA9IDUzMzsKPiA+IC0JCWJyZWFrOwo+ID4gLQljYXNlIENMS0NGR19NRU1fNjY3Ogo+ID4g LQkJZGV2X3ByaXYtPm1lbV9mcmVxID0gNjY3Owo+ID4gLQkJYnJlYWs7Cj4gPiAtCWNhc2UgQ0xL Q0ZHX01FTV84MDA6Cj4gPiAtCQlkZXZfcHJpdi0+bWVtX2ZyZXEgPSA4MDA7Cj4gPiAtCQlicmVh azsKPiA+IC0JfQo+ID4gLQo+ID4gLQkvKiBkZXRlY3QgcGluZXZpZXcgRERSMyBzZXR0aW5nICov Cj4gPiAtCXRtcCA9IEk5MTVfUkVBRChDU0hSRERSM0NUTCk7Cj4gPiAtCWRldl9wcml2LT5pc19k ZHIzID0gKHRtcCAmIENTSFJERFIzQ1RMX0REUjMpID8gMSA6IDA7Cj4gPiAtfQo+ID4gLQo+ID4g LXN0YXRpYyB2b2lkIGk5MTVfaXJvbmxha2VfZ2V0X21lbV9mcmVxKHN0cnVjdCBkcm1fZGV2aWNl ICpkZXYpCj4gPiAtewo+ID4gLQlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBk ZXYtPmRldl9wcml2YXRlOwo+ID4gLQl1MTYgZGRycGxsLCBjc2lwbGw7Cj4gPiAtCj4gPiAtCWRk cnBsbCA9IEk5MTVfUkVBRDE2KEREUk1QTEwxKTsKPiA+IC0JY3NpcGxsID0gSTkxNV9SRUFEMTYo Q1NJUExMMCk7Cj4gPiAtCj4gPiAtCXN3aXRjaCAoZGRycGxsICYgMHhmZikgewo+ID4gLQljYXNl IDB4YzoKPiA+IC0JCWRldl9wcml2LT5tZW1fZnJlcSA9IDgwMDsKPiA+IC0JCWJyZWFrOwo+ID4g LQljYXNlIDB4MTA6Cj4gPiAtCQlkZXZfcHJpdi0+bWVtX2ZyZXEgPSAxMDY2Owo+ID4gLQkJYnJl YWs7Cj4gPiAtCWNhc2UgMHgxNDoKPiA+IC0JCWRldl9wcml2LT5tZW1fZnJlcSA9IDEzMzM7Cj4g PiAtCQlicmVhazsKPiA+IC0JY2FzZSAweDE4Ogo+ID4gLQkJZGV2X3ByaXYtPm1lbV9mcmVxID0g MTYwMDsKPiA+IC0JCWJyZWFrOwo+ID4gLQlkZWZhdWx0Ogo+ID4gLQkJRFJNX0RFQlVHX0RSSVZF UigidW5rbm93biBtZW1vcnkgZnJlcXVlbmN5IDB4JTAyeFxuIiwKPiA+IC0JCQkJIGRkcnBsbCAm IDB4ZmYpOwo+ID4gLQkJZGV2X3ByaXYtPm1lbV9mcmVxID0gMDsKPiA+IC0JCWJyZWFrOwo+ID4g LQl9Cj4gPiAtCj4gPiAtCWRldl9wcml2LT5pcHMucl90ID0gZGV2X3ByaXYtPm1lbV9mcmVxOwo+ ID4gLQo+ID4gLQlzd2l0Y2ggKGNzaXBsbCAmIDB4M2ZmKSB7Cj4gPiAtCWNhc2UgMHgwMGM6Cj4g PiAtCQlkZXZfcHJpdi0+ZnNiX2ZyZXEgPSAzMjAwOwo+ID4gLQkJYnJlYWs7Cj4gPiAtCWNhc2Ug MHgwMGU6Cj4gPiAtCQlkZXZfcHJpdi0+ZnNiX2ZyZXEgPSAzNzMzOwo+ID4gLQkJYnJlYWs7Cj4g PiAtCWNhc2UgMHgwMTA6Cj4gPiAtCQlkZXZfcHJpdi0+ZnNiX2ZyZXEgPSA0MjY2Owo+ID4gLQkJ YnJlYWs7Cj4gPiAtCWNhc2UgMHgwMTI6Cj4gPiAtCQlkZXZfcHJpdi0+ZnNiX2ZyZXEgPSA0ODAw Owo+ID4gLQkJYnJlYWs7Cj4gPiAtCWNhc2UgMHgwMTQ6Cj4gPiAtCQlkZXZfcHJpdi0+ZnNiX2Zy ZXEgPSA1MzMzOwo+ID4gLQkJYnJlYWs7Cj4gPiAtCWNhc2UgMHgwMTY6Cj4gPiAtCQlkZXZfcHJp di0+ZnNiX2ZyZXEgPSA1ODY2Owo+ID4gLQkJYnJlYWs7Cj4gPiAtCWNhc2UgMHgwMTg6Cj4gPiAt CQlkZXZfcHJpdi0+ZnNiX2ZyZXEgPSA2NDAwOwo+ID4gLQkJYnJlYWs7Cj4gPiAtCWRlZmF1bHQ6 Cj4gPiAtCQlEUk1fREVCVUdfRFJJVkVSKCJ1bmtub3duIGZzYiBmcmVxdWVuY3kgMHglMDR4XG4i LAo+ID4gLQkJCQkgY3NpcGxsICYgMHgzZmYpOwo+ID4gLQkJZGV2X3ByaXYtPmZzYl9mcmVxID0g MDsKPiA+IC0JCWJyZWFrOwo+ID4gLQl9Cj4gPiAtCj4gPiAtCWlmIChkZXZfcHJpdi0+ZnNiX2Zy ZXEgPT0gMzIwMCkgewo+ID4gLQkJZGV2X3ByaXYtPmlwcy5jX20gPSAwOwo+ID4gLQl9IGVsc2Ug aWYgKGRldl9wcml2LT5mc2JfZnJlcSA+IDMyMDAgJiYgZGV2X3ByaXYtPmZzYl9mcmVxIDw9IDQ4 MDApIHsKPiA+IC0JCWRldl9wcml2LT5pcHMuY19tID0gMTsKPiA+IC0JfSBlbHNlIHsKPiA+IC0J CWRldl9wcml2LT5pcHMuY19tID0gMjsKPiA+IC0JfQo+ID4gLX0KPiAKPiBJIGRvbid0IHRoaW5r IHRoZXNlIHR3byBmdW5jdGlvbnMgc2hvdWxkIGJlIG1vdmVkLgo+IAo+IC0tIAo+IFZpbGxlIFN5 cmrDpGzDpAo+IEludGVsIE9UQwo+IF9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fCj4gSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdAo+IEludGVsLWdmeEBsaXN0cy5m cmVlZGVza3RvcC5vcmcKPiBodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlz dGluZm8vaW50ZWwtZ2Z4CgotLSAKRGFuaWVsIFZldHRlcgpTb2Z0d2FyZSBFbmdpbmVlciwgSW50 ZWwgQ29ycG9yYXRpb24KKzQxICgwKSA3OSAzNjUgNTcgNDggLSBodHRwOi8vYmxvZy5mZndsbC5j aApfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1n ZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cDovL2xp c3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=