From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sean Paul Subject: [PATCH 3/4] drm/msm: dpu: Untangle frame_done timeout units Date: Mon, 28 Jan 2019 15:42:50 -0500 Message-ID: <20190128204306.95076-3-sean@poorly.run> References: <20190128204306.95076-1-sean@poorly.run> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20190128204306.95076-1-sean@poorly.run> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: freedreno@lists.freedesktop.org Cc: linux-arm-msm@vger.kernel.org, Sean Paul , dri-devel@lists.freedesktop.org List-Id: linux-arm-msm@vger.kernel.org RnJvbTogU2VhbiBQYXVsIDxzZWFucGF1bEBjaHJvbWl1bS5vcmc+CgpUaGVyZSBleGlzdHMgYSBi dW5jaCBvZiBjb25mdXNpb24gYXMgdG8gd2hhdCB0aGUgYWN0dWFsIHVuaXRzIG9mCmZyYW1lX2Rv bmUgaXM6CgotIFRoZSBkZWZpbml0aW9uIHN0YXRlcyBpdCdzIGluICMgb2YgZnJhbWVzCi0gQ1JU QyB0cmVhdHMgaXQgbGlrZSBpdCdzIG1zCi0gZnJhbWVfZG9uZV90aW1lb3V0IGNvbW1lbnQgdGhp bmtzIGl0J3MgSHosIGJ1dCBpdCBzdG9yZXMgbXMKLSBmcmFtZV9kb25lIHRpbWVyIGlzIHNldHVw IHN1Y2ggdGhhdCBpdCBfc2hvdWxkXyBiZSBpbiBmcmFtZXMsIGJ1dCB0aGUKICB0aW1lb3V0IGlz IHN1cGVyIGxvbmcKClNvIHRoaXMgcGF0Y2ggdHJpZXMgdG8gaW50ZXJwcmV0IHdoYXQgdGhlIGRy aXZlciByZWFsbHkgd2FudHMuIEkndmUKZGUtY2VudHJhbGl6ZWQgdGhlICNkZWZpbmUgc2luY2Ug dGhlIGNvbnN1bWVycyBhcmUgZXhwZWN0aW5nIGRpZmZlcmVudAp1bml0cy4KCkZvciBjcnRjLCB3 ZSBqdXN0IHVzZSA2MG1zIHNpbmNlIHRoYXQncyB3aGF0IGl0IHdhcyBkb2luZyBiZWZvcmUuClBl cmhhcHMgd2UgY291bGQgZ2V0IGZhbmN5IGFuZCBzY2FsZSB3aXRoIHZyZWZyZXNoLCBidXQgdGhh dCdzIGZvcgphbm90aGVyIHRpbWUuCgpGb3IgZW5jb2RlciwgZml4IHRoZSBjb21tZW50cyBhbmQg cmVuYW1lIGZyYW1lX2RvbmVfdGltZW91dCBzbyBpdCdzCm9idmlvdXMgd2hhdCB0aGUgdW5pdHMg YXJlLiBJbiBwcmFjdGljZSwgZnJhbWVfZG9uZV90aW1lb3V0IGlzIHJlYWxseQpqdXN0IGNoZWNr ZWQgYWdhaW5zdCAwIHx8ICEwLCB3aGljaCBJIGd1ZXNzIGlzIHdoeSB0aGUgdW5pdHMgYmVpbmcg d3JvbmcKZGlkbid0IG1hdHRlci4gSSd2ZSBhbHNvIGRyb3BwZWQgdGhlIHRpbWVvdXQgZnJvbSB0 aGUgcHJldmlvdXMgNjAgZnJhbWVzCnRvIDUuIFRoYXQgc2VlbXMgbGlrZSBtb3JlIHRoYW4gZW5v dWdoIHRpbWUgdG8gZ2l2ZSB1cCBvbiBhIGZyYW1lLCBhbmQKbXkgZ3Vlc3MgaXMgdGhhdCBubyBv bmUgaW50ZW5kZWQgZm9yIHRoZSB0aW1lb3V0IHRvIF9hY3R1YWxseV8gYmUgNjAKZnJhbWVzLgoK U2lnbmVkLW9mZi1ieTogU2VhbiBQYXVsIDxzZWFucGF1bEBjaHJvbWl1bS5vcmc+Ci0tLQogZHJp dmVycy9ncHUvZHJtL21zbS9kaXNwL2RwdTEvZHB1X2NydGMuYyAgICB8ICA1ICsrKystCiBkcml2 ZXJzL2dwdS9kcm0vbXNtL2Rpc3AvZHB1MS9kcHVfZW5jb2Rlci5jIHwgMTkgKysrKysrKysrKyst LS0tLS0tLQogZHJpdmVycy9ncHUvZHJtL21zbS9kaXNwL2RwdTEvZHB1X2ttcy5oICAgICB8ICAz IC0tLQogMyBmaWxlcyBjaGFuZ2VkLCAxNSBpbnNlcnRpb25zKCspLCAxMiBkZWxldGlvbnMoLSkK CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vbXNtL2Rpc3AvZHB1MS9kcHVfY3J0Yy5jIGIv ZHJpdmVycy9ncHUvZHJtL21zbS9kaXNwL2RwdTEvZHB1X2NydGMuYwppbmRleCA0ZTRiNjQ4MjFj OWU4Li5iMGIzOTRhZjJhN2VmIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vbXNtL2Rpc3Av ZHB1MS9kcHVfY3J0Yy5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9tc20vZGlzcC9kcHUxL2RwdV9j cnRjLmMKQEAgLTQ2LDYgKzQ2LDkgQEAKICNkZWZpbmUgTEVGVF9NSVhFUiAwCiAjZGVmaW5lIFJJ R0hUX01JWEVSIDEKIAorLyogdGltZW91dCBpbiBtcyB3YWl0aW5nIGZvciBmcmFtZSBkb25lICov CisjZGVmaW5lIERQVV9DUlRDX0ZSQU1FX0RPTkVfVElNRU9VVF9NUwk2MAorCiBzdGF0aWMgc3Ry dWN0IGRwdV9rbXMgKl9kcHVfY3J0Y19nZXRfa21zKHN0cnVjdCBkcm1fY3J0YyAqY3J0YykKIHsK IAlzdHJ1Y3QgbXNtX2RybV9wcml2YXRlICpwcml2ID0gY3J0Yy0+ZGV2LT5kZXZfcHJpdmF0ZTsK QEAgLTY4Myw3ICs2ODYsNyBAQCBzdGF0aWMgaW50IF9kcHVfY3J0Y193YWl0X2Zvcl9mcmFtZV9k b25lKHN0cnVjdCBkcm1fY3J0YyAqY3J0YykKIAogCURQVV9BVFJBQ0VfQkVHSU4oImZyYW1lIGRv bmUgY29tcGxldGlvbiB3YWl0Iik7CiAJcmV0ID0gd2FpdF9mb3JfY29tcGxldGlvbl90aW1lb3V0 KCZkcHVfY3J0Yy0+ZnJhbWVfZG9uZV9jb21wLAotCQkJbXNlY3NfdG9famlmZmllcyhEUFVfRlJB TUVfRE9ORV9USU1FT1VUKSk7CisJCQltc2Vjc190b19qaWZmaWVzKERQVV9DUlRDX0ZSQU1FX0RP TkVfVElNRU9VVF9NUykpOwogCWlmICghcmV0KSB7CiAJCURSTV9FUlJPUigiZnJhbWUgZG9uZSB3 YWl0IHRpbWVkIG91dCwgcmV0OiVkXG4iLCByZXQpOwogCQlyYyA9IC1FVElNRURPVVQ7CmRpZmYg LS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vbXNtL2Rpc3AvZHB1MS9kcHVfZW5jb2Rlci5jIGIvZHJp dmVycy9ncHUvZHJtL21zbS9kaXNwL2RwdTEvZHB1X2VuY29kZXIuYwppbmRleCA4M2E0YzQ3ZGJl ZDJkLi41MWU0NmIyMDZjNzNlIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vbXNtL2Rpc3Av ZHB1MS9kcHVfZW5jb2Rlci5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9tc20vZGlzcC9kcHUxL2Rw dV9lbmNvZGVyLmMKQEAgLTY5LDYgKzY5LDkgQEAKIAogI2RlZmluZSBNQVhfVkRJU1BMQVlfU1BM SVQgMTA4MAogCisvKiB0aW1lb3V0IGluIGZyYW1lcyB3YWl0aW5nIGZvciBmcmFtZSBkb25lICov CisjZGVmaW5lIERQVV9FTkNPREVSX0ZSQU1FX0RPTkVfVElNRU9VVF9GUkFNRVMgNQorCiAvKioK ICAqIGVudW0gZHB1X2VuY19yY19ldmVudHMgLSBldmVudHMgZm9yIHJlc291cmNlIGNvbnRyb2wg c3RhdGUgbWFjaGluZQogICogQERQVV9FTkNfUkNfRVZFTlRfS0lDS09GRjoKQEAgLTE1OCw3ICsx NjEsNyBAQCBlbnVtIGRwdV9lbmNfcmNfc3RhdGVzIHsKICAqCQkJCUJpdDAgPSBwaHlzX2VuY3Nb MF0gZXRjLgogICogQGNydGNfZnJhbWVfZXZlbnRfY2I6CWNhbGxiYWNrIGhhbmRsZXIgZm9yIGZy YW1lIGV2ZW50CiAgKiBAY3J0Y19mcmFtZV9ldmVudF9jYl9kYXRhOgljYWxsYmFjayBoYW5kbGVy IHByaXZhdGUgZGF0YQotICogQGZyYW1lX2RvbmVfdGltZW91dDoJCWZyYW1lIGRvbmUgdGltZW91 dCBpbiBIegorICogQGZyYW1lX2RvbmVfdGltZW91dF9tczoJZnJhbWUgZG9uZSB0aW1lb3V0IGlu IG1zCiAgKiBAZnJhbWVfZG9uZV90aW1lcjoJCXdhdGNoZG9nIHRpbWVyIGZvciBmcmFtZSBkb25l IGV2ZW50CiAgKiBAdnN5bmNfZXZlbnRfdGltZXI6CQl2c3luYyB0aW1lcgogICogQGRpc3BfaW5m bzoJCQlsb2NhbCBjb3B5IG9mIG1zbV9kaXNwbGF5X2luZm8gc3RydWN0CkBAIC0xOTYsNyArMTk5 LDcgQEAgc3RydWN0IGRwdV9lbmNvZGVyX3ZpcnQgewogCXZvaWQgKCpjcnRjX2ZyYW1lX2V2ZW50 X2NiKSh2b2lkICosIHUzMiBldmVudCk7CiAJdm9pZCAqY3J0Y19mcmFtZV9ldmVudF9jYl9kYXRh OwogCi0JYXRvbWljX3QgZnJhbWVfZG9uZV90aW1lb3V0OworCWF0b21pY190IGZyYW1lX2RvbmVf dGltZW91dF9tczsKIAlzdHJ1Y3QgdGltZXJfbGlzdCBmcmFtZV9kb25lX3RpbWVyOwogCXN0cnVj dCB0aW1lcl9saXN0IHZzeW5jX2V2ZW50X3RpbWVyOwogCkBAIC0xMTg0LDcgKzExODcsNyBAQCBz dGF0aWMgdm9pZCBkcHVfZW5jb2Rlcl92aXJ0X2Rpc2FibGUoc3RydWN0IGRybV9lbmNvZGVyICpk cm1fZW5jKQogCX0KIAogCS8qIGFmdGVyIHBoeXMgd2FpdHMgZm9yIGZyYW1lLWRvbmUsIHNob3Vs ZCBiZSBubyBtb3JlIGZyYW1lcyBwZW5kaW5nICovCi0JaWYgKGF0b21pY194Y2hnKCZkcHVfZW5j LT5mcmFtZV9kb25lX3RpbWVvdXQsIDApKSB7CisJaWYgKGF0b21pY194Y2hnKCZkcHVfZW5jLT5m cmFtZV9kb25lX3RpbWVvdXRfbXMsIDApKSB7CiAJCURQVV9FUlJPUigiZW5jJWQgdGltZW91dCBw ZW5kaW5nXG4iLCBkcm1fZW5jLT5iYXNlLmlkKTsKIAkJZGVsX3RpbWVyX3N5bmMoJmRwdV9lbmMt PmZyYW1lX2RvbmVfdGltZXIpOwogCX0KQEAgLTEzNDEsNyArMTM0NCw3IEBAIHN0YXRpYyB2b2lk IGRwdV9lbmNvZGVyX2ZyYW1lX2RvbmVfY2FsbGJhY2soCiAJCX0KIAogCQlpZiAoIWRwdV9lbmMt PmZyYW1lX2J1c3lfbWFza1swXSkgewotCQkJYXRvbWljX3NldCgmZHB1X2VuYy0+ZnJhbWVfZG9u ZV90aW1lb3V0LCAwKTsKKwkJCWF0b21pY19zZXQoJmRwdV9lbmMtPmZyYW1lX2RvbmVfdGltZW91 dF9tcywgMCk7CiAJCQlkZWxfdGltZXIoJmRwdV9lbmMtPmZyYW1lX2RvbmVfdGltZXIpOwogCiAJ CQlkcHVfZW5jb2Rlcl9yZXNvdXJjZV9jb250cm9sKGRybV9lbmMsCkBAIC0xODA0LDEwICsxODA3 LDEwIEBAIHZvaWQgZHB1X2VuY29kZXJfa2lja29mZihzdHJ1Y3QgZHJtX2VuY29kZXIgKmRybV9l bmMsIGJvb2wgYXN5bmMpCiAKIAl0cmFjZV9kcHVfZW5jX2tpY2tvZmYoRFJNSUQoZHJtX2VuYykp OwogCi0JdGltZW91dF9tcyA9IERQVV9GUkFNRV9ET05FX1RJTUVPVVQgKiAxMDAwIC8KKwl0aW1l b3V0X21zID0gRFBVX0VOQ09ERVJfRlJBTUVfRE9ORV9USU1FT1VUX0ZSQU1FUyAqIDEwMDAgLwog CQlkcm1fbW9kZV92cmVmcmVzaCgmZHJtX2VuYy0+Y3J0Yy0+c3RhdGUtPmFkanVzdGVkX21vZGUp OwogCi0JYXRvbWljX3NldCgmZHB1X2VuYy0+ZnJhbWVfZG9uZV90aW1lb3V0LCB0aW1lb3V0X21z KTsKKwlhdG9taWNfc2V0KCZkcHVfZW5jLT5mcmFtZV9kb25lX3RpbWVvdXRfbXMsIHRpbWVvdXRf bXMpOwogCW1vZF90aW1lcigmZHB1X2VuYy0+ZnJhbWVfZG9uZV90aW1lciwKIAkJICBqaWZmaWVz ICsgbXNlY3NfdG9famlmZmllcyh0aW1lb3V0X21zKSk7CiAKQEAgLTIxMjksNyArMjEzMiw3IEBA IHN0YXRpYyB2b2lkIGRwdV9lbmNvZGVyX2ZyYW1lX2RvbmVfdGltZW91dChzdHJ1Y3QgdGltZXJf bGlzdCAqdCkKIAkJRFJNX0RFQlVHX0tNUygiaWQ6JXUgaW52YWxpZCB0aW1lb3V0IGZyYW1lX2J1 c3lfbWFzaz0lbHVcbiIsCiAJCQkgICAgICBEUk1JRChkcm1fZW5jKSwgZHB1X2VuYy0+ZnJhbWVf YnVzeV9tYXNrWzBdKTsKIAkJcmV0dXJuOwotCX0gZWxzZSBpZiAoIWF0b21pY194Y2hnKCZkcHVf ZW5jLT5mcmFtZV9kb25lX3RpbWVvdXQsIDApKSB7CisJfSBlbHNlIGlmICghYXRvbWljX3hjaGco JmRwdV9lbmMtPmZyYW1lX2RvbmVfdGltZW91dF9tcywgMCkpIHsKIAkJRFJNX0RFQlVHX0tNUygi aWQ6JXUgaW52YWxpZCB0aW1lb3V0XG4iLCBEUk1JRChkcm1fZW5jKSk7CiAJCXJldHVybjsKIAl9 CkBAIC0yMTc1LDcgKzIxNzgsNyBAQCBpbnQgZHB1X2VuY29kZXJfc2V0dXAoc3RydWN0IGRybV9k ZXZpY2UgKmRldiwgc3RydWN0IGRybV9lbmNvZGVyICplbmMsCiAKIAlzcGluX2xvY2tfaW5pdCgm ZHB1X2VuYy0+ZW5jX3NwaW5sb2NrKTsKIAotCWF0b21pY19zZXQoJmRwdV9lbmMtPmZyYW1lX2Rv bmVfdGltZW91dCwgMCk7CisJYXRvbWljX3NldCgmZHB1X2VuYy0+ZnJhbWVfZG9uZV90aW1lb3V0 X21zLCAwKTsKIAl0aW1lcl9zZXR1cCgmZHB1X2VuYy0+ZnJhbWVfZG9uZV90aW1lciwKIAkJCWRw dV9lbmNvZGVyX2ZyYW1lX2RvbmVfdGltZW91dCwgMCk7CiAKZGlmZiAtLWdpdCBhL2RyaXZlcnMv Z3B1L2RybS9tc20vZGlzcC9kcHUxL2RwdV9rbXMuaCBiL2RyaXZlcnMvZ3B1L2RybS9tc20vZGlz cC9kcHUxL2RwdV9rbXMuaAppbmRleCBhYzc1Y2ZjMjY3ZjQwLi4zMWU5ZWY5NmNhNWRjIDEwMDY0 NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vbXNtL2Rpc3AvZHB1MS9kcHVfa21zLmgKKysrIGIvZHJp dmVycy9ncHUvZHJtL21zbS9kaXNwL2RwdTEvZHB1X2ttcy5oCkBAIC03Myw5ICs3Myw2IEBACiAK ICNkZWZpbmUgRFBVX05BTUVfU0laRSAgMTIKIAotLyogdGltZW91dCBpbiBmcmFtZXMgd2FpdGlu ZyBmb3IgZnJhbWUgZG9uZSAqLwotI2RlZmluZSBEUFVfRlJBTUVfRE9ORV9USU1FT1VUCTYwCi0K IC8qCiAgKiBzdHJ1Y3QgZHB1X2lycV9jYWxsYmFjayAtIElSUSBjYWxsYmFjayBoYW5kbGVycwog ICogQGxpc3Q6IGxpc3QgdG8gY2FsbGJhY2sKLS0gClNlYW4gUGF1bCwgU29mdHdhcmUgRW5naW5l ZXIsIEdvb2dsZSAvIENocm9taXVtIE9TCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fXwpkcmktZGV2ZWwgbWFpbGluZyBsaXN0CmRyaS1kZXZlbEBsaXN0cy5m cmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0 aW5mby9kcmktZGV2ZWwK