From: ville.syrjala@linux.intel.com Subject: [PATCH 03.5/14] drm/i915: Nuke ironlake_plane_ctl() Date: Mon, 20 Mar 2017 18:47:44 +0200 Message-ID: <20170320164744.10820-2-ville.syrjala@linux.intel.com> References: <20170317211808.14693-4-ville.syrjala@linux.intel.com> <20170320164744.10820-1-ville.syrjala@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by gabe.freedesktop.org (Postfix) with ESMTPS id 2CEF889363 for ; Mon, 20 Mar 2017 16:47:51 +0000 (UTC) In-Reply-To: <20170320164744.10820-1-ville.syrjala@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 RnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KClNo YXJlIHRoZSBjb2RlIHRvIGNvbXB1dGUgdGhlIHByaW1hcnkgcGxhbmUgY29udHJvbCByZWdpc3Rl ciB2YWx1ZQpiZXR3ZWVuIHRoZSBpOXh4IGFuZCBpbGsgY29kZXBhdGhzIGFzIHRoZSBkaWZmZXJl bmNlcyBhcmUgbWluaW1hbC4KQWN0dWFsbHkgdGhlcmUgYXJlIG5vIGRpZmZlcmVuY2VzIGJldHdl ZW4gZzR4IGFuZCBpbGssIHNvIHRoZQpjdXJyZW50IHNwbGl0IGRvZXNuJ3QgcmVhbGx5IG1ha2Ug YW55IHNlbnNlLgoKQ2M6IENocmlzIFdpbHNvbiA8Y2hyaXNAY2hyaXMtd2lsc29uLmNvLnVrPgpT aWduZWQtb2ZmLWJ5OiBWaWxsZSBTeXJqw6Rsw6QgPHZpbGxlLnN5cmphbGFAbGludXguaW50ZWwu Y29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYyB8IDU4ICsrKyst LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDYgaW5zZXJ0 aW9ucygrKSwgNTIgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfZGlzcGxheS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5j CmluZGV4IGJkNmMxYzU0NjllNC4uOTliNzJjNDIxOWE4IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfZGlzcGxheS5jCkBAIC0yOTc0LDkgKzI5NzQsMTMgQEAgc3RhdGljIHUzMiBpOXh4X3BsYW5l X2N0bChjb25zdCBzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3J0Y19zdGF0ZSwKIAogCWRzcGNu dHIgPSBESVNQTEFZX1BMQU5FX0VOQUJMRSB8IERJU1BQTEFORV9HQU1NQV9FTkFCTEU7CiAKLQlp ZiAoSVNfRzRYKGRldl9wcml2KSkKKwlpZiAoSVNfRzRYKGRldl9wcml2KSB8fCBJU19HRU41KGRl dl9wcml2KSB8fAorCSAgICBJU19HRU42KGRldl9wcml2KSB8fCBJU19JVllCUklER0UoZGV2X3By aXYpKQogCQlkc3BjbnRyIHw9IERJU1BQTEFORV9UUklDS0xFX0ZFRURfRElTQUJMRTsKIAorCWlm IChJU19IQVNXRUxMKGRldl9wcml2KSB8fCBJU19CUk9BRFdFTEwoZGV2X3ByaXYpKQorCQlkc3Bj bnRyIHw9IERJU1BQTEFORV9QSVBFX0NTQ19FTkFCTEU7CisKIAlpZiAoSU5URUxfR0VOKGRldl9w cml2KSA8IDQpIHsKIAkJaWYgKGNydGMtPnBpcGUgPT0gUElQRV9CKQogCQkJZHNwY250ciB8PSBE SVNQUExBTkVfU0VMX1BJUEVfQjsKQEAgLTMxMTksNTYgKzMxMjMsNiBAQCBzdGF0aWMgdm9pZCBp OXh4X2Rpc2FibGVfcHJpbWFyeV9wbGFuZShzdHJ1Y3QgZHJtX3BsYW5lICpwcmltYXJ5LAogCXNw aW5fdW5sb2NrX2lycXJlc3RvcmUoJmRldl9wcml2LT51bmNvcmUubG9jaywgaXJxZmxhZ3MpOwog fQogCi1zdGF0aWMgdTMyIGlyb25sYWtlX3BsYW5lX2N0bChjb25zdCBzdHJ1Y3QgaW50ZWxfY3J0 Y19zdGF0ZSAqY3J0Y19zdGF0ZSwKLQkJCSAgICAgIGNvbnN0IHN0cnVjdCBpbnRlbF9wbGFuZV9z dGF0ZSAqcGxhbmVfc3RhdGUpCi17Ci0Jc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2 ID0KLQkJdG9faTkxNShwbGFuZV9zdGF0ZS0+YmFzZS5wbGFuZS0+ZGV2KTsKLQljb25zdCBzdHJ1 Y3QgZHJtX2ZyYW1lYnVmZmVyICpmYiA9IHBsYW5lX3N0YXRlLT5iYXNlLmZiOwotCXVuc2lnbmVk IGludCByb3RhdGlvbiA9IHBsYW5lX3N0YXRlLT5iYXNlLnJvdGF0aW9uOwotCXUzMiBkc3BjbnRy OwotCi0JZHNwY250ciA9IERJU1BMQVlfUExBTkVfRU5BQkxFIHwgRElTUFBMQU5FX0dBTU1BX0VO QUJMRTsKLQotCWlmICghSVNfSEFTV0VMTChkZXZfcHJpdikgJiYgIUlTX0JST0FEV0VMTChkZXZf cHJpdikpCi0JCWRzcGNudHIgfD0gRElTUFBMQU5FX1RSSUNLTEVfRkVFRF9ESVNBQkxFOwotCi0J aWYgKElTX0hBU1dFTEwoZGV2X3ByaXYpIHx8IElTX0JST0FEV0VMTChkZXZfcHJpdikpCi0JCWRz cGNudHIgfD0gRElTUFBMQU5FX1BJUEVfQ1NDX0VOQUJMRTsKLQotCXN3aXRjaCAoZmItPmZvcm1h dC0+Zm9ybWF0KSB7Ci0JY2FzZSBEUk1fRk9STUFUX0M4OgotCQlkc3BjbnRyIHw9IERJU1BQTEFO RV84QlBQOwotCQlicmVhazsKLQljYXNlIERSTV9GT1JNQVRfUkdCNTY1OgotCQlkc3BjbnRyIHw9 IERJU1BQTEFORV9CR1JYNTY1OwotCQlicmVhazsKLQljYXNlIERSTV9GT1JNQVRfWFJHQjg4ODg6 Ci0JCWRzcGNudHIgfD0gRElTUFBMQU5FX0JHUlg4ODg7Ci0JCWJyZWFrOwotCWNhc2UgRFJNX0ZP Uk1BVF9YQkdSODg4ODoKLQkJZHNwY250ciB8PSBESVNQUExBTkVfUkdCWDg4ODsKLQkJYnJlYWs7 Ci0JY2FzZSBEUk1fRk9STUFUX1hSR0IyMTAxMDEwOgotCQlkc3BjbnRyIHw9IERJU1BQTEFORV9C R1JYMTAxMDEwOwotCQlicmVhazsKLQljYXNlIERSTV9GT1JNQVRfWEJHUjIxMDEwMTA6Ci0JCWRz cGNudHIgfD0gRElTUFBMQU5FX1JHQlgxMDEwMTA7Ci0JCWJyZWFrOwotCWRlZmF1bHQ6Ci0JCU1J U1NJTkdfQ0FTRShmYi0+Zm9ybWF0LT5mb3JtYXQpOwotCQlyZXR1cm4gMDsKLQl9Ci0KLQlpZiAo ZmItPm1vZGlmaWVyID09IEk5MTVfRk9STUFUX01PRF9YX1RJTEVEKQotCQlkc3BjbnRyIHw9IERJ U1BQTEFORV9USUxFRDsKLQotCWlmIChyb3RhdGlvbiAmIERSTV9ST1RBVEVfMTgwKQotCQlkc3Bj bnRyIHw9IERJU1BQTEFORV9ST1RBVEVfMTgwOwotCi0JcmV0dXJuIGRzcGNudHI7Ci19Ci0KIHN0 YXRpYyB2b2lkIGlyb25sYWtlX3VwZGF0ZV9wcmltYXJ5X3BsYW5lKHN0cnVjdCBkcm1fcGxhbmUg KnByaW1hcnksCiAJCQkJCSAgY29uc3Qgc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNydGNfc3Rh dGUsCiAJCQkJCSAgY29uc3Qgc3RydWN0IGludGVsX3BsYW5lX3N0YXRlICpwbGFuZV9zdGF0ZSkK QEAgLTMxODYsNyArMzE0MCw3IEBAIHN0YXRpYyB2b2lkIGlyb25sYWtlX3VwZGF0ZV9wcmltYXJ5 X3BsYW5lKHN0cnVjdCBkcm1fcGxhbmUgKnByaW1hcnksCiAJaW50IHkgPSBwbGFuZV9zdGF0ZS0+ YmFzZS5zcmMueTEgPj4gMTY7CiAJdW5zaWduZWQgbG9uZyBpcnFmbGFnczsKIAotCWRzcGNudHIg PSBpcm9ubGFrZV9wbGFuZV9jdGwoY3J0Y19zdGF0ZSwgcGxhbmVfc3RhdGUpOworCWRzcGNudHIg PSBpOXh4X3BsYW5lX2N0bChjcnRjX3N0YXRlLCBwbGFuZV9zdGF0ZSk7CiAKIAlpbnRlbF9hZGRf ZmJfb2Zmc2V0cygmeCwgJnksIHBsYW5lX3N0YXRlLCAwKTsKIAotLSAKMi4xMC4yCgpfX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGlu ZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVl ZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK