From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= Subject: Re: [PATCH 2/3] drm/i915: Use atomic helpers for suspend. Date: Tue, 9 Feb 2016 15:37:47 +0200 Message-ID: <20160209133747.GN23290@intel.com> References: <20160203163408.GF23290@intel.com> <1455022343-15222-1-git-send-email-maarten.lankhorst@linux.intel.com> <1455022343-15222-2-git-send-email-maarten.lankhorst@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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 16FD46E138 for ; Tue, 9 Feb 2016 05:37:50 -0800 (PST) Content-Disposition: inline In-Reply-To: <1455022343-15222-2-git-send-email-maarten.lankhorst@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 Cc: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org T24gVHVlLCBGZWIgMDksIDIwMTYgYXQgMDE6NTI6MjJQTSArMDEwMCwgTWFhcnRlbiBMYW5raG9y c3Qgd3JvdGU6Cj4gSW5zdGVhZCBvZiBkdXBsaWNhdGluZyB0aGUgZnVuY3Rpb25hbGl0eSBub3cg dGhhdCB3ZSBubyBsb25nZXIgbmVlZAo+IHRvIHByZXNlcnZlIGRwbGwgc3RhdGUgd2UgY2FuIG1v dmUgdG8gdXNpbmcgdGhlIHVwc3RyZWFtIHN1c3BlbmQgaGVscGVyLgo+IAo+IFNpZ25lZC1vZmYt Ynk6IE1hYXJ0ZW4gTGFua2hvcnN0IDxtYWFydGVuLmxhbmtob3JzdEBsaW51eC5pbnRlbC5jb20+ Cj4gLS0tCj4gIGRyaXZlcnMvZ3B1L2RybS9kcm1fYXRvbWljX2hlbHBlci5jICB8ICAgMyArCj4g IGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmMgICAgICB8ICAgOCAtLS0KPiAgZHJpdmVy cy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaCAgICAgIHwgICAxICsKPiAgZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfZGlzcGxheS5jIHwgMTE3ICsrKysrKysrKysrKy0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tCj4gIDQgZmlsZXMgY2hhbmdlZCwgNDIgaW5zZXJ0aW9ucygrKSwgODcgZGVsZXRpb25z KC0pCj4gCj4gZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9kcm1fYXRvbWljX2hlbHBlci5j IGIvZHJpdmVycy9ncHUvZHJtL2RybV9hdG9taWNfaGVscGVyLmMKPiBpbmRleCAyYjQzMGIwNWYz NWQuLmEyZDNiMDk0ZjI3YyAxMDA2NDQKPiAtLS0gYS9kcml2ZXJzL2dwdS9kcm0vZHJtX2F0b21p Y19oZWxwZXIuYwo+ICsrKyBiL2RyaXZlcnMvZ3B1L2RybS9kcm1fYXRvbWljX2hlbHBlci5jCj4g QEAgLTIxMDIsNiArMjEwMiw5IEBAIGludCBkcm1fYXRvbWljX2hlbHBlcl9yZXN1bWUoc3RydWN0 IGRybV9kZXZpY2UgKmRldiwKPiAgCWVyciA9IGRybV9hdG9taWNfY29tbWl0KHN0YXRlKTsKPiAg CWRybV9tb2Rlc2V0X3VubG9ja19hbGwoZGV2KTsKPiAgCj4gKwlpZiAoZXJyKQo+ICsJCWRybV9h dG9taWNfc3RhdGVfZnJlZShzdGF0ZSk7Cj4gKwo+ICAJcmV0dXJuIGVycjsKPiAgfQo+ICBFWFBP UlRfU1lNQk9MKGRybV9hdG9taWNfaGVscGVyX3Jlc3VtZSk7Cj4gZGlmZiAtLWdpdCBhL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Ry di5jCj4gaW5kZXggMTFkODQxNGVkYmJlLi5mYzliNTUyYmZjZDEgMTAwNjQ0Cj4gLS0tIGEvZHJp dmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuYwo+ICsrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2k5MTVfZHJ2LmMKPiBAQCAtNjAwLDEzICs2MDAsNyBAQCBzdGF0aWMgaW50IGk5MTVfZHJtX3N1 c3BlbmQoc3RydWN0IGRybV9kZXZpY2UgKmRldikKPiAgCj4gIAlpbnRlbF9zdXNwZW5kX2d0X3Bv d2Vyc2F2ZShkZXYpOwo+ICAKPiAtCS8qCj4gLQkgKiBEaXNhYmxlIENSVENzIGRpcmVjdGx5IHNp bmNlIHdlIHdhbnQgdG8gcHJlc2VydmUgc3cgc3RhdGUKPiAtCSAqIGZvciBfdGhhdy4gQWxzbywg cG93ZXIgZ2F0ZSB0aGUgQ1JUQyBwb3dlciB3ZWxscy4KPiAtCSAqLwo+IC0JZHJtX21vZGVzZXRf bG9ja19hbGwoZGV2KTsKPiAgCWludGVsX2Rpc3BsYXlfc3VzcGVuZChkZXYpOwo+IC0JZHJtX21v ZGVzZXRfdW5sb2NrX2FsbChkZXYpOwo+ICAKPiAgCWludGVsX2RwX21zdF9zdXNwZW5kKGRldik7 Cj4gIAo+IEBAIC03NjEsOSArNzU1LDcgQEAgc3RhdGljIGludCBpOTE1X2RybV9yZXN1bWUoc3Ry dWN0IGRybV9kZXZpY2UgKmRldikKPiAgCQlkZXZfcHJpdi0+ZGlzcGxheS5ocGRfaXJxX3NldHVw KGRldik7Cj4gIAlzcGluX3VubG9ja19pcnEoJmRldl9wcml2LT5pcnFfbG9jayk7Cj4gIAo+IC0J ZHJtX21vZGVzZXRfbG9ja19hbGwoZGV2KTsKPiAgCWludGVsX2Rpc3BsYXlfcmVzdW1lKGRldik7 Cj4gLQlkcm1fbW9kZXNldF91bmxvY2tfYWxsKGRldik7Cj4gIAo+ICAJaW50ZWxfZHBfbXN0X3Jl c3VtZShkZXYpOwo+ICAKPiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9k cnYuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKPiBpbmRleCA4MjE2NjY1NDA1 ZWIuLmVmMjg5NTE0Yjk3ZSAxMDA2NDQKPiAtLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1 X2Rydi5oCj4gKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaAo+IEBAIC0xODQ4 LDYgKzE4NDgsNyBAQCBzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSB7Cj4gIAo+ICAJZW51bSBtb2Rl c2V0X3Jlc3RvcmUgbW9kZXNldF9yZXN0b3JlOwo+ICAJc3RydWN0IG11dGV4IG1vZGVzZXRfcmVz dG9yZV9sb2NrOwo+ICsJc3RydWN0IGRybV9hdG9taWNfc3RhdGUgKm1vZGVzZXRfcmVzdG9yZV9z dGF0ZTsKPiAgCj4gIAlzdHJ1Y3QgbGlzdF9oZWFkIHZtX2xpc3Q7IC8qIEdsb2JhbCBsaXN0IG9m IGFsbCBhZGRyZXNzIHNwYWNlcyAqLwo+ICAJc3RydWN0IGk5MTVfZ3R0IGd0dDsgLyogVk0gcmVw cmVzZW50aW5nIHRoZSBnbG9iYWwgYWRkcmVzcyBzcGFjZSAqLwo+IGRpZmYgLS1naXQgYS9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF9kaXNwbGF5LmMKPiBpbmRleCBlNDk2YzEzMDM2NGQuLjRjOTFmZDFjNTIyMiAxMDA2NDQK PiAtLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKPiArKysgYi9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKPiBAQCAtNjM5Myw1OCArNjM5MywxOSBA QCBzdGF0aWMgdm9pZCBpbnRlbF9jcnRjX2Rpc2FibGVfbm9hdG9taWMoc3RydWN0IGRybV9jcnRj ICpjcnRjKQo+ICAgKi8KPiAgaW50IGludGVsX2Rpc3BsYXlfc3VzcGVuZChzdHJ1Y3QgZHJtX2Rl dmljZSAqZGV2KQo+ICB7Cj4gLQlzdHJ1Y3QgZHJtX21vZGVfY29uZmlnICpjb25maWcgPSAmZGV2 LT5tb2RlX2NvbmZpZzsKPiAtCXN0cnVjdCBkcm1fbW9kZXNldF9hY3F1aXJlX2N0eCAqY3R4ID0g Y29uZmlnLT5hY3F1aXJlX2N0eDsKPiAtCXN0cnVjdCBkcm1fYXRvbWljX3N0YXRlICpzdGF0ZTsK PiAtCXN0cnVjdCBkcm1fY3J0YyAqY3J0YzsKPiAtCXVuc2lnbmVkIGNydGNfbWFzayA9IDA7Cj4g LQlpbnQgcmV0ID0gMDsKPiAtCj4gLQlpZiAoV0FSTl9PTighY3R4KSkKPiAtCQlyZXR1cm4gMDsK PiAtCj4gLQlsb2NrZGVwX2Fzc2VydF9oZWxkKCZjdHgtPnd3X2N0eCk7Cj4gLQlzdGF0ZSA9IGRy bV9hdG9taWNfc3RhdGVfYWxsb2MoZGV2KTsKPiAtCWlmIChXQVJOX09OKCFzdGF0ZSkpCj4gLQkJ cmV0dXJuIC1FTk9NRU07Cj4gLQo+IC0Jc3RhdGUtPmFjcXVpcmVfY3R4ID0gY3R4Owo+IC0Jc3Rh dGUtPmFsbG93X21vZGVzZXQgPSB0cnVlOwo+IC0KPiAtCWZvcl9lYWNoX2NydGMoZGV2LCBjcnRj KSB7Cj4gLQkJc3RydWN0IGRybV9jcnRjX3N0YXRlICpjcnRjX3N0YXRlID0KPiAtCQkJZHJtX2F0 b21pY19nZXRfY3J0Y19zdGF0ZShzdGF0ZSwgY3J0Yyk7Cj4gLQo+IC0JCXJldCA9IFBUUl9FUlJf T1JfWkVSTyhjcnRjX3N0YXRlKTsKPiAtCQlpZiAocmV0KQo+IC0JCQlnb3RvIGZyZWU7Cj4gLQo+ IC0JCWlmICghY3J0Y19zdGF0ZS0+YWN0aXZlKQo+IC0JCQljb250aW51ZTsKPiAtCj4gLQkJY3J0 Y19zdGF0ZS0+YWN0aXZlID0gZmFsc2U7Cj4gLQkJY3J0Y19tYXNrIHw9IDEgPDwgZHJtX2NydGNf aW5kZXgoY3J0Yyk7Cj4gLQl9Cj4gLQo+IC0JaWYgKGNydGNfbWFzaykgewo+IC0JCXJldCA9IGRy bV9hdG9taWNfY29tbWl0KHN0YXRlKTsKPiAtCj4gLQkJaWYgKCFyZXQpIHsKPiAtCQkJZm9yX2Vh Y2hfY3J0YyhkZXYsIGNydGMpCj4gLQkJCQlpZiAoY3J0Y19tYXNrICYgKDEgPDwgZHJtX2NydGNf aW5kZXgoY3J0YykpKQo+IC0JCQkJCWNydGMtPnN0YXRlLT5hY3RpdmUgPSB0cnVlOwo+IC0KPiAt CQkJcmV0dXJuIHJldDsKPiAtCQl9Cj4gLQl9Cj4gKwlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAq ZGV2X3ByaXYgPSB0b19pOTE1KGRldik7Cj4gKwlpbnQgcmV0Owo+ICAKPiAtZnJlZToKPiAtCWlm IChyZXQpCj4gKwlkZXZfcHJpdi0+bW9kZXNldF9yZXN0b3JlX3N0YXRlID0gZHJtX2F0b21pY19o ZWxwZXJfc3VzcGVuZChkZXYpOwo+ICsJcmV0ID0gUFRSX0VSUl9PUl9aRVJPKGRldl9wcml2LT5t b2Rlc2V0X3Jlc3RvcmVfc3RhdGUpOwo+ICsJaWYgKHJldCkgewo+ICAJCURSTV9FUlJPUigiU3Vz cGVuZGluZyBjcnRjJ3MgZmFpbGVkIHdpdGggJWlcbiIsIHJldCk7Cj4gLQlkcm1fYXRvbWljX3N0 YXRlX2ZyZWUoc3RhdGUpOwo+ICsJCWRldl9wcml2LT5tb2Rlc2V0X3Jlc3RvcmVfc3RhdGUgPSBO VUxMOwo+ICsJfQoKSSB3b3VsZCB1c2UgYSBsb2NhbCBzdGF0ZSBwb2ludGVyIGFuZCBvbmx5IGFz c2lnbiBpdCB0bwptb2Rlc2V0X3Jlc3RvcmVfc3RhdGUgb25jZSB3ZSBrbm93IGl0J3MgZ29vZC4K Cj4gIAlyZXR1cm4gcmV0Owo+ICB9Cj4gIAo+ICsKClNwdXJpb3VzIG5ld2xpbmUuCgo+ICB2b2lk IGludGVsX2VuY29kZXJfZGVzdHJveShzdHJ1Y3QgZHJtX2VuY29kZXIgKmVuY29kZXIpCj4gIHsK PiAgCXN0cnVjdCBpbnRlbF9lbmNvZGVyICppbnRlbF9lbmNvZGVyID0gdG9faW50ZWxfZW5jb2Rl cihlbmNvZGVyKTsKPiBAQCAtMTU5MDksNTEgKzE1ODcwLDQ5IEBAIGludGVsX21vZGVzZXRfc2V0 dXBfaHdfc3RhdGUoc3RydWN0IGRybV9kZXZpY2UgKmRldikKPiAgCj4gIHZvaWQgaW50ZWxfZGlz cGxheV9yZXN1bWUoc3RydWN0IGRybV9kZXZpY2UgKmRldikKPiAgewo+IC0Jc3RydWN0IGRybV9h dG9taWNfc3RhdGUgKnN0YXRlID0gZHJtX2F0b21pY19zdGF0ZV9hbGxvYyhkZXYpOwo+IC0Jc3Ry dWN0IGludGVsX2Nvbm5lY3RvciAqY29ubjsKPiAtCXN0cnVjdCBpbnRlbF9wbGFuZSAqcGxhbmU7 Cj4gKwlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSB0b19pOTE1KGRldik7Cj4g KwlzdHJ1Y3QgZHJtX2F0b21pY19zdGF0ZSAqc3RhdGUgPSBkZXZfcHJpdi0+bW9kZXNldF9yZXN0 b3JlX3N0YXRlOwo+ICsJc3RydWN0IGRybV9tb2Rlc2V0X2FjcXVpcmVfY3R4IGN0eDsKPiAgCXN0 cnVjdCBkcm1fY3J0YyAqY3J0YzsKPiAtCWludCByZXQ7Cj4gKwlzdHJ1Y3QgZHJtX2NydGNfc3Rh dGUgKmNydGNfc3RhdGU7Cj4gKwlpbnQgcmV0LCBpOwo+ICsKPiArCWludGVsX21vZGVzZXRfc2V0 dXBfaHdfc3RhdGUoZGV2KTsKCklzbid0IHNvbWV0aGluZyBpbiB0aGVyZSBnb2luZyB0byBzY3Jl YW0gYWJvdXQgbG9ja2luZz8KCj4gKwlpOTE1X3JlZGlzYWJsZV92Z2EoZGV2KTsKPiArCWRldl9w cml2LT5tb2Rlc2V0X3Jlc3RvcmVfc3RhdGUgPSBOVUxMOwo+ICAKPiAgCWlmICghc3RhdGUpCj4g IAkJcmV0dXJuOwo+ICAKPiAtCXN0YXRlLT5hY3F1aXJlX2N0eCA9IGRldi0+bW9kZV9jb25maWcu YWNxdWlyZV9jdHg7Cj4gLQo+IC0JZm9yX2VhY2hfY3J0YyhkZXYsIGNydGMpIHsKPiAtCQlzdHJ1 Y3QgZHJtX2NydGNfc3RhdGUgKmNydGNfc3RhdGUgPQo+IC0JCQlkcm1fYXRvbWljX2dldF9jcnRj X3N0YXRlKHN0YXRlLCBjcnRjKTsKPiAtCj4gLQkJcmV0ID0gUFRSX0VSUl9PUl9aRVJPKGNydGNf c3RhdGUpOwo+IC0JCWlmIChyZXQpCj4gLQkJCWdvdG8gZXJyOwo+ICsJZHJtX21vZGVzZXRfYWNx dWlyZV9pbml0KCZjdHgsIDApOwo+ICsJc3RhdGUtPmFjcXVpcmVfY3R4ID0gJmN0eDsKPiAgCj4g LQkJLyogZm9yY2UgYSByZXN0b3JlICovCj4gKwlmb3JfZWFjaF9jcnRjX2luX3N0YXRlKHN0YXRl LCBjcnRjLCBjcnRjX3N0YXRlLCBpKSB7Cj4gKwkJLyoKPiArCQkgKiBGb3JjZSByZWNhbGN1bGF0 aW9uIGV2ZW4gaWYgd2UgcmVzdG9yZQo+ICsJCSAqIGN1cnJlbnQgc3RhdGUuIFdpdGggZmFzdCBt b2Rlc2V0IHRoaXMgbWF5IG5vdCByZXN1bHQKPiArCQkgKiBpbiBhIG1vZGVzZXQgd2hlbiB0aGUg c3RhdGUgaXMgY29tcGF0aWJsZS4KPiArCQkgKi8KPiAgCQljcnRjX3N0YXRlLT5tb2RlX2NoYW5n ZWQgPSB0cnVlOwo+ICAJfQoKSG1tLiBXaHkgZG8gd2UgbmVlZCB0byBzZXQgdGhhdCBleGFjdGx5 PyBJZiB0aGUgY3VycmVudCBzdGF0ZSBkb2Vzbid0Cm1hdGNoIHRoZSAidG8gYmUgcmVzdG9yZWQi IHN0YXRlLCBzaG91bGRuJ3Qgc29tZXRoaW5nIHNvbWV3aGVyZSBmaWd1cmUKb3V0IHRoYXQgd2Ug cmVhbGx5IG5lZWQgYSBtb2Rlc2V0PwoKPiAgCj4gLQlmb3JfZWFjaF9pbnRlbF9wbGFuZShkZXYs IHBsYW5lKSB7Cj4gLQkJcmV0ID0gUFRSX0VSUl9PUl9aRVJPKGRybV9hdG9taWNfZ2V0X3BsYW5l X3N0YXRlKHN0YXRlLCAmcGxhbmUtPmJhc2UpKTsKPiAtCQlpZiAocmV0KQo+IC0JCQlnb3RvIGVy cjsKPiAtCX0KPiArcmV0cnk6Cj4gKwlyZXQgPSBkcm1fbW9kZXNldF9sb2NrX2FsbF9jdHgoZGV2 LCAmY3R4KTsKPiArCWlmIChyZXQgPT0gMCkKPiArCQlyZXQgPSBkcm1fYXRvbWljX2NvbW1pdChz dGF0ZSk7Cj4gIAo+IC0JZm9yX2VhY2hfaW50ZWxfY29ubmVjdG9yKGRldiwgY29ubikgewo+IC0J CXJldCA9IFBUUl9FUlJfT1JfWkVSTyhkcm1fYXRvbWljX2dldF9jb25uZWN0b3Jfc3RhdGUoc3Rh dGUsICZjb25uLT5iYXNlKSk7Cj4gLQkJaWYgKHJldCkKPiAtCQkJZ290byBlcnI7Cj4gKwlpZiAo cmV0ID09IC1FREVBRExLKSB7Cj4gKwkJZHJtX21vZGVzZXRfYmFja29mZigmY3R4KTsKPiArCQln b3RvIHJldHJ5Owo+ICAJfQo+ICAKPiAtCWludGVsX21vZGVzZXRfc2V0dXBfaHdfc3RhdGUoZGV2 KTsKPiAtCj4gLQlpOTE1X3JlZGlzYWJsZV92Z2EoZGV2KTsKPiAtCXJldCA9IGRybV9hdG9taWNf Y29tbWl0KHN0YXRlKTsKPiAtCWlmICghcmV0KQo+IC0JCXJldHVybjsKPiArCWRybV9tb2Rlc2V0 X2Ryb3BfbG9ja3MoJmN0eCk7Cj4gKwlkcm1fbW9kZXNldF9hY3F1aXJlX2ZpbmkoJmN0eCk7Cj4g IAo+IC1lcnI6Cj4gLQlEUk1fRVJST1IoIlJlc3RvcmluZyBvbGQgc3RhdGUgZmFpbGVkIHdpdGgg JWlcbiIsIHJldCk7Cj4gLQlkcm1fYXRvbWljX3N0YXRlX2ZyZWUoc3RhdGUpOwo+ICsJaWYgKHJl dCkgewo+ICsJCURSTV9FUlJPUigiUmVzdG9yaW5nIG9sZCBzdGF0ZSBmYWlsZWQgd2l0aCAlaVxu IiwgcmV0KTsKPiArCQlkcm1fYXRvbWljX3N0YXRlX2ZyZWUoc3RhdGUpOwo+ICsJfQo+ICB9Cj4g IAo+ICB2b2lkIGludGVsX21vZGVzZXRfZ2VtX2luaXQoc3RydWN0IGRybV9kZXZpY2UgKmRldikK PiAtLSAKPiAyLjEuMAoKLS0gClZpbGxlIFN5cmrDpGzDpApJbnRlbCBPVEMKX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlz dApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0 b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==