From mboxrd@z Thu Jan 1 00:00:00 1970 From: ville.syrjala@linux.intel.com Subject: [PATCH] drm: Don't force all planes to be added to the state due to zpos Date: Mon, 10 Oct 2016 15:19:47 +0300 Message-ID: <1476101987-31986-1-git-send-email-ville.syrjala@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTPS id 078A56E510 for ; Mon, 10 Oct 2016 12:19:53 +0000 (UTC) List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: dri-devel@lists.freedesktop.org Cc: Seung-Woo Kim , stable@vger.kernel.org, Kyungmin Park , Laurent Pinchart , Lyude , Vincent Abriou , Marek Szyprowski List-Id: dri-devel@lists.freedesktop.org RnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KCldl IGRvbid0IHdhbnQgYWxsIHBsYW5lcyB0byBiZSBhZGRlZCB0byB0aGUgc3RhdGUgd2hlbmV2ZXIg YQpwbGFuZSB3aXRoIGZpeGVkIHpwb3MgZ2V0cyBlbmFibGVkL2Rpc2FibGVkLiBUaGlzIGlzIHRy dWUKZXNwZWNpYWxseSBmb3IgZWcuIGN1cnNvciBwbGFuZXMgb24gaTkxNSwgYXMgd2Ugd2FudCBj dXJzb3IKdXBkYXRlcyB0byBnbyB0aHJvdWdoIHcvbyB0aHJvdHRsaW5nLiBTYW1lIGhvbGRzIGZv ciBkcml2ZXJzCnRoYXQgZG9uJ3Qgc3VwcG9ydCB6cG9zIGF0IGFsbCAoaTkxNSBhY3R1YWxseSBm YWxscyBpbnRvIHRoaXMKY2F0ZWdvcnkgcmlnaHQgbm93IHNpbmNlIHdlJ3ZlIG5vdCB5ZXQgYWRk ZWQgenBvcyBzdXBwb3J0KS4KCkFsbG93IGRyaXZlcnMgbW9yZSBmcmVlZG9tIGJ5IGxldHRpbmcg dGhlbSBkZWFsIHdpdGggenBvcwp0aGVtc2VsdmVzIGluc3RlYWQgb2YgZG9pbmcgaXQgaW4gZHJt X2F0b21pY19oZWxwZXJfY2hlY2tfcGxhbmVzKCkKdW5jb25kaXRpb25hbGx5LiBFYXNpZXN0IHNv bHV0aW9uIHNlZW1zIHRvIGJlIHRvIG1vdmUgdGhlIGNhbGwKdXAgdG8gZHJtX2F0b21pY19oZWxw ZXJfY2hlY2soKS4gQnV0IGFzIHNvbWUgZHJpdmVycyBtaWdodCB3YW50CnRvIHVzZSB0aGF0IGZ1 bmN0aW9uIHdpdGhvdXQgdGhlIHpwb3MgaGFuZGxpbmcsIGxldCdzIHByb3ZpZGUKdHdvIHZhcmlh bnRzOiB0aGUgbm9ybWFsIG9uZSwgYW5kIG9uZSB0aGF0IGRlYWxzIHdpdGggenBvcy4KCkNjOiBN YXJlayBTenlwcm93c2tpIDxtLnN6eXByb3dza2lAc2Ftc3VuZy5jb20+CkNjOiBCZW5qYW1pbiBH YWlnbmFyZCA8YmVuamFtaW4uZ2FpZ25hcmRAbGluYXJvLm9yZz4KQ2M6IFZpbmNlbnQgQWJyaW91 IDx2aW5jZW50LmFicmlvdUBzdC5jb20+CkNjOiBMYXVyZW50IFBpbmNoYXJ0IDxsYXVyZW50LnBp bmNoYXJ0QGlkZWFzb25ib2FyZC5jb20+CkNjOiBJbmtpIERhZSA8aW5raS5kYWVAc2Ftc3VuZy5j b20+CkNjOiBKb29ueW91bmcgU2hpbSA8ankwOTIyLnNoaW1Ac2Ftc3VuZy5jb20+CkNjOiBTZXVu Zy1Xb28gS2ltIDxzdzAzMTIua2ltQHNhbXN1bmcuY29tPgpDYzogS3l1bmdtaW4gUGFyayA8a3l1 bmdtaW4ucGFya0BzYW1zdW5nLmNvbT4KQ2M6IEx5dWRlIDxjcGF1bEByZWRoYXQuY29tPgpDYzog TWFhcnRlbiBMYW5raG9yc3QgPG1hYXJ0ZW4ubGFua2hvcnN0QGxpbnV4LmludGVsLmNvbT4KQ2M6 IHN0YWJsZUB2Z2VyLmtlcm5lbC5vcmcKRml4ZXM6IDQ0ZDEyNDBkMDA2YyAoImRybTogYWRkIGdl bmVyaWMgenBvcyBwcm9wZXJ0eSIpClNpZ25lZC1vZmYtYnk6IFZpbGxlIFN5cmrDpGzDpCA8dmls bGUuc3lyamFsYUBsaW51eC5pbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2RybV9hdG9t aWNfaGVscGVyLmMgICAgfCA0NiArKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrLS0tCiBk cml2ZXJzL2dwdS9kcm0vZXh5bm9zL2V4eW5vc19kcm1fZmIuYyB8ICAyICstCiBkcml2ZXJzL2dw dS9kcm0vcmNhci1kdS9yY2FyX2R1X2ttcy5jICB8ICAyICstCiBkcml2ZXJzL2dwdS9kcm0vc3Rp L3N0aV9kcnYuYyAgICAgICAgICB8ICAyICstCiBpbmNsdWRlL2RybS9kcm1fYXRvbWljX2hlbHBl ci5oICAgICAgICB8ICAyICsrCiA1IGZpbGVzIGNoYW5nZWQsIDQ3IGluc2VydGlvbnMoKyksIDcg ZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2RybV9hdG9taWNfaGVs cGVyLmMgYi9kcml2ZXJzL2dwdS9kcm0vZHJtX2F0b21pY19oZWxwZXIuYwppbmRleCBjM2Y4MzQ3 NmY5OTYuLmNkMTkyODFjZGVmYiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2RybV9hdG9t aWNfaGVscGVyLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2RybV9hdG9taWNfaGVscGVyLmMKQEAg LTU5NCwxMCArNTk0LDYgQEAgZHJtX2F0b21pY19oZWxwZXJfY2hlY2tfcGxhbmVzKHN0cnVjdCBk cm1fZGV2aWNlICpkZXYsCiAJc3RydWN0IGRybV9wbGFuZV9zdGF0ZSAqcGxhbmVfc3RhdGU7CiAJ aW50IGksIHJldCA9IDA7CiAKLQlyZXQgPSBkcm1fYXRvbWljX25vcm1hbGl6ZV96cG9zKGRldiwg c3RhdGUpOwotCWlmIChyZXQpCi0JCXJldHVybiByZXQ7Ci0KIAlmb3JfZWFjaF9wbGFuZV9pbl9z dGF0ZShzdGF0ZSwgcGxhbmUsIHBsYW5lX3N0YXRlLCBpKSB7CiAJCWNvbnN0IHN0cnVjdCBkcm1f cGxhbmVfaGVscGVyX2Z1bmNzICpmdW5jczsKIApAQCAtNjczLDYgKzY2OSw0OCBAQCBpbnQgZHJt X2F0b21pY19oZWxwZXJfY2hlY2soc3RydWN0IGRybV9kZXZpY2UgKmRldiwKIH0KIEVYUE9SVF9T WU1CT0woZHJtX2F0b21pY19oZWxwZXJfY2hlY2spOwogCisvKioKKyAqIGRybV9hdG9taWNfaGVs cGVyX2NoZWNrX3dpdGhfenBvcyAtIHZhbGlkYXRlIHN0YXRlIG9iamVjdCwgZGVhbGluZyB3aXRo IHpwb3MKKyAqIEBkZXY6IERSTSBkZXZpY2UKKyAqIEBzdGF0ZTogdGhlIGRyaXZlciBzdGF0ZSBv YmplY3QKKyAqCisgKiBDaGVjayB0aGUgc3RhdGUgb2JqZWN0IHRvIHNlZSBpZiB0aGUgcmVxdWVz dGVkIHN0YXRlIGlzIHBoeXNpY2FsbHkgcG9zc2libGUuCisgKiBPbmx5IGNydGNzIGFuZCBwbGFu ZXMgaGF2ZSBjaGVjayBjYWxsYmFja3MsIHNvIGZvciBhbnkgYWRkaXRpb25hbCAoZ2xvYmFsKQor ICogY2hlY2tpbmcgdGhhdCBhIGRyaXZlciBuZWVkcyBpdCBjYW4gc2ltcGx5IHdyYXAgdGhhdCBh cm91bmQgdGhpcyBmdW5jdGlvbi4KKyAqIERyaXZlcnMgd2l0aG91dCBzdWNoIG5lZWRzIGNhbiBk aXJlY3RseSB1c2UgdGhpcyBhcyB0aGVpciAtPmF0b21pY19jaGVjaygpCisgKiBjYWxsYmFjay4K KyAqCisgKiBUaGlzIGp1c3Qgd3JhcHMgdGhlIHR3byBwYXJ0cyBvZiB0aGUgc3RhdGUgY2hlY2tp bmcgZm9yIHBsYW5lcyBhbmQgbW9kZXNldAorICogc3RhdGUgaW4gdGhlIGRlZmF1bHQgb3JkZXI6 IEZpcnN0IGl0IGNhbGxzIGRybV9hdG9taWNfaGVscGVyX2NoZWNrX21vZGVzZXQoKSwKKyAqIGZv bGxvd2VkIGJ5IGRybV9hdG9taWNfbm9ybWFsaXplX3pwb3MoKSwgYW5kIGZpbmFsbHkKKyAqIGRy bV9hdG9taWNfaGVscGVyX2NoZWNrX3BsYW5lcygpLiBUaGUgYXNzdW1wdGlvbiBpcyB0aGF0IHRo ZQorICogLT5hdG9taWNfY2hlY2sgZnVuY3Rpb25zIGRlcGVuZCB1cG9uIGFuIHVwZGF0ZWQgYWRq dXN0ZWRfbW9kZS5jbG9jayB0bworICogZS5nLiBwcm9wZXJseSBjb21wdXRlIHdhdGVybWFya3Mu CisgKgorICogUkVUVVJOUzoKKyAqIFplcm8gZm9yIHN1Y2Nlc3Mgb3IgLWVycm5vCisgKi8KK2lu dCBkcm1fYXRvbWljX2hlbHBlcl9jaGVja193aXRoX3pwb3Moc3RydWN0IGRybV9kZXZpY2UgKmRl diwKKwkJCQkgICAgICBzdHJ1Y3QgZHJtX2F0b21pY19zdGF0ZSAqc3RhdGUpCit7CisJaW50IHJl dDsKKworCXJldCA9IGRybV9hdG9taWNfaGVscGVyX2NoZWNrX21vZGVzZXQoZGV2LCBzdGF0ZSk7 CisJaWYgKHJldCkKKwkJcmV0dXJuIHJldDsKKworCXJldCA9IGRybV9hdG9taWNfbm9ybWFsaXpl X3pwb3MoZGV2LCBzdGF0ZSk7CisJaWYgKHJldCkKKwkJcmV0dXJuIHJldDsKKworCXJldCA9IGRy bV9hdG9taWNfaGVscGVyX2NoZWNrX3BsYW5lcyhkZXYsIHN0YXRlKTsKKwlpZiAocmV0KQorCQly ZXR1cm4gcmV0OworCisJcmV0dXJuIHJldDsKK30KK0VYUE9SVF9TWU1CT0woZHJtX2F0b21pY19o ZWxwZXJfY2hlY2tfd2l0aF96cG9zKTsKKwogc3RhdGljIHZvaWQKIGRpc2FibGVfb3V0cHV0cyhz dHJ1Y3QgZHJtX2RldmljZSAqZGV2LCBzdHJ1Y3QgZHJtX2F0b21pY19zdGF0ZSAqb2xkX3N0YXRl KQogewpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2V4eW5vcy9leHlub3NfZHJtX2ZiLmMg Yi9kcml2ZXJzL2dwdS9kcm0vZXh5bm9zL2V4eW5vc19kcm1fZmIuYwppbmRleCA0MGNlODQxZWI5 NTIuLjVjMDkzMGFmMDFmYSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2V4eW5vcy9leHlu b3NfZHJtX2ZiLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2V4eW5vcy9leHlub3NfZHJtX2ZiLmMK QEAgLTE5MCw3ICsxOTAsNyBAQCBkbWFfYWRkcl90IGV4eW5vc19kcm1fZmJfZG1hX2FkZHIoc3Ry dWN0IGRybV9mcmFtZWJ1ZmZlciAqZmIsIGludCBpbmRleCkKIHN0YXRpYyBjb25zdCBzdHJ1Y3Qg ZHJtX21vZGVfY29uZmlnX2Z1bmNzIGV4eW5vc19kcm1fbW9kZV9jb25maWdfZnVuY3MgPSB7CiAJ LmZiX2NyZWF0ZSA9IGV4eW5vc191c2VyX2ZiX2NyZWF0ZSwKIAkub3V0cHV0X3BvbGxfY2hhbmdl ZCA9IGV4eW5vc19kcm1fb3V0cHV0X3BvbGxfY2hhbmdlZCwKLQkuYXRvbWljX2NoZWNrID0gZHJt X2F0b21pY19oZWxwZXJfY2hlY2ssCisJLmF0b21pY19jaGVjayA9IGRybV9hdG9taWNfaGVscGVy X2NoZWNrX3dpdGhfenBvcywKIAkuYXRvbWljX2NvbW1pdCA9IGV4eW5vc19hdG9taWNfY29tbWl0 LAogfTsKIApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL3JjYXItZHUvcmNhcl9kdV9rbXMu YyBiL2RyaXZlcnMvZ3B1L2RybS9yY2FyLWR1L3JjYXJfZHVfa21zLmMKaW5kZXggYmQ5YzNiYjky NTJjLi4yY2ZkMzVmM2YyZjYgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9yY2FyLWR1L3Jj YXJfZHVfa21zLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL3JjYXItZHUvcmNhcl9kdV9rbXMuYwpA QCAtMjMxLDcgKzIzMSw3IEBAIHN0YXRpYyBpbnQgcmNhcl9kdV9hdG9taWNfY2hlY2soc3RydWN0 IGRybV9kZXZpY2UgKmRldiwKIAlzdHJ1Y3QgcmNhcl9kdV9kZXZpY2UgKnJjZHUgPSBkZXYtPmRl dl9wcml2YXRlOwogCWludCByZXQ7CiAKLQlyZXQgPSBkcm1fYXRvbWljX2hlbHBlcl9jaGVjayhk ZXYsIHN0YXRlKTsKKwlyZXQgPSBkcm1fYXRvbWljX2hlbHBlcl9jaGVja193aXRoX3pwb3MoZGV2 LCBzdGF0ZSk7CiAJaWYgKHJldCA8IDApCiAJCXJldHVybiByZXQ7CiAKZGlmZiAtLWdpdCBhL2Ry aXZlcnMvZ3B1L2RybS9zdGkvc3RpX2Rydi5jIGIvZHJpdmVycy9ncHUvZHJtL3N0aS9zdGlfZHJ2 LmMKaW5kZXggMjc4NDkxOWE3MzY2Li5kZjVmMTUwMDIxZDAgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMv Z3B1L2RybS9zdGkvc3RpX2Rydi5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9zdGkvc3RpX2Rydi5j CkBAIC0yNDgsNyArMjQ4LDcgQEAgc3RhdGljIHZvaWQgc3RpX291dHB1dF9wb2xsX2NoYW5nZWQo c3RydWN0IGRybV9kZXZpY2UgKmRkZXYpCiBzdGF0aWMgY29uc3Qgc3RydWN0IGRybV9tb2RlX2Nv bmZpZ19mdW5jcyBzdGlfbW9kZV9jb25maWdfZnVuY3MgPSB7CiAJLmZiX2NyZWF0ZSA9IGRybV9m Yl9jbWFfY3JlYXRlLAogCS5vdXRwdXRfcG9sbF9jaGFuZ2VkID0gc3RpX291dHB1dF9wb2xsX2No YW5nZWQsCi0JLmF0b21pY19jaGVjayA9IGRybV9hdG9taWNfaGVscGVyX2NoZWNrLAorCS5hdG9t aWNfY2hlY2sgPSBkcm1fYXRvbWljX2hlbHBlcl9jaGVja193aXRoX3pwb3MsCiAJLmF0b21pY19j b21taXQgPSBzdGlfYXRvbWljX2NvbW1pdCwKIH07CiAKZGlmZiAtLWdpdCBhL2luY2x1ZGUvZHJt L2RybV9hdG9taWNfaGVscGVyLmggYi9pbmNsdWRlL2RybS9kcm1fYXRvbWljX2hlbHBlci5oCmlu ZGV4IDdmZjkyYjA5ZmQ5Yy4uYjFlNzE5M2M5ZDFjIDEwMDY0NAotLS0gYS9pbmNsdWRlL2RybS9k cm1fYXRvbWljX2hlbHBlci5oCisrKyBiL2luY2x1ZGUvZHJtL2RybV9hdG9taWNfaGVscGVyLmgK QEAgLTQwLDYgKzQwLDggQEAgaW50IGRybV9hdG9taWNfaGVscGVyX2NoZWNrX3BsYW5lcyhzdHJ1 Y3QgZHJtX2RldmljZSAqZGV2LAogCQkJICAgICAgIHN0cnVjdCBkcm1fYXRvbWljX3N0YXRlICpz dGF0ZSk7CiBpbnQgZHJtX2F0b21pY19oZWxwZXJfY2hlY2soc3RydWN0IGRybV9kZXZpY2UgKmRl diwKIAkJCSAgICBzdHJ1Y3QgZHJtX2F0b21pY19zdGF0ZSAqc3RhdGUpOworaW50IGRybV9hdG9t aWNfaGVscGVyX2NoZWNrX3dpdGhfenBvcyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAorCQkJCSAg ICAgIHN0cnVjdCBkcm1fYXRvbWljX3N0YXRlICpzdGF0ZSk7CiB2b2lkIGRybV9hdG9taWNfaGVs cGVyX2NvbW1pdF90YWlsKHN0cnVjdCBkcm1fYXRvbWljX3N0YXRlICpzdGF0ZSk7CiBpbnQgZHJt X2F0b21pY19oZWxwZXJfY29tbWl0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAJCQkgICAgIHN0 cnVjdCBkcm1fYXRvbWljX3N0YXRlICpzdGF0ZSwKLS0gCjIuNy40CgpfX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpkcmktZGV2ZWwgbWFpbGluZyBsaXN0CmRy aS1kZXZlbEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5v cmcvbWFpbG1hbi9saXN0aW5mby9kcmktZGV2ZWwK