From: Maarten Lankhorst Subject: [PATCH 2/3] drm/i915: Remove atomic.pre_disable_primary. Date: Wed, 3 Feb 2016 16:53:24 +0100 Message-ID: <1454514805-10595-3-git-send-email-maarten.lankhorst@linux.intel.com> References: <1454514805-10595-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 81A436E76B for ; Wed, 3 Feb 2016 07:53:31 -0800 (PST) In-Reply-To: <1454514805-10595-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 VGhpcyBjYW4gYmUgZGVyaXZlZCBmcm9tIHRoZSBhdG9taWMgc3RhdGUgaW4gcHJlX3BsYW5lX3Vw ZGF0ZSwKd2hpY2ggbWFrZXMgaXQgbW9yZSBjbGVhciB3aGVuIGl0J3Mgc3VwcG9zZWQgdG8gYmUg Y2FsbGVkLgoKUmV2aWV3ZWQtYnk6IEFuZGVyIENvbnNlbHZhbiBkZSBPbGl2ZWlyYSA8Y29uc2Vs dmFuMkBnbWFpbC5jb20+ClNpZ25lZC1vZmYtYnk6IE1hYXJ0ZW4gTGFua2hvcnN0IDxtYWFydGVu Lmxhbmtob3JzdEBsaW51eC5pbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfZGlzcGxheS5jIHwgMjUgKysrKysrKysrKysrKysrKysrKy0tLS0tLQogZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfZHJ2LmggICAgIHwgIDEgLQogMiBmaWxlcyBjaGFuZ2VkLCAxOSBpbnNl cnRpb25zKCspLCA3IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX2Rpc3BsYXkuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXku YwppbmRleCBkZTk0ZWYxNjVmYmUuLmM3ZjJhMThhYjM0ZSAxMDA2NDQKLS0tIGEvZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX2Rpc3BsYXkuYwpAQCAtNDgwNywxOSArNDgwNywzMyBAQCBzdGF0aWMgdm9pZCBpbnRlbF9w b3N0X3BsYW5lX3VwZGF0ZShzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YykKIAltZW1zZXQoYXRvbWlj LCAwLCBzaXplb2YoKmF0b21pYykpOwogfQogCi1zdGF0aWMgdm9pZCBpbnRlbF9wcmVfcGxhbmVf dXBkYXRlKHN0cnVjdCBpbnRlbF9jcnRjICpjcnRjKQorc3RhdGljIHZvaWQgaW50ZWxfcHJlX3Bs YW5lX3VwZGF0ZShzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqb2xkX2NydGNfc3RhdGUpCiB7CisJ c3RydWN0IGludGVsX2NydGMgKmNydGMgPSB0b19pbnRlbF9jcnRjKG9sZF9jcnRjX3N0YXRlLT5i YXNlLmNydGMpOwogCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSBjcnRjLT5iYXNlLmRldjsKIAlz dHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBkZXYtPmRldl9wcml2YXRlOwogCXN0 cnVjdCBpbnRlbF9jcnRjX2F0b21pY19jb21taXQgKmF0b21pYyA9ICZjcnRjLT5hdG9taWM7CiAJ c3RydWN0IGludGVsX2NydGNfc3RhdGUgKnBpcGVfY29uZmlnID0KIAkJdG9faW50ZWxfY3J0Y19z dGF0ZShjcnRjLT5iYXNlLnN0YXRlKTsKKwlzdHJ1Y3QgZHJtX2F0b21pY19zdGF0ZSAqb2xkX3N0 YXRlID0gb2xkX2NydGNfc3RhdGUtPmJhc2Uuc3RhdGU7CisJc3RydWN0IGRybV9wbGFuZSAqcHJp bWFyeSA9IGNydGMtPmJhc2UucHJpbWFyeTsKKwlzdHJ1Y3QgZHJtX3BsYW5lX3N0YXRlICpvbGRf cHJpX3N0YXRlID0KKwkJZHJtX2F0b21pY19nZXRfZXhpc3RpbmdfcGxhbmVfc3RhdGUob2xkX3N0 YXRlLCBwcmltYXJ5KTsKKwlib29sIG1vZGVzZXQgPSBuZWVkc19tb2Rlc2V0KCZwaXBlX2NvbmZp Zy0+YmFzZSk7CiAKIAlpZiAoYXRvbWljLT51cGRhdGVfZmJjKQogCQlpbnRlbF9mYmNfcHJlX3Vw ZGF0ZShjcnRjKTsKIAotCWlmIChhdG9taWMtPnByZV9kaXNhYmxlX3ByaW1hcnkpCi0JCWludGVs X3ByZV9kaXNhYmxlX3ByaW1hcnkoJmNydGMtPmJhc2UpOworCWlmIChvbGRfcHJpX3N0YXRlKSB7 CisJCXN0cnVjdCBpbnRlbF9wbGFuZV9zdGF0ZSAqcHJpbWFyeV9zdGF0ZSA9CisJCQl0b19pbnRl bF9wbGFuZV9zdGF0ZShwcmltYXJ5LT5zdGF0ZSk7CisJCXN0cnVjdCBpbnRlbF9wbGFuZV9zdGF0 ZSAqb2xkX3ByaW1hcnlfc3RhdGUgPQorCQkJdG9faW50ZWxfcGxhbmVfc3RhdGUob2xkX3ByaV9z dGF0ZSk7CisKKwkJaWYgKG9sZF9wcmltYXJ5X3N0YXRlLT52aXNpYmxlICYmCisJCSAgICAobW9k ZXNldCB8fCAhcHJpbWFyeV9zdGF0ZS0+dmlzaWJsZSkpCisJCQlpbnRlbF9wcmVfZGlzYWJsZV9w cmltYXJ5KCZjcnRjLT5iYXNlKTsKKwl9CiAKIAlpZiAocGlwZV9jb25maWctPmRpc2FibGVfY3hz cikgewogCQljcnRjLT53bS5jeHNyX2FsbG93ZWQgPSBmYWxzZTsKQEAgLTExODgzLDcgKzExODk3 LDYgQEAgaW50IGludGVsX3BsYW5lX2F0b21pY19jYWxjX2NoYW5nZXMoc3RydWN0IGRybV9jcnRj X3N0YXRlICpjcnRjX3N0YXRlLAogCiAJc3dpdGNoIChwbGFuZS0+dHlwZSkgewogCWNhc2UgRFJN X1BMQU5FX1RZUEVfUFJJTUFSWToKLQkJaW50ZWxfY3J0Yy0+YXRvbWljLnByZV9kaXNhYmxlX3By aW1hcnkgPSB0dXJuX29mZjsKIAkJaW50ZWxfY3J0Yy0+YXRvbWljLnBvc3RfZW5hYmxlX3ByaW1h cnkgPSB0dXJuX29uOwogCQlpbnRlbF9jcnRjLT5hdG9taWMudXBkYXRlX2ZiYyA9IHRydWU7CiAK QEAgLTEzNDk1LDcgKzEzNTA4LDcgQEAgc3RhdGljIGludCBpbnRlbF9hdG9taWNfY29tbWl0KHN0 cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAJCWlmICghbmVlZHNfbW9kZXNldChjcnRjLT5zdGF0ZSkp CiAJCQljb250aW51ZTsKIAotCQlpbnRlbF9wcmVfcGxhbmVfdXBkYXRlKGludGVsX2NydGMpOwor CQlpbnRlbF9wcmVfcGxhbmVfdXBkYXRlKHRvX2ludGVsX2NydGNfc3RhdGUoY3J0Y19zdGF0ZSkp OwogCiAJCWlmIChjcnRjX3N0YXRlLT5hY3RpdmUpIHsKIAkJCWludGVsX2NydGNfZGlzYWJsZV9w bGFuZXMoY3J0YywgY3J0Y19zdGF0ZS0+cGxhbmVfbWFzayk7CkBAIC0xMzU1MSw3ICsxMzU2NCw3 IEBAIHN0YXRpYyBpbnQgaW50ZWxfYXRvbWljX2NvbW1pdChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2 LAogCQl9CiAKIAkJaWYgKCFtb2Rlc2V0KQotCQkJaW50ZWxfcHJlX3BsYW5lX3VwZGF0ZShpbnRl bF9jcnRjKTsKKwkJCWludGVsX3ByZV9wbGFuZV91cGRhdGUodG9faW50ZWxfY3J0Y19zdGF0ZShj cnRjX3N0YXRlKSk7CiAKIAkJaWYgKGNydGMtPnN0YXRlLT5hY3RpdmUgJiYgaW50ZWxfY3J0Yy0+ YXRvbWljLnVwZGF0ZV9mYmMpCiAJCQlpbnRlbF9mYmNfZW5hYmxlKGludGVsX2NydGMpOwpkaWZm IC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmggYi9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF9kcnYuaAppbmRleCBjOWFlMmJlMjYwZDAuLjE2N2YyODRjY2IxNiAxMDA2 NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmgKKysrIGIvZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmgKQEAgLTU0NCw3ICs1NDQsNiBAQCBzdHJ1Y3QgaW50ZWxf bW1pb19mbGlwIHsKICAqLwogc3RydWN0IGludGVsX2NydGNfYXRvbWljX2NvbW1pdCB7CiAJLyog U2xlZXBhYmxlIG9wZXJhdGlvbnMgdG8gcGVyZm9ybSBiZWZvcmUgY29tbWl0ICovCi0JYm9vbCBw cmVfZGlzYWJsZV9wcmltYXJ5OwogCiAJLyogU2xlZXBhYmxlIG9wZXJhdGlvbnMgdG8gcGVyZm9y bSBhZnRlciBjb21taXQgKi8KIAl1bnNpZ25lZCBmYl9iaXRzOwotLSAKMi4xLjAKCl9fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5n IGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwOi8vbGlzdHMuZnJlZWRl c2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==