From mboxrd@z Thu Jan 1 00:00:00 1970 From: Chris Wilson Subject: [PATCH v2] drm/i915: Move fence cancellation to runtime suspend Date: Fri, 21 Oct 2016 15:05:03 +0100 Message-ID: <20161021140503.7775-1-chris@chris-wilson.co.uk> References: <1477054107.28355.21.camel@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-qk0-x244.google.com (mail-qk0-x244.google.com [IPv6:2607:f8b0:400d:c09::244]) by gabe.freedesktop.org (Postfix) with ESMTPS id 22F566ED28 for ; Fri, 21 Oct 2016 14:05:10 +0000 (UTC) Received: by mail-qk0-x244.google.com with SMTP id z190so7244353qkc.3 for ; Fri, 21 Oct 2016 07:05:10 -0700 (PDT) In-Reply-To: <1477054107.28355.21.camel@intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: intel-gfx@lists.freedesktop.org Cc: Imre Deak , Daniel Vetter List-Id: intel-gfx@lists.freedesktop.org QXQgdGhlIG1vbWVudCwgd2UgaGF2ZSBkZXBlbmRlbmN5IG9uIHRoZSBSUE0gYXMgYSBiYXJyaWVy IGl0c2VsZiBpbiBib3RoCmk5MTVfZ2VtX3JlbGVhc2VfYWxsX21tYXBzKCkgYW5kIGk5MTVfZ2Vt X3Jlc3RvcmVfZmVuY2VzKCkuCmk5MTVfZ2VtX3Jlc3RvcmVfZmVuY2VzKCkgaXMgYWxzbyBjYWxs ZWQgYWxvbmcgIXJ1bnRpbWUgcG0gcGF0aHMsIGJ1dCB3ZQpjYW4gbW92ZSB0aGUgbWFya3VwIG9m IGxvc3QgZmVuY2VzIGFsb25nc2lkZSByZWxlYXNpbmcgdGhlIG1tYXBzIGludG8gYQpjb21tb24g aTkxNV9nZW1fcnVudGltZV9zdXNwZW5kKCkuIFRoaXMgaGFzIHRoZSBhZHZhbnRhZ2Ugb2YgbG9j YXRpbmcKYWxsIHRoZSB0cmlja3kgYmFycmllciBkZXBlbmRlbmNpZXMgaW50byBvbmUgbG9jYXRp b24uCgp2MjogSnVzdCBtYXJrIHRoZSBmZW5jZSBhcyBpbnZhbGlkIChmZW5jZS0+ZGlydHkpIHNv IHRoYXQgdXBvbiB3YWtpbmcgd2UKd2lsbCBiZSBzdXJlIHRvIGNsZWFyIHRoZSBmZW5jZSBhZnRl ciB1c2UsIG9yIHJlc3RvcmUgaXQgdG8gdGhlIGNvcnJlY3QKdmFsdWUgYmVmb3JlIHVzZS4gVGhp cyBtYWtlcyBzdXJlIHRoYXQgaWYgdGhlIGZlbmNlIGlzIGxlZnQgaW50YWN0CmFjcm9zcyB0aGUg c2xlZXAsIHdlIGRvIG5vdCBsZWF2ZSBpdCBwb2ludGluZyB0byBhIHJlZ2lvbiBvZiBHVFQgZm9y IHRoZQpuZXh0IHVuc3VzcGVjdGluZyB1c2VyLgoKU3VnZ2VzdGVkLWJ5OiBEYW5pZWwgVmV0dGVy IDxkYW5pZWwudmV0dGVyQGZmd2xsLmNoPgpTaWduZWQtb2ZmLWJ5OiBDaHJpcyBXaWxzb24gPGNo cmlzQGNocmlzLXdpbHNvbi5jby51az4KQ2M6IERhbmllbCBWZXR0ZXIgPGRhbmllbC52ZXR0ZXJA ZmZ3bGwuY2g+CkNjOiBJbXJlIERlYWsgPGltcmUuZGVha0BsaW51eC5pbnRlbC5jb20+Ci0tLQog ZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuYyAgICAgICB8ICA2ICsrLS0tLQogZHJpdmVy cy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaCAgICAgICB8ICAzICsrLQogZHJpdmVycy9ncHUvZHJt L2k5MTUvaTkxNV9nZW0uYyAgICAgICB8IDIxICsrKysrKysrKysrKysrKysrKystLQogZHJpdmVy cy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZmVuY2UuYyB8IDEyICsrKysrLS0tLS0tLQogNCBmaWxl cyBjaGFuZ2VkLCAyOCBpbnNlcnRpb25zKCspLCAxNCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQg YS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUv aTkxNV9kcnYuYwppbmRleCA4ODVkMzNmMzQxZjMuLjk5ZTRlMDQ0ZTk1OCAxMDA2NDQKLS0tIGEv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pOTE1X2Rydi5jCkBAIC0yMjc4LDEwICsyMjc4LDggQEAgc3RhdGljIGludCB2bHZfcmVzdW1l X3ByZXBhcmUoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAogCiAJdmx2X2NoZWNr X25vX2d0X2FjY2VzcyhkZXZfcHJpdik7CiAKLQlpZiAocnBtX3Jlc3VtZSkgeworCWlmIChycG1f cmVzdW1lKQogCQlpbnRlbF9pbml0X2Nsb2NrX2dhdGluZyhkZXYpOwotCQlpOTE1X2dlbV9yZXN0 b3JlX2ZlbmNlcyhkZXYpOwotCX0KIAogCXJldHVybiByZXQ7CiB9CkBAIC0yMzA3LDcgKzIzMDUs NyBAQCBzdGF0aWMgaW50IGludGVsX3J1bnRpbWVfc3VzcGVuZChzdHJ1Y3QgZGV2aWNlICprZGV2 KQogCSAqIFdlIGFyZSBzYWZlIGhlcmUgYWdhaW5zdCByZS1mYXVsdHMsIHNpbmNlIHRoZSBmYXVs dCBoYW5kbGVyIHRha2VzCiAJICogYW4gUlBNIHJlZmVyZW5jZS4KIAkgKi8KLQlpOTE1X2dlbV9y ZWxlYXNlX2FsbF9tbWFwcyhkZXZfcHJpdik7CisJaTkxNV9nZW1fcnVudGltZV9zdXNwZW5kKGRl dl9wcml2KTsKIAogCWludGVsX2d1Y19zdXNwZW5kKGRldik7CiAKZGlmZiAtLWdpdCBhL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Ry di5oCmluZGV4IGMzODgzNjFhZDcxNy4uOTQzNDczNDE3NmEzIDEwMDY0NAotLS0gYS9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVf ZHJ2LmgKQEAgLTMxMzAsOSArMzEzMCwxMCBAQCB2b2lkIGk5MTVfdm1hX2Rlc3Ryb3koc3RydWN0 IGk5MTVfdm1hICp2bWEpOwogCiBpbnQgaTkxNV9nZW1fb2JqZWN0X3VuYmluZChzdHJ1Y3QgZHJt X2k5MTVfZ2VtX29iamVjdCAqb2JqKTsKIGludCBpOTE1X2dlbV9vYmplY3RfcHV0X3BhZ2VzKHN0 cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpvYmopOwotdm9pZCBpOTE1X2dlbV9yZWxlYXNlX2Fs bF9tbWFwcyhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpOwogdm9pZCBpOTE1X2dl bV9yZWxlYXNlX21tYXAoc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKm9iaik7CiAKK3ZvaWQg aTkxNV9nZW1fcnVudGltZV9zdXNwZW5kKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJp dik7CisKIGludCBfX211c3RfY2hlY2sgaTkxNV9nZW1fb2JqZWN0X2dldF9wYWdlcyhzdHJ1Y3Qg ZHJtX2k5MTVfZ2VtX29iamVjdCAqb2JqKTsKIAogc3RhdGljIGlubGluZSBpbnQgX19zZ19wYWdl X2NvdW50KHN0cnVjdCBzY2F0dGVybGlzdCAqc2cpCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pOTE1X2dlbS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYwppbmRl eCA2NGE4OGNlNGIzYzYuLjBlMjZlZTk2ODU2ZSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJt L2k5MTUvaTkxNV9nZW0uYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jCkBA IC0xOTUyLDEwICsxOTUyLDEwIEBAIGk5MTVfZ2VtX3JlbGVhc2VfbW1hcChzdHJ1Y3QgZHJtX2k5 MTVfZ2VtX29iamVjdCAqb2JqKQogCWludGVsX3J1bnRpbWVfcG1fcHV0KGk5MTUpOwogfQogCi12 b2lkCi1pOTE1X2dlbV9yZWxlYXNlX2FsbF9tbWFwcyhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAq ZGV2X3ByaXYpCit2b2lkIGk5MTVfZ2VtX3J1bnRpbWVfc3VzcGVuZChzdHJ1Y3QgZHJtX2k5MTVf cHJpdmF0ZSAqZGV2X3ByaXYpCiB7CiAJc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKm9iaiwg Km9uOworCWludCBpOwogCiAJLyoKIAkgKiBPbmx5IGNhbGxlZCBkdXJpbmcgUlBNIHN1c3BlbmQu IEFsbCB1c2VycyBvZiB0aGUgdXNlcmZhdWx0X2xpc3QKQEAgLTE5NzAsNiArMTk3MCwyMyBAQCBp OTE1X2dlbV9yZWxlYXNlX2FsbF9tbWFwcyhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3By aXYpCiAJCWRybV92bWFfbm9kZV91bm1hcCgmb2JqLT5iYXNlLnZtYV9ub2RlLAogCQkJCSAgIG9i ai0+YmFzZS5kZXYtPmFub25faW5vZGUtPmlfbWFwcGluZyk7CiAJfQorCisJLyogVGhlIGZlbmNl IHdpbGwgYmUgbG9zdCB3aGVuIHRoZSBkZXZpY2UgcG93ZXJzIGRvd24uIElmIGFueSB3ZXJlCisJ ICogaW4gdXNlIGJ5IGhhcmR3YXJlIChpLmUuIHRoZXkgYXJlIHBpbm5lZCksIHdlIHNob3VsZCBu b3QgYmUgcG93ZXJpbmcKKwkgKiBkb3duISBBbGwgb3RoZXIgZmVuY2VzIHdpbGwgYmUgcmVhY3F1 aXJlZCBieSB0aGUgdXNlciB1cG9uIHdha2luZy4KKwkgKi8KKwlmb3IgKGkgPSAwOyBpIDwgZGV2 X3ByaXYtPm51bV9mZW5jZV9yZWdzOyBpKyspIHsKKwkJc3RydWN0IGRybV9pOTE1X2ZlbmNlX3Jl ZyAqcmVnID0gJmRldl9wcml2LT5mZW5jZV9yZWdzW2ldOworCisJCWlmIChXQVJOX09OKHJlZy0+ cGluX2NvdW50KSkKKwkJCWNvbnRpbnVlOworCisJCWlmICghcmVnLT52bWEpCisJCQljb250aW51 ZTsKKworCQlHRU1fQlVHX09OKCFsaXN0X2VtcHR5KCZyZWctPnZtYS0+b2JqLT51c2VyZmF1bHRf bGluaykpOworCQlyZWctPmRpcnR5ID0gdHJ1ZTsKKwl9CiB9CiAKIC8qKgpkaWZmIC0tZ2l0IGEv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZmVuY2UuYyBiL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2k5MTVfZ2VtX2ZlbmNlLmMKaW5kZXggNjcwMTMxNzliOGVkLi4zYzVhODA4MmNhYzMgMTAw NjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2ZlbmNlLmMKKysrIGIvZHJp dmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZmVuY2UuYwpAQCAtMzQzLDYgKzM0Myw5IEBAIGk5 MTVfdm1hX2dldF9mZW5jZShzdHJ1Y3QgaTkxNV92bWEgKnZtYSkKIAlzdHJ1Y3QgZHJtX2k5MTVf ZmVuY2VfcmVnICpmZW5jZTsKIAlzdHJ1Y3QgaTkxNV92bWEgKnNldCA9IGk5MTVfZ2VtX29iamVj dF9pc190aWxlZCh2bWEtPm9iaikgPyB2bWEgOiBOVUxMOwogCisJLyogTm90ZSB0aGF0IHdlIHJl dm9rZSBmZW5jZXMgb24gcnVudGltZSBzdXNwZW5kLiBUaGVyZWZvcmUgdGhlIHVzZXIKKwkgKiBt dXN0IGtlZXAgdGhlIGRldmljZSBhd2FrZSB3aGlsc3QgdXNpbmcgdGhlIGZlbmNlLgorCSAqLwog CWFzc2VydF9ycG1fd2FrZWxvY2tfaGVsZCh0b19pOTE1KHZtYS0+dm0tPmRldikpOwogCiAJLyog SnVzdCB1cGRhdGUgb3VyIHBsYWNlIGluIHRoZSBMUlUgaWYgb3VyIGZlbmNlIGlzIGdldHRpbmcg cmV1c2VkLiAqLwpAQCAtMzY4LDE5ICszNzEsMTQgQEAgaTkxNV92bWFfZ2V0X2ZlbmNlKHN0cnVj dCBpOTE1X3ZtYSAqdm1hKQogICogQGRldjogRFJNIGRldmljZQogICoKICAqIFJlc3RvcmUgdGhl IGh3IGZlbmNlIHN0YXRlIHRvIG1hdGNoIHRoZSBzb2Z0d2FyZSB0cmFja2luZyBhZ2FpbiwgdG8g YmUgY2FsbGVkCi0gKiBhZnRlciBhIGdwdSByZXNldCBhbmQgb24gcmVzdW1lLgorICogYWZ0ZXIg YSBncHUgcmVzZXQgYW5kIG9uIHJlc3VtZS4gTm90ZSB0aGF0IG9uIHJ1bnRpbWUgc3VzcGVuZCB3 ZSBvbmx5IGNhbmNlbAorICogdGhlIGZlbmNlcywgdG8gYmUgcmVhY3F1aXJlZCBieSB0aGUgdXNl ciBsYXRlci4KICAqLwogdm9pZCBpOTE1X2dlbV9yZXN0b3JlX2ZlbmNlcyhzdHJ1Y3QgZHJtX2Rl dmljZSAqZGV2KQogewogCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHRvX2k5 MTUoZGV2KTsKIAlpbnQgaTsKIAotCS8qIE5vdGUgdGhhdCB0aGlzIG1heSBiZSBjYWxsZWQgb3V0 c2lkZSBvZiBzdHJ1Y3RfbXV0ZXgsIGJ5Ci0JICogcnVudGltZSBzdXNwZW5kL3Jlc3VtZS4gVGhl IGJhcnJpZXIgd2UgcmVxdWlyZSBpcyBlbmZvcmNlZCBieQotCSAqIHJwbSBpdHNlbGYgLSBhbGwg YWNjZXNzIHRvIGZlbmNlcy9HVFQgYXJlIG9ubHkgd2l0aGluIGFuIHJwbQotCSAqIHdha2VyZWYs IGFuZCB0byBhY3F1aXJlIHRoYXQgd2FrZXJlZiB5b3UgbXVzdCBwYXNzIHRocm91Z2ggaGVyZS4K LQkgKi8KLQogCWZvciAoaSA9IDA7IGkgPCBkZXZfcHJpdi0+bnVtX2ZlbmNlX3JlZ3M7IGkrKykg ewogCQlzdHJ1Y3QgZHJtX2k5MTVfZmVuY2VfcmVnICpyZWcgPSAmZGV2X3ByaXYtPmZlbmNlX3Jl Z3NbaV07CiAJCXN0cnVjdCBpOTE1X3ZtYSAqdm1hID0gcmVnLT52bWE7Ci0tIAoyLjkuMwoKX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1h aWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMu ZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==