From mboxrd@z Thu Jan 1 00:00:00 1970 From: Paulo Zanoni Subject: [PATCH 1/6] drm/i915: move FBC vfuncs to struct i915_fbc Date: Tue, 7 Jul 2015 15:26:03 -0300 Message-ID: <1436293568-1674-2-git-send-email-przanoni@gmail.com> References: <1436293568-1674-1-git-send-email-przanoni@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-qg0-f51.google.com (mail-qg0-f51.google.com [209.85.192.51]) by gabe.freedesktop.org (Postfix) with ESMTPS id F113E6EA2B for ; Tue, 7 Jul 2015 11:26:53 -0700 (PDT) Received: by qgii30 with SMTP id i30so88595646qgi.1 for ; Tue, 07 Jul 2015 11:26:53 -0700 (PDT) In-Reply-To: <1436293568-1674-1-git-send-email-przanoni@gmail.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 Cc: Paulo Zanoni List-Id: intel-gfx@lists.freedesktop.org RnJvbTogUGF1bG8gWmFub25pIDxwYXVsby5yLnphbm9uaUBpbnRlbC5jb20+CgpCZWNhdXNlIGl0 IG1ha2VzIG1vcmUgc2Vuc2UgdGhlcmUsIElNSE8uCgpTaWduZWQtb2ZmLWJ5OiBQYXVsbyBaYW5v bmkgPHBhdWxvLnIuemFub25pQGludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9p OTE1X2Rydi5oICAgICAgfCAgNyArKystLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rp c3BsYXkuYyB8ICA0ICsrLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2ZiYy5jICAgICB8 IDQ0ICsrKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0tLS0tLQogMyBmaWxlcyBjaGFuZ2Vk LCAyOCBpbnNlcnRpb25zKCspLCAyNyBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYu aAppbmRleCA0NjRiMjhkLi43OWQ3ZWNlIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pOTE1X2Rydi5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKQEAgLTU5 OCw5ICs1OTgsNiBAQCBzdHJ1Y3QgaW50ZWxfbGltaXQ7CiBzdHJ1Y3QgZHBsbDsKIAogc3RydWN0 IGRybV9pOTE1X2Rpc3BsYXlfZnVuY3MgewotCWJvb2wgKCpmYmNfZW5hYmxlZCkoc3RydWN0IGRy bV9kZXZpY2UgKmRldik7Ci0Jdm9pZCAoKmVuYWJsZV9mYmMpKHN0cnVjdCBkcm1fY3J0YyAqY3J0 Yyk7Ci0Jdm9pZCAoKmRpc2FibGVfZmJjKShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KTsKIAlpbnQg KCpnZXRfZGlzcGxheV9jbG9ja19zcGVlZCkoc3RydWN0IGRybV9kZXZpY2UgKmRldik7CiAJaW50 ICgqZ2V0X2ZpZm9fc2l6ZSkoc3RydWN0IGRybV9kZXZpY2UgKmRldiwgaW50IHBsYW5lKTsKIAkv KioKQEAgLTkzOSw2ICs5MzYsMTAgQEAgc3RydWN0IGk5MTVfZmJjIHsKIAkJRkJDX0NISVBfREVG QVVMVCwgLyogZGlzYWJsZWQgYnkgZGVmYXVsdCBvbiB0aGlzIGNoaXAgKi8KIAkJRkJDX1JPVEFU SU9OLCAvKiByb3RhdGlvbiBpcyBub3Qgc3VwcG9ydGVkICovCiAJfSBub19mYmNfcmVhc29uOwor CisJYm9vbCAoKmZiY19lbmFibGVkKShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KTsKKwl2b2lkICgq ZW5hYmxlX2ZiYykoc3RydWN0IGRybV9jcnRjICpjcnRjKTsKKwl2b2lkICgqZGlzYWJsZV9mYmMp KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpOwogfTsKIAogLyoqCmRpZmYgLS1naXQgYS9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9kaXNwbGF5LmMKaW5kZXggM2MyNDI1Zi4uYWVmY2YwMiAxMDA2NDQKLS0tIGEvZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX2Rpc3BsYXkuYwpAQCAtMzEzNCw4ICszMTM0LDggQEAgaW50ZWxfcGlwZV9zZXRfYmFzZV9h dG9taWMoc3RydWN0IGRybV9jcnRjICpjcnRjLCBzdHJ1Y3QgZHJtX2ZyYW1lYnVmZmVyICpmYiwK IAlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gY3J0Yy0+ZGV2OwogCXN0cnVjdCBkcm1faTkxNV9w cml2YXRlICpkZXZfcHJpdiA9IGRldi0+ZGV2X3ByaXZhdGU7CiAKLQlpZiAoZGV2X3ByaXYtPmRp c3BsYXkuZGlzYWJsZV9mYmMpCi0JCWRldl9wcml2LT5kaXNwbGF5LmRpc2FibGVfZmJjKGRldik7 CisJaWYgKGRldl9wcml2LT5mYmMuZGlzYWJsZV9mYmMpCisJCWRldl9wcml2LT5mYmMuZGlzYWJs ZV9mYmMoZGV2KTsKIAogCWRldl9wcml2LT5kaXNwbGF5LnVwZGF0ZV9wcmltYXJ5X3BsYW5lKGNy dGMsIGZiLCB4LCB5KTsKIApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf ZmJjLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9mYmMuYwppbmRleCA2NWYwOGUzLi4w N2VhNWIzIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9mYmMuYworKysg Yi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9mYmMuYwpAQCAtMzQxLDcgKzM0MSw3IEBAIHN0 YXRpYyB2b2lkIGludGVsX2ZiY193b3JrX2ZuKHN0cnVjdCB3b3JrX3N0cnVjdCAqX193b3JrKQog CQkgKiB0aGUgcHJpb3Igd29yay4KIAkJICovCiAJCWlmICh3b3JrLT5jcnRjLT5wcmltYXJ5LT5m YiA9PSB3b3JrLT5mYikgewotCQkJZGV2X3ByaXYtPmRpc3BsYXkuZW5hYmxlX2ZiYyh3b3JrLT5j cnRjKTsKKwkJCWRldl9wcml2LT5mYmMuZW5hYmxlX2ZiYyh3b3JrLT5jcnRjKTsKIAogCQkJZGV2 X3ByaXYtPmZiYy5jcnRjID0gdG9faW50ZWxfY3J0Yyh3b3JrLT5jcnRjKTsKIAkJCWRldl9wcml2 LT5mYmMuZmJfaWQgPSB3b3JrLT5jcnRjLT5wcmltYXJ5LT5mYi0+YmFzZS5pZDsKQEAgLTM5Myw3 ICszOTMsNyBAQCBzdGF0aWMgdm9pZCBpbnRlbF9mYmNfZW5hYmxlKHN0cnVjdCBkcm1fY3J0YyAq Y3J0YykKIAl3b3JrID0ga3phbGxvYyhzaXplb2YoKndvcmspLCBHRlBfS0VSTkVMKTsKIAlpZiAo d29yayA9PSBOVUxMKSB7CiAJCURSTV9FUlJPUigiRmFpbGVkIHRvIGFsbG9jYXRlIEZCQyB3b3Jr IHN0cnVjdHVyZVxuIik7Ci0JCWRldl9wcml2LT5kaXNwbGF5LmVuYWJsZV9mYmMoY3J0Yyk7CisJ CWRldl9wcml2LT5mYmMuZW5hYmxlX2ZiYyhjcnRjKTsKIAkJcmV0dXJuOwogCX0KIApAQCAtNDI3 LDcgKzQyNyw3IEBAIHN0YXRpYyB2b2lkIF9faW50ZWxfZmJjX2Rpc2FibGUoc3RydWN0IGRybV9k ZXZpY2UgKmRldikKIAogCWludGVsX2ZiY19jYW5jZWxfd29yayhkZXZfcHJpdik7CiAKLQlkZXZf cHJpdi0+ZGlzcGxheS5kaXNhYmxlX2ZiYyhkZXYpOworCWRldl9wcml2LT5mYmMuZGlzYWJsZV9m YmMoZGV2KTsKIAlkZXZfcHJpdi0+ZmJjLmNydGMgPSBOVUxMOwogfQogCkBAIC00NDEsNyArNDQx LDcgQEAgdm9pZCBpbnRlbF9mYmNfZGlzYWJsZShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogewog CXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IGRldi0+ZGV2X3ByaXZhdGU7CiAK LQlpZiAoIWRldl9wcml2LT5kaXNwbGF5LmVuYWJsZV9mYmMpCisJaWYgKCFkZXZfcHJpdi0+ZmJj LmVuYWJsZV9mYmMpCiAJCXJldHVybjsKIAogCW11dGV4X2xvY2soJmRldl9wcml2LT5mYmMubG9j ayk7CkBAIC00NjAsNyArNDYwLDcgQEAgdm9pZCBpbnRlbF9mYmNfZGlzYWJsZV9jcnRjKHN0cnVj dCBpbnRlbF9jcnRjICpjcnRjKQogCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSBjcnRjLT5iYXNl LmRldjsKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBkZXYtPmRldl9wcml2 YXRlOwogCi0JaWYgKCFkZXZfcHJpdi0+ZGlzcGxheS5lbmFibGVfZmJjKQorCWlmICghZGV2X3By aXYtPmZiYy5lbmFibGVfZmJjKQogCQlyZXR1cm47CiAKIAltdXRleF9sb2NrKCZkZXZfcHJpdi0+ ZmJjLmxvY2spOwpAQCAtNjYxLDcgKzY2MSw3IEBAIHZvaWQgaW50ZWxfZmJjX2NsZWFudXBfY2Zi KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiB7CiAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRl dl9wcml2ID0gZGV2LT5kZXZfcHJpdmF0ZTsKIAotCWlmICghZGV2X3ByaXYtPmRpc3BsYXkuZW5h YmxlX2ZiYykKKwlpZiAoIWRldl9wcml2LT5mYmMuZW5hYmxlX2ZiYykKIAkJcmV0dXJuOwogCiAJ bXV0ZXhfbG9jaygmZGV2X3ByaXYtPmZiYy5sb2NrKTsKQEAgLTg1Nyw3ICs4NTcsNyBAQCB2b2lk IGludGVsX2ZiY191cGRhdGUoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIHsKIAlzdHJ1Y3QgZHJt X2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBkZXYtPmRldl9wcml2YXRlOwogCi0JaWYgKCFkZXZf cHJpdi0+ZGlzcGxheS5lbmFibGVfZmJjKQorCWlmICghZGV2X3ByaXYtPmZiYy5lbmFibGVfZmJj KQogCQlyZXR1cm47CiAKIAltdXRleF9sb2NrKCZkZXZfcHJpdi0+ZmJjLmxvY2spOwpAQCAtODcy LDcgKzg3Miw3IEBAIHZvaWQgaW50ZWxfZmJjX2ludmFsaWRhdGUoc3RydWN0IGRybV9pOTE1X3By aXZhdGUgKmRldl9wcml2LAogCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSBkZXZfcHJpdi0+ZGV2 OwogCXVuc2lnbmVkIGludCBmYmNfYml0czsKIAotCWlmICghZGV2X3ByaXYtPmRpc3BsYXkuZW5h YmxlX2ZiYykKKwlpZiAoIWRldl9wcml2LT5mYmMuZW5hYmxlX2ZiYykKIAkJcmV0dXJuOwogCiAJ aWYgKG9yaWdpbiA9PSBPUklHSU5fR1RUKQpAQCAtOTAxLDcgKzkwMSw3IEBAIHZvaWQgaW50ZWxf ZmJjX2ZsdXNoKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKIHsKIAlzdHJ1Y3Qg ZHJtX2RldmljZSAqZGV2ID0gZGV2X3ByaXYtPmRldjsKIAotCWlmICghZGV2X3ByaXYtPmRpc3Bs YXkuZW5hYmxlX2ZiYykKKwlpZiAoIWRldl9wcml2LT5mYmMuZW5hYmxlX2ZiYykKIAkJcmV0dXJu OwogCiAJbXV0ZXhfbG9jaygmZGV2X3ByaXYtPmZiYy5sb2NrKTsKQEAgLTk0NSwyNSArOTQ1LDI1 IEBAIHZvaWQgaW50ZWxfZmJjX2luaXQoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2 KQogCX0KIAogCWlmIChJTlRFTF9JTkZPKGRldl9wcml2KS0+Z2VuID49IDcpIHsKLQkJZGV2X3By aXYtPmRpc3BsYXkuZmJjX2VuYWJsZWQgPSBpbGtfZmJjX2VuYWJsZWQ7Ci0JCWRldl9wcml2LT5k aXNwbGF5LmVuYWJsZV9mYmMgPSBnZW43X2ZiY19lbmFibGU7Ci0JCWRldl9wcml2LT5kaXNwbGF5 LmRpc2FibGVfZmJjID0gaWxrX2ZiY19kaXNhYmxlOworCQlkZXZfcHJpdi0+ZmJjLmZiY19lbmFi bGVkID0gaWxrX2ZiY19lbmFibGVkOworCQlkZXZfcHJpdi0+ZmJjLmVuYWJsZV9mYmMgPSBnZW43 X2ZiY19lbmFibGU7CisJCWRldl9wcml2LT5mYmMuZGlzYWJsZV9mYmMgPSBpbGtfZmJjX2Rpc2Fi bGU7CiAJfSBlbHNlIGlmIChJTlRFTF9JTkZPKGRldl9wcml2KS0+Z2VuID49IDUpIHsKLQkJZGV2 X3ByaXYtPmRpc3BsYXkuZmJjX2VuYWJsZWQgPSBpbGtfZmJjX2VuYWJsZWQ7Ci0JCWRldl9wcml2 LT5kaXNwbGF5LmVuYWJsZV9mYmMgPSBpbGtfZmJjX2VuYWJsZTsKLQkJZGV2X3ByaXYtPmRpc3Bs YXkuZGlzYWJsZV9mYmMgPSBpbGtfZmJjX2Rpc2FibGU7CisJCWRldl9wcml2LT5mYmMuZmJjX2Vu YWJsZWQgPSBpbGtfZmJjX2VuYWJsZWQ7CisJCWRldl9wcml2LT5mYmMuZW5hYmxlX2ZiYyA9IGls a19mYmNfZW5hYmxlOworCQlkZXZfcHJpdi0+ZmJjLmRpc2FibGVfZmJjID0gaWxrX2ZiY19kaXNh YmxlOwogCX0gZWxzZSBpZiAoSVNfR000NShkZXZfcHJpdikpIHsKLQkJZGV2X3ByaXYtPmRpc3Bs YXkuZmJjX2VuYWJsZWQgPSBnNHhfZmJjX2VuYWJsZWQ7Ci0JCWRldl9wcml2LT5kaXNwbGF5LmVu YWJsZV9mYmMgPSBnNHhfZmJjX2VuYWJsZTsKLQkJZGV2X3ByaXYtPmRpc3BsYXkuZGlzYWJsZV9m YmMgPSBnNHhfZmJjX2Rpc2FibGU7CisJCWRldl9wcml2LT5mYmMuZmJjX2VuYWJsZWQgPSBnNHhf ZmJjX2VuYWJsZWQ7CisJCWRldl9wcml2LT5mYmMuZW5hYmxlX2ZiYyA9IGc0eF9mYmNfZW5hYmxl OworCQlkZXZfcHJpdi0+ZmJjLmRpc2FibGVfZmJjID0gZzR4X2ZiY19kaXNhYmxlOwogCX0gZWxz ZSB7Ci0JCWRldl9wcml2LT5kaXNwbGF5LmZiY19lbmFibGVkID0gaTh4eF9mYmNfZW5hYmxlZDsK LQkJZGV2X3ByaXYtPmRpc3BsYXkuZW5hYmxlX2ZiYyA9IGk4eHhfZmJjX2VuYWJsZTsKLQkJZGV2 X3ByaXYtPmRpc3BsYXkuZGlzYWJsZV9mYmMgPSBpOHh4X2ZiY19kaXNhYmxlOworCQlkZXZfcHJp di0+ZmJjLmZiY19lbmFibGVkID0gaTh4eF9mYmNfZW5hYmxlZDsKKwkJZGV2X3ByaXYtPmZiYy5l bmFibGVfZmJjID0gaTh4eF9mYmNfZW5hYmxlOworCQlkZXZfcHJpdi0+ZmJjLmRpc2FibGVfZmJj ID0gaTh4eF9mYmNfZGlzYWJsZTsKIAogCQkvKiBUaGlzIHZhbHVlIHdhcyBwdWxsZWQgb3V0IG9m IHNvbWVvbmUncyBoYXQgKi8KIAkJSTkxNV9XUklURShGQkNfQ09OVFJPTCwgNTAwIDw8IEZCQ19D VExfSU5URVJWQUxfU0hJRlQpOwogCX0KIAotCWRldl9wcml2LT5mYmMuZW5hYmxlZCA9IGRldl9w cml2LT5kaXNwbGF5LmZiY19lbmFibGVkKGRldl9wcml2LT5kZXYpOworCWRldl9wcml2LT5mYmMu ZW5hYmxlZCA9IGRldl9wcml2LT5mYmMuZmJjX2VuYWJsZWQoZGV2X3ByaXYtPmRldik7CiB9Ci0t IAoyLjEuNAoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18K SW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0 dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK