From mboxrd@z Thu Jan 1 00:00:00 1970 From: Chris Wilson Subject: [CI 6/6] drm/i915: Remove 'retire' parameter from intel_fb_obj_flush Date: Wed, 22 Feb 2017 11:40:49 +0000 Message-ID: <20170222114049.28456-6-chris@chris-wilson.co.uk> References: <20170222114049.28456-1-chris@chris-wilson.co.uk> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-wr0-x243.google.com (mail-wr0-x243.google.com [IPv6:2a00:1450:400c:c0c::243]) by gabe.freedesktop.org (Postfix) with ESMTPS id D877A6E7C0 for ; Wed, 22 Feb 2017 11:40:57 +0000 (UTC) Received: by mail-wr0-x243.google.com with SMTP id s27so1155080wrb.0 for ; Wed, 22 Feb 2017 03:40:57 -0800 (PST) Received: from haswell.alporthouse.com ([78.156.65.138]) by smtp.gmail.com with ESMTPSA id m188sm2189363wma.27.2017.02.22.03.40.55 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 22 Feb 2017 03:40:55 -0800 (PST) In-Reply-To: <20170222114049.28456-1-chris@chris-wilson.co.uk> 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 List-Id: intel-gfx@lists.freedesktop.org U2V0dGluZyByZXRpcmU9dHJ1ZSBpcyBpZGVudGljYWwgdG8gdXNpbmcgb3JpZ2luPU9SSUdJTl9D Uywgc28gbWFrZSB0aGUKc2FtZSBzaW1wbGlmaWNhdGlvbiB0byBpbnRlbF9mYl9vYmpfZmx1c2go KSBhcyBhbHJlYWR5IGVtcGxveWVkIGZvcgppbnRlbF9mYl9vYmpfaW52YWxpZGF0ZSgpLgoKU2ln bmVkLW9mZi1ieTogQ2hyaXMgV2lsc29uIDxjaHJpc0BjaHJpcy13aWxzb24uY28udWs+ClJldmll d2VkLWJ5OiBKb29uYXMgTGFodGluZW4gPGpvb25hcy5sYWh0aW5lbkBsaW51eC5pbnRlbC5jb20+ Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYyAgICAgICAgICB8IDEyICsrKysr Ky0tLS0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fY2xmbHVzaC5jICB8ICAyICst CiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgICAgIHwgIDIgKy0KIGRyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX2Zyb250YnVmZmVyLmMgfCAgMyArLS0KIGRyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX2Zyb250YnVmZmVyLmggfCAgOCArKy0tLS0tLQogNSBmaWxlcyBjaGFu Z2VkLCAxMSBpbnNlcnRpb25zKCspLCAxNiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9n ZW0uYwppbmRleCBmYWQwZjVhZGI5NzAuLmUyOWI2ZjBkZGEyOSAxMDA2NDQKLS0tIGEvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1 X2dlbS5jCkBAIC02MjgsNyArNjI4LDcgQEAgaTkxNV9nZW1fcGh5c19wd3JpdGUoc3RydWN0IGRy bV9pOTE1X2dlbV9vYmplY3QgKm9iaiwKIAlkcm1fY2xmbHVzaF92aXJ0X3JhbmdlKHZhZGRyLCBh cmdzLT5zaXplKTsKIAlpOTE1X2dlbV9jaGlwc2V0X2ZsdXNoKHRvX2k5MTUob2JqLT5iYXNlLmRl dikpOwogCi0JaW50ZWxfZmJfb2JqX2ZsdXNoKG9iaiwgZmFsc2UsIE9SSUdJTl9DUFUpOworCWlu dGVsX2ZiX29ial9mbHVzaChvYmosIE9SSUdJTl9DUFUpOwogCXJldHVybiAwOwogfQogCkBAIC0x Mjc1LDcgKzEyNzUsNyBAQCBpOTE1X2dlbV9ndHRfcHdyaXRlX2Zhc3Qoc3RydWN0IGRybV9pOTE1 X2dlbV9vYmplY3QgKm9iaiwKIAkJdXNlcl9kYXRhICs9IHBhZ2VfbGVuZ3RoOwogCQlvZmZzZXQg Kz0gcGFnZV9sZW5ndGg7CiAJfQotCWludGVsX2ZiX29ial9mbHVzaChvYmosIGZhbHNlLCBPUklH SU5fQ1BVKTsKKwlpbnRlbF9mYl9vYmpfZmx1c2gob2JqLCBPUklHSU5fQ1BVKTsKIAogCW11dGV4 X2xvY2soJmk5MTUtPmRybS5zdHJ1Y3RfbXV0ZXgpOwogb3V0X3VucGluOgpAQCAtMTQxMSw3ICsx NDExLDcgQEAgaTkxNV9nZW1fc2htZW1fcHdyaXRlKHN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0 ICpvYmosCiAJCW9mZnNldCA9IDA7CiAJfQogCi0JaW50ZWxfZmJfb2JqX2ZsdXNoKG9iaiwgZmFs c2UsIE9SSUdJTl9DUFUpOworCWludGVsX2ZiX29ial9mbHVzaChvYmosIE9SSUdJTl9DUFUpOwog CWk5MTVfZ2VtX29ial9maW5pc2hfc2htZW1fYWNjZXNzKG9iaik7CiAJcmV0dXJuIHJldDsKIH0K QEAgLTMxNjIsNyArMzE2Miw3IEBAIGk5MTVfZ2VtX29iamVjdF9mbHVzaF9ndHRfd3JpdGVfZG9t YWluKHN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpvYmopCiAJaWYgKElOVEVMX0dFTihkZXZf cHJpdikgPj0gNiAmJiAhSEFTX0xMQyhkZXZfcHJpdikpCiAJCVBPU1RJTkdfUkVBRChSSU5HX0FD VEhEKGRldl9wcml2LT5lbmdpbmVbUkNTXS0+bW1pb19iYXNlKSk7CiAKLQlpbnRlbF9mYl9vYmpf Zmx1c2gob2JqLCBmYWxzZSwgd3JpdGVfb3JpZ2luKG9iaiwgSTkxNV9HRU1fRE9NQUlOX0dUVCkp OworCWludGVsX2ZiX29ial9mbHVzaChvYmosIHdyaXRlX29yaWdpbihvYmosIEk5MTVfR0VNX0RP TUFJTl9HVFQpKTsKIAogCW9iai0+YmFzZS53cml0ZV9kb21haW4gPSAwOwogfQpAQCAtMzU1Miw3 ICszNTUyLDcgQEAgaTkxNV9nZW1fb2JqZWN0X3Bpbl90b19kaXNwbGF5X3BsYW5lKHN0cnVjdCBk cm1faTkxNV9nZW1fb2JqZWN0ICpvYmosCiAKIAkvKiBUcmVhdCB0aGlzIGFzIGFuIGVuZC1vZi1m cmFtZSwgbGlrZSBpbnRlbF91c2VyX2ZyYW1lYnVmZmVyX2RpcnR5KCkgKi8KIAlfX2k5MTVfZ2Vt X29iamVjdF9mbHVzaF9mb3JfZGlzcGxheShvYmopOwotCWludGVsX2ZiX29ial9mbHVzaChvYmos IGZhbHNlLCBPUklHSU5fRElSVFlGQik7CisJaW50ZWxfZmJfb2JqX2ZsdXNoKG9iaiwgT1JJR0lO X0RJUlRZRkIpOwogCiAJLyogSXQgc2hvdWxkIG5vdyBiZSBvdXQgb2YgYW55IG90aGVyIHdyaXRl IGRvbWFpbnMsIGFuZCB3ZSBjYW4gdXBkYXRlCiAJICogdGhlIGRvbWFpbiB2YWx1ZXMgZm9yIG91 ciBjaGFuZ2VzLgpAQCAtMzk1Myw3ICszOTUzLDcgQEAgZnJvbnRidWZmZXJfcmV0aXJlKHN0cnVj dCBpOTE1X2dlbV9hY3RpdmUgKmFjdGl2ZSwKIAlzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAq b2JqID0KIAkJY29udGFpbmVyX29mKGFjdGl2ZSwgdHlwZW9mKCpvYmopLCBmcm9udGJ1ZmZlcl93 cml0ZSk7CiAKLQlpbnRlbF9mYl9vYmpfZmx1c2gob2JqLCB0cnVlLCBPUklHSU5fQ1MpOworCWlu dGVsX2ZiX29ial9mbHVzaChvYmosIE9SSUdJTl9DUyk7CiB9CiAKIHZvaWQgaTkxNV9nZW1fb2Jq ZWN0X2luaXQoc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKm9iaiwKZGlmZiAtLWdpdCBhL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2NsZmx1c2guYyBiL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2k5MTVfZ2VtX2NsZmx1c2guYwppbmRleCBjNWZlZTAyZjMxNzMuLmQ5MjVmYjU4MmJhNyAx MDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fY2xmbHVzaC5jCisrKyBi L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2NsZmx1c2guYwpAQCAtNzQsNyArNzQsNyBA QCBzdGF0aWMgdm9pZCBfX2k5MTVfZG9fY2xmbHVzaChzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVj dCAqb2JqKQogCWRybV9jbGZsdXNoX3NnKG9iai0+bW0ucGFnZXMpOwogCW9iai0+Y2FjaGVfZGly dHkgPSBmYWxzZTsKIAotCWludGVsX2ZiX29ial9mbHVzaChvYmosIGZhbHNlLCBPUklHSU5fQ1BV KTsKKwlpbnRlbF9mYl9vYmpfZmx1c2gob2JqLCBPUklHSU5fQ1BVKTsKIH0KIAogc3RhdGljIHZv aWQgaTkxNV9jbGZsdXNoX3dvcmsoc3RydWN0IHdvcmtfc3RydWN0ICp3b3JrKQpkaWZmIC0tZ2l0 IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jIGIvZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfZGlzcGxheS5jCmluZGV4IGJiNTcxMzk4NWU1NC4uMjEwMzMyYzY5ODI2IDEw MDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKKysrIGIvZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCkBAIC0xNDI4Niw3ICsxNDI4Niw3IEBA IHN0YXRpYyBpbnQgaW50ZWxfdXNlcl9mcmFtZWJ1ZmZlcl9kaXJ0eShzdHJ1Y3QgZHJtX2ZyYW1l YnVmZmVyICpmYiwKIAlzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqb2JqID0gaW50ZWxfZmJf b2JqKGZiKTsKIAogCWk5MTVfZ2VtX29iamVjdF9mbHVzaF9pZl9kaXNwbGF5KG9iaik7Ci0JaW50 ZWxfZmJfb2JqX2ZsdXNoKG9iaiwgZmFsc2UsIE9SSUdJTl9ESVJUWUZCKTsKKwlpbnRlbF9mYl9v YmpfZmx1c2gob2JqLCBPUklHSU5fRElSVFlGQik7CiAKIAlyZXR1cm4gMDsKIH0KZGlmZiAtLWdp dCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Zyb250YnVmZmVyLmMgYi9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF9mcm9udGJ1ZmZlci5jCmluZGV4IDk2NmRlNGM3YzdhMi4uZmNmYzIx N2U3NTRlIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9mcm9udGJ1ZmZl ci5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Zyb250YnVmZmVyLmMKQEAgLTEx NCwxMyArMTE0LDEyIEBAIHN0YXRpYyB2b2lkIGludGVsX2Zyb250YnVmZmVyX2ZsdXNoKHN0cnVj dCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKIH0KIAogdm9pZCBfX2ludGVsX2ZiX29ial9m bHVzaChzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqb2JqLAotCQkJICBib29sIHJldGlyZSwK IAkJCSAgZW51bSBmYl9vcF9vcmlnaW4gb3JpZ2luLAogCQkJICB1bnNpZ25lZCBpbnQgZnJvbnRi dWZmZXJfYml0cykKIHsKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSB0b19p OTE1KG9iai0+YmFzZS5kZXYpOwogCi0JaWYgKHJldGlyZSkgeworCWlmIChvcmlnaW4gPT0gT1JJ R0lOX0NTKSB7CiAJCXNwaW5fbG9jaygmZGV2X3ByaXYtPmZiX3RyYWNraW5nLmxvY2spOwogCQkv KiBGaWx0ZXIgb3V0IG5ldyBiaXRzIHNpbmNlIHJlbmRlcmluZyBzdGFydGVkLiAqLwogCQlmcm9u dGJ1ZmZlcl9iaXRzICY9IGRldl9wcml2LT5mYl90cmFja2luZy5idXN5X2JpdHM7CmRpZmYgLS1n aXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9mcm9udGJ1ZmZlci5oIGIvZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfZnJvbnRidWZmZXIuaAppbmRleCA3YmFiNDEyMThjZjcuLjYzY2Q5 YTc1M2E3MiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZnJvbnRidWZm ZXIuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9mcm9udGJ1ZmZlci5oCkBAIC0z OCw3ICszOCw2IEBAIHZvaWQgX19pbnRlbF9mYl9vYmpfaW52YWxpZGF0ZShzdHJ1Y3QgZHJtX2k5 MTVfZ2VtX29iamVjdCAqb2JqLAogCQkJICAgICAgIGVudW0gZmJfb3Bfb3JpZ2luIG9yaWdpbiwK IAkJCSAgICAgICB1bnNpZ25lZCBpbnQgZnJvbnRidWZmZXJfYml0cyk7CiB2b2lkIF9faW50ZWxf ZmJfb2JqX2ZsdXNoKHN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpvYmosCi0JCQkgIGJvb2wg cmV0aXJlLAogCQkJICBlbnVtIGZiX29wX29yaWdpbiBvcmlnaW4sCiAJCQkgIHVuc2lnbmVkIGlu dCBmcm9udGJ1ZmZlcl9iaXRzKTsKIApAQCAtNjksMTUgKzY4LDEyIEBAIHN0YXRpYyBpbmxpbmUg Ym9vbCBpbnRlbF9mYl9vYmpfaW52YWxpZGF0ZShzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAq b2JqLAogLyoqCiAgKiBpbnRlbF9mYl9vYmpfZmx1c2ggLSBmbHVzaCBmcm9udGJ1ZmZlciBvYmpl Y3QKICAqIEBvYmo6IEdFTSBvYmplY3QgdG8gZmx1c2gKLSAqIEByZXRpcmU6IHNldCB3aGVuIHJl dGlyaW5nIGFzeW5jaHJvbm91cyByZW5kZXJpbmcKICAqIEBvcmlnaW46IHdoaWNoIG9wZXJhdGlv biBjYXVzZWQgdGhlIGZsdXNoCiAgKgogICogVGhpcyBmdW5jdGlvbiBnZXRzIGNhbGxlZCBldmVy eSB0aW1lIHJlbmRlcmluZyBvbiB0aGUgZ2l2ZW4gb2JqZWN0IGhhcwotICogY29tcGxldGVkIGFu ZCBmcm9udGJ1ZmZlciBjYWNoaW5nIGNhbiBiZSBzdGFydGVkIGFnYWluLiBJZiBAcmV0aXJlIGlz IHRydWUKLSAqIHRoZW4gYW55IGRlbGF5ZWQgZmx1c2hlcyB3aWxsIGJlIHVuYmxvY2tlZC4KKyAq IGNvbXBsZXRlZCBhbmQgZnJvbnRidWZmZXIgY2FjaGluZyBjYW4gYmUgc3RhcnRlZCBhZ2Fpbi4K ICAqLwogc3RhdGljIGlubGluZSB2b2lkIGludGVsX2ZiX29ial9mbHVzaChzdHJ1Y3QgZHJtX2k5 MTVfZ2VtX29iamVjdCAqb2JqLAotCQkJCSAgICAgIGJvb2wgcmV0aXJlLAogCQkJCSAgICAgIGVu dW0gZmJfb3Bfb3JpZ2luIG9yaWdpbikKIHsKIAl1bnNpZ25lZCBpbnQgZnJvbnRidWZmZXJfYml0 czsKQEAgLTg2LDcgKzgyLDcgQEAgc3RhdGljIGlubGluZSB2b2lkIGludGVsX2ZiX29ial9mbHVz aChzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqb2JqLAogCWlmICghZnJvbnRidWZmZXJfYml0 cykKIAkJcmV0dXJuOwogCi0JX19pbnRlbF9mYl9vYmpfZmx1c2gob2JqLCByZXRpcmUsIG9yaWdp biwgZnJvbnRidWZmZXJfYml0cyk7CisJX19pbnRlbF9mYl9vYmpfZmx1c2gob2JqLCBvcmlnaW4s IGZyb250YnVmZmVyX2JpdHMpOwogfQogCiAjZW5kaWYgLyogX19JTlRFTF9GUk9OVEJVRkZFUl9I X18gKi8KLS0gCjIuMTEuMAoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0 b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50 ZWwtZ2Z4Cg==