From: Harry Wentland Subject: [PATCH 018/120] drm/amd/display: Roll surface struct into core_surface Date: Wed, 9 Aug 2017 11:01:04 -0400 Message-ID: <20170809150246.8835-19-harry.wentland@amd.com> References: <20170809150246.8835-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: <20170809150246.8835-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: Harry Wentland Q2hhbmdlLUlkOiBJNGQ2NDAwZTdlN2Y4YzM2NGFkYTJmYmVkYTVjOTk4Y2E5MGQ3YTgzNApTaWdu ZWQtb2ZmLWJ5OiBIYXJyeSBXZW50bGFuZCA8aGFycnkud2VudGxhbmRAYW1kLmNvbT4KUmV2aWV3 ZWQtYnk6IFRvbnkgQ2hlbmcgPFRvbnkuQ2hlbmdAYW1kLmNvbT4KQWNrZWQtYnk6IEhhcnJ5IFdl bnRsYW5kIDxIYXJyeS5XZW50bGFuZEBhbWQuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9hbWQv ZGlzcGxheS9kYy9jb3JlL2RjX3N1cmZhY2UuYyB8IDM3ICsrKysrKysrKy0tLS0tLS0tLS0tLS0t LQogZHJpdmVycy9ncHUvZHJtL2FtZC9kaXNwbGF5L2RjL2luYy9jb3JlX3R5cGVzLmggIHwgIDQg KysrCiAyIGZpbGVzIGNoYW5nZWQsIDE4IGluc2VydGlvbnMoKyksIDIzIGRlbGV0aW9ucygtKQoK ZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvZGlzcGxheS9kYy9jb3JlL2RjX3N1cmZh Y2UuYyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvZGlzcGxheS9kYy9jb3JlL2RjX3N1cmZhY2UuYwpp bmRleCBkNDRkZGZiODU3NDguLjM3ODQzNThkMzVlZiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUv ZHJtL2FtZC9kaXNwbGF5L2RjL2NvcmUvZGNfc3VyZmFjZS5jCisrKyBiL2RyaXZlcnMvZ3B1L2Ry bS9hbWQvZGlzcGxheS9kYy9jb3JlL2RjX3N1cmZhY2UuYwpAQCAtMzQsMjAgKzM0LDExIEBACiAv KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq KioqKioqKioqKioqKioqKioqKioqKgogICogUHJpdmF0ZSBzdHJ1Y3R1cmVzCiAgKioqKioqKioq KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq KioqKioqKioqKioqLwotc3RydWN0IHN1cmZhY2UgewotCXN0cnVjdCBjb3JlX3N1cmZhY2UgcHJv dGVjdGVkOwotCWVudW0gZGNfaXJxX3NvdXJjZSBpcnFfc291cmNlOwotCWludCByZWZfY291bnQ7 Ci19OwotCiBzdHJ1Y3QgZ2FtbWEgewogCXN0cnVjdCBjb3JlX2dhbW1hIHByb3RlY3RlZDsKIAlp bnQgcmVmX2NvdW50OwogfTsKIAotI2RlZmluZSBEQ19TVVJGQUNFX1RPX1NVUkZBQ0UoZGNfc3Vy ZmFjZSkgY29udGFpbmVyX29mKGRjX3N1cmZhY2UsIHN0cnVjdCBzdXJmYWNlLCBwcm90ZWN0ZWQu cHVibGljKQotI2RlZmluZSBDT1JFX1NVUkZBQ0VfVE9fU1VSRkFDRShjb3JlX3N1cmZhY2UpIGNv bnRhaW5lcl9vZihjb3JlX3N1cmZhY2UsIHN0cnVjdCBzdXJmYWNlLCBwcm90ZWN0ZWQpCi0KICNk ZWZpbmUgRENfR0FNTUFfVE9fR0FNTUEoZGNfZ2FtbWEpIFwKIAljb250YWluZXJfb2YoZGNfZ2Ft bWEsIHN0cnVjdCBnYW1tYSwgcHJvdGVjdGVkLnB1YmxpYykKICNkZWZpbmUgQ09SRV9HQU1NQV9U T19HQU1NQShjb3JlX2dhbW1hKSBcCkBAIC01NiwyMyArNDcsMjMgQEAgc3RydWN0IGdhbW1hIHsK IC8qKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq KioqKioqKioqKioqKioqKioqKioqKioqCiAgKiBQcml2YXRlIGZ1bmN0aW9ucwogICoqKioqKioq KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq KioqKioqKioqKioqKi8KLXN0YXRpYyBib29sIGNvbnN0cnVjdChzdHJ1Y3QgZGNfY29udGV4dCAq Y3R4LCBzdHJ1Y3Qgc3VyZmFjZSAqc3VyZmFjZSkKK3N0YXRpYyBib29sIGNvbnN0cnVjdChzdHJ1 Y3QgZGNfY29udGV4dCAqY3R4LCBzdHJ1Y3QgY29yZV9zdXJmYWNlICpzdXJmYWNlKQogewotCXN1 cmZhY2UtPnByb3RlY3RlZC5jdHggPSBjdHg7Ci0JbWVtc2V0KCZzdXJmYWNlLT5wcm90ZWN0ZWQu cHVibGljLmhkcl9zdGF0aWNfY3R4LAorCXN1cmZhY2UtPmN0eCA9IGN0eDsKKwltZW1zZXQoJnN1 cmZhY2UtPnB1YmxpYy5oZHJfc3RhdGljX2N0eCwKIAkJCTAsIHNpemVvZihzdHJ1Y3QgZGNfaGRy X3N0YXRpY19tZXRhZGF0YSkpOwogCXJldHVybiB0cnVlOwogfQogCi1zdGF0aWMgdm9pZCBkZXN0 cnVjdChzdHJ1Y3Qgc3VyZmFjZSAqc3VyZmFjZSkKK3N0YXRpYyB2b2lkIGRlc3RydWN0KHN0cnVj dCBjb3JlX3N1cmZhY2UgKnN1cmZhY2UpCiB7Ci0JaWYgKHN1cmZhY2UtPnByb3RlY3RlZC5wdWJs aWMuZ2FtbWFfY29ycmVjdGlvbiAhPSBOVUxMKSB7Ci0JCWRjX2dhbW1hX3JlbGVhc2UoJnN1cmZh Y2UtPnByb3RlY3RlZC5wdWJsaWMuZ2FtbWFfY29ycmVjdGlvbik7CisJaWYgKHN1cmZhY2UtPnB1 YmxpYy5nYW1tYV9jb3JyZWN0aW9uICE9IE5VTEwpIHsKKwkJZGNfZ2FtbWFfcmVsZWFzZSgmc3Vy ZmFjZS0+cHVibGljLmdhbW1hX2NvcnJlY3Rpb24pOwogCX0KLQlpZiAoc3VyZmFjZS0+cHJvdGVj dGVkLnB1YmxpYy5pbl90cmFuc2Zlcl9mdW5jICE9IE5VTEwpIHsKKwlpZiAoc3VyZmFjZS0+cHVi bGljLmluX3RyYW5zZmVyX2Z1bmMgIT0gTlVMTCkgewogCQlkY190cmFuc2Zlcl9mdW5jX3JlbGVh c2UoCi0JCQkJc3VyZmFjZS0+cHJvdGVjdGVkLnB1YmxpYy5pbl90cmFuc2Zlcl9mdW5jKTsKLQkJ c3VyZmFjZS0+cHJvdGVjdGVkLnB1YmxpYy5pbl90cmFuc2Zlcl9mdW5jID0gTlVMTDsKKwkJCQlz dXJmYWNlLT5wdWJsaWMuaW5fdHJhbnNmZXJfZnVuYyk7CisJCXN1cmZhY2UtPnB1YmxpYy5pbl90 cmFuc2Zlcl9mdW5jID0gTlVMTDsKIAl9CiB9CiAKQEAgLTgyLDcgKzczLDcgQEAgc3RhdGljIHZv aWQgZGVzdHJ1Y3Qoc3RydWN0IHN1cmZhY2UgKnN1cmZhY2UpCiB2b2lkIGVuYWJsZV9zdXJmYWNl X2ZsaXBfcmVwb3J0aW5nKHN0cnVjdCBkY19zdXJmYWNlICpkY19zdXJmYWNlLAogCQl1aW50MzJf dCBjb250cm9sbGVyX2lkKQogewotCXN0cnVjdCBzdXJmYWNlICpzdXJmYWNlID0gRENfU1VSRkFD RV9UT19TVVJGQUNFKGRjX3N1cmZhY2UpOworCXN0cnVjdCBjb3JlX3N1cmZhY2UgKnN1cmZhY2Ug PSBEQ19TVVJGQUNFX1RPX0NPUkUoZGNfc3VyZmFjZSk7CiAJc3VyZmFjZS0+aXJxX3NvdXJjZSA9 IGNvbnRyb2xsZXJfaWQgKyBEQ19JUlFfU09VUkNFX1BGTElQMSAtIDE7CiAJLypyZWdpc3Rlcl9m bGlwX2ludGVycnVwdChzdXJmYWNlKTsqLwogfQpAQCAtOTEsNyArODIsNyBAQCBzdHJ1Y3QgZGNf c3VyZmFjZSAqZGNfY3JlYXRlX3N1cmZhY2UoY29uc3Qgc3RydWN0IGRjICpkYykKIHsKIAlzdHJ1 Y3QgY29yZV9kYyAqY29yZV9kYyA9IERDX1RPX0NPUkUoZGMpOwogCi0Jc3RydWN0IHN1cmZhY2Ug KnN1cmZhY2UgPSBkbV9hbGxvYyhzaXplb2YoKnN1cmZhY2UpKTsKKwlzdHJ1Y3QgY29yZV9zdXJm YWNlICpzdXJmYWNlID0gZG1fYWxsb2Moc2l6ZW9mKCpzdXJmYWNlKSk7CiAKIAlpZiAoTlVMTCA9 PSBzdXJmYWNlKQogCQlnb3RvIGFsbG9jX2ZhaWw7CkBAIC0xMDEsNyArOTIsNyBAQCBzdHJ1Y3Qg ZGNfc3VyZmFjZSAqZGNfY3JlYXRlX3N1cmZhY2UoY29uc3Qgc3RydWN0IGRjICpkYykKIAogCSsr c3VyZmFjZS0+cmVmX2NvdW50OwogCi0JcmV0dXJuICZzdXJmYWNlLT5wcm90ZWN0ZWQucHVibGlj OworCXJldHVybiAmc3VyZmFjZS0+cHVibGljOwogCiBjb25zdHJ1Y3RfZmFpbDoKIAlkbV9mcmVl KHN1cmZhY2UpOwpAQCAtMTQ2LDcgKzEzNyw3IEBAIGNvbnN0IHN0cnVjdCBkY19zdXJmYWNlX3N0 YXR1cyAqZGNfc3VyZmFjZV9nZXRfc3RhdHVzKAogCiB2b2lkIGRjX3N1cmZhY2VfcmV0YWluKGNv bnN0IHN0cnVjdCBkY19zdXJmYWNlICpkY19zdXJmYWNlKQogewotCXN0cnVjdCBzdXJmYWNlICpz dXJmYWNlID0gRENfU1VSRkFDRV9UT19TVVJGQUNFKGRjX3N1cmZhY2UpOworCXN0cnVjdCBjb3Jl X3N1cmZhY2UgKnN1cmZhY2UgPSBEQ19TVVJGQUNFX1RPX0NPUkUoZGNfc3VyZmFjZSk7CiAKIAlB U1NFUlQoc3VyZmFjZS0+cmVmX2NvdW50ID4gMCk7CiAJKytzdXJmYWNlLT5yZWZfY291bnQ7CkBA IC0xNTQsNyArMTQ1LDcgQEAgdm9pZCBkY19zdXJmYWNlX3JldGFpbihjb25zdCBzdHJ1Y3QgZGNf c3VyZmFjZSAqZGNfc3VyZmFjZSkKIAogdm9pZCBkY19zdXJmYWNlX3JlbGVhc2UoY29uc3Qgc3Ry dWN0IGRjX3N1cmZhY2UgKmRjX3N1cmZhY2UpCiB7Ci0Jc3RydWN0IHN1cmZhY2UgKnN1cmZhY2Ug PSBEQ19TVVJGQUNFX1RPX1NVUkZBQ0UoZGNfc3VyZmFjZSk7CisJc3RydWN0IGNvcmVfc3VyZmFj ZSAqc3VyZmFjZSA9IERDX1NVUkZBQ0VfVE9fQ09SRShkY19zdXJmYWNlKTsKIAogCUFTU0VSVChz dXJmYWNlLT5yZWZfY291bnQgPiAwKTsKIAktLXN1cmZhY2UtPnJlZl9jb3VudDsKZGlmZiAtLWdp dCBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvZGlzcGxheS9kYy9pbmMvY29yZV90eXBlcy5oIGIvZHJp dmVycy9ncHUvZHJtL2FtZC9kaXNwbGF5L2RjL2luYy9jb3JlX3R5cGVzLmgKaW5kZXggZDc1MzY4 MDMwOTE3Li4zMDE3N2Y4MzliOGEgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvZGlz cGxheS9kYy9pbmMvY29yZV90eXBlcy5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvZGlzcGxh eS9kYy9pbmMvY29yZV90eXBlcy5oCkBAIC01Myw2ICs1MywxMCBAQCBzdHJ1Y3QgY29yZV9zdXJm YWNlIHsKIAlzdHJ1Y3QgZGNfc3VyZmFjZSBwdWJsaWM7CiAJc3RydWN0IGRjX3N1cmZhY2Vfc3Rh dHVzIHN0YXR1czsKIAlzdHJ1Y3QgZGNfY29udGV4dCAqY3R4OworCisJLyogcHJpdmF0ZSB0byBk Y19zdXJmYWNlLmMgKi8KKwllbnVtIGRjX2lycV9zb3VyY2UgaXJxX3NvdXJjZTsKKwlpbnQgcmVm X2NvdW50OwogfTsKIAogc3RydWN0IGNvcmVfZ2FtbWEgewotLSAKMi4xMS4wCgpfX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwphbWQtZ2Z4IG1haWxpbmcgbGlz dAphbWQtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9w Lm9yZy9tYWlsbWFuL2xpc3RpbmZvL2FtZC1nZngK