From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ville Syrjala Subject: [PATCH 4/9] drm/i915: Use enum old_plane_id for the .get_fifo_size() hooks Date: Wed, 11 Oct 2017 19:04:50 +0300 Message-ID: <20171011160455.1874-5-ville.syrjala@linux.intel.com> References: <20171011160455.1874-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 mga14.intel.com (mga14.intel.com [192.55.52.115]) by gabe.freedesktop.org (Postfix) with ESMTPS id AE1F26E6DC for ; Wed, 11 Oct 2017 16:05:12 +0000 (UTC) In-Reply-To: <20171011160455.1874-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 RnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KClJl cGxhY2UgdGhlIDAgYW5kIDEgd2l0aCBQTEFORV9BIGFuZCBQTEFORV9CIGluIHRoZSBwcmUtZzR4 IHdtIGNvZGUuCgpTaWduZWQtb2ZmLWJ5OiBWaWxsZSBTeXJqw6Rsw6QgPHZpbGxlLnN5cmphbGFA bGludXguaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmggfCAg MyArKy0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMgfCAzNiArKysrKysrKysrKysr KysrKysrLS0tLS0tLS0tLS0tLS0tLS0KIDIgZmlsZXMgY2hhbmdlZCwgMjEgaW5zZXJ0aW9ucygr KSwgMTggZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkx NV9kcnYuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKaW5kZXggNzI4MGY5ZWIy ZTk1Li5kZjEyMGEzOGFlNDIgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVf ZHJ2LmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaApAQCAtNjk5LDcgKzY5 OSw4IEBAIHN0cnVjdCBkcm1faTkxNV9kaXNwbGF5X2Z1bmNzIHsKIAkJCSAgc3RydWN0IGludGVs X2NkY2xrX3N0YXRlICpjZGNsa19zdGF0ZSk7CiAJdm9pZCAoKnNldF9jZGNsaykoc3RydWN0IGRy bV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAogCQkJICBjb25zdCBzdHJ1Y3QgaW50ZWxfY2RjbGtf c3RhdGUgKmNkY2xrX3N0YXRlKTsKLQlpbnQgKCpnZXRfZmlmb19zaXplKShzdHJ1Y3QgZHJtX2k5 MTVfcHJpdmF0ZSAqZGV2X3ByaXYsIGludCBwbGFuZSk7CisJaW50ICgqZ2V0X2ZpZm9fc2l6ZSko c3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAorCQkJICAgICBlbnVtIG9sZF9wbGFu ZV9pZCBwbGFuZV9pZCk7CiAJaW50ICgqY29tcHV0ZV9waXBlX3dtKShzdHJ1Y3QgaW50ZWxfY3J0 Y19zdGF0ZSAqY3N0YXRlKTsKIAlpbnQgKCpjb21wdXRlX2ludGVybWVkaWF0ZV93bSkoc3RydWN0 IGRybV9kZXZpY2UgKmRldiwKIAkJCQkgICAgICAgc3RydWN0IGludGVsX2NydGMgKmludGVsX2Ny dGMsCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jIGIvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYwppbmRleCAyZmNmZjk3ODhiNmYuLjEzZjEwMTBlZWE3 NyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYworKysgYi9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jCkBAIC01MjEsMzggKzUyMSw0MSBAQCBzdGF0aWMg dm9pZCB2bHZfZ2V0X2ZpZm9fc2l6ZShzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3J0Y19zdGF0 ZSkKIAlmaWZvX3N0YXRlLT5wbGFuZVtQTEFORV9DVVJTT1JdID0gNjM7CiB9CiAKLXN0YXRpYyBp bnQgaTl4eF9nZXRfZmlmb19zaXplKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwg aW50IHBsYW5lKQorc3RhdGljIGludCBpOXh4X2dldF9maWZvX3NpemUoc3RydWN0IGRybV9pOTE1 X3ByaXZhdGUgKmRldl9wcml2LAorCQkJICAgICAgZW51bSBvbGRfcGxhbmVfaWQgcGxhbmVfaWQp CiB7CiAJdWludDMyX3QgZHNwYXJiID0gSTkxNV9SRUFEKERTUEFSQik7CiAJaW50IHNpemU7CiAK IAlzaXplID0gZHNwYXJiICYgMHg3ZjsKLQlpZiAocGxhbmUpCisJaWYgKHBsYW5lX2lkID09IFBM QU5FX0IpCiAJCXNpemUgPSAoKGRzcGFyYiA+PiBEU1BBUkJfQ1NUQVJUX1NISUZUKSAmIDB4N2Yp IC0gc2l6ZTsKIAotCURSTV9ERUJVR19LTVMoIkZJRk8gc2l6ZSAtICgweCUwOHgpICVzOiAlZFxu IiwgZHNwYXJiLAotCQkgICAgICBwbGFuZSA/ICJCIiA6ICJBIiwgc2l6ZSk7CisJRFJNX0RFQlVH X0tNUygiRklGTyBzaXplIC0gKDB4JTA4eCkgJWM6ICVkXG4iLAorCQkgICAgICBkc3BhcmIsIHBs YW5lX25hbWUocGxhbmVfaWQpLCBzaXplKTsKIAogCXJldHVybiBzaXplOwogfQogCi1zdGF0aWMg aW50IGk4MzBfZ2V0X2ZpZm9fc2l6ZShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYs IGludCBwbGFuZSkKK3N0YXRpYyBpbnQgaTgzMF9nZXRfZmlmb19zaXplKHN0cnVjdCBkcm1faTkx NV9wcml2YXRlICpkZXZfcHJpdiwKKwkJCSAgICAgIGVudW0gb2xkX3BsYW5lX2lkIHBsYW5lX2lk KQogewogCXVpbnQzMl90IGRzcGFyYiA9IEk5MTVfUkVBRChEU1BBUkIpOwogCWludCBzaXplOwog CiAJc2l6ZSA9IGRzcGFyYiAmIDB4MWZmOwotCWlmIChwbGFuZSkKKwlpZiAocGxhbmVfaWQgPT0g UExBTkVfQikKIAkJc2l6ZSA9ICgoZHNwYXJiID4+IERTUEFSQl9CRU5EX1NISUZUKSAmIDB4MWZm KSAtIHNpemU7CiAJc2l6ZSA+Pj0gMTsgLyogQ29udmVydCB0byBjYWNoZWxpbmVzICovCiAKLQlE Uk1fREVCVUdfS01TKCJGSUZPIHNpemUgLSAoMHglMDh4KSAlczogJWRcbiIsIGRzcGFyYiwKLQkJ ICAgICAgcGxhbmUgPyAiQiIgOiAiQSIsIHNpemUpOworCURSTV9ERUJVR19LTVMoIkZJRk8gc2l6 ZSAtICgweCUwOHgpICVjOiAlZFxuIiwKKwkJICAgICAgZHNwYXJiLCBwbGFuZV9uYW1lKHBsYW5l X2lkKSwgc2l6ZSk7CiAKIAlyZXR1cm4gc2l6ZTsKIH0KIAotc3RhdGljIGludCBpODQ1X2dldF9m aWZvX3NpemUoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LCBpbnQgcGxhbmUpCitz dGF0aWMgaW50IGk4NDVfZ2V0X2ZpZm9fc2l6ZShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2 X3ByaXYsCisJCQkgICAgICBlbnVtIG9sZF9wbGFuZV9pZCBwbGFuZV9pZCkKIHsKIAl1aW50MzJf dCBkc3BhcmIgPSBJOTE1X1JFQUQoRFNQQVJCKTsKIAlpbnQgc2l6ZTsKQEAgLTU2MCw5ICs1NjMs OCBAQCBzdGF0aWMgaW50IGk4NDVfZ2V0X2ZpZm9fc2l6ZShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0 ZSAqZGV2X3ByaXYsIGludCBwbGFuZSkKIAlzaXplID0gZHNwYXJiICYgMHg3ZjsKIAlzaXplID4+ PSAyOyAvKiBDb252ZXJ0IHRvIGNhY2hlbGluZXMgKi8KIAotCURSTV9ERUJVR19LTVMoIkZJRk8g c2l6ZSAtICgweCUwOHgpICVzOiAlZFxuIiwgZHNwYXJiLAotCQkgICAgICBwbGFuZSA/ICJCIiA6 ICJBIiwKLQkJICAgICAgc2l6ZSk7CisJRFJNX0RFQlVHX0tNUygiRklGTyBzaXplIC0gKDB4JTA4 eCkgJWM6ICVkXG4iLAorCQkgICAgICBkc3BhcmIsIHBsYW5lX25hbWUocGxhbmVfaWQpLCBzaXpl KTsKIAogCXJldHVybiBzaXplOwogfQpAQCAtMjI2MSw4ICsyMjYzLDggQEAgc3RhdGljIHZvaWQg aTl4eF91cGRhdGVfd20oc3RydWN0IGludGVsX2NydGMgKnVudXNlZF9jcnRjKQogCWVsc2UKIAkJ d21faW5mbyA9ICZpODMwX2Ffd21faW5mbzsKIAotCWZpZm9fc2l6ZSA9IGRldl9wcml2LT5kaXNw bGF5LmdldF9maWZvX3NpemUoZGV2X3ByaXYsIDApOwotCWNydGMgPSBpbnRlbF9nZXRfY3J0Y19m b3JfcGxhbmUoZGV2X3ByaXYsIDApOworCWZpZm9fc2l6ZSA9IGRldl9wcml2LT5kaXNwbGF5Lmdl dF9maWZvX3NpemUoZGV2X3ByaXYsIFBMQU5FX0EpOworCWNydGMgPSBpbnRlbF9nZXRfY3J0Y19m b3JfcGxhbmUoZGV2X3ByaXYsIFBMQU5FX0EpOwogCWlmIChpbnRlbF9jcnRjX2FjdGl2ZShjcnRj KSkgewogCQljb25zdCBzdHJ1Y3QgZHJtX2Rpc3BsYXlfbW9kZSAqYWRqdXN0ZWRfbW9kZSA9CiAJ CQkmY3J0Yy0+Y29uZmlnLT5iYXNlLmFkanVzdGVkX21vZGU7CkBAIC0yMjg4LDggKzIyOTAsOCBA QCBzdGF0aWMgdm9pZCBpOXh4X3VwZGF0ZV93bShzdHJ1Y3QgaW50ZWxfY3J0YyAqdW51c2VkX2Ny dGMpCiAJaWYgKElTX0dFTjIoZGV2X3ByaXYpKQogCQl3bV9pbmZvID0gJmk4MzBfYmNfd21faW5m bzsKIAotCWZpZm9fc2l6ZSA9IGRldl9wcml2LT5kaXNwbGF5LmdldF9maWZvX3NpemUoZGV2X3By aXYsIDEpOwotCWNydGMgPSBpbnRlbF9nZXRfY3J0Y19mb3JfcGxhbmUoZGV2X3ByaXYsIDEpOwor CWZpZm9fc2l6ZSA9IGRldl9wcml2LT5kaXNwbGF5LmdldF9maWZvX3NpemUoZGV2X3ByaXYsIFBM QU5FX0IpOworCWNydGMgPSBpbnRlbF9nZXRfY3J0Y19mb3JfcGxhbmUoZGV2X3ByaXYsIFBMQU5F X0IpOwogCWlmIChpbnRlbF9jcnRjX2FjdGl2ZShjcnRjKSkgewogCQljb25zdCBzdHJ1Y3QgZHJt X2Rpc3BsYXlfbW9kZSAqYWRqdXN0ZWRfbW9kZSA9CiAJCQkmY3J0Yy0+Y29uZmlnLT5iYXNlLmFk anVzdGVkX21vZGU7CkBAIC0yNDAxLDcgKzI0MDMsNyBAQCBzdGF0aWMgdm9pZCBpODQ1X3VwZGF0 ZV93bShzdHJ1Y3QgaW50ZWxfY3J0YyAqdW51c2VkX2NydGMpCiAJYWRqdXN0ZWRfbW9kZSA9ICZj cnRjLT5jb25maWctPmJhc2UuYWRqdXN0ZWRfbW9kZTsKIAlwbGFuZWFfd20gPSBpbnRlbF9jYWxj dWxhdGVfd20oYWRqdXN0ZWRfbW9kZS0+Y3J0Y19jbG9jaywKIAkJCQkgICAgICAgJmk4NDVfd21f aW5mbywKLQkJCQkgICAgICAgZGV2X3ByaXYtPmRpc3BsYXkuZ2V0X2ZpZm9fc2l6ZShkZXZfcHJp diwgMCksCisJCQkJICAgICAgIGRldl9wcml2LT5kaXNwbGF5LmdldF9maWZvX3NpemUoZGV2X3By aXYsIFBMQU5FX0EpLAogCQkJCSAgICAgICA0LCBwZXNzaW1hbF9sYXRlbmN5X25zKTsKIAlmd2F0 ZXJfbG8gPSBJOTE1X1JFQUQoRldfQkxDKSAmIH4weGZmZjsKIAlmd2F0ZXJfbG8gfD0gKDM8PDgp IHwgcGxhbmVhX3dtOwotLSAKMi4xMy42CgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5m cmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0 aW5mby9pbnRlbC1nZngK