From mboxrd@z Thu Jan 1 00:00:00 1970 From: ville.syrjala@linux.intel.com Subject: [PATCH v3] drm/i915: Always normalize return timeout for wait_timeout_ioctl Date: Fri, 26 Apr 2013 16:22:46 +0300 Message-ID: <1366982566-11245-1-git-send-email-ville.syrjala@linux.intel.com> References: <1366981740-905-1-git-send-email-ville.syrjala@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by gabe.freedesktop.org (Postfix) with ESMTP id B4C89E62BD for ; Fri, 26 Apr 2013 06:22:50 -0700 (PDT) In-Reply-To: <1366981740-905-1-git-send-email-ville.syrjala@linux.intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org Errors-To: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org To: intel-gfx@lists.freedesktop.org Cc: Ben Widawsky List-Id: intel-gfx@lists.freedesktop.org RnJvbTogQ2hyaXMgV2lsc29uIDxjaHJpc0BjaHJpcy13aWxzb24uY28udWs+CgpBcyB3ZSByZWNv bXB1dGUgdGhlIHJlbWFpbmluZyB0aW1lb3V0IGFmdGVyIHdhaXRpbmcsIHRoZXJlIGlzIGEKcG90 ZW50aWFsIGZvciB0aGF0IHRpbWVvdXQgdG8gYmUgbGVzcyB0aGFuIHplcm8gYW5kIHNvIG5lZWQg c2FuaXRpemluZy4KVGhlIHRpbWVvdXQgaXMgYWx3YXlzIHJldHVybmVkIHRvIHVzZXJzcGFjZSBh bmQgdmFsaWRhdGVkLCBzbyB3ZSBzaG91bGQKYWx3YXlzIHBlcmZvcm0gdGhlIHNhbml0YXRpb24u Cgp2MiBbdnN5cmphbGFdOiBPbmx5IG5vcm1hbGl6ZSB0aGUgdGltZXNwZWMgaWYgaXQncyBpbnZh bGlkCnYzOiBBZGQgYSBjb21tZW50IHRvIGNsYXJpZnkgdGhlIHNpdHVhdGlvbiBhbmQgcmVtb3Zl IHRoZSBub3cKICAgIHVzZWxlc3MgV0FSTl9PTigpIChpY2tsZSkKCkNjOiBCZW4gV2lkYXdza3kg PGJlbkBid2lkYXdzay5uZXQ+ClNpZ25lZC1vZmYtYnk6IENocmlzIFdpbHNvbiA8Y2hyaXNAY2hy aXMtd2lsc29uLmNvLnVrPgpTaWduZWQtb2ZmLWJ5OiBWaWxsZSBTeXJqw6Rsw6QgPHZpbGxlLnN5 cmphbGFAbGludXguaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2Vt LmMgfCA4ICsrKy0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgMyBpbnNlcnRpb25zKCspLCA1IGRlbGV0 aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMgYi9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jCmluZGV4IDZiZTk0MGUuLjYxNjU1MzUgMTAw NjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMKKysrIGIvZHJpdmVycy9n cHUvZHJtL2k5MTUvaTkxNV9nZW0uYwpAQCAtMTA0NSw2ICsxMDQ1LDggQEAgc3RhdGljIGludCBf X3dhaXRfc2Vxbm8oc3RydWN0IGludGVsX3JpbmdfYnVmZmVyICpyaW5nLCB1MzIgc2Vxbm8sCiAJ aWYgKHRpbWVvdXQpIHsKIAkJc3RydWN0IHRpbWVzcGVjIHNsZWVwX3RpbWUgPSB0aW1lc3BlY19z dWIobm93LCBiZWZvcmUpOwogCQkqdGltZW91dCA9IHRpbWVzcGVjX3N1YigqdGltZW91dCwgc2xl ZXBfdGltZSk7CisJCWlmICghdGltZXNwZWNfdmFsaWQodGltZW91dCkpIC8qIGkuZS4gbmVnYXRp dmUgdGltZSByZW1haW5zICovCisJCQlzZXRfbm9ybWFsaXplZF90aW1lc3BlYyh0aW1lb3V0LCAw LCAwKTsKIAl9CiAKIAlzd2l0Y2ggKGVuZCkgewpAQCAtMTA1Myw4ICsxMDU1LDYgQEAgc3RhdGlj IGludCBfX3dhaXRfc2Vxbm8oc3RydWN0IGludGVsX3JpbmdfYnVmZmVyICpyaW5nLCB1MzIgc2Vx bm8sCiAJY2FzZSAtRVJFU1RBUlRTWVM6IC8qIFNpZ25hbCAqLwogCQlyZXR1cm4gKGludCllbmQ7 CiAJY2FzZSAwOiAvKiBUaW1lb3V0ICovCi0JCWlmICh0aW1lb3V0KQotCQkJc2V0X25vcm1hbGl6 ZWRfdGltZXNwZWModGltZW91dCwgMCwgMCk7CiAJCXJldHVybiAtRVRJTUU7CiAJZGVmYXVsdDog LyogQ29tcGxldGVkICovCiAJCVdBUk5fT04oZW5kIDwgMCk7IC8qIFdlJ3JlIG5vdCBhd2FyZSBv ZiBvdGhlciBlcnJvcnMgKi8KQEAgLTIzNzcsMTAgKzIzNzcsOCBAQCBpOTE1X2dlbV93YWl0X2lv Y3RsKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHZvaWQgKmRhdGEsIHN0cnVjdCBkcm1fZmlsZSAq ZmlsZSkKIAltdXRleF91bmxvY2soJmRldi0+c3RydWN0X211dGV4KTsKIAogCXJldCA9IF9fd2Fp dF9zZXFubyhyaW5nLCBzZXFubywgcmVzZXRfY291bnRlciwgdHJ1ZSwgdGltZW91dCk7Ci0JaWYg KHRpbWVvdXQpIHsKLQkJV0FSTl9PTighdGltZXNwZWNfdmFsaWQodGltZW91dCkpOworCWlmICh0 aW1lb3V0KQogCQlhcmdzLT50aW1lb3V0X25zID0gdGltZXNwZWNfdG9fbnModGltZW91dCk7Ci0J fQogCXJldHVybiByZXQ7CiAKIG91dDoKLS0gCjEuOC4xLjUKCl9fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwt Z2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21h aWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==