From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= Subject: Re: [RFC 12/15] drm/i915: Actually use pre-computer watermark values (!!SQUASHME) Date: Thu, 21 May 2015 16:08:47 +0300 Message-ID: <20150521130847.GC18908@intel.com> References: <1432174347-19138-1-git-send-email-matthew.d.roper@intel.com> <1432174347-19138-13-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 mga01.intel.com (mga01.intel.com [192.55.52.88]) by gabe.freedesktop.org (Postfix) with ESMTP id BD7A76E8E1 for ; Thu, 21 May 2015 06:09:21 -0700 (PDT) Content-Disposition: inline In-Reply-To: <1432174347-19138-13-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 T24gV2VkLCBNYXkgMjAsIDIwMTUgYXQgMDc6MTI6MjRQTSAtMDcwMCwgTWF0dCBSb3BlciB3cm90 ZToKPiBSYXRoZXIgdGhhdCBqdXN0IGNvbXBhcmluZyBhbmQgdGhlbiB0aHJvd2luZyBhd2F5IHRo ZSBwaXBlIHdhdGVybWFyawo+IHZhbHVlcyB3ZSBwcmVjb21wdXRlZCBhdCBhdG9taWMgY2hlY2sg dGltZSwgYWN0dWFsbHkgdXNlIHRob3NlIHZhbHVlcwo+IHdoZW4gd2UgcHJvZ3JhbSB3YXRlcm1h cmtzLgo+IAo+IEZJWE1FOiAgVGhpcyBzaG91bGQgYmUgc3F1YXNoZWQgaW50byB0aGUgcHJldmlv dXMgcGF0Y2ggZXZlbnR1YWxseSwgb25jZQo+IHdlJ3JlIGNvbnZpbmNlZCB0aGF0IHByZS1jb21w dXRlZCB3YXRlcm1hcmtzIGdldCB0aGUgcHJvcGVyIHZhbHVlcyBpbgo+IGFsbCBjYXNlcy4KPiAK PiBTaWduZWQtb2ZmLWJ5OiBNYXR0IFJvcGVyIDxtYXR0aGV3LmQucm9wZXJAaW50ZWwuY29tPgo+ IC0tLQo+ICBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oICAgICB8ICAzICstCj4gIGRy aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2F0b21pYy5jIHwgIDQgKy0KPiAgZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfZHJ2LmggICAgfCAgMyAtLQo+ICBkcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF9wbS5jICAgICB8IDc3ICsrKysrKysrKysrLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0K PiAgNCBmaWxlcyBjaGFuZ2VkLCAyNCBpbnNlcnRpb25zKCspLCA2MyBkZWxldGlvbnMoLSkKPiAK PiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaCBiL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKPiBpbmRleCAyMTRjZTc2Li5kNTc3ZWJhIDEwMDY0NAo+ IC0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKPiArKysgYi9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pOTE1X2Rydi5oCj4gQEAgLTU2Myw4ICs1NjMsNyBAQCBzdHJ1Y3QgZHJtX2k5 MTVfZGlzcGxheV9mdW5jcyB7Cj4gIAkJCSAgc3RydWN0IGRwbGwgKm1hdGNoX2Nsb2NrLAo+ICAJ CQkgIHN0cnVjdCBkcGxsICpiZXN0X2Nsb2NrKTsKPiAgCWludCAoKmNvbXB1dGVfcGlwZV93bSko c3RydWN0IGRybV9jcnRjICpjcnRjLAo+IC0JCQkgICAgICAgc3RydWN0IGRybV9hdG9taWNfc3Rh dGUgKnN0YXRlLAo+IC0JCQkgICAgICAgdm9pZCAqdGFyZ2V0KTsKPiArCQkJICAgICAgIHN0cnVj dCBkcm1fYXRvbWljX3N0YXRlICpzdGF0ZSk7Cj4gIAl2b2lkICgqdXBkYXRlX3dtKShzdHJ1Y3Qg ZHJtX2NydGMgKmNydGMpOwo+ICAJdm9pZCAoKnVwZGF0ZV9zcHJpdGVfd20pKHN0cnVjdCBkcm1f cGxhbmUgKnBsYW5lLAo+ICAJCQkJIHN0cnVjdCBkcm1fY3J0YyAqY3J0YywKPiBkaWZmIC0tZ2l0 IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfYXRvbWljLmMgYi9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9hdG9taWMuYwo+IGluZGV4IGRiMzQ5ZGQuLjUyOTQ4NDAgMTAwNjQ0Cj4gLS0t IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfYXRvbWljLmMKPiArKysgYi9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF9hdG9taWMuYwo+IEBAIC00MzUsMTQgKzQzNSwxMiBAQCBpbnRlbF9j aGVja19jcnRjKHN0cnVjdCBkcm1fY3J0YyAqY3J0YywKPiAgCQkgc3RydWN0IGRybV9jcnRjX3N0 YXRlICpzdGF0ZSkKPiAgewo+ICAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0g dG9faTkxNShjcnRjLT5kZXYpOwo+IC0Jc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmludGVsX3N0 YXRlID0gdG9faW50ZWxfY3J0Y19zdGF0ZShzdGF0ZSk7Cj4gIAlpbnQgcmV0Owo+ICAKPiAgCWlm ICghZGV2X3ByaXYtPmRpc3BsYXkuY29tcHV0ZV9waXBlX3dtKQo+ICAJCXJldHVybiAwOwo+ICAK PiAtCXJldCA9IGRldl9wcml2LT5kaXNwbGF5LmNvbXB1dGVfcGlwZV93bShjcnRjLCBzdGF0ZS0+ c3RhdGUsCj4gLQkJCQkJCSZpbnRlbF9zdGF0ZS0+d20udG1wKTsKPiArCXJldCA9IGRldl9wcml2 LT5kaXNwbGF5LmNvbXB1dGVfcGlwZV93bShjcnRjLCBzdGF0ZS0+c3RhdGUpOwo+ICAKPiAgCXJl dHVybiByZXQ7Cj4gIH0KPiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf ZHJ2LmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaAo+IGluZGV4IDZjYTNjMDYu LjYyNzc0MWEgMTAwNjQ0Cj4gLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmgK PiArKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaAo+IEBAIC00NjQsOSArNDY0 LDYgQEAgc3RydWN0IGludGVsX2NydGNfc3RhdGUgewo+ICAJc3RydWN0IGludGVsX2NydGNfc2Nh bGVyX3N0YXRlIHNjYWxlcl9zdGF0ZTsKPiAgCj4gIAlzdHJ1Y3Qgewo+IC0JCS8qIHRtcCB3bSAq Lwo+IC0JCXN0cnVjdCBpbnRlbF9waXBlX3dtIHRtcDsKPiAtCj4gIAkJLyogZmluYWwsIHRhcmdl dCB3YXRlcm1hcmtzIGZvciBzdGF0ZSAqLwo+ICAJCXVuaW9uIHsKPiAgCQkJc3RydWN0IGludGVs X3BpcGVfd20gaWxrOwo+IGRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9w bS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYwo+IGluZGV4IDAxN2IxODQuLjI3 MzM3ZmUgMTAwNjQ0Cj4gLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYwo+ICsr KyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMKPiBAQCAtMjA3MywxMCArMjA3Myw5 IEBAIHN0YXRpYyB2b2lkIGlsa19jb21wdXRlX3dtX2NvbmZpZyhzdHJ1Y3QgZHJtX2RldmljZSAq ZGV2LAo+ICAKPiAgLyogQ29tcHV0ZSBuZXcgd2F0ZXJtYXJrcyBmb3IgdGhlIHBpcGUgKi8KPiAg c3RhdGljIGludCBpbGtfY29tcHV0ZV9waXBlX3dtKHN0cnVjdCBkcm1fY3J0YyAqY3J0YywKPiAt CQkJICAgICAgIHN0cnVjdCBkcm1fYXRvbWljX3N0YXRlICpzdGF0ZSwKPiAtCQkJICAgICAgIHZv aWQgKnRhcmdldCkKPiArCQkJICAgICAgIHN0cnVjdCBkcm1fYXRvbWljX3N0YXRlICpzdGF0ZSkK PiAgewo+IC0Jc3RydWN0IGludGVsX3BpcGVfd20gKnBpcGVfd20gPSB0YXJnZXQ7Cj4gKwlzdHJ1 Y3QgaW50ZWxfcGlwZV93bSAqcGlwZV93bTsKPiAgCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSBj cnRjLT5kZXY7Cj4gIAljb25zdCBzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBk ZXYtPmRldl9wcml2YXRlOwo+ICAJc3RydWN0IGludGVsX2NydGMgKmludGVsX2NydGMgPSB0b19p bnRlbF9jcnRjKGNydGMpOwo+IEBAIC0yMDk0LDQ3ICsyMDkzLDI2IEBAIHN0YXRpYyBpbnQgaWxr X2NvbXB1dGVfcGlwZV93bShzdHJ1Y3QgZHJtX2NydGMgKmNydGMsCj4gIAl9Owo+ICAJc3RydWN0 IGlsa193bV9tYXhpbXVtcyBtYXg7Cj4gIAo+IC0JLyoKPiAtCSAqIEZJWE1FOiBJbiBhbiB1cGNv bWluZyBwYXRjaCwgd2UnbGwgKm9ubHkqIGJlIGNhbGxpbmcgdGhpcyBmcm9tIHRoZQo+IC0JICog YXRvbWljICdjaGVjaycgY29kZXBhdGggYW5kIHRodXMgd2lsbCBhbHdheXMgaGF2ZSBhIHRvcC1s ZXZlbCBhdG9taWMKPiAtCSAqIHRyYW5zYWN0aW9uLiAgSG93ZXZlciBhdCB0aGUgbW9tZW50IHdl IHN0aWxsIGNhbGwgdGhpcyBpbiB0aGUgbGVnYWN5Cj4gLQkgKiAnaWxrX3VwZGF0ZV93bScgZnVu Y3Rpb24sIHdoaWNoIG1lYW5zIHdlIG5lZWQgdG8gYmUgYWJsZSB0byBhbHNvCj4gLQkgKiBvcGVy YXRlIG9uIGFscmVhZHktY29tbWl0dGVkIHN0YXRlIHdoaWNoIGhhcyBiZWVuIGRldGFjaGVkIGZy b20gYW55Cj4gLQkgKiB0b3AtbGV2ZWwgdHJhbnNhY3Rpb24uCj4gLQkgKgo+IC0JICogRHJvcCB0 aGUgJ2Vsc2UnIGJsb2NrIGhlcmUgb25jZSB3ZSBvbmx5IGRvIGF0b21pYy1zdHlsZSB3YXRlcm1h cmtzLgo+IC0JICovCj4gLQlpZiAoc3RhdGUpIHsKPiAtCQljcyA9IGRybV9hdG9taWNfZ2V0X2Ny dGNfc3RhdGUoc3RhdGUsIGNydGMpOwo+IC0JCWlmIChJU19FUlIoY3MpKQo+IC0JCQlyZXR1cm4g UFRSX0VSUihjcyk7Cj4gLQkJZWxzZQo+IC0JCQljc3RhdGUgPSB0b19pbnRlbF9jcnRjX3N0YXRl KGNzKTsKPiAtCj4gLQkJZm9yX2VhY2hfaW50ZWxfcGxhbmVfb2ZfY3J0YyhpbnRlbF9jcnRjLCBp bnRlbF9wbGFuZSkgewo+IC0JCQlwcyA9IGRybV9hdG9taWNfZ2V0X3BsYW5lX3N0YXRlKHN0YXRl LAo+IC0JCQkJCQkJJmludGVsX3BsYW5lLT5iYXNlKTsKPiAtCQkJaWYgKElTX0VSUihwcykpCj4g LQkJCQlyZXR1cm4gUFRSX0VSUihwcyk7Cj4gLQo+IC0JCQlpZiAoaW50ZWxfcGxhbmUtPmJhc2Uu dHlwZSA9PSBEUk1fUExBTkVfVFlQRV9QUklNQVJZKQo+IC0JCQkJcHJpc3RhdGUgPSB0b19pbnRl bF9wbGFuZV9zdGF0ZShwcyk7Cj4gLQkJCWVsc2UgaWYgKGludGVsX3BsYW5lLT5iYXNlLnR5cGUg PT0gRFJNX1BMQU5FX1RZUEVfT1ZFUkxBWSkKPiAtCQkJCXNwcnN0YXRlID0gdG9faW50ZWxfcGxh bmVfc3RhdGUocHMpOwo+IC0JCQllbHNlIGlmIChpbnRlbF9wbGFuZS0+YmFzZS50eXBlID09IERS TV9QTEFORV9UWVBFX0NVUlNPUikKPiAtCQkJCWN1cnN0YXRlID0gdG9faW50ZWxfcGxhbmVfc3Rh dGUocHMpOwo+IC0JCX0KPiAtCX0gZWxzZSB7Cj4gLQkJLyogVXNlIGFscmVhZHktY29tbWl0dGVk IHN0YXRlICovCj4gLQkJY3N0YXRlID0gdG9faW50ZWxfY3J0Y19zdGF0ZShjcnRjLT5zdGF0ZSk7 Cj4gLQkJZm9yX2VhY2hfaW50ZWxfcGxhbmVfb2ZfY3J0YyhpbnRlbF9jcnRjLCBpbnRlbF9wbGFu ZSkgewo+IC0JCQlpZiAoaW50ZWxfcGxhbmUtPmJhc2UudHlwZSA9PSBEUk1fUExBTkVfVFlQRV9P VkVSTEFZKSB7Cj4gLQkJCQlzcHJzdGF0ZSA9IHRvX2ludGVsX3BsYW5lX3N0YXRlKGludGVsX3Bs YW5lLT5iYXNlLnN0YXRlKTsKPiAtCQkJCWJyZWFrOwo+IC0JCQl9Cj4gLQkJfQo+IC0JCXByaXN0 YXRlID0gdG9faW50ZWxfcGxhbmVfc3RhdGUoY3J0Yy0+cHJpbWFyeS0+c3RhdGUpOwo+IC0JCWN1 cnN0YXRlID0gdG9faW50ZWxfcGxhbmVfc3RhdGUoY3J0Yy0+Y3Vyc29yLT5zdGF0ZSk7Cj4gKwlj cyA9IGRybV9hdG9taWNfZ2V0X2NydGNfc3RhdGUoc3RhdGUsIGNydGMpOwo+ICsJaWYgKElTX0VS UihjcykpCj4gKwkJcmV0dXJuIFBUUl9FUlIoY3MpOwo+ICsJZWxzZQo+ICsJCWNzdGF0ZSA9IHRv X2ludGVsX2NydGNfc3RhdGUoY3MpOwo+ICsKPiArCXBpcGVfd20gPSAmY3N0YXRlLT53bS50YXJn ZXQuaWxrOwo+ICsKPiArCWZvcl9lYWNoX2ludGVsX3BsYW5lX29mX2NydGMoaW50ZWxfY3J0Yywg aW50ZWxfcGxhbmUpIHsKPiArCQlwcyA9IGRybV9hdG9taWNfZ2V0X3BsYW5lX3N0YXRlKHN0YXRl LAo+ICsJCQkJCQkmaW50ZWxfcGxhbmUtPmJhc2UpOwo+ICsJCWlmIChJU19FUlIocHMpKQo+ICsJ CQlyZXR1cm4gUFRSX0VSUihwcyk7Cj4gKwo+ICsJCWlmIChpbnRlbF9wbGFuZS0+YmFzZS50eXBl ID09IERSTV9QTEFORV9UWVBFX1BSSU1BUlkpCj4gKwkJCXByaXN0YXRlID0gdG9faW50ZWxfcGxh bmVfc3RhdGUocHMpOwo+ICsJCWVsc2UgaWYgKGludGVsX3BsYW5lLT5iYXNlLnR5cGUgPT0gRFJN X1BMQU5FX1RZUEVfT1ZFUkxBWSkKPiArCQkJc3Byc3RhdGUgPSB0b19pbnRlbF9wbGFuZV9zdGF0 ZShwcyk7Cj4gKwkJZWxzZSBpZiAoaW50ZWxfcGxhbmUtPmJhc2UudHlwZSA9PSBEUk1fUExBTkVf VFlQRV9DVVJTT1IpCj4gKwkJCWN1cnN0YXRlID0gdG9faW50ZWxfcGxhbmVfc3RhdGUocHMpOwo+ ICAJfQo+ICAKPiAgCWNvbmZpZy5zcHJpdGVzX2VuYWJsZWQgPSBzcHJzdGF0ZS0+dmlzaWJsZTsK PiBAQCAtMzUxMSwxNyArMzQ4OSw2IEBAIHN0YXRpYyB2b2lkIGlsa19wcm9ncmFtX3dhdGVybWFy a3Moc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQo+ICBzdGF0aWMgdm9pZCBpbGtf dXBkYXRlX3dtKHN0cnVjdCBkcm1fY3J0YyAqY3J0YykKPiAgewo+ICAJc3RydWN0IGRybV9pOTE1 X3ByaXZhdGUgKmRldl9wcml2ID0gdG9faTkxNShjcnRjLT5kZXYpOwo+IC0Jc3RydWN0IGludGVs X2NydGNfc3RhdGUgKmNzdGF0ZSA9IHRvX2ludGVsX2NydGNfc3RhdGUoY3J0Yy0+c3RhdGUpOwo+ IC0Jc3RydWN0IGludGVsX3BpcGVfd20gcGlwZV93bSA9IHt9Owo+IC0KPiAtCWlsa19jb21wdXRl X3BpcGVfd20oY3J0YywgTlVMTCwgJnBpcGVfd20pOwo+IC0JV0FSTihtZW1jbXAoJmNzdGF0ZS0+ d20udG1wLCAmcGlwZV93bSwgc2l6ZW9mKHBpcGVfd20pKSAhPSAwLAo+IC0JICAgICAiUHJlLWNv bXB1dGVkIGF0b21pYyB3YXRlcm1hcmsgdmFsdWVzIGRvIG5vdCBtYXRjaCBmaW5hbCB2YWx1ZXMh Iik7Cj4gLQo+IC0JaWYgKCFtZW1jbXAoJmNzdGF0ZS0+d20udGFyZ2V0LmlsaywgJnBpcGVfd20s IHNpemVvZihwaXBlX3dtKSkpCj4gLQkJcmV0dXJuOwoKVGhlIG1lbWNtcCgpIGlzIHRoZXJlIHRv IGF2b2lkIHJlcHJvZ3JvbWFtaW5nIG5lZWRsZXNzbHkuIEl0IHNob3VsZApzdGF5LgoKPiAtCj4g LQljc3RhdGUtPndtLnRhcmdldC5pbGsgPSBwaXBlX3dtOwo+ICAKPiAgCWlsa19wcm9ncmFtX3dh dGVybWFya3MoZGV2X3ByaXYpOwo+ICB9Cj4gLS0gCj4gMS44LjUuMQo+IAo+IF9fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCj4gSW50ZWwtZ2Z4IG1haWxpbmcg bGlzdAo+IEludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKPiBodHRwOi8vbGlzdHMuZnJl ZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4CgotLSAKVmlsbGUgU3lyasOk bMOkCkludGVsIE9UQwpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5v cmcKaHR0cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdm eAo=