From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andrey Grodzovsky Subject: [PATCH 4/4] drm/nouveau/kms/nv50: Switch to using atomic helper for flip. Date: Mon, 16 Jan 2017 10:44:58 -0500 Message-ID: <1484581498-32309-5-git-send-email-Andrey.Grodzovsky@amd.com> References: <1484581498-32309-1-git-send-email-Andrey.Grodzovsky@amd.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <1484581498-32309-1-git-send-email-Andrey.Grodzovsky@amd.com> 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: nouveau@lists.freedesktop.org, amd-gfx@lists.freedesktop.org, Alexander.Deucher@amd.com, daniel.vetter@intel.com List-Id: nouveau.vger.kernel.org U2lnbmVkLW9mZi1ieTogQW5kcmV5IEdyb2R6b3Zza3kgPEFuZHJleS5Hcm9kem92c2t5QGFtZC5j b20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL25vdXZlYXUvbnY1MF9kaXNwbGF5LmMgfCA3NyArKyst LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgNSBpbnNlcnRp b25zKCspLCA3MiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vbm91 dmVhdS9udjUwX2Rpc3BsYXkuYyBiL2RyaXZlcnMvZ3B1L2RybS9ub3V2ZWF1L252NTBfZGlzcGxh eS5jCmluZGV4IDJjMmM2NDUuLjQxOWUwMGMgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9u b3V2ZWF1L252NTBfZGlzcGxheS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9ub3V2ZWF1L252NTBf ZGlzcGxheS5jCkBAIC04NDYsNiArODQ2LDEwIEBAIHN0cnVjdCBudjUwX3duZHdfZnVuYyB7CiAJ YXN5dy0+aW1hZ2UudyA9IGZiLT5iYXNlLndpZHRoOwogCWFzeXctPmltYWdlLmggPSBmYi0+YmFz ZS5oZWlnaHQ7CiAJYXN5dy0+aW1hZ2Uua2luZCA9IChmYi0+bnZiby0+dGlsZV9mbGFncyAmIDB4 MDAwMGZmMDApID4+IDg7CisKKwlhc3l3LT5pbnRlcnZhbCA9CisJCQlhc3l3LT5zdGF0ZS5wZmxp cF9mbGFncyAmIERSTV9NT0RFX1BBR0VfRkxJUF9BU1lOQyA/IDAgOiAxOworCiAJaWYgKGFzeXct PmltYWdlLmtpbmQpIHsKIAkJYXN5dy0+aW1hZ2UubGF5b3V0ID0gMDsKIAkJaWYgKGRybS0+ZGV2 aWNlLmluZm8uY2hpcHNldCA+PSAweGMwKQpAQCAtMjIyMSw3NyArMjIyNSw2IEBAIHN0cnVjdCBu djUwX2Jhc2UgewogCS5hdG9taWNfY2hlY2sgPSBudjUwX2hlYWRfYXRvbWljX2NoZWNrLAogfTsK IAotLyogVGhpcyBpcyBpZGVudGljYWwgdG8gdGhlIHZlcnNpb24gaW4gdGhlIGF0b21pYyBoZWxw ZXJzLCBleGNlcHQgdGhhdAotICogaXQgc3VwcG9ydHMgbm9uLXZibGFua2VkICgiYXN5bmMiKSBw YWdlIGZsaXBzLgotICovCi1zdGF0aWMgaW50Ci1udjUwX2hlYWRfcGFnZV9mbGlwKHN0cnVjdCBk cm1fY3J0YyAqY3J0Yywgc3RydWN0IGRybV9mcmFtZWJ1ZmZlciAqZmIsCi0JCSAgICBzdHJ1Y3Qg ZHJtX3BlbmRpbmdfdmJsYW5rX2V2ZW50ICpldmVudCwgdTMyIGZsYWdzKQotewotCXN0cnVjdCBk cm1fcGxhbmUgKnBsYW5lID0gY3J0Yy0+cHJpbWFyeTsKLQlzdHJ1Y3QgZHJtX2F0b21pY19zdGF0 ZSAqc3RhdGU7Ci0Jc3RydWN0IGRybV9wbGFuZV9zdGF0ZSAqcGxhbmVfc3RhdGU7Ci0Jc3RydWN0 IGRybV9jcnRjX3N0YXRlICpjcnRjX3N0YXRlOwotCWludCByZXQgPSAwOwotCi0Jc3RhdGUgPSBk cm1fYXRvbWljX3N0YXRlX2FsbG9jKHBsYW5lLT5kZXYpOwotCWlmICghc3RhdGUpCi0JCXJldHVy biAtRU5PTUVNOwotCi0Jc3RhdGUtPmFjcXVpcmVfY3R4ID0gZHJtX21vZGVzZXRfbGVnYWN5X2Fj cXVpcmVfY3R4KGNydGMpOwotcmV0cnk6Ci0JY3J0Y19zdGF0ZSA9IGRybV9hdG9taWNfZ2V0X2Ny dGNfc3RhdGUoc3RhdGUsIGNydGMpOwotCWlmIChJU19FUlIoY3J0Y19zdGF0ZSkpIHsKLQkJcmV0 ID0gUFRSX0VSUihjcnRjX3N0YXRlKTsKLQkJZ290byBmYWlsOwotCX0KLQljcnRjX3N0YXRlLT5l dmVudCA9IGV2ZW50OwotCi0JcGxhbmVfc3RhdGUgPSBkcm1fYXRvbWljX2dldF9wbGFuZV9zdGF0 ZShzdGF0ZSwgcGxhbmUpOwotCWlmIChJU19FUlIocGxhbmVfc3RhdGUpKSB7Ci0JCXJldCA9IFBU Ul9FUlIocGxhbmVfc3RhdGUpOwotCQlnb3RvIGZhaWw7Ci0JfQotCi0JcmV0ID0gZHJtX2F0b21p Y19zZXRfY3J0Y19mb3JfcGxhbmUocGxhbmVfc3RhdGUsIGNydGMpOwotCWlmIChyZXQgIT0gMCkK LQkJZ290byBmYWlsOwotCWRybV9hdG9taWNfc2V0X2ZiX2Zvcl9wbGFuZShwbGFuZV9zdGF0ZSwg ZmIpOwotCi0JLyogTWFrZSBzdXJlIHdlIGRvbid0IGFjY2lkZW50YWxseSBkbyBhIGZ1bGwgbW9k ZXNldC4gKi8KLQlzdGF0ZS0+YWxsb3dfbW9kZXNldCA9IGZhbHNlOwotCWlmICghY3J0Y19zdGF0 ZS0+YWN0aXZlKSB7Ci0JCURSTV9ERUJVR19BVE9NSUMoIltDUlRDOiVkXSBkaXNhYmxlZCwgcmVq ZWN0aW5nIGxlZ2FjeSBmbGlwXG4iLAotCQkJCSBjcnRjLT5iYXNlLmlkKTsKLQkJcmV0ID0gLUVJ TlZBTDsKLQkJZ290byBmYWlsOwotCX0KLQotCWlmIChmbGFncyAmIERSTV9NT0RFX1BBR0VfRkxJ UF9BU1lOQykKLQkJbnY1MF93bmR3X2F0b20ocGxhbmVfc3RhdGUpLT5pbnRlcnZhbCA9IDA7Ci0K LQlyZXQgPSBkcm1fYXRvbWljX25vbmJsb2NraW5nX2NvbW1pdChzdGF0ZSk7Ci1mYWlsOgotCWlm IChyZXQgPT0gLUVERUFETEspCi0JCWdvdG8gYmFja29mZjsKLQotCWRybV9hdG9taWNfc3RhdGVf cHV0KHN0YXRlKTsKLQlyZXR1cm4gcmV0OwotCi1iYWNrb2ZmOgotCWRybV9hdG9taWNfc3RhdGVf Y2xlYXIoc3RhdGUpOwotCWRybV9hdG9taWNfbGVnYWN5X2JhY2tvZmYoc3RhdGUpOwotCi0JLyoK LQkgKiBTb21lb25lIG1pZ2h0IGhhdmUgZXhjaGFuZ2VkIHRoZSBmcmFtZWJ1ZmZlciB3aGlsZSB3 ZSBkcm9wcGVkIGxvY2tzCi0JICogaW4gdGhlIGJhY2tvZmYgY29kZS4gV2UgbmVlZCB0byBmaXgg dXAgdGhlIGZiIHJlZmNvdW50IHRyYWNraW5nIHRoZQotCSAqIGNvcmUgZG9lcyBmb3IgdXMuCi0J ICovCi0JcGxhbmUtPm9sZF9mYiA9IHBsYW5lLT5mYjsKLQotCWdvdG8gcmV0cnk7Ci19Ci0KIHN0 YXRpYyBpbnQKIG52NTBfaGVhZF9nYW1tYV9zZXQoc3RydWN0IGRybV9jcnRjICpjcnRjLCB1MTYg KnIsIHUxNiAqZywgdTE2ICpiLAogCQkgICAgdWludDMyX3Qgc2l6ZSkKQEAgLTIzODYsNyArMjMx OSw3IEBAIHN0cnVjdCBudjUwX2Jhc2UgewogCS5nYW1tYV9zZXQgPSBudjUwX2hlYWRfZ2FtbWFf c2V0LAogCS5kZXN0cm95ID0gbnY1MF9oZWFkX2Rlc3Ryb3ksCiAJLnNldF9jb25maWcgPSBkcm1f YXRvbWljX2hlbHBlcl9zZXRfY29uZmlnLAotCS5wYWdlX2ZsaXAgPSBudjUwX2hlYWRfcGFnZV9m bGlwLAorCS5wYWdlX2ZsaXAgPSBkcm1fYXRvbWljX2hlbHBlcl9wYWdlX2ZsaXAsCiAJLnNldF9w cm9wZXJ0eSA9IGRybV9hdG9taWNfaGVscGVyX2NydGNfc2V0X3Byb3BlcnR5LAogCS5hdG9taWNf ZHVwbGljYXRlX3N0YXRlID0gbnY1MF9oZWFkX2F0b21pY19kdXBsaWNhdGVfc3RhdGUsCiAJLmF0 b21pY19kZXN0cm95X3N0YXRlID0gbnY1MF9oZWFkX2F0b21pY19kZXN0cm95X3N0YXRlLAotLSAK MS45LjEKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmRy aS1kZXZlbCBtYWlsaW5nIGxpc3QKZHJpLWRldmVsQGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRw czovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2RyaS1kZXZlbAo=