From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ville Syrjala Subject: [PATCH 1/2] drm/i915: Flatten and rename haswell_set_pipemisc() Date: Fri, 12 Apr 2019 21:30:08 +0300 Message-ID: <20190412183009.8237-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 mga12.intel.com (mga12.intel.com [192.55.52.136]) by gabe.freedesktop.org (Postfix) with ESMTPS id 32C7289A44 for ; Fri, 12 Apr 2019 18:30:15 +0000 (UTC) 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 RnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KCk1v dmUgdGhlIHBsYXRmb3JtIGNoZWNrcyBvdXQgZnJvbSBoYXN3ZWxsX3NldF9waXBlbWlzYygpIGFu ZApyZW5hbWUgaXQgdG8gYmR3X3NldF9waXBlbWlzYygpIHRvIG1ha2UgaXQgY2xlYXIgd2hlbiB0 byBjYWxsIGl0LgoKU2lnbmVkLW9mZi1ieTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxh QGxpbnV4LmludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5 LmMgfCA2OCArKysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgMzMg aW5zZXJ0aW9ucygrKSwgMzUgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlz cGxheS5jCmluZGV4IGM3ODBjYTZjZDY2Ny4uNDkwYmQ0OWZmNDJhIDEwMDY0NAotLS0gYS9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfZGlzcGxheS5jCkBAIC0xMjAsNyArMTIwLDcgQEAgc3RhdGljIHZvaWQgaW50ZWxf Y3B1X3RyYW5zY29kZXJfc2V0X21fbihjb25zdCBzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3J0 Y19zdGEKIHN0YXRpYyB2b2lkIGk5eHhfc2V0X3BpcGVjb25mKGNvbnN0IHN0cnVjdCBpbnRlbF9j cnRjX3N0YXRlICpjcnRjX3N0YXRlKTsKIHN0YXRpYyB2b2lkIGlyb25sYWtlX3NldF9waXBlY29u Zihjb25zdCBzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3J0Y19zdGF0ZSk7CiBzdGF0aWMgdm9p ZCBoYXN3ZWxsX3NldF9waXBlY29uZihjb25zdCBzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3J0 Y19zdGF0ZSk7Ci1zdGF0aWMgdm9pZCBoYXN3ZWxsX3NldF9waXBlbWlzYyhjb25zdCBzdHJ1Y3Qg aW50ZWxfY3J0Y19zdGF0ZSAqY3J0Y19zdGF0ZSk7CitzdGF0aWMgdm9pZCBiZHdfc2V0X3BpcGVt aXNjKGNvbnN0IHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjcnRjX3N0YXRlKTsKIHN0YXRpYyB2 b2lkIHZsdl9wcmVwYXJlX3BsbChzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YywKIAkJCSAgICBjb25z dCBzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqcGlwZV9jb25maWcpOwogc3RhdGljIHZvaWQgY2h2 X3ByZXBhcmVfcGxsKHN0cnVjdCBpbnRlbF9jcnRjICpjcnRjLApAQCAtNTk4Nyw3ICs1OTg3LDgg QEAgc3RhdGljIHZvaWQgaGFzd2VsbF9jcnRjX2VuYWJsZShzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0 ZSAqcGlwZV9jb25maWcsCiAJaWYgKCF0cmFuc2NvZGVyX2lzX2RzaShjcHVfdHJhbnNjb2Rlcikp CiAJCWhhc3dlbGxfc2V0X3BpcGVjb25mKHBpcGVfY29uZmlnKTsKIAotCWhhc3dlbGxfc2V0X3Bp cGVtaXNjKHBpcGVfY29uZmlnKTsKKwlpZiAoSU5URUxfR0VOKGRldl9wcml2KSA+PSA5IHx8IElT X0JST0FEV0VMTChkZXZfcHJpdikpCisJCWJkd19zZXRfcGlwZW1pc2MocGlwZV9jb25maWcpOwog CiAJaW50ZWxfY3J0Yy0+YWN0aXZlID0gdHJ1ZTsKIApAQCAtODgzMyw0NSArODgzNCw0MiBAQCBz dGF0aWMgdm9pZCBoYXN3ZWxsX3NldF9waXBlY29uZihjb25zdCBzdHJ1Y3QgaW50ZWxfY3J0Y19z dGF0ZSAqY3J0Y19zdGF0ZSkKIAlQT1NUSU5HX1JFQUQoUElQRUNPTkYoY3B1X3RyYW5zY29kZXIp KTsKIH0KIAotc3RhdGljIHZvaWQgaGFzd2VsbF9zZXRfcGlwZW1pc2MoY29uc3Qgc3RydWN0IGlu dGVsX2NydGNfc3RhdGUgKmNydGNfc3RhdGUpCitzdGF0aWMgdm9pZCBiZHdfc2V0X3BpcGVtaXNj KGNvbnN0IHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjcnRjX3N0YXRlKQogewotCXN0cnVjdCBp bnRlbF9jcnRjICppbnRlbF9jcnRjID0gdG9faW50ZWxfY3J0YyhjcnRjX3N0YXRlLT5iYXNlLmNy dGMpOwotCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUoaW50ZWxf Y3J0Yy0+YmFzZS5kZXYpOwotCi0JaWYgKElTX0JST0FEV0VMTChkZXZfcHJpdikgfHwgSU5URUxf R0VOKGRldl9wcml2KSA+PSA5KSB7Ci0JCXUzMiB2YWwgPSAwOworCXN0cnVjdCBpbnRlbF9jcnRj ICpjcnRjID0gdG9faW50ZWxfY3J0YyhjcnRjX3N0YXRlLT5iYXNlLmNydGMpOworCXN0cnVjdCBk cm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUoY3J0Yy0+YmFzZS5kZXYpOworCXUz MiB2YWwgPSAwOwogCi0JCXN3aXRjaCAoY3J0Y19zdGF0ZS0+cGlwZV9icHApIHsKLQkJY2FzZSAx ODoKLQkJCXZhbCB8PSBQSVBFTUlTQ19ESVRIRVJfNl9CUEM7Ci0JCQlicmVhazsKLQkJY2FzZSAy NDoKLQkJCXZhbCB8PSBQSVBFTUlTQ19ESVRIRVJfOF9CUEM7Ci0JCQlicmVhazsKLQkJY2FzZSAz MDoKLQkJCXZhbCB8PSBQSVBFTUlTQ19ESVRIRVJfMTBfQlBDOwotCQkJYnJlYWs7Ci0JCWNhc2Ug MzY6Ci0JCQl2YWwgfD0gUElQRU1JU0NfRElUSEVSXzEyX0JQQzsKLQkJCWJyZWFrOwotCQlkZWZh dWx0OgotCQkJLyogQ2FzZSBwcmV2ZW50ZWQgYnkgcGlwZV9jb25maWdfc2V0X2JwcC4gKi8KLQkJ CUJVRygpOwotCQl9CisJc3dpdGNoIChjcnRjX3N0YXRlLT5waXBlX2JwcCkgeworCWNhc2UgMTg6 CisJCXZhbCB8PSBQSVBFTUlTQ19ESVRIRVJfNl9CUEM7CisJCWJyZWFrOworCWNhc2UgMjQ6CisJ CXZhbCB8PSBQSVBFTUlTQ19ESVRIRVJfOF9CUEM7CisJCWJyZWFrOworCWNhc2UgMzA6CisJCXZh bCB8PSBQSVBFTUlTQ19ESVRIRVJfMTBfQlBDOworCQlicmVhazsKKwljYXNlIDM2OgorCQl2YWwg fD0gUElQRU1JU0NfRElUSEVSXzEyX0JQQzsKKwkJYnJlYWs7CisJZGVmYXVsdDoKKwkJTUlTU0lO R19DQVNFKGNydGNfc3RhdGUtPnBpcGVfYnBwKTsKKwkJYnJlYWs7CisJfQogCi0JCWlmIChjcnRj X3N0YXRlLT5kaXRoZXIpCi0JCQl2YWwgfD0gUElQRU1JU0NfRElUSEVSX0VOQUJMRSB8IFBJUEVN SVNDX0RJVEhFUl9UWVBFX1NQOworCWlmIChjcnRjX3N0YXRlLT5kaXRoZXIpCisJCXZhbCB8PSBQ SVBFTUlTQ19ESVRIRVJfRU5BQkxFIHwgUElQRU1JU0NfRElUSEVSX1RZUEVfU1A7CiAKLQkJaWYg KGNydGNfc3RhdGUtPm91dHB1dF9mb3JtYXQgPT0gSU5URUxfT1VUUFVUX0ZPUk1BVF9ZQ0JDUjQy MCB8fAotCQkgICAgY3J0Y19zdGF0ZS0+b3V0cHV0X2Zvcm1hdCA9PSBJTlRFTF9PVVRQVVRfRk9S TUFUX1lDQkNSNDQ0KQotCQkJdmFsIHw9IFBJUEVNSVNDX09VVFBVVF9DT0xPUlNQQUNFX1lVVjsK KwlpZiAoY3J0Y19zdGF0ZS0+b3V0cHV0X2Zvcm1hdCA9PSBJTlRFTF9PVVRQVVRfRk9STUFUX1lD QkNSNDIwIHx8CisJICAgIGNydGNfc3RhdGUtPm91dHB1dF9mb3JtYXQgPT0gSU5URUxfT1VUUFVU X0ZPUk1BVF9ZQ0JDUjQ0NCkKKwkJdmFsIHw9IFBJUEVNSVNDX09VVFBVVF9DT0xPUlNQQUNFX1lV VjsKIAotCQlpZiAoY3J0Y19zdGF0ZS0+b3V0cHV0X2Zvcm1hdCA9PSBJTlRFTF9PVVRQVVRfRk9S TUFUX1lDQkNSNDIwKQotCQkJdmFsIHw9IFBJUEVNSVNDX1lVVjQyMF9FTkFCTEUgfAotCQkJCVBJ UEVNSVNDX1lVVjQyMF9NT0RFX0ZVTExfQkxFTkQ7CisJaWYgKGNydGNfc3RhdGUtPm91dHB1dF9m b3JtYXQgPT0gSU5URUxfT1VUUFVUX0ZPUk1BVF9ZQ0JDUjQyMCkKKwkJdmFsIHw9IFBJUEVNSVND X1lVVjQyMF9FTkFCTEUgfAorCQkJUElQRU1JU0NfWVVWNDIwX01PREVfRlVMTF9CTEVORDsKIAot CQlJOTE1X1dSSVRFKFBJUEVNSVNDKGludGVsX2NydGMtPnBpcGUpLCB2YWwpOwotCX0KKwlJOTE1 X1dSSVRFKFBJUEVNSVNDKGNydGMtPnBpcGUpLCB2YWwpOwogfQogCiBpbnQgaXJvbmxha2VfZ2V0 X2xhbmVzX3JlcXVpcmVkKGludCB0YXJnZXRfY2xvY2ssIGludCBsaW5rX2J3LCBpbnQgYnBwKQot LSAKMi4yMS4wCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f XwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcK aHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZng=