From: Ville Syrjala Subject: [PATCH 2/6] drm/atomic-helper: Make drm_atomic_helper_disable_all() update the plane->fb pointers Date: Tue, 20 Mar 2018 21:17:53 +0200 Message-ID: <20180320191757.23869-2-ville.syrjala@linux.intel.com> References: <20180320191757.23869-1-ville.syrjala@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20180320191757.23869-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: dri-devel@lists.freedesktop.org Cc: intel-gfx@lists.freedesktop.org, martin.peres@free.fr, Daniel Vetter List-Id: dri-devel@lists.freedesktop.org RnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KCmRy bV9hdG9taWNfaGVscGVyX3NodXRkb3duKCkgbmVlZHMgdG8gcmVsZWFzZSB0aGUgcmVmZXJlbmNl IGhlbGQgYnkKcGxhbmUtPmZiLCBzbyB3ZSB3YW50IHRvIHVzZSBkcm1fYXRvbWljX2NsZWFuX29s ZF9mYigpIGluCmRybV9hdG9taWNfaGVscGVyX2Rpc2FibGVfYWxsKCkuIEhvd2V2ZXIgZHVyaW5n IHN1c3BlbmQvcmVzdW1lLCBncHUKcmVzZXQgYW5kIGxvYWQgZGV0ZWN0aW9uIHdlIHNob3VsZCBw cm9iYWJseSBsZWF2ZSB0aGF0IHN0dWZmIGFsb25lLAphcyBvdGhlcndpc2Ugd2UnZCBoYXZlIHRv IG1ha2Ugc3VyZSB3ZSBwdXQgdGhlbSBiYWNrIGFnYWluIHdoZW4Kd2UgcmVzdG9yZSB0aGUgZHVw bGljYXRlZCBzdGF0ZSB0byB0aGUgZGV2aWNlLiBTZWVtcyBzaW1wbGVyIHRvIG1lCnRvIG5vdCB0 b3VjaCBhbnkgb2YgaXQgYW55d2F5LgoKQ2M6IG1hcnRpbi5wZXJlc0BmcmVlLmZyCkNjOiBjaHJp c0BjaHJpcy13aWxzb24uY28udWsKQ2M6IERhdmUgQWlybGllIDxhaXJsaWVkQGdtYWlsLmNvbT4g KHYxKQpDYzogTWFhcnRlbiBMYW5raG9yc3QgPG1hYXJ0ZW4ubGFua2hvcnN0QGxpbnV4LmludGVs LmNvbT4KQ2M6IERhbmllbCBWZXR0ZXIgPGRhbmllbC52ZXR0ZXJAaW50ZWwuY29tPgpTaWduZWQt b2ZmLWJ5OiBWaWxsZSBTeXJqw6Rsw6QgPHZpbGxlLnN5cmphbGFAbGludXguaW50ZWwuY29tPgot LS0KIGRyaXZlcnMvZ3B1L2RybS9kcm1fYXRvbWljX2hlbHBlci5jICB8IDE2ICsrKysrKysrKysr KystLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYyB8ICAyICstCiBpbmNs dWRlL2RybS9kcm1fYXRvbWljX2hlbHBlci5oICAgICAgfCAgMyArKy0KIDMgZmlsZXMgY2hhbmdl ZCwgMTYgaW5zZXJ0aW9ucygrKSwgNSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJz L2dwdS9kcm0vZHJtX2F0b21pY19oZWxwZXIuYyBiL2RyaXZlcnMvZ3B1L2RybS9kcm1fYXRvbWlj X2hlbHBlci5jCmluZGV4IGM0OGYxODdkMDhkZS4uZTlkZmY5YzAxNGRmIDEwMDY0NAotLS0gYS9k cml2ZXJzL2dwdS9kcm0vZHJtX2F0b21pY19oZWxwZXIuYworKysgYi9kcml2ZXJzL2dwdS9kcm0v ZHJtX2F0b21pY19oZWxwZXIuYwpAQCAtMjg4NSw2ICsyODg1LDcgQEAgaW50IF9fZHJtX2F0b21p Y19oZWxwZXJfc2V0X2NvbmZpZyhzdHJ1Y3QgZHJtX21vZGVfc2V0ICpzZXQsCiAgKiBkcm1fYXRv bWljX2hlbHBlcl9kaXNhYmxlX2FsbCAtIGRpc2FibGUgYWxsIGN1cnJlbnRseSBhY3RpdmUgb3V0 cHV0cwogICogQGRldjogRFJNIGRldmljZQogICogQGN0eDogbG9jayBhY3F1aXNpdGlvbiBjb250 ZXh0CisgKiBAY2xlYW5fb2xkX2ZiczogdXBkYXRlIHRoZSBwbGFuZS0+ZmIvb2xkX2ZiIHBvaW50 ZXJzPwogICoKICAqIExvb3BzIHRocm91Z2ggYWxsIGNvbm5lY3RvcnMsIGZpbmRpbmcgdGhvc2Ug dGhhdCBhcmVuJ3QgdHVybmVkIG9mZiBhbmQgdGhlbgogICogdHVybnMgdGhlbSBvZmYgYnkgc2V0 dGluZyB0aGVpciBEUE1TIG1vZGUgdG8gT0ZGIGFuZCBkZWFjdGl2YXRpbmcgdGhlIENSVEMKQEAg LTI5MDUsNyArMjkwNiw4IEBAIGludCBfX2RybV9hdG9taWNfaGVscGVyX3NldF9jb25maWcoc3Ry dWN0IGRybV9tb2RlX3NldCAqc2V0LAogICogZHJtX2F0b21pY19oZWxwZXJfc2h1dGRvd24oKS4K ICAqLwogaW50IGRybV9hdG9taWNfaGVscGVyX2Rpc2FibGVfYWxsKHN0cnVjdCBkcm1fZGV2aWNl ICpkZXYsCi0JCQkJICBzdHJ1Y3QgZHJtX21vZGVzZXRfYWNxdWlyZV9jdHggKmN0eCkKKwkJCQkg IHN0cnVjdCBkcm1fbW9kZXNldF9hY3F1aXJlX2N0eCAqY3R4LAorCQkJCSAgYm9vbCBjbGVhbl9v bGRfZmJzKQogewogCXN0cnVjdCBkcm1fYXRvbWljX3N0YXRlICpzdGF0ZTsKIAlzdHJ1Y3QgZHJt X2Nvbm5lY3Rvcl9zdGF0ZSAqY29ubl9zdGF0ZTsKQEAgLTI5MTQsNiArMjkxNiw3IEBAIGludCBk cm1fYXRvbWljX2hlbHBlcl9kaXNhYmxlX2FsbChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogCXN0 cnVjdCBkcm1fcGxhbmUgKnBsYW5lOwogCXN0cnVjdCBkcm1fY3J0Y19zdGF0ZSAqY3J0Y19zdGF0 ZTsKIAlzdHJ1Y3QgZHJtX2NydGMgKmNydGM7CisJdW5zaWduZWQgaW50IHBsYW5lX21hc2sgPSAw OwogCWludCByZXQsIGk7CiAKIAlzdGF0ZSA9IGRybV9hdG9taWNfc3RhdGVfYWxsb2MoZGV2KTsK QEAgLTI5NTYsMTAgKzI5NTksMTcgQEAgaW50IGRybV9hdG9taWNfaGVscGVyX2Rpc2FibGVfYWxs KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAJCQlnb3RvIGZyZWU7CiAKIAkJZHJtX2F0b21pY19z ZXRfZmJfZm9yX3BsYW5lKHBsYW5lX3N0YXRlLCBOVUxMKTsKKworCQlpZiAoY2xlYW5fb2xkX2Zi cykgeworCQkJcGxhbmUtPm9sZF9mYiA9IHBsYW5lLT5mYjsKKwkJCXBsYW5lX21hc2sgfD0gQklU KGRybV9wbGFuZV9pbmRleChwbGFuZSkpOworCQl9CiAJfQogCiAJcmV0ID0gZHJtX2F0b21pY19j b21taXQoc3RhdGUpOwogZnJlZToKKwlkcm1fYXRvbWljX2NsZWFuX29sZF9mYihkZXYsIHBsYW5l X21hc2ssIHJldCk7CisKIAlkcm1fYXRvbWljX3N0YXRlX3B1dChzdGF0ZSk7CiAJcmV0dXJuIHJl dDsKIH0KQEAgLTI5ODYsNyArMjk5Niw3IEBAIHZvaWQgZHJtX2F0b21pY19oZWxwZXJfc2h1dGRv d24oc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAl3aGlsZSAoMSkgewogCQlyZXQgPSBkcm1fbW9k ZXNldF9sb2NrX2FsbF9jdHgoZGV2LCAmY3R4KTsKIAkJaWYgKCFyZXQpCi0JCQlyZXQgPSBkcm1f YXRvbWljX2hlbHBlcl9kaXNhYmxlX2FsbChkZXYsICZjdHgpOworCQkJcmV0ID0gZHJtX2F0b21p Y19oZWxwZXJfZGlzYWJsZV9hbGwoZGV2LCAmY3R4LCB0cnVlKTsKIAogCQlpZiAocmV0ICE9IC1F REVBRExLKQogCQkJYnJlYWs7CkBAIC0zMDQ2LDcgKzMwNTYsNyBAQCBzdHJ1Y3QgZHJtX2F0b21p Y19zdGF0ZSAqZHJtX2F0b21pY19oZWxwZXJfc3VzcGVuZChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2 KQogCWlmIChJU19FUlIoc3RhdGUpKQogCQlnb3RvIHVubG9jazsKIAotCWVyciA9IGRybV9hdG9t aWNfaGVscGVyX2Rpc2FibGVfYWxsKGRldiwgJmN0eCk7CisJZXJyID0gZHJtX2F0b21pY19oZWxw ZXJfZGlzYWJsZV9hbGwoZGV2LCAmY3R4LCBmYWxzZSk7CiAJaWYgKGVyciA8IDApIHsKIAkJZHJt X2F0b21pY19zdGF0ZV9wdXQoc3RhdGUpOwogCQlzdGF0ZSA9IEVSUl9QVFIoZXJyKTsKZGlmZiAt LWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYyBiL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwppbmRleCAzZTdhYjc1ZTFiNDEuLmM3OTgwMGFlMzVj MyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCisrKyBi L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwpAQCAtMzcxNiw3ICszNzE2LDcg QEAgdm9pZCBpbnRlbF9wcmVwYXJlX3Jlc2V0KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZf cHJpdikKIAkJcmV0dXJuOwogCX0KIAotCXJldCA9IGRybV9hdG9taWNfaGVscGVyX2Rpc2FibGVf YWxsKGRldiwgY3R4KTsKKwlyZXQgPSBkcm1fYXRvbWljX2hlbHBlcl9kaXNhYmxlX2FsbChkZXYs IGN0eCwgZmFsc2UpOwogCWlmIChyZXQpIHsKIAkJRFJNX0VSUk9SKCJTdXNwZW5kaW5nIGNydGMn cyBmYWlsZWQgd2l0aCAlaVxuIiwgcmV0KTsKIAkJZHJtX2F0b21pY19zdGF0ZV9wdXQoc3RhdGUp OwpkaWZmIC0tZ2l0IGEvaW5jbHVkZS9kcm0vZHJtX2F0b21pY19oZWxwZXIuaCBiL2luY2x1ZGUv ZHJtL2RybV9hdG9taWNfaGVscGVyLmgKaW5kZXggMjZhYWJhNThkNmNlLi4xMGU5NTI5NTFkMmYg MTAwNjQ0Ci0tLSBhL2luY2x1ZGUvZHJtL2RybV9hdG9taWNfaGVscGVyLmgKKysrIGIvaW5jbHVk ZS9kcm0vZHJtX2F0b21pY19oZWxwZXIuaApAQCAtMTIyLDcgKzEyMiw4IEBAIGludCBfX2RybV9h dG9taWNfaGVscGVyX3NldF9jb25maWcoc3RydWN0IGRybV9tb2RlX3NldCAqc2V0LAogCQlzdHJ1 Y3QgZHJtX2F0b21pY19zdGF0ZSAqc3RhdGUpOwogCiBpbnQgZHJtX2F0b21pY19oZWxwZXJfZGlz YWJsZV9hbGwoc3RydWN0IGRybV9kZXZpY2UgKmRldiwKLQkJCQkgIHN0cnVjdCBkcm1fbW9kZXNl dF9hY3F1aXJlX2N0eCAqY3R4KTsKKwkJCQkgIHN0cnVjdCBkcm1fbW9kZXNldF9hY3F1aXJlX2N0 eCAqY3R4LAorCQkJCSAgYm9vbCBjbGVhbl9vbGRfZmJzKTsKIHZvaWQgZHJtX2F0b21pY19oZWxw ZXJfc2h1dGRvd24oc3RydWN0IGRybV9kZXZpY2UgKmRldik7CiBzdHJ1Y3QgZHJtX2F0b21pY19z dGF0ZSAqZHJtX2F0b21pY19oZWxwZXJfc3VzcGVuZChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KTsK IGludCBkcm1fYXRvbWljX2hlbHBlcl9jb21taXRfZHVwbGljYXRlZF9zdGF0ZShzdHJ1Y3QgZHJt X2F0b21pY19zdGF0ZSAqc3RhdGUsCi0tIAoyLjE2LjEKCl9fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4 QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWls bWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=