From: Paulo Zanoni Subject: [PATCH 05/11] drm/i915: change dev_priv->fbc.plane to dev_priv->fbc.crtc Date: Mon, 8 Dec 2014 14:09:14 -0200 Message-ID: <1418054960-1403-6-git-send-email-przanoni@gmail.com> References: <1418054960-1403-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-f43.google.com (mail-qg0-f43.google.com [209.85.192.43]) by gabe.freedesktop.org (Postfix) with ESMTP id 30B656E779 for ; Mon, 8 Dec 2014 08:10:34 -0800 (PST) Received: by mail-qg0-f43.google.com with SMTP id i50so771319qgf.2 for ; Mon, 08 Dec 2014 08:10:33 -0800 (PST) In-Reply-To: <1418054960-1403-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+CgpTaW5jZSB0aGUg bWFwcGluZyBmcm9tIENSVENzIHRvIHBsYW5lcyBpcyBmaXhlZCwgbG9va2luZyBhdCB0aGUgQ1JU QwppcyBlc3NlbnRpYWxseSB0aGUgc2FtZSBhcyBsb29raW5nIGF0IHRoZSBwbGFuZS4gQWxzbywg dGhlIG5leHQKcGF0Y2hlcyB3aWwgc3RhcnQgdXNpbmcgdGhlIGZyb250YnVmZmVyX2JpdHMgbWFj cm9zLCBhbmQgdGhleSB0YWtlIHRoZQpwaXBlIGFzIHRoZSBwYXJhbWV0ZXIgaW5zdGVhZCBvZiB0 aGUgcGxhbmUsIGFuZCB0aGlzIGNvdWxkIGRpZmZlciBvbgpnZW5zIDIgYW5kIDMuCgpBbm90aGVy IG5pY2UgdGhpbmcgaXMgdGhhdCB3ZSBkb24ndCByaXNrIGFjY2lkZW50YWxseSBpbml0aWFsaXpp bmcKdGhpbmdzIHRvIFBMQU5FX0EgaWYgd2UgZG9uJ3Qgc2V0IHRoZSB2YWx1ZSBiZWZvcmUgaXQg aXMgdXNlZCBmb3IgdGhlCmZpcnN0IHRpbWUuIEJ1dCB0aGlzIHNob3VsZG4ndCBiZSBhIHByb2Js ZW0gd2l0aCB0aGUgY3VycmVudCBjb2RlLgoKU2lnbmVkLW9mZi1ieTogUGF1bG8gWmFub25pIDxw YXVsby5yLnphbm9uaUBpbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9k cnYuaCAgICAgIHwgMiArLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jIHwg NSArKy0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZmJjLmMgICAgIHwgNiArKystLS0K IGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Nwcml0ZS5jICB8IDIgKy0KIDQgZmlsZXMgY2hh bmdlZCwgNyBpbnNlcnRpb25zKCspLCA4IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Ry di5oCmluZGV4IGI1MjYwYmYuLjlkNjk0ZjEgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2k5MTVfZHJ2LmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaApAQCAt Njg5LDcgKzY4OSw3IEBAIHN0cnVjdCBpOTE1X2ZiYyB7CiAJdW5zaWduZWQgbG9uZyBzaXplOwog CXVuc2lnbmVkIHRocmVzaG9sZDsKIAl1bnNpZ25lZCBpbnQgZmJfaWQ7Ci0JZW51bSBwbGFuZSBw bGFuZTsKKwlzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YzsKIAlpbnQgeTsKIAogCXN0cnVjdCBkcm1f bW1fbm9kZSBjb21wcmVzc2VkX2ZiOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUv aW50ZWxfZGlzcGxheS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCmlu ZGV4IGU0Nzg5ZjQuLjg4ZjM2NTIgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX2Rpc3BsYXkuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMK QEAgLTQyMTgsMTEgKzQyMTgsMTAgQEAgc3RhdGljIHZvaWQgaW50ZWxfY3J0Y19kaXNhYmxlX3Bs YW5lcyhzdHJ1Y3QgZHJtX2NydGMgKmNydGMpCiAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRl dl9wcml2ID0gZGV2LT5kZXZfcHJpdmF0ZTsKIAlzdHJ1Y3QgaW50ZWxfY3J0YyAqaW50ZWxfY3J0 YyA9IHRvX2ludGVsX2NydGMoY3J0Yyk7CiAJaW50IHBpcGUgPSBpbnRlbF9jcnRjLT5waXBlOwot CWludCBwbGFuZSA9IGludGVsX2NydGMtPnBsYW5lOwogCiAJaW50ZWxfY3J0Y193YWl0X2Zvcl9w ZW5kaW5nX2ZsaXBzKGNydGMpOwogCi0JaWYgKGRldl9wcml2LT5mYmMucGxhbmUgPT0gcGxhbmUp CisJaWYgKGRldl9wcml2LT5mYmMuY3J0YyA9PSBpbnRlbF9jcnRjKQogCQlpbnRlbF9mYmNfZGlz YWJsZShkZXYpOwogCiAJaHN3X2Rpc2FibGVfaXBzKGludGVsX2NydGMpOwpAQCAtMTE4MTMsNyAr MTE4MTIsNyBAQCBpbnRlbF9jb21taXRfcHJpbWFyeV9wbGFuZShzdHJ1Y3QgZHJtX3BsYW5lICpw bGFuZSwKIAkJICovCiAJCWlmIChpbnRlbF9jcnRjLT5wcmltYXJ5X2VuYWJsZWQgJiYKIAkJICAg IElOVEVMX0lORk8oZGV2KS0+Z2VuIDw9IDQgJiYgIUlTX0c0WChkZXYpICYmCi0JCSAgICBkZXZf cHJpdi0+ZmJjLnBsYW5lID09IGludGVsX2NydGMtPnBsYW5lICYmCisJCSAgICBkZXZfcHJpdi0+ ZmJjLmNydGMgPT0gaW50ZWxfY3J0YyAmJgogCQkgICAgaW50ZWxfcGxhbmUtPnJvdGF0aW9uICE9 IEJJVChEUk1fUk9UQVRFXzApKSB7CiAJCQlpbnRlbF9mYmNfZGlzYWJsZShkZXYpOwogCQl9CmRp ZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9mYmMuYyBiL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX2ZiYy5jCmluZGV4IGYzZDU3NjQuLjg4ZDAwZDMgMTAwNjQ0Ci0tLSBh L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2ZiYy5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX2ZiYy5jCkBAIC0zODMsNyArMzgzLDcgQEAgc3RhdGljIHZvaWQgaW50ZWxfZmJj X3dvcmtfZm4oc3RydWN0IHdvcmtfc3RydWN0ICpfX3dvcmspCiAJCWlmICh3b3JrLT5jcnRjLT5w cmltYXJ5LT5mYiA9PSB3b3JrLT5mYikgewogCQkJZGV2X3ByaXYtPmRpc3BsYXkuZW5hYmxlX2Zi Yyh3b3JrLT5jcnRjKTsKIAotCQkJZGV2X3ByaXYtPmZiYy5wbGFuZSA9IHRvX2ludGVsX2NydGMo d29yay0+Y3J0YyktPnBsYW5lOworCQkJZGV2X3ByaXYtPmZiYy5jcnRjID0gdG9faW50ZWxfY3J0 Yyh3b3JrLT5jcnRjKTsKIAkJCWRldl9wcml2LT5mYmMuZmJfaWQgPSB3b3JrLT5jcnRjLT5wcmlt YXJ5LT5mYi0+YmFzZS5pZDsKIAkJCWRldl9wcml2LT5mYmMueSA9IHdvcmstPmNydGMtPnk7CiAJ CX0KQEAgLTQ3NCw3ICs0NzQsNyBAQCB2b2lkIGludGVsX2ZiY19kaXNhYmxlKHN0cnVjdCBkcm1f ZGV2aWNlICpkZXYpCiAJCXJldHVybjsKIAogCWRldl9wcml2LT5kaXNwbGF5LmRpc2FibGVfZmJj KGRldik7Ci0JZGV2X3ByaXYtPmZiYy5wbGFuZSA9IC0xOworCWRldl9wcml2LT5mYmMuY3J0YyA9 IE5VTEw7CiB9CiAKIHN0YXRpYyBib29sIHNldF9ub19mYmNfcmVhc29uKHN0cnVjdCBkcm1faTkx NV9wcml2YXRlICpkZXZfcHJpdiwKQEAgLTYyNiw3ICs2MjYsNyBAQCB2b2lkIGludGVsX2ZiY191 cGRhdGUoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAkgKiBjYW5ub3QgYmUgdW5waW5uZWQgKGFu ZCBoYXZlIGl0cyBHVFQgb2Zmc2V0IGFuZCBmZW5jZSByZXZva2VkKQogCSAqIHdpdGhvdXQgZmly c3QgYmVpbmcgZGVjb3VwbGVkIGZyb20gdGhlIHNjYW5vdXQgYW5kIEZCQyBkaXNhYmxlZC4KIAkg Ki8KLQlpZiAoZGV2X3ByaXYtPmZiYy5wbGFuZSA9PSBpbnRlbF9jcnRjLT5wbGFuZSAmJgorCWlm IChkZXZfcHJpdi0+ZmJjLmNydGMgPT0gaW50ZWxfY3J0YyAmJgogCSAgICBkZXZfcHJpdi0+ZmJj LmZiX2lkID09IGZiLT5iYXNlLmlkICYmCiAJICAgIGRldl9wcml2LT5mYmMueSA9PSBjcnRjLT55 KQogCQlyZXR1cm47CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9zcHJp dGUuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Nwcml0ZS5jCmluZGV4IGMxOGU1N2Qu Ljk0MmRhY2EgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Nwcml0ZS5j CisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Nwcml0ZS5jCkBAIC0xMDE2LDcgKzEw MTYsNyBAQCBpbnRlbF9wcmVfZGlzYWJsZV9wcmltYXJ5KHN0cnVjdCBkcm1fY3J0YyAqY3J0YykK IAlzdHJ1Y3QgaW50ZWxfY3J0YyAqaW50ZWxfY3J0YyA9IHRvX2ludGVsX2NydGMoY3J0Yyk7CiAK IAltdXRleF9sb2NrKCZkZXYtPnN0cnVjdF9tdXRleCk7Ci0JaWYgKGRldl9wcml2LT5mYmMucGxh bmUgPT0gaW50ZWxfY3J0Yy0+cGxhbmUpCisJaWYgKGRldl9wcml2LT5mYmMuY3J0YyA9PSBpbnRl bF9jcnRjKQogCQlpbnRlbF9mYmNfZGlzYWJsZShkZXYpOwogCW11dGV4X3VubG9jaygmZGV2LT5z dHJ1Y3RfbXV0ZXgpOwogCi0tIAoyLjEuMwoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMu ZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0 aW5mby9pbnRlbC1nZngK