From: Harry Wentland Subject: [PATCH 086/103] drm/amd/display: Fix up plane_states add/remove logic Date: Tue, 10 Oct 2017 18:40:55 -0400 Message-ID: <20171010224112.3023-87-harry.wentland@amd.com> References: <20171010224112.3023-1-harry.wentland@amd.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20171010224112.3023-1-harry.wentland-5C7GfCeVMHo@public.gmane.org> List-Id: Discussion list for AMD gfx List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: amd-gfx-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org Sender: "amd-gfx" To: amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org Cc: Andrew Jiang RnJvbTogQW5kcmV3IEppYW5nIDxBbmRyZXcuSmlhbmdAYW1kLmNvbT4KCk91ciBwbGFuZV9zdGF0 ZXMgYXJyYXkgdHJpbW1pbmcgbG9naWMgd2FzIGZhdWx0eSwgd2Ugc2hvdWxkIGJlIHN0YXJ0aW5n CnRvIHNodWZmbGUgZnJvbSB0aGUgcGxhbmUgdGhhdCB3YXMganVzdCByZWxlYXNlZCwgbm90IGZy b20gdGhlIHZlcnkKYmVnaW5uaW5nIG9mIHRoZSBhcnJheS4KCkFsc28gZ2V0IHJpZCBvZiBhIGxl ZnRvdmVyIGxpbmUgdGhhdCB3YXMgc2V0dGluZyB0aGUgcGxhbmUgc3RhdGUgYXQgdGhlCnN0cmVh bSBpbmRleCB0byBudWxsLCBsZWFkaW5nIHRvIGlzc3Vlcy4gQWxzbyBtb3ZlIHRoZQpkY19wbGFu ZV9zdGF0ZV9yZXRhaW4gY2FsbCB0byB3aGVyZSB3ZSByZWZlcmVuY2UgcGxhbmVfc3RhdGUsIGlu IGNhc2Ugd2UKZG8gaGl0IHRoZSBlcnJvciBjYXNlIHdoZXJlIHdlIGNhbid0IGdldCBhIGZyZWUg cGlwZS4KClNpZ25lZC1vZmYtYnk6IEFuZHJldyBKaWFuZyA8QW5kcmV3LkppYW5nQGFtZC5jb20+ ClJldmlld2VkLWJ5OiBUb255IENoZW5nIDxUb255LkNoZW5nQGFtZC5jb20+CkFja2VkLWJ5OiBI YXJyeSBXZW50bGFuZCA8SGFycnkuV2VudGxhbmRAYW1kLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9k cm0vYW1kL2Rpc3BsYXkvZGMvY29yZS9kY19yZXNvdXJjZS5jIHwgMTMgKysrKystLS0tLS0tLQog MSBmaWxlIGNoYW5nZWQsIDUgaW5zZXJ0aW9ucygrKSwgOCBkZWxldGlvbnMoLSkKCmRpZmYgLS1n aXQgYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2Rpc3BsYXkvZGMvY29yZS9kY19yZXNvdXJjZS5jIGIv ZHJpdmVycy9ncHUvZHJtL2FtZC9kaXNwbGF5L2RjL2NvcmUvZGNfcmVzb3VyY2UuYwppbmRleCA0 ZmI0ZjAwNjhmMWIuLmM4MGJkZTk0NDcyZiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2Ft ZC9kaXNwbGF5L2RjL2NvcmUvZGNfcmVzb3VyY2UuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vYW1k L2Rpc3BsYXkvZGMvY29yZS9kY19yZXNvdXJjZS5jCkBAIC0xMDczLDkgKzEwNzMsNiBAQCBib29s IGRjX2FkZF9wbGFuZV90b19jb250ZXh0KAogCQlyZXR1cm4gZmFsc2U7CiAJfQogCi0JLyogcmV0 YWluIG5ldyBzdXJmYWNlcyAqLwotCWRjX3BsYW5lX3N0YXRlX3JldGFpbihwbGFuZV9zdGF0ZSk7 Ci0KIAlmcmVlX3BpcGUgPSBhY3F1aXJlX2ZyZWVfcGlwZV9mb3Jfc3RyZWFtKGNvbnRleHQsIHBv b2wsIHN0cmVhbSk7CiAKICNpZiBkZWZpbmVkKENPTkZJR19EUk1fQU1EX0RDX0RDTjFfMCkKQEAg LTEwODUsMTEgKzEwODIsMTEgQEAgYm9vbCBkY19hZGRfcGxhbmVfdG9fY29udGV4dCgKIAkJCWZy ZWVfcGlwZSA9ICZjb250ZXh0LT5yZXNfY3R4LnBpcGVfY3R4W3BpcGVfaWR4XTsKIAl9CiAjZW5k aWYKLQlpZiAoIWZyZWVfcGlwZSkgewotCQlzdHJlYW1fc3RhdHVzLT5wbGFuZV9zdGF0ZXNbaV0g PSBOVUxMOworCWlmICghZnJlZV9waXBlKQogCQlyZXR1cm4gZmFsc2U7Ci0JfQogCisJLyogcmV0 YWluIG5ldyBzdXJmYWNlcyAqLworCWRjX3BsYW5lX3N0YXRlX3JldGFpbihwbGFuZV9zdGF0ZSk7 CiAJZnJlZV9waXBlLT5wbGFuZV9zdGF0ZSA9IHBsYW5lX3N0YXRlOwogCiAJaWYgKGhlYWRfcGlw ZSAhPSBmcmVlX3BpcGUpIHsKQEAgLTExODEsOCArMTE3OCw4IEBAIGJvb2wgZGNfcmVtb3ZlX3Bs YW5lX2Zyb21fY29udGV4dCgKIAogCXN0cmVhbV9zdGF0dXMtPnBsYW5lX2NvdW50LS07CiAKLQkv KiBUcmltIGJhY2sgYXJyYXlzICovCi0JZm9yIChpID0gMDsgaSA8IHN0cmVhbV9zdGF0dXMtPnBs YW5lX2NvdW50OyBpKyspCisJLyogU3RhcnQgYXQgdGhlIHBsYW5lIHdlJ3ZlIGp1c3QgcmVsZWFz ZWQsIGFuZCBtb3ZlIGFsbCB0aGUgcGxhbmVzIG9uZSBpbmRleCBmb3J3YXJkIHRvICJ0cmltIiB0 aGUgYXJyYXkgKi8KKwlmb3IgKDsgaSA8IHN0cmVhbV9zdGF0dXMtPnBsYW5lX2NvdW50OyBpKysp CiAJCXN0cmVhbV9zdGF0dXMtPnBsYW5lX3N0YXRlc1tpXSA9IHN0cmVhbV9zdGF0dXMtPnBsYW5l X3N0YXRlc1tpICsgMV07CiAKIAlzdHJlYW1fc3RhdHVzLT5wbGFuZV9zdGF0ZXNbc3RyZWFtX3N0 YXR1cy0+cGxhbmVfY291bnRdID0gTlVMTDsKLS0gCjIuMTQuMQoKX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX18KYW1kLWdmeCBtYWlsaW5nIGxpc3QKYW1kLWdm eEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFp bG1hbi9saXN0aW5mby9hbWQtZ2Z4Cg==