From mboxrd@z Thu Jan 1 00:00:00 1970 From: Maarten Lankhorst Subject: Re: [PATCH 2/4] drm/i915: get rid of intel_plane_restore in intel_crtc_page_flip Date: Fri, 12 Jun 2015 15:17:04 +0200 Message-ID: <557ADBD0.7060605@linux.intel.com> References: <1434100542-15301-1-git-send-email-maarten.lankhorst@linux.intel.com> <1434100542-15301-3-git-send-email-maarten.lankhorst@linux.intel.com> <20150612101600.GT5176@intel.com> <557AB509.9080202@linux.intel.com> <20150612112754.GY5176@intel.com> <20150612114314.GZ5176@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 D80B16E263 for ; Fri, 12 Jun 2015 06:17:05 -0700 (PDT) In-Reply-To: <20150612114314.GZ5176@intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: =?windows-1252?Q?Ville_Syrj=E4l=E4?= Cc: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org T3AgMTItMDYtMTUgb20gMTM6NDMgc2NocmVlZiBWaWxsZSBTeXJqw6Rsw6Q6Cj4gT24gRnJpLCBK dW4gMTIsIDIwMTUgYXQgMDI6Mjc6NTRQTSArMDMwMCwgVmlsbGUgU3lyasOkbMOkIHdyb3RlOgo+ PiBPbiBGcmksIEp1biAxMiwgMjAxNSBhdCAxMjozMTozN1BNICswMjAwLCBNYWFydGVuIExhbmto b3JzdCB3cm90ZToKPj4+IE9wIDEyLTA2LTE1IG9tIDEyOjE2IHNjaHJlZWYgVmlsbGUgU3lyasOk bMOkOgo+Pj4+IE9uIEZyaSwgSnVuIDEyLCAyMDE1IGF0IDExOjE1OjQwQU0gKzAyMDAsIE1hYXJ0 ZW4gTGFua2hvcnN0IHdyb3RlOgo+Pj4+PiBVc2UgYSBmdWxsIGF0b21pYyBjYWxsIGluc3RlYWQu IGludGVsX2NydGNfcGFnZV9mbGlwIHdpbGwgc3RpbGwKPj4+Pj4gaGF2ZSB0byBsaXZlIHVudGls IGFzeW5jIHVwZGF0ZXMgYXJlIGFsbG93ZWQuCj4+Pj4+Cj4+Pj4+IFRoaXMgZG9lc24ndCBzZWVt IHRvIGJlIGEgcmVncmVzc2lvbiBmcm9tIHRoZSBjb252ZXJ0IHRvIGF0b21pYywKPj4+Pj4gcGFy dCAzIHBhdGNoLiBEdXJpbmcgR1BVIHJlc2V0IGl0IGZpeGVzIHRoZSBmb2xsb3dpbmcgd2Fybmlu ZzoKPj4+Pj4KPj4+Pj4gIC0tLS0tLS0tLS0tLVsgY3V0IGhlcmUgXS0tLS0tLS0tLS0tLQo+Pj4+ PiBXQVJOSU5HOiBDUFU6IDAgUElEOiA3NTIgYXQgZHJpdmVycy9ncHUvZHJtL2RybV9jcnRjLmM6 NTMzNyBkcm1fbW9kZV9wYWdlX2ZsaXBfaW9jdGwrMHgyN2IvMHgzNjAoKQo+Pj4+PiBNb2R1bGVz IGxpbmtlZCBpbjogaTkxNQo+Pj4+PiBDUFU6IDAgUElEOiA3NTIgQ29tbTogWG9yZyBOb3QgdGFp bnRlZCA0LjEuMC1yYzctcGF0c2VyKyAjNDA5MAo+Pj4+PiBIYXJkd2FyZSBuYW1lOiBOVUM1aTdS WUIsIEJJT1MgUllCRFdpMzUuODZBLjAyNDYuMjAxNS4wMzA5LjEzNTUgMDMvMDkvMjAxNQo+Pj4+ PiAgZmZmZmZmZmY4MWM5MDg2NiBmZmZmODgwMGQ4N2MzY2E4IGZmZmZmZmZmODE3ZjdkODcgMDAw MDAwMDA4MDAwMDAwMQo+Pj4+PiAgMDAwMDAwMDAwMDAwMDAwMCBmZmZmODgwMGQ4N2MzY2U4IGZm ZmZmZmZmODEwODQ5NTUgZmZmZjg4MDAwMDAwMDAwMAo+Pj4+PiAgZmZmZjg4MDBkODdjM2RjMCBm ZmZmODgwMGQ5M2QxMjA4IDAwMDAwMDAwMDAwMDAwMDAgZmZmZjg4MDBiN2QxZjNlMAo+Pj4+PiBD YWxsIFRyYWNlOgo+Pj4+PiAgWzxmZmZmZmZmZjgxN2Y3ZDg3Pl0gZHVtcF9zdGFjaysweDRmLzB4 N2IKPj4+Pj4gIFs8ZmZmZmZmZmY4MTA4NDk1NT5dIHdhcm5fc2xvd3BhdGhfY29tbW9uKzB4ODUv MHhjMAo+Pj4+PiAgWzxmZmZmZmZmZjgxMDg0YTM1Pl0gd2Fybl9zbG93cGF0aF9udWxsKzB4MTUv MHgyMAo+Pj4+PiAgWzxmZmZmZmZmZjgxNDZkZmZiPl0gZHJtX21vZGVfcGFnZV9mbGlwX2lvY3Rs KzB4MjdiLzB4MzYwCj4+Pj4+ICBbPGZmZmZmZmZmODE0NWNjYjA+XSBkcm1faW9jdGwrMHgxYTAv MHg2YTAKPj4+Pj4gIFs8ZmZmZmZmZmY4MTBiM2I0MT5dID8gZ2V0X3BhcmVudF9pcCsweDExLzB4 NTAKPj4+Pj4gIFs8ZmZmZmZmZmY4MTJlNTU0MD5dID8gYXZjX2hhc19wZXJtKzB4MjAvMHgyODAK Pj4+Pj4gIFs8ZmZmZmZmZmY4MTBiM2I0MT5dID8gZ2V0X3BhcmVudF9pcCsweDExLzB4NTAKPj4+ Pj4gIFs8ZmZmZmZmZmY4MTFlYTBmOD5dIGRvX3Zmc19pb2N0bCsweDJmOC8weDUzMAo+Pj4+PiAg WzxmZmZmZmZmZjgxMWY2MDAxPl0gPyBleHBhbmRfZmlsZXMrMHgyNjEvMHgyNzAKPj4+Pj4gIFs8 ZmZmZmZmZmY4MTJlN2MxNj5dID8gc2VsaW51eF9maWxlX2lvY3RsKzB4NTYvMHgxMDAKPj4+Pj4g IFs8ZmZmZmZmZmY4MTFlYTNiMT5dIFN5U19pb2N0bCsweDgxLzB4YTAKPj4+Pj4gIFs8ZmZmZmZm ZmY4MTgwMWI5Nz5dIHN5c3RlbV9jYWxsX2Zhc3RwYXRoKzB4MTIvMHg2Zgo+Pj4+PiAtLS1bIGVu ZCB0cmFjZSA5Y2U4MzQ1NjAwODViZDY0IF0tLS0KPj4+Pj4KPj4+Pj4gU2lnbmVkLW9mZi1ieTog TWFhcnRlbiBMYW5raG9yc3QgPG1hYXJ0ZW4ubGFua2hvcnN0QGxpbnV4LmludGVsLmNvbT4KPj4+ Pj4gLS0tCj4+Pj4+ICBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgfCAyOSAr KysrKysrKysrKysrKysrKysrKysrKysrKysrLQo+Pj4+PiAgMSBmaWxlIGNoYW5nZWQsIDI4IGlu c2VydGlvbnMoKyksIDEgZGVsZXRpb24oLSkKPj4+Pj4KPj4+Pj4gZGlmZiAtLWdpdCBhL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX2Rpc3BsYXkuYwo+Pj4+PiBpbmRleCA3YWJhZmZlZGE3Y2UuLmNkZjY1NDljOGU3NCAxMDA2 NDQKPj4+Pj4gLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCj4+Pj4+ ICsrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwo+Pj4+PiBAQCAtMTE2 MTgsOCArMTE2MTgsMzUgQEAgZnJlZV93b3JrOgo+Pj4+PiAgCWtmcmVlKHdvcmspOwo+Pj4+PiAg Cj4+Pj4+ICAJaWYgKHJldCA9PSAtRUlPKSB7Cj4+Pj4+ICsJCXN0cnVjdCBkcm1fYXRvbWljX3N0 YXRlICpzdGF0ZTsKPj4+Pj4gKwkJc3RydWN0IGRybV9wbGFuZV9zdGF0ZSAqcGxhbmVfc3RhdGU7 Cj4+Pj4+ICsKPj4+Pj4gIG91dF9oYW5nOgo+Pj4+PiAtCQlyZXQgPSBpbnRlbF9wbGFuZV9yZXN0 b3JlKHByaW1hcnkpOwo+Pj4+IFNvIHdoYXQgZXhhY3RseSBpcyB3cm9uZyB3aXRoIGludGVsX3Bs YW5lX3Jlc3RvcmUoKSAoaWUuCj4+Pj4gZHJtX3BsYW5lX2hlbHBlcl91cGRhdGUoKSk/IFNob3Vs ZG4ndCB5b3UgZml4IHRoYXQgaW5zdGVhZCBvZiBzcHJlYWRpbmcKPj4+PiB0aGUgdWdseW5lc3Mg aGVyZT8KPj4+Pgo+Pj4gaW50ZWxfcGxhbmVfcmVzdG9yZSB1c2VzIHRoZSB0cmFuc2l0aW9uYWwg aGVscGVycy4gVGhpcyBpcyBjdXJyZW50bHkgdXNlZCBmb3IKPj4+IHNldHRpbmcgY29sb3Iga2V5 LCBlbmFibGluZyBzcHJpdGUgcGxhbmVzIGFmdGVyIGEgbW9kZXNldCBhbmQgdGhpcyBmdW5jdGlv bi4KPj4+IC0gQ29sb3Iga2V5IHdpbGwgYmUgbWFkZSBhdG9taWMgYnkgbWFraW5nIGNrZXkgcGFy dCBvZiB0aGUgcGxhbmUgc3RhdGUuCj4+IFdlbGwgd2hhdCBmdW5jdGlvbiBkbyB5b3UgcGxhbiB0 byBjYWxsIHRoZXJlPyBUaGUgc2FtZSBzaG91bGQgd29yayBoZXJlCj4+IG5vPwo+IFRvIGVsYWJv cmF0ZSBhIGJpdCBtb3JlLiBNeSBtYWluIGdyaXBlIGhlcmUgaXMgYWxsIHRoaXMgYm9pbGVycGxh dGUgd2UKPiBuZWVkLiBJIGhvcGUgd2UncmUgcGxhbm5pbmcgdG8gYWJzdHJhY3QgdGhhdCBhd2F5 IGEgYml0IHNvIHdlIGRvbid0IGhhdmUKPiB0byBrZWVwIHJlcGVhdGluZyBpdCBldmVyeXdoZXJl LgoKRXZlbnR1YWxseSBjb2xvciBrZXkgc2hvdWxkIHByb2JhYmx5IGJlY29tZSBhIHByb3BlcnR5 LCBidXQgaG93IGRvZXMgdGhpcyBsb29rPwoKQWRkaW5nIGNvbG9yIGtleSB3aXRoIHRoaXMgZnVu Y3Rpb24gc2hvdWxkIGJlIGVhc3kuCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUv aW50ZWxfZGlzcGxheS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCmlu ZGV4IDdhYmFmZmVkYTdjZS4uY2RhODVlY2E3MTc0IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf ZGlzcGxheS5jCkBAIC0xMTQzMSw2ICsxMTQzMSw1MyBAQCB2b2lkIGludGVsX2NoZWNrX3BhZ2Vf ZmxpcChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCBpbnQgcGlwZSkKIAlzcGluX3VubG9jaygmZGV2 LT5ldmVudF9sb2NrKTsKIH0KIAorc3RhdGljIGludCBpbnRlbF91cGRhdGVfcGxhbmVfc3RhdGUo c3RydWN0IGRybV9wbGFuZSAqcGxhbmUsCisJCQkJICAgIHN0cnVjdCBkcm1fbW9kZXNldF9hY3F1 aXJlX2N0eCAqYWNxdWlyZV9jdHgsCisJCQkJICAgIGludCAoKnVwZGF0ZV9mbikoc3RydWN0IGRy bV9wbGFuZV9zdGF0ZSAqLCB2b2lkICpkYXRhKSwKKwkJCQkgICAgdm9pZCAqZGF0YSkKK3sKKwlz dHJ1Y3QgZHJtX2F0b21pY19zdGF0ZSAqc3RhdGU7CisJc3RydWN0IGRybV9wbGFuZV9zdGF0ZSAq cGxhbmVfc3RhdGU7CisJaW50IHJldDsKKworCXN0YXRlID0gZHJtX2F0b21pY19zdGF0ZV9hbGxv YyhwbGFuZS0+ZGV2KTsKKwlpZiAoIXN0YXRlKQorCQlyZXR1cm4gLUVOT01FTTsKKworCXN0YXRl LT5hY3F1aXJlX2N0eCA9IGFjcXVpcmVfY3R4OworCityZXRyeToKKwlwbGFuZV9zdGF0ZSA9IGRy bV9hdG9taWNfZ2V0X3BsYW5lX3N0YXRlKHN0YXRlLCBwbGFuZSk7CisJcmV0ID0gUFRSX0VSUl9P Ul9aRVJPKHBsYW5lX3N0YXRlKTsKKwlpZiAoIXJldCkKKwkJcmV0ID0gdXBkYXRlX2ZuKHBsYW5l X3N0YXRlLCBkYXRhKTsKKworCWlmICghcmV0KQorCQlyZXQgPSBkcm1fYXRvbWljX2NvbW1pdChz dGF0ZSk7CisKKwlpZiAocmV0ID09IC1FREVBRExLKSB7CisJCWRybV9tb2Rlc2V0X2JhY2tvZmYo c3RhdGUtPmFjcXVpcmVfY3R4KTsKKwkJZHJtX2F0b21pY19zdGF0ZV9jbGVhcihzdGF0ZSk7CisJ CWdvdG8gcmV0cnk7CisJfQorCisJaWYgKHJldCkKKwkJZHJtX2F0b21pY19zdGF0ZV9mcmVlKHN0 YXRlKTsKKworCXJldHVybiByZXQ7Cit9CisKK3N0YXRpYyBpbnQKK2ludGVsX2NydGNfcGFnZV9m bGlwX3VwZGF0ZV9mYihzdHJ1Y3QgZHJtX3BsYW5lX3N0YXRlICpwbGFuZV9zdGF0ZSwgdm9pZCAq ZGF0YSkKK3sKKwlkcm1fYXRvbWljX3NldF9mYl9mb3JfcGxhbmUocGxhbmVfc3RhdGUsIGRhdGEp OworCisJaWYgKFdBUk5fT04oIXBsYW5lX3N0YXRlLT5jcnRjKSkKKwkJcmV0dXJuIC1FSU5WQUw7 CisKKwlyZXR1cm4gMDsKK30KKwogc3RhdGljIGludCBpbnRlbF9jcnRjX3BhZ2VfZmxpcChzdHJ1 Y3QgZHJtX2NydGMgKmNydGMsCiAJCQkJc3RydWN0IGRybV9mcmFtZWJ1ZmZlciAqZmIsCiAJCQkJ c3RydWN0IGRybV9wZW5kaW5nX3ZibGFua19ldmVudCAqZXZlbnQsCkBAIC0xMTYxOSw3ICsxMTY2 Niw4IEBAIGZyZWVfd29yazoKIAogCWlmIChyZXQgPT0gLUVJTykgewogb3V0X2hhbmc6Ci0JCXJl dCA9IGludGVsX3BsYW5lX3Jlc3RvcmUocHJpbWFyeSk7CisJCXJldCA9IGludGVsX3VwZGF0ZV9w bGFuZV9zdGF0ZShwcmltYXJ5LCBkcm1fbW9kZXNldF9sZWdhY3lfYWNxdWlyZV9jdHgoY3J0Yyks IGludGVsX2NydGNfcGFnZV9mbGlwX3VwZGF0ZV9mYiwgZmIpOworCiAJCWlmIChyZXQgPT0gMCAm JiBldmVudCkgewogCQkJc3Bpbl9sb2NrX2lycSgmZGV2LT5ldmVudF9sb2NrKTsKIAkJCWRybV9z ZW5kX3ZibGFua19ldmVudChkZXYsIHBpcGUsIGV2ZW50KTsKCl9fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwt Z2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21h aWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==