From mboxrd@z Thu Jan 1 00:00:00 1970 From: Paulo Zanoni Subject: [PATCH 1/2] drm/i915: kill intel_resume_prepare() Date: Mon, 27 Oct 2014 17:54:32 -0200 Message-ID: <1414439673-1994-1-git-send-email-przanoni@gmail.com> References: <20141023121346.GG26941@phenom.ffwll.local> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-qg0-f49.google.com (mail-qg0-f49.google.com [209.85.192.49]) by gabe.freedesktop.org (Postfix) with ESMTP id 623D46E254 for ; Mon, 27 Oct 2014 12:54:57 -0700 (PDT) Received: by mail-qg0-f49.google.com with SMTP id e89so4545232qgf.22 for ; Mon, 27 Oct 2014 12:54:56 -0700 (PDT) In-Reply-To: <20141023121346.GG26941@phenom.ffwll.local> 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 Cc: Paulo Zanoni List-Id: intel-gfx@lists.freedesktop.org RnJvbTogUGF1bG8gWmFub25pIDxwYXVsby5yLnphbm9uaUBpbnRlbC5jb20+CgpCZWNhdXNlLCBy ZWFsbHksIHRoZSBhYnN0cmFjdGlvbiBpcyBub3Qgd29ya2luZyBmb3IgdXMuIEl0IGlzIG5pY2Ug Zm9yClZMViwgYnV0IGRvZXNuJ3QgYWRkIGFueXRoaW5nIHVzZWZ1bCBvbiBTTkIvSFNXL0JEVy4g V2Ugd2FudCB0byBjaGFuZ2UKdGhpcyBjb2RlIGR1ZSB0byBhIHJlY2VudGx5LWRpc2NvdmVyZWQg YnVnLCBidXQgd2UgY2FuJ3Qgc2VlbSB0byBmaW5kCmEgbmljZSBzb2x1dGlvbiB0aGF0IHJlcGVj dHMgdGhlIGN1cnJlbnQgYWJzdHJhY3Rpb24uIFNvIGxldCdzIGtpbGwKaW50ZWxfcmVzdW1lX3By ZXBhcmUoKSBhbmQgaXRzIGZyaWVuZHMsIGFuZCBhZGQgYW4gZXF1aXZhbGVudAppbXBsZW1lbnRh dGlvbiB0byBib3RoIGl0cyBjYWxsZXJzLgoKQWxzbywgbG9vayBhdCB0aGUgZGlmZnN0YXQhCgp2 MjogLSBSZWJhc2UuCgpTaWduZWQtb2ZmLWJ5OiBQYXVsbyBaYW5vbmkgPHBhdWxvLnIuemFub25p QGludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5jIHwgNjMgKysr KysrKysrKy0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCAx NSBpbnNlcnRpb25zKCspLCA0OCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pOTE1X2Rydi5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuYwpp bmRleCAwMzVlYzk0Li4zM2I2ZmM0IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p OTE1X2Rydi5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmMKQEAgLTU1MSw4 ICs1NTEsOCBAQCBzdGF0aWMgdm9pZCBpbnRlbF9zdXNwZW5kX2VuY29kZXJzKHN0cnVjdCBkcm1f aTkxNV9wcml2YXRlICpkZXZfcHJpdikKIH0KIAogc3RhdGljIGludCBpbnRlbF9zdXNwZW5kX2Nv bXBsZXRlKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdik7Ci1zdGF0aWMgaW50IGlu dGVsX3Jlc3VtZV9wcmVwYXJlKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKLQkJ CQlib29sIHJwbV9yZXN1bWUpOworc3RhdGljIGludCB2bHZfcmVzdW1lX3ByZXBhcmUoc3RydWN0 IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAorCQkJICAgICAgYm9vbCBycG1fcmVzdW1lKTsK IAogc3RhdGljIGludCBpOTE1X2RybV9zdXNwZW5kKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiB7 CkBAIC03NDQsNyArNzQ0LDcgQEAgc3RhdGljIGludCBpOTE1X2RybV9yZXN1bWUoc3RydWN0IGRy bV9kZXZpY2UgKmRldikKIHN0YXRpYyBpbnQgaTkxNV9kcm1fcmVzdW1lX2Vhcmx5KHN0cnVjdCBk cm1fZGV2aWNlICpkZXYpCiB7CiAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0g ZGV2LT5kZXZfcHJpdmF0ZTsKLQlpbnQgcmV0OworCWludCByZXQgPSAwOwogCiAJLyoKIAkgKiBX ZSBoYXZlIGEgcmVzdW1lIG9yZGVyaW5nIGlzc3VlIHdpdGggdGhlIHNuZC1oZGEgZHJpdmVyIGFs c28KQEAgLTc2MCw3ICs3NjAsMTAgQEAgc3RhdGljIGludCBpOTE1X2RybV9yZXN1bWVfZWFybHko c3RydWN0IGRybV9kZXZpY2UgKmRldikKIAogCXBjaV9zZXRfbWFzdGVyKGRldi0+cGRldik7CiAK LQlyZXQgPSBpbnRlbF9yZXN1bWVfcHJlcGFyZShkZXZfcHJpdiwgZmFsc2UpOworCWlmIChJU19I QVNXRUxMKGRldl9wcml2KSB8fCBJU19CUk9BRFdFTEwoZGV2X3ByaXYpKQorCQloc3dfZGlzYWJs ZV9wYzgoZGV2X3ByaXYpOworCWVsc2UgaWYgKElTX1ZBTExFWVZJRVcoZGV2X3ByaXYpKQorCQly ZXQgPSB2bHZfcmVzdW1lX3ByZXBhcmUoZGV2X3ByaXYsIGZhbHNlKTsKIAlpZiAocmV0KQogCQlE Uk1fRVJST1IoIlJlc3VtZSBwcmVwYXJlIGZhaWxlZDogJWQsQ29udGludWluZyByZXN1bWVcbiIs IHJldCk7CiAKQEAgLTk4NiwyNSArOTg5LDYgQEAgc3RhdGljIGludCBoc3dfc3VzcGVuZF9jb21w bGV0ZShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiAJcmV0dXJuIDA7CiB9CiAK LXN0YXRpYyBpbnQgc25iX3Jlc3VtZV9wcmVwYXJlKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpk ZXZfcHJpdiwKLQkJCQlib29sIHJwbV9yZXN1bWUpCi17Ci0Jc3RydWN0IGRybV9kZXZpY2UgKmRl diA9IGRldl9wcml2LT5kZXY7Ci0KLQlpZiAocnBtX3Jlc3VtZSkKLQkJaW50ZWxfaW5pdF9wY2hf cmVmY2xrKGRldik7Ci0KLQlyZXR1cm4gMDsKLX0KLQotc3RhdGljIGludCBoc3dfcmVzdW1lX3By ZXBhcmUoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAotCQkJCWJvb2wgcnBtX3Jl c3VtZSkKLXsKLQloc3dfZGlzYWJsZV9wYzgoZGV2X3ByaXYpOwotCi0JcmV0dXJuIDA7Ci19Ci0K IC8qCiAgKiBTYXZlIGFsbCBHdW5pdCByZWdpc3RlcnMgdGhhdCBtYXkgYmUgbG9zdCBhZnRlciBh IEQzIGFuZCBhIHN1YnNlcXVlbnQKICAqIFMwaVtSMTIzXSB0cmFuc2l0aW9uLiBUaGUgbGlzdCBv ZiByZWdpc3RlcnMgbmVlZGluZyBhIHNhdmUvcmVzdG9yZSBpcwpAQCAtMTQ2Miw3ICsxNDQ2LDcg QEAgc3RhdGljIGludCBpbnRlbF9ydW50aW1lX3Jlc3VtZShzdHJ1Y3QgZGV2aWNlICpkZXZpY2Up CiAJc3RydWN0IHBjaV9kZXYgKnBkZXYgPSB0b19wY2lfZGV2KGRldmljZSk7CiAJc3RydWN0IGRy bV9kZXZpY2UgKmRldiA9IHBjaV9nZXRfZHJ2ZGF0YShwZGV2KTsKIAlzdHJ1Y3QgZHJtX2k5MTVf cHJpdmF0ZSAqZGV2X3ByaXYgPSBkZXYtPmRldl9wcml2YXRlOwotCWludCByZXQ7CisJaW50IHJl dCA9IDA7CiAKIAlpZiAoV0FSTl9PTl9PTkNFKCFIQVNfUlVOVElNRV9QTShkZXYpKSkKIAkJcmV0 dXJuIC1FTk9ERVY7CkBAIC0xNDcyLDcgKzE0NTYsMTMgQEAgc3RhdGljIGludCBpbnRlbF9ydW50 aW1lX3Jlc3VtZShzdHJ1Y3QgZGV2aWNlICpkZXZpY2UpCiAJaW50ZWxfb3ByZWdpb25fbm90aWZ5 X2FkYXB0ZXIoZGV2LCBQQ0lfRDApOwogCWRldl9wcml2LT5wbS5zdXNwZW5kZWQgPSBmYWxzZTsK IAotCXJldCA9IGludGVsX3Jlc3VtZV9wcmVwYXJlKGRldl9wcml2LCB0cnVlKTsKKwlpZiAoSVNf R0VONihkZXZfcHJpdikpCisJCWludGVsX2luaXRfcGNoX3JlZmNsayhkZXYpOworCWVsc2UgaWYg KElTX0hBU1dFTEwoZGV2X3ByaXYpIHx8IElTX0JST0FEV0VMTChkZXZfcHJpdikpCisJCWhzd19k aXNhYmxlX3BjOChkZXZfcHJpdik7CisJZWxzZSBpZiAoSVNfVkFMTEVZVklFVyhkZXZfcHJpdikp CisJCXJldCA9IHZsdl9yZXN1bWVfcHJlcGFyZShkZXZfcHJpdiwgdHJ1ZSk7CisKIAkvKgogCSAq IE5vIHBvaW50IG9mIHJvbGxpbmcgYmFjayB0aGluZ3MgaW4gY2FzZSBvZiBhbiBlcnJvciwgYXMg dGhlIGJlc3QKIAkgKiB3ZSBjYW4gZG8gaXMgdG8gaG9wZSB0aGF0IHRoaW5ncyB3aWxsIHN0aWxs IHdvcmsgKGFuZCBkaXNhYmxlIFJQTSkuCkBAIC0xNTEwLDI5ICsxNTAwLDYgQEAgc3RhdGljIGlu dCBpbnRlbF9zdXNwZW5kX2NvbXBsZXRlKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJp dikKIAlyZXR1cm4gcmV0OwogfQogCi0vKgotICogVGhpcyBmdW5jdGlvbiBpbXBsZW1lbnRzIGNv bW1vbiBmdW5jdGlvbmFsaXR5IG9mIHJ1bnRpbWUgYW5kIHN5c3RlbQotICogcmVzdW1lIHNlcXVl bmNlLiBWYXJpYWJsZSBycG1fcmVzdW1lIHVzZWQgZm9yIGltcGxlbWVudGluZyBkaWZmZXJlbnQK LSAqIGNvZGUgcGF0aHMuCi0gKi8KLXN0YXRpYyBpbnQgaW50ZWxfcmVzdW1lX3ByZXBhcmUoc3Ry dWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAotCQkJCWJvb2wgcnBtX3Jlc3VtZSkKLXsK LQlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gZGV2X3ByaXYtPmRldjsKLQlpbnQgcmV0OwotCi0J aWYgKElTX0dFTjYoZGV2KSkKLQkJcmV0ID0gc25iX3Jlc3VtZV9wcmVwYXJlKGRldl9wcml2LCBy cG1fcmVzdW1lKTsKLQllbHNlIGlmIChJU19IQVNXRUxMKGRldikgfHwgSVNfQlJPQURXRUxMKGRl dikpCi0JCXJldCA9IGhzd19yZXN1bWVfcHJlcGFyZShkZXZfcHJpdiwgcnBtX3Jlc3VtZSk7Ci0J ZWxzZSBpZiAoSVNfVkFMTEVZVklFVyhkZXYpKQotCQlyZXQgPSB2bHZfcmVzdW1lX3ByZXBhcmUo ZGV2X3ByaXYsIHJwbV9yZXN1bWUpOwotCWVsc2UKLQkJcmV0ID0gMDsKLQotCXJldHVybiByZXQ7 Ci19Ci0KIHN0YXRpYyBjb25zdCBzdHJ1Y3QgZGV2X3BtX29wcyBpOTE1X3BtX29wcyA9IHsKIAkv KgogCSAqIFMwaXggKHZpYSBzeXN0ZW0gc3VzcGVuZCkgYW5kIFMzIGV2ZW50IGhhbmRsZXJzIFtQ TVNHX1NVU1BFTkQsCi0tIAoyLjEuMQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJl ZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5m by9pbnRlbC1nZngK