From mboxrd@z Thu Jan 1 00:00:00 1970 From: Maarten Lankhorst Subject: [PATCH 03/11] drm/i915: Kill off intel_crtc->atomic.wait_vblank. Date: Thu, 22 Oct 2015 13:56:28 +0200 Message-ID: <1445514996-18733-4-git-send-email-maarten.lankhorst@linux.intel.com> References: <1445514996-18733-1-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 mblankhorst.nl (mblankhorst.nl [141.105.120.124]) by gabe.freedesktop.org (Postfix) with ESMTPS id 4B2176E38C for ; Thu, 22 Oct 2015 04:56:41 -0700 (PDT) In-Reply-To: <1445514996-18733-1-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: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org QnkgaGFuZGxpbmcgdGhpcyBhZnRlciB0aGUgYXRvbWljIGhlbHBlciB3YWl0cyBmb3IgdmJsYW5r cyB0aGVyZSB3aWxsCmJlIG9uZSBsZXNzIHdhaXQgZm9yIHZibGFuayBpbiB0aGUgYXRvbWljIHBh dGguCgpBbHNvIGdldCByaWQgb2YgdGhlIGRvdWJsZSB3YWl0X2Zvcl92Ymxhbmsgb24gYnJvYWR3 ZWxsLCBsb29rcyBsaWtlCml0J3MgYSBidWcgZG9pbmcgdGhlIHZibGFuayB3YWl0IHR3aWNlLgoK U2lnbmVkLW9mZi1ieTogTWFhcnRlbiBMYW5raG9yc3QgPG1hYXJ0ZW4ubGFua2hvcnN0QGxpbnV4 LmludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgfCAy OCArKystLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9kcnYuaCAgICAgfCAgMSAtCiAyIGZpbGVzIGNoYW5nZWQsIDMgaW5zZXJ0aW9ucygrKSwgMjYg ZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlz cGxheS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCmluZGV4IDA1MWEx ZTJiMWM1NS4uYjhlMWE1NDcxYmVkIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF9kaXNwbGF5LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5j CkBAIC00NjcyLDE0ICs0NjcyLDYgQEAgaW50ZWxfcG9zdF9lbmFibGVfcHJpbWFyeShzdHJ1Y3Qg ZHJtX2NydGMgKmNydGMpCiAJaW50IHBpcGUgPSBpbnRlbF9jcnRjLT5waXBlOwogCiAJLyoKLQkg KiBCRFcgc2lnbmFscyBmbGlwIGRvbmUgaW1tZWRpYXRlbHkgaWYgdGhlIHBsYW5lCi0JICogaXMg ZGlzYWJsZWQsIGV2ZW4gaWYgdGhlIHBsYW5lIGVuYWJsZSBpcyBhbHJlYWR5Ci0JICogYXJtZWQg dG8gb2NjdXIgYXQgdGhlIG5leHQgdmJsYW5rIDooCi0JICovCi0JaWYgKElTX0JST0FEV0VMTChk ZXYpKQotCQlpbnRlbF93YWl0X2Zvcl92YmxhbmsoZGV2LCBwaXBlKTsKLQotCS8qCiAJICogRklY TUUgSVBTIHNob3VsZCBiZSBmaW5lIGFzIGxvbmcgYXMgb25lIHBsYW5lIGlzCiAJICogZW5hYmxl ZCwgYnV0IGluIHByYWN0aWNlIGl0IHNlZW1zIHRvIGhhdmUgcHJvYmxlbXMKIAkgKiB3aGVuIGdv aW5nIGZyb20gcHJpbWFyeSBvbmx5IHRvIHNwcml0ZSBvbmx5IGFuZCB2aWNlCkBAIC00NzYwLDkg KzQ3NTIsNiBAQCBzdGF0aWMgdm9pZCBpbnRlbF9wb3N0X3BsYW5lX3VwZGF0ZShzdHJ1Y3QgaW50 ZWxfY3J0YyAqY3J0YykKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBkZXYt PmRldl9wcml2YXRlOwogCXN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lOwogCi0JaWYgKGF0b21pYy0+ d2FpdF92YmxhbmspCi0JCWludGVsX3dhaXRfZm9yX3ZibGFuayhkZXYsIGNydGMtPnBpcGUpOwot CiAJaW50ZWxfZnJvbnRidWZmZXJfZmxpcChkZXYsIGF0b21pYy0+ZmJfYml0cyk7CiAKIAlpZiAo YXRvbWljLT5kaXNhYmxlX2N4c3IpCkBAIC0xMTY2MSwxNSArMTE2NTAsMTIgQEAgaW50IGludGVs X3BsYW5lX2F0b21pY19jYWxjX2NoYW5nZXMoc3RydWN0IGRybV9jcnRjX3N0YXRlICpjcnRjX3N0 YXRlLAogCQlpZiAocGxhbmUtPnR5cGUgIT0gRFJNX1BMQU5FX1RZUEVfQ1VSU09SKSB7CiAJCQlp bnRlbF9jcnRjLT5hdG9taWMuZGlzYWJsZV9jeHNyID0gdHJ1ZTsKIAkJCS8qIHRvIHBvdGVudGlh bGx5IHJlLWVuYWJsZSBjeHNyICovCi0JCQlpbnRlbF9jcnRjLT5hdG9taWMud2FpdF92Ymxhbmsg PSB0cnVlOwogCQkJaW50ZWxfY3J0Yy0+YXRvbWljLnVwZGF0ZV93bV9wb3N0ID0gdHJ1ZTsKIAkJ fQogCX0gZWxzZSBpZiAodHVybl9vZmYpIHsKIAkJaW50ZWxfY3J0Yy0+YXRvbWljLnVwZGF0ZV93 bV9wb3N0ID0gdHJ1ZTsKIAkJLyogbXVzdCBkaXNhYmxlIGN4c3IgYXJvdW5kIHBsYW5lIGVuYWJs ZS9kaXNhYmxlICovCiAJCWlmIChwbGFuZS0+dHlwZSAhPSBEUk1fUExBTkVfVFlQRV9DVVJTT1Ip IHsKLQkJCWlmIChpc19jcnRjX2VuYWJsZWQpCi0JCQkJaW50ZWxfY3J0Yy0+YXRvbWljLndhaXRf dmJsYW5rID0gdHJ1ZTsKIAkJCWludGVsX2NydGMtPmF0b21pYy5kaXNhYmxlX2N4c3IgPSB0cnVl OwogCQl9CiAJfSBlbHNlIGlmIChpbnRlbF93bV9uZWVkX3VwZGF0ZShwbGFuZSwgcGxhbmVfc3Rh dGUpKSB7CkBAIC0xMTcxNiwyMSArMTE3MDIsMTIgQEAgaW50IGludGVsX3BsYW5lX2F0b21pY19j YWxjX2NoYW5nZXMoc3RydWN0IGRybV9jcnRjX3N0YXRlICpjcnRjX3N0YXRlLAogCQkgICAgcGxh bmVfc3RhdGUtPnJvdGF0aW9uICE9IEJJVChEUk1fUk9UQVRFXzApKQogCQkJaW50ZWxfY3J0Yy0+ YXRvbWljLmRpc2FibGVfZmJjID0gdHJ1ZTsKIAotCQkvKgotCQkgKiBCRFcgc2lnbmFscyBmbGlw IGRvbmUgaW1tZWRpYXRlbHkgaWYgdGhlIHBsYW5lCi0JCSAqIGlzIGRpc2FibGVkLCBldmVuIGlm IHRoZSBwbGFuZSBlbmFibGUgaXMgYWxyZWFkeQotCQkgKiBhcm1lZCB0byBvY2N1ciBhdCB0aGUg bmV4dCB2YmxhbmsgOigKLQkJICovCi0JCWlmICh0dXJuX29uICYmIElTX0JST0FEV0VMTChkZXYp KQotCQkJaW50ZWxfY3J0Yy0+YXRvbWljLndhaXRfdmJsYW5rID0gdHJ1ZTsKLQogCQlpbnRlbF9j cnRjLT5hdG9taWMudXBkYXRlX2ZiYyB8PSB2aXNpYmxlIHx8IG1vZGVfY2hhbmdlZDsKIAkJYnJl YWs7CiAJY2FzZSBEUk1fUExBTkVfVFlQRV9DVVJTT1I6CiAJCWJyZWFrOwogCWNhc2UgRFJNX1BM QU5FX1RZUEVfT1ZFUkxBWToKIAkJaWYgKHR1cm5fb2ZmICYmICFtb2RlX2NoYW5nZWQpIHsKLQkJ CWludGVsX2NydGMtPmF0b21pYy53YWl0X3ZibGFuayA9IHRydWU7CiAJCQlpbnRlbF9jcnRjLT5h dG9taWMudXBkYXRlX3Nwcml0ZV93YXRlcm1hcmtzIHw9CiAJCQkJMSA8PCBpOwogCQl9CkBAIC0x MzI3MSwxNCArMTMyNDgsMTUgQEAgc3RhdGljIGludCBpbnRlbF9hdG9taWNfY29tbWl0KHN0cnVj dCBkcm1fZGV2aWNlICpkZXYsCiAKIAkJaWYgKHB1dF9kb21haW5zKQogCQkJbW9kZXNldF9wdXRf cG93ZXJfZG9tYWlucyhkZXZfcHJpdiwgcHV0X2RvbWFpbnMpOwotCi0JCWludGVsX3Bvc3RfcGxh bmVfdXBkYXRlKGludGVsX2NydGMpOwogCX0KIAogCS8qIEZJWE1FOiBhZGQgc3VicGl4ZWwgb3Jk ZXIgKi8KIAogCWRybV9hdG9taWNfaGVscGVyX3dhaXRfZm9yX3ZibGFua3MoZGV2LCBzdGF0ZSk7 CiAKKwlmb3JfZWFjaF9jcnRjX2luX3N0YXRlKHN0YXRlLCBjcnRjLCBjcnRjX3N0YXRlLCBpKQor CQlpbnRlbF9wb3N0X3BsYW5lX3VwZGF0ZSh0b19pbnRlbF9jcnRjKGNydGMpKTsKKwogCW11dGV4 X2xvY2soJmRldi0+c3RydWN0X211dGV4KTsKIAlkcm1fYXRvbWljX2hlbHBlcl9jbGVhbnVwX3Bs YW5lcyhkZXYsIHN0YXRlKTsKIAltdXRleF91bmxvY2soJmRldi0+c3RydWN0X211dGV4KTsKZGlm ZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oIGIvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfZHJ2LmgKaW5kZXggNTRhMmMwZGEyZWNlLi40YjZiYjFhZGZkZGQgMTAw NjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oCisrKyBiL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2ludGVsX2Rydi5oCkBAIC01MjIsNyArNTIyLDYgQEAgc3RydWN0IGludGVs X2NydGNfYXRvbWljX2NvbW1pdCB7CiAKIAkvKiBTbGVlcGFibGUgb3BlcmF0aW9ucyB0byBwZXJm b3JtIGFmdGVyIGNvbW1pdCAqLwogCXVuc2lnbmVkIGZiX2JpdHM7Ci0JYm9vbCB3YWl0X3ZibGFu azsKIAlib29sIHVwZGF0ZV9mYmM7CiAJYm9vbCBwb3N0X2VuYWJsZV9wcmltYXJ5OwogCXVuc2ln bmVkIHVwZGF0ZV9zcHJpdGVfd2F0ZXJtYXJrczsKLS0gCjIuMS4wCgpfX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0Cklu dGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9y Zy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=