From: Harry Wentland Subject: [PATCH 30/31] drm/amd/display: fix scaling info based surface update type check Date: Fri, 12 May 2017 11:21:03 -0400 Message-ID: <20170512152104.5354-31-harry.wentland@amd.com> References: <20170512152104.5354-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: <20170512152104.5354-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: Dmytro Laktyushkin RnJvbTogRG15dHJvIExha3R5dXNoa2luIDxEbXl0cm8uTGFrdHl1c2hraW5AYW1kLmNvbT4KCkNo YW5nZS1JZDogSTg3NDdhMWJiMjk4ZTU3ODI0NTE1ZjEyNjk5MDQyOWRiYmNhMDVlY2QKU2lnbmVk LW9mZi1ieTogRG15dHJvIExha3R5dXNoa2luIDxEbXl0cm8uTGFrdHl1c2hraW5AYW1kLmNvbT4K UmV2aWV3ZWQtYnk6IFRvbnkgQ2hlbmcgPFRvbnkuQ2hlbmdAYW1kLmNvbT4KQWNrZWQtYnk6IEhh cnJ5IFdlbnRsYW5kIDxIYXJyeS5XZW50bGFuZEBhbWQuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2Ry bS9hbWQvZGlzcGxheS9kYy9jb3JlL2RjLmMgfCA0NyArKysrKysrKystLS0tLS0tLS0tLS0tLS0t LS0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDEzIGluc2VydGlvbnMoKyksIDM0IGRlbGV0aW9ucygt KQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvZGlzcGxheS9kYy9jb3JlL2RjLmMg Yi9kcml2ZXJzL2dwdS9kcm0vYW1kL2Rpc3BsYXkvZGMvY29yZS9kYy5jCmluZGV4IGJjOTgwODE4 MDM0Ni4uNmQ1NmNiMGMyOWNjIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2Rpc3Bs YXkvZGMvY29yZS9kYy5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvZGlzcGxheS9kYy9jb3Jl L2RjLmMKQEAgLTExMjIsNDUgKzExMjIsMjQgQEAgc3RhdGljIGVudW0gc3VyZmFjZV91cGRhdGVf dHlwZSBnZXRfcGxhbmVfaW5mb191cGRhdGVfdHlwZSgKIHN0YXRpYyBlbnVtIHN1cmZhY2VfdXBk YXRlX3R5cGUgIGdldF9zY2FsaW5nX2luZm9fdXBkYXRlX3R5cGUoCiAJCWNvbnN0IHN0cnVjdCBk Y19zdXJmYWNlX3VwZGF0ZSAqdSkKIHsKLQlzdHJ1Y3QgZGNfc2NhbGluZ19pbmZvIHRlbXBfc2Nh bGluZ19pbmZvID0geyB7IDAgfSB9OwotCiAJaWYgKCF1LT5zY2FsaW5nX2luZm8pCiAJCXJldHVy biBVUERBVEVfVFlQRV9GQVNUOwogCi0JLyogQ29weSBhbGwgcGFyYW1ldGVycyB0aGF0IHdpbGwg Y2F1c2UgYSBmdWxsIHVwZGF0ZQotCSAqIGZyb20gY3VycmVudCBzdXJmYWNlLCB0aGUgcmVzdCBv ZiB0aGUgcGFyYW1ldGVycwotCSAqIGZyb20gcHJvdmlkZWQgcGxhbmUgY29uZmlndXJhdGlvbi4K LQkgKiBQZXJmb3JtIG1lbW9yeSBjb21wYXJlIGFuZCBzcGVjaWFsIHZhbGlkYXRpb24KLQkgKiBm b3IgdGhvc2UgdGhhdCBjYW4gY2F1c2UgZmFzdC9tZWRpdW0gdXBkYXRlcwotCSAqLwotCi0JLyog RnVsbCBVcGRhdGUgUGFyYW1ldGVycyAqLwotCXRlbXBfc2NhbGluZ19pbmZvLmRzdF9yZWN0ID0g dS0+c3VyZmFjZS0+ZHN0X3JlY3Q7Ci0JdGVtcF9zY2FsaW5nX2luZm8uc3JjX3JlY3QgPSB1LT5z dXJmYWNlLT5zcmNfcmVjdDsKLQl0ZW1wX3NjYWxpbmdfaW5mby5zY2FsaW5nX3F1YWxpdHkgPSB1 LT5zdXJmYWNlLT5zY2FsaW5nX3F1YWxpdHk7Ci0KLQkvKiBTcGVjaWFsIHZhbGlkYXRpb24gcmVx dWlyZWQgKi8KLQl0ZW1wX3NjYWxpbmdfaW5mby5jbGlwX3JlY3QgPSB1LT5zY2FsaW5nX2luZm8t PmNsaXBfcmVjdDsKLQotCWlmIChtZW1jbXAodS0+c2NhbGluZ19pbmZvLCAmdGVtcF9zY2FsaW5n X2luZm8sCi0JCQlzaXplb2Yoc3RydWN0IGRjX3NjYWxpbmdfaW5mbykpICE9IDApCisJaWYgKHUt PnNjYWxpbmdfaW5mby0+c3JjX3JlY3Qud2lkdGggIT0gdS0+c3VyZmFjZS0+c3JjX3JlY3Qud2lk dGgKKwkJCXx8IHUtPnNjYWxpbmdfaW5mby0+c3JjX3JlY3QuaGVpZ2h0ICE9IHUtPnN1cmZhY2Ut PnNyY19yZWN0LmhlaWdodAorCQkJfHwgdS0+c2NhbGluZ19pbmZvLT5jbGlwX3JlY3Qud2lkdGgg IT0gdS0+c3VyZmFjZS0+Y2xpcF9yZWN0LndpZHRoCisJCQl8fCB1LT5zY2FsaW5nX2luZm8tPmNs aXBfcmVjdC5oZWlnaHQgIT0gdS0+c3VyZmFjZS0+Y2xpcF9yZWN0LmhlaWdodAorCQkJfHwgdS0+ c2NhbGluZ19pbmZvLT5kc3RfcmVjdC53aWR0aCAhPSB1LT5zdXJmYWNlLT5kc3RfcmVjdC53aWR0 aAorCQkJfHwgdS0+c2NhbGluZ19pbmZvLT5kc3RfcmVjdC5oZWlnaHQgIT0gdS0+c3VyZmFjZS0+ ZHN0X3JlY3QuaGVpZ2h0KQogCQlyZXR1cm4gVVBEQVRFX1RZUEVfRlVMTDsKIAotCS8qIENoZWNr IENsaXAgcmVjdGFuZ2xlcyBpZiBub3QgZXF1YWwKLQkgKiBkaWZmZXJlbmNlIGlzIGluIG9mZnNl dHMgPT0gPiBVUERBVEVfVFlQRV9NRUQKLQkgKiBkaWZmZXJlbmNlIGlzIGluIGRpbWVuc2lvbnMg PT0gPiBVUERBVEVfVFlQRV9GVUxMCi0JICovCi0JaWYgKG1lbWNtcCgmdS0+c2NhbGluZ19pbmZv LT5jbGlwX3JlY3QsCi0JCQkmdS0+c3VyZmFjZS0+Y2xpcF9yZWN0LCBzaXplb2Yoc3RydWN0IHJl Y3QpKSAhPSAwKSB7Ci0JCWlmICgodS0+c2NhbGluZ19pbmZvLT5jbGlwX3JlY3QuaGVpZ2h0ID09 Ci0JCQl1LT5zdXJmYWNlLT5jbGlwX3JlY3QuaGVpZ2h0KSAmJgotCQkJKHUtPnNjYWxpbmdfaW5m by0+Y2xpcF9yZWN0LndpZHRoID09Ci0JCQl1LT5zdXJmYWNlLT5jbGlwX3JlY3Qud2lkdGgpKSB7 Ci0JCQlyZXR1cm4gVVBEQVRFX1RZUEVfTUVEOwotCQl9IGVsc2UgewotCQkJcmV0dXJuIFVQREFU RV9UWVBFX0ZVTEw7Ci0JCX0KLQl9CisJaWYgKHUtPnNjYWxpbmdfaW5mby0+c3JjX3JlY3QueCAh PSB1LT5zdXJmYWNlLT5zcmNfcmVjdC54CisJCQl8fCB1LT5zY2FsaW5nX2luZm8tPnNyY19yZWN0 LnkgIT0gdS0+c3VyZmFjZS0+c3JjX3JlY3QueQorCQkJfHwgdS0+c2NhbGluZ19pbmZvLT5jbGlw X3JlY3QueCAhPSB1LT5zdXJmYWNlLT5jbGlwX3JlY3QueAorCQkJfHwgdS0+c2NhbGluZ19pbmZv LT5jbGlwX3JlY3QueSAhPSB1LT5zdXJmYWNlLT5jbGlwX3JlY3QueQorCQkJfHwgdS0+c2NhbGlu Z19pbmZvLT5kc3RfcmVjdC54ICE9IHUtPnN1cmZhY2UtPmRzdF9yZWN0LngKKwkJCXx8IHUtPnNj YWxpbmdfaW5mby0+ZHN0X3JlY3QueSAhPSB1LT5zdXJmYWNlLT5kc3RfcmVjdC55KQorCQlyZXR1 cm4gVVBEQVRFX1RZUEVfTUVEOwogCiAJcmV0dXJuIFVQREFURV9UWVBFX0ZBU1Q7CiB9Ci0tIAoy LjExLjAKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmFt ZC1nZnggbWFpbGluZyBsaXN0CmFtZC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8v bGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vYW1kLWdmeAo=