From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tvrtko Ursulin Subject: Re: [PATCH] drm/i915: Update state before setting watermarks. Date: Wed, 24 Feb 2016 14:13:08 +0000 Message-ID: <56CDBA74.9080601@linux.intel.com> References: <56CDB61D.8020108@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8"; Format="flowed" Content-Transfer-Encoding: base64 Return-path: Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by gabe.freedesktop.org (Postfix) with ESMTP id C0B8B6E6F0 for ; Wed, 24 Feb 2016 14:41:19 +0000 (UTC) In-Reply-To: <56CDB61D.8020108@linux.intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Maarten Lankhorst , Intel Graphics Development List-Id: intel-gfx@lists.freedesktop.org Ck9uIDI0LzAyLzE2IDEzOjU0LCBNYWFydGVuIExhbmtob3JzdCB3cm90ZToKPiBXaGVuIGludGVs X3VwZGF0ZV93YXRlcm1hcmtzIGlzIGNhbGxlZCBvbiBza3lsYWtlIGl0IGluc3BlY3RzCj4gY3J0 Yy0+c3RhdGUsIHdoaWNoIHNob3VsZCBzaG93IGFzIGRpc2FibGVkLiBUaGlzIHdhc24ndCB0aGUg Y2FzZSwKPiBhbmQgdGhpcyByZXN1bHRlZCBpbiBhIGRpdmlkZS1ieS16ZXJvIGluCj4gc2tsX2Rk Yl9nZXRfcGlwZV9hbGxvY2F0aW9uX2xpbWl0cyB3aGVuIGludGVsX3VwZGF0ZV93YXRlcm1hcmtz IHdhcyBjYWxsZWQuCj4KPiAgIC0tLS0tLS0tLS0tLVsgY3V0IGhlcmUgXS0tLS0tLS0tLS0tLQo+ ICAgV0FSTklORzogQ1BVOiAxIFBJRDogMjk1IGF0IGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs X3BtLmM6MjgzNCBza2xfdXBkYXRlX3BpcGVfd20rMHgxMDIvMHg4YzAgW2k5MTVdKCkKPiAgIFdB Uk5fT04oIWNvbmZpZy0+bnVtX3BpcGVzX2FjdGl2ZSkKPiAgIE1vZHVsZXMgbGlua2VkIGluOiBj b3JldGVtcCBpOTE1KCspIHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4 eHh4eHh4eHh4eHh4eHh4eAo+ICAgQ1BVOiAxIFBJRDogMjk1IENvbW06IHN5c3RlbWQtdWRldmQg VGFpbnRlZDogRyAgICAgVSAgVyAgICAgICA0LjUuMC1yYzQteHh4eHh4ICMyNQo+ICAgSGFyZHdh cmUgbmFtZTogeHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHgKPiAgICAw MDAwMDAwMDAwMDAwMDAwIGZmZmY4ODAwMzc3N2Y1YTggZmZmZmZmZmY4MTM0ODVjMiBmZmZmODgw MDM3NzdmNWYwCj4gICAgZmZmZmZmZmZhMDIzNjI0MCBmZmZmODgwMDM3NzdmNWUwIGZmZmZmZmZm ODEwNTBmY2UgZmZmZjg4MDBhYTQyMDAwMAo+ICAgIGZmZmY4ODAwYWJhMTgwMDAgZmZmZjg4MDBh YmExODAwMCBmZmZmODgwMDM3MzA0YzAwIGZmZmY4ODAwYWE0MjAwMDAKPiAgIENhbGwgVHJhY2U6 Cj4gICAgWzxmZmZmZmZmZjgxMzQ4NWMyPl0gZHVtcF9zdGFjaysweDY3LzB4OTUKPiAgICBbPGZm ZmZmZmZmODEwNTBmY2U+XSB3YXJuX3Nsb3dwYXRoX2NvbW1vbisweDllLzB4YzAKPiAgICBbPGZm ZmZmZmZmODEwNTEwM2M+XSB3YXJuX3Nsb3dwYXRoX2ZtdCsweDRjLzB4NTAKPiAgICBbPGZmZmZm ZmZmODEwNjk0NWU+XSA/IGZsdXNoX3dvcmsrMHg4ZS8weDI4MAo+ICAgIFs8ZmZmZmZmZmY4MTA2 OTNkNT5dID8gZmx1c2hfd29yaysweDUvMHgyODAKPiAgICBbPGZmZmZmZmZmYTAxNmFkZDI+XSBz a2xfdXBkYXRlX3BpcGVfd20rMHgxMDIvMHg4YzAgW2k5MTVdCj4gICAgWzxmZmZmZmZmZmEwMTZi OTZmPl0gc2tsX3VwZGF0ZV93bSsweGZmLzB4NWYwIFtpOTE1XQo+ICAgIFs8ZmZmZmZmZmY4MTA5 MjhlZT5dID8gdHJhY2VfaGFyZGlycXNfb25fY2FsbGVyKzB4MTVlLzB4MWQwCj4gICAgWzxmZmZm ZmZmZjgxMDkyOTZkPl0gPyB0cmFjZV9oYXJkaXJxc19vbisweGQvMHgxMAo+ICAgIFs8ZmZmZmZm ZmZhMDE2Y2U2ZT5dIGludGVsX3VwZGF0ZV93YXRlcm1hcmtzKzB4MWUvMHgzMCBbaTkxNV0KPiAg ICBbPGZmZmZmZmZmYTAxZDNlZTI+XSBpbnRlbF9jcnRjX2Rpc2FibGVfbm9hdG9taWMrMHhkMi8w eDE1MCBbaTkxNV0KPiAgICBbPGZmZmZmZmZmYTAxZGQzZDI+XSBpbnRlbF9tb2Rlc2V0X3NldHVw X2h3X3N0YXRlKzB4ZGQyLzB4ZGUwIFtpOTE1XQo+ICAgIFs8ZmZmZmZmZmZhMDFkZmQ4Mz5dIGlu dGVsX21vZGVzZXRfaW5pdCsweDE1YTMvMHgxOTUwIFtpOTE1XQo+ICAgIFs8ZmZmZmZmZmZhMDIx NjBiNj5dIGk5MTVfZHJpdmVyX2xvYWQrMHgxM2M2LzB4MTcyMCBbaTkxNV0KPiAgICBbPGZmZmZm ZmZmODE1MjIxNjA+XSA/IGFkZF9zeXNmc19md19tYXBfZW50cnkrMHg5Yi8weDliCj4gICAgWzxm ZmZmZmZmZmEwMGIxNWVmPl0gZHJtX2Rldl9yZWdpc3RlcisweDZmLzB4YjAgW2RybV0KPiAgICBb PGZmZmZmZmZmYTAwYjNiM2E+XSBkcm1fZ2V0X3BjaV9kZXYrMHgxMGEvMHgxZDAgW2RybV0KPiAg ICBbPGZmZmZmZmZmYTAxNTgyZDk+XSBpOTE1X3BjaV9wcm9iZSsweDQ5LzB4NTAgW2k5MTVdCj4g ICAgWzxmZmZmZmZmZjgxMzhhZTMwPl0gcGNpX2RldmljZV9wcm9iZSsweDgwLzB4ZjAKPiAgICBb PGZmZmZmZmZmODE0M2UyYWM+XSBkcml2ZXJfcHJvYmVfZGV2aWNlKzB4MWJjLzB4M2QwCj4gICAg WzxmZmZmZmZmZjgxNDNlNTI2Pl0gX19kcml2ZXJfYXR0YWNoKzB4NjYvMHg5MAo+ICAgIFs8ZmZm ZmZmZmY4MTQzZTRjMD5dID8gZHJpdmVyX3Byb2JlX2RldmljZSsweDNkMC8weDNkMAo+ICAgIFs8 ZmZmZmZmZmY4MTQzYmUzYj5dIGJ1c19mb3JfZWFjaF9kZXYrMHg1Yi8weGEwCj4gICAgWzxmZmZm ZmZmZjgxNDNkYjNlPl0gZHJpdmVyX2F0dGFjaCsweDFlLzB4MjAKPiAgICBbPGZmZmZmZmZmODE0 M2Q0NjE+XSBidXNfYWRkX2RyaXZlcisweDE1MS8weDI3MAo+ICAgIFs8ZmZmZmZmZmY4MTQzZWFi Yz5dIGRyaXZlcl9yZWdpc3RlcisweDhjLzB4ZDAKPiAgICBbPGZmZmZmZmZmODEzOGEyZWQ+XSBf X3BjaV9yZWdpc3Rlcl9kcml2ZXIrMHg1ZC8weDYwCj4gICAgWzxmZmZmZmZmZmEwMGIzYzU4Pl0g ZHJtX3BjaV9pbml0KzB4NTgvMHhmMCBbZHJtXQo+ICAgIFs8ZmZmZmZmZmY4MTA5Mjk2ZD5dID8g dHJhY2VfaGFyZGlycXNfb24rMHhkLzB4MTAKPiAgICBbPGZmZmZmZmZmYTAyYWEwMDA+XSA/IDB4 ZmZmZmZmZmZhMDJhYTAwMAo+ICAgIFs8ZmZmZmZmZmZhMDJhYTA5ND5dIGk5MTVfaW5pdCsweDk0 LzB4OWIgW2k5MTVdCj4gICAgWzxmZmZmZmZmZjgxMDAwNDIzPl0gZG9fb25lX2luaXRjYWxsKzB4 MTEzLzB4MWYwCj4gICAgWzxmZmZmZmZmZjgxMGE0YjIxPl0gPyByY3VfcmVhZF9sb2NrX3NjaGVk X2hlbGQrMHg2MS8weDkwCj4gICAgWzxmZmZmZmZmZjgxMTYwMWRjPl0gPyBrbWVtX2NhY2hlX2Fs bG9jX3RyYWNlKzB4MWNjLzB4MjgwCj4gICAgWzxmZmZmZmZmZjgxMTExMTBhPl0gZG9faW5pdF9t b2R1bGUrMHg2MC8weDFjOAo+ICAgIFs8ZmZmZmZmZmY4MTBjNzMxYj5dIGxvYWRfbW9kdWxlKzB4 MWNlYi8weDI0MTAKPiAgICBbPGZmZmZmZmZmODEwYzNhNjA+XSA/IHN0b3JlX3VldmVudCsweDQw LzB4NDAKPiAgICBbPGZmZmZmZmZmODExNzYzZDE+XSA/IGtlcm5lbF9yZWFkKzB4NDEvMHg2MAo+ ICAgIFs8ZmZmZmZmZmY4MTBjN2MxZD5dIFNZU0NfZmluaXRfbW9kdWxlKzB4OGQvMHhhMAo+ICAg IFs8ZmZmZmZmZmY4MTBjN2M0ZT5dIFN5U19maW5pdF9tb2R1bGUrMHhlLzB4MTAKPiAgICBbPGZm ZmZmZmZmODE1ZjFlOTc+XSBlbnRyeV9TWVNDQUxMXzY0X2Zhc3RwYXRoKzB4MTIvMHg2Zgo+ICAg LS0tWyBlbmQgdHJhY2UgMTE0OWU5YWIzNjk1YTQyMyBdLS0tCj4gICAtLS0tLS0tLS0tLS1bIGN1 dCBoZXJlIF0tLS0tLS0tLS0tLS0KPgo+IFJlcG9ydGVkLWJ5OiBUdnJ0a28gVXJzdWxpbiA8dHZy dGtvLnVyc3VsaW5AbGludXguaW50ZWwuY29tPgo+IFNpZ25lZC1vZmYtYnk6IE1hYXJ0ZW4gTGFu a2hvcnN0IDxtYWFydGVuLmxhbmtob3JzdEBsaW51eC5pbnRlbC5jb20+CgpUaGFua3MgZm9yIGxv b2tpbmcgaW50byB0aGlzISBBbHNvLAoKVGVzdGVkLWJ5OiBUdnJ0a28gVXJzdWxpbiA8dHZydGtv LnVyc3VsaW5AaW50ZWwuY29tPgoKUmVnYXJkcywKClR2cnRrbwoKPiAtLS0KPiBkaWZmIC0tZ2l0 IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jIGIvZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfZGlzcGxheS5jCj4gaW5kZXggZGVlZTU2MDEwZWVlLi5kOWUwNDcwNDE5YTEg MTAwNjQ0Cj4gLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCj4gKysr IGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCj4gQEAgLTYzNTgsNiArNjM1 OCw3IEBAIHN0YXRpYyB2b2lkIGk5eHhfY3J0Y19kaXNhYmxlKHN0cnVjdCBkcm1fY3J0YyAqY3J0 YykKPgo+ICAgc3RhdGljIHZvaWQgaW50ZWxfY3J0Y19kaXNhYmxlX25vYXRvbWljKHN0cnVjdCBk cm1fY3J0YyAqY3J0YykKPiAgIHsKPiArCXN0cnVjdCBpbnRlbF9lbmNvZGVyICplbmNvZGVyOwo+ ICAgCXN0cnVjdCBpbnRlbF9jcnRjICppbnRlbF9jcnRjID0gdG9faW50ZWxfY3J0YyhjcnRjKTsK PiAgIAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSB0b19pOTE1KGNydGMtPmRl dik7Cj4gICAJZW51bSBpbnRlbF9kaXNwbGF5X3Bvd2VyX2RvbWFpbiBkb21haW47Cj4gQEAgLTYz NzgsNiArNjM3OSwxOSBAQCBzdGF0aWMgdm9pZCBpbnRlbF9jcnRjX2Rpc2FibGVfbm9hdG9taWMo c3RydWN0IGRybV9jcnRjICpjcnRjKQo+ICAgCWRldl9wcml2LT5kaXNwbGF5LmNydGNfZGlzYWJs ZShjcnRjKTsKPiAgIAlpbnRlbF9jcnRjLT5hY3RpdmUgPSBmYWxzZTsKPiAgIAlpbnRlbF9mYmNf ZGlzYWJsZShpbnRlbF9jcnRjKTsKPiArCj4gKwlEUk1fREVCVUdfS01TKCJbQ1JUQzolZF0gaHcg c3RhdGUgYWRqdXN0ZWQsIHdhcyBlbmFibGVkLCBub3cgZGlzYWJsZWRcbiIsCj4gKwkJICAgICAg Y3J0Yy0+YmFzZS5pZCk7Cj4gKwo+ICsJV0FSTl9PTihkcm1fYXRvbWljX3NldF9tb2RlX2Zvcl9j cnRjKGNydGMtPnN0YXRlLCBOVUxMKSA8IDApOwo+ICsJY3J0Yy0+c3RhdGUtPmFjdGl2ZSA9IGZh bHNlOwo+ICsJY3J0Yy0+ZW5hYmxlZCA9IGZhbHNlOwo+ICsJY3J0Yy0+c3RhdGUtPmNvbm5lY3Rv cl9tYXNrID0gMDsKPiArCWNydGMtPnN0YXRlLT5lbmNvZGVyX21hc2sgPSAwOwo+ICsKPiArCWZv cl9lYWNoX2VuY29kZXJfb25fY3J0YyhjcnRjLT5kZXYsIGNydGMsIGVuY29kZXIpCj4gKwkJZW5j b2Rlci0+YmFzZS5jcnRjID0gTlVMTDsKPiArCj4gICAJaW50ZWxfdXBkYXRlX3dhdGVybWFya3Mo Y3J0Yyk7Cj4gICAJaW50ZWxfZGlzYWJsZV9zaGFyZWRfZHBsbChpbnRlbF9jcnRjKTsKPgo+IEBA IC0xNTUyNiwzOCArMTU1NDAsOSBAQCBzdGF0aWMgdm9pZCBpbnRlbF9zYW5pdGl6ZV9jcnRjKHN0 cnVjdCBpbnRlbF9jcnRjICpjcnRjKQo+Cj4gICAJLyogQWRqdXN0IHRoZSBzdGF0ZSBvZiB0aGUg b3V0cHV0IHBpcGUgYWNjb3JkaW5nIHRvIHdoZXRoZXIgd2UKPiAgIAkgKiBoYXZlIGFjdGl2ZSBj b25uZWN0b3JzL2VuY29kZXJzLiAqLwo+IC0JaWYgKCFpbnRlbF9jcnRjX2hhc19lbmNvZGVycyhj cnRjKSkKPiArCWlmIChjcnRjLT5hY3RpdmUgJiYgIWludGVsX2NydGNfaGFzX2VuY29kZXJzKGNy dGMpKQo+ICAgCQlpbnRlbF9jcnRjX2Rpc2FibGVfbm9hdG9taWMoJmNydGMtPmJhc2UpOwo+Cj4g LQlpZiAoY3J0Yy0+YWN0aXZlICE9IGNydGMtPmJhc2Uuc3RhdGUtPmFjdGl2ZSkgewo+IC0JCXN0 cnVjdCBpbnRlbF9lbmNvZGVyICplbmNvZGVyOwo+IC0KPiAtCQkvKiBUaGlzIGNhbiBoYXBwZW4g ZWl0aGVyIGR1ZSB0byBidWdzIGluIHRoZSBnZXRfaHdfc3RhdGUKPiAtCQkgKiBmdW5jdGlvbnMg b3IgYmVjYXVzZSBvZiBjYWxscyB0byBpbnRlbF9jcnRjX2Rpc2FibGVfbm9hdG9taWMsCj4gLQkJ ICogb3IgYmVjYXVzZSB0aGUgcGlwZSBpcyBmb3JjZS1lbmFibGVkIGR1ZSB0byB0aGUKPiAtCQkg KiBwaXBlIEEgcXVpcmsuICovCj4gLQkJRFJNX0RFQlVHX0tNUygiW0NSVEM6JWRdIGh3IHN0YXRl IGFkanVzdGVkLCB3YXMgJXMsIG5vdyAlc1xuIiwKPiAtCQkJICAgICAgY3J0Yy0+YmFzZS5iYXNl LmlkLAo+IC0JCQkgICAgICBjcnRjLT5iYXNlLnN0YXRlLT5lbmFibGUgPyAiZW5hYmxlZCIgOiAi ZGlzYWJsZWQiLAo+IC0JCQkgICAgICBjcnRjLT5hY3RpdmUgPyAiZW5hYmxlZCIgOiAiZGlzYWJs ZWQiKTsKPiAtCj4gLQkJV0FSTl9PTihkcm1fYXRvbWljX3NldF9tb2RlX2Zvcl9jcnRjKGNydGMt PmJhc2Uuc3RhdGUsIE5VTEwpIDwgMCk7Cj4gLQkJY3J0Yy0+YmFzZS5zdGF0ZS0+YWN0aXZlID0g Y3J0Yy0+YWN0aXZlOwo+IC0JCWNydGMtPmJhc2UuZW5hYmxlZCA9IGNydGMtPmFjdGl2ZTsKPiAt CQljcnRjLT5iYXNlLnN0YXRlLT5jb25uZWN0b3JfbWFzayA9IDA7Cj4gLQkJY3J0Yy0+YmFzZS5z dGF0ZS0+ZW5jb2Rlcl9tYXNrID0gMDsKPiAtCj4gLQkJLyogQmVjYXVzZSB3ZSBvbmx5IGVzdGFi bGlzaCB0aGUgY29ubmVjdG9yIC0+IGVuY29kZXIgLT4KPiAtCQkgKiBjcnRjIGxpbmtzIGlmIHNv bWV0aGluZyBpcyBhY3RpdmUsIHRoaXMgbWVhbnMgdGhlCj4gLQkJICogY3J0YyBpcyBub3cgZGVh Y3RpdmF0ZWQuIEJyZWFrIHRoZSBsaW5rcy4gY29ubmVjdG9yCj4gLQkJICogLT4gZW5jb2RlciBs aW5rcyBhcmUgb25seSBlc3RhYmxpc2ggd2hlbiB0aGluZ3MgYXJlCj4gLQkJICogIGFjdHVhbGx5 IHVwLCBoZW5jZSBubyBuZWVkIHRvIGJyZWFrIHRoZW0uICovCj4gLQkJV0FSTl9PTihjcnRjLT5h Y3RpdmUpOwo+IC0KPiAtCQlmb3JfZWFjaF9lbmNvZGVyX29uX2NydGMoZGV2LCAmY3J0Yy0+YmFz ZSwgZW5jb2RlcikKPiAtCQkJZW5jb2Rlci0+YmFzZS5jcnRjID0gTlVMTDsKPiAtCX0KPiAtCj4g ICAJaWYgKGNydGMtPmFjdGl2ZSB8fCBIQVNfR01DSF9ESVNQTEFZKGRldikpIHsKPiAgIAkJLyoK PiAgIAkJICogV2Ugc3RhcnQgb3V0IHdpdGggdW5kZXJydW4gcmVwb3J0aW5nIGRpc2FibGVkIHRv IGF2b2lkIHJhY2VzLgo+Cj4KX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0 b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50 ZWwtZ2Z4Cg==