From: Maarten Lankhorst Subject: [PATCH 2/2] drm/i915: Replace use of pipe_crc->lock with an atomic Date: Thu, 28 Jun 2018 09:23:03 +0200 Message-ID: <20180628072303.14175-2-maarten.lankhorst@linux.intel.com> References: <20180628072303.14175-1-maarten.lankhorst@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mblankhorst.nl (mblankhorst.nl [IPv6:2a02:2308::216:3eff:fe92:dfa3]) by gabe.freedesktop.org (Postfix) with ESMTPS id 798196EC25 for ; Thu, 28 Jun 2018 07:23:10 +0000 (UTC) In-Reply-To: <20180628072303.14175-1-maarten.lankhorst@linux.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 List-Id: intel-gfx@lists.freedesktop.org cGlwZV9jcmMtPmxvY2sgb25seSBwcm90ZWN0cyBwaXBlX2NyYy0+c2tpcHBlZC4gUmVwbGFjZSB0 aGUgbG9jayB3aXRoCmF0b21pYyBvcGVyYXRpb25zIGluc3RlYWQsIGl0IHNob3VsZCB3b3JrIGp1 c3QgYXMgd2VsbCwgd2l0aG91dCB0aGUKc3BpbmxvY2suIEluIHRoZSBjYXNlIHdlIGRvbid0IHNr aXAgQ1JDIGluIHRoZSBpcnEsIHRoZSBmYXN0cGF0aCBpcwpvbmx5IGEgc2luZ2xlIGF0b21pY19y ZWFkKCkuCgpTaWduZWQtb2ZmLWJ5OiBNYWFydGVuIExhbmtob3JzdCA8bWFhcnRlbi5sYW5raG9y c3RAbGludXguaW50ZWwuY29tPgpDYzogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxp bnV4LmludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5jICAgICAg IHwgIDEgLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaCAgICAgICB8ICA1ICstLS0t CiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2lycS5jICAgICAgIHwgMTUgKysrKysrKystLS0t LS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9waXBlX2NyYy5jIHwgMjAgKysrLS0tLS0t LS0tLS0tLS0tLS0KIDQgZmlsZXMgY2hhbmdlZCwgMTIgaW5zZXJ0aW9ucygrKSwgMjkgZGVsZXRp b25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuYyBiL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmMKaW5kZXggMGRiM2M4M2NjZTI5Li41YWQ2OWI0 ODhkMmEgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmMKKysrIGIv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuYwpAQCAtOTIzLDcgKzkyMyw2IEBAIHN0YXRp YyBpbnQgaTkxNV9kcml2ZXJfaW5pdF9lYXJseShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2 X3ByaXYsCiAJaW50ZWxfaW5pdF9kaXNwbGF5X2hvb2tzKGRldl9wcml2KTsKIAlpbnRlbF9pbml0 X2Nsb2NrX2dhdGluZ19ob29rcyhkZXZfcHJpdik7CiAJaW50ZWxfaW5pdF9hdWRpb19ob29rcyhk ZXZfcHJpdik7Ci0JaW50ZWxfZGlzcGxheV9jcmNfaW5pdChkZXZfcHJpdik7CiAKIAlpbnRlbF9k ZXRlY3RfcHJlcHJvZHVjdGlvbl9odyhkZXZfcHJpdik7CiAKZGlmZiAtLWdpdCBhL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2k5MTVfZHJ2LmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5o CmluZGV4IDI5OGI2NDk3Y2RjNS4uYTg5NjFhZGRlNDk3IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pOTE1X2Rydi5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2 LmgKQEAgLTEyNzgsOCArMTI3OCw3IEBAIGVudW0gaW50ZWxfcGlwZV9jcmNfc291cmNlIHsKIAog I2RlZmluZSBJTlRFTF9QSVBFX0NSQ19FTlRSSUVTX05SCTEyOAogc3RydWN0IGludGVsX3BpcGVf Y3JjIHsKLQlzcGlubG9ja190IGxvY2s7Ci0JaW50IHNraXBwZWQ7CisJYXRvbWljX3Qgc2tpcHBl ZDsKIAllbnVtIGludGVsX3BpcGVfY3JjX3NvdXJjZSBzb3VyY2U7CiB9OwogCkBAIC0zMzM1LDEy ICszMzM0LDEwIEBAIHUzMiBpOTE1X2dlbV9mZW5jZV9hbGlnbm1lbnQoc3RydWN0IGRybV9pOTE1 X3ByaXZhdGUgKmRldl9wcml2LCB1MzIgc2l6ZSwKICNpZmRlZiBDT05GSUdfREVCVUdfRlMKIGlu dCBpOTE1X2RlYnVnZnNfcmVnaXN0ZXIoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2 KTsKIGludCBpOTE1X2RlYnVnZnNfY29ubmVjdG9yX2FkZChzdHJ1Y3QgZHJtX2Nvbm5lY3RvciAq Y29ubmVjdG9yKTsKLXZvaWQgaW50ZWxfZGlzcGxheV9jcmNfaW5pdChzdHJ1Y3QgZHJtX2k5MTVf cHJpdmF0ZSAqZGV2X3ByaXYpOwogI2Vsc2UKIHN0YXRpYyBpbmxpbmUgaW50IGk5MTVfZGVidWdm c19yZWdpc3RlcihzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpIHtyZXR1cm4gMDt9 CiBzdGF0aWMgaW5saW5lIGludCBpOTE1X2RlYnVnZnNfY29ubmVjdG9yX2FkZChzdHJ1Y3QgZHJt X2Nvbm5lY3RvciAqY29ubmVjdG9yKQogeyByZXR1cm4gMDsgfQotc3RhdGljIGlubGluZSB2b2lk IGludGVsX2Rpc3BsYXlfY3JjX2luaXQoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2 KSB7fQogI2VuZGlmCiAKIGNvbnN0IGNoYXIgKmk5MTVfY2FjaGVfbGV2ZWxfc3RyKHN0cnVjdCBk cm1faTkxNV9wcml2YXRlICppOTE1LCBpbnQgdHlwZSk7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pOTE1X2lycS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9pcnEuYwpp bmRleCAwODkyODgzMGZhMDMuLjU2ODhjZjFlMTIyNSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaTkxNV9pcnEuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2lycS5j CkBAIC0xNzA1LDggKzE3MDUsOCBAQCBzdGF0aWMgdm9pZCBkaXNwbGF5X3BpcGVfY3JjX2lycV9o YW5kbGVyKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKIAlzdHJ1Y3QgaW50ZWxf cGlwZV9jcmMgKnBpcGVfY3JjID0gJmRldl9wcml2LT5waXBlX2NyY1twaXBlXTsKIAlzdHJ1Y3Qg aW50ZWxfY3J0YyAqY3J0YyA9IGludGVsX2dldF9jcnRjX2Zvcl9waXBlKGRldl9wcml2LCBwaXBl KTsKIAl1aW50MzJfdCBjcmNzWzVdOworCWludCB0b19za2lwOwogCi0Jc3Bpbl9sb2NrKCZwaXBl X2NyYy0+bG9jayk7CiAJLyoKIAkgKiBGb3Igc29tZSBub3QgeWV0IGlkZW50aWZpZWQgcmVhc29u LCB0aGUgZmlyc3QgQ1JDIGlzCiAJICogYm9ua2Vycy4gU28gbGV0J3MganVzdCB3YWl0IGZvciB0 aGUgbmV4dCB2YmxhbmsgYW5kIHJlYWQKQEAgLTE3MTUsMTMgKzE3MTUsMTQgQEAgc3RhdGljIHZv aWQgZGlzcGxheV9waXBlX2NyY19pcnFfaGFuZGxlcihzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAq ZGV2X3ByaXYsCiAJICogT24gR0VOOCsgc29tZXRpbWVzIHRoZSBzZWNvbmQgQ1JDIGlzIGJvbmtl cnMgYXMgd2VsbCwgc28KIAkgKiBkb24ndCB0cnVzdCB0aGF0IG9uZSBlaXRoZXIuCiAJICovCi0J aWYgKHBpcGVfY3JjLT5za2lwcGVkIDw9IDAgfHwKLQkgICAgKElOVEVMX0dFTihkZXZfcHJpdikg Pj0gOCAmJiBwaXBlX2NyYy0+c2tpcHBlZCA9PSAxKSkgewotCQlwaXBlX2NyYy0+c2tpcHBlZCsr OwotCQlzcGluX3VubG9jaygmcGlwZV9jcmMtPmxvY2spOworCisJaWYgKElOVEVMX0dFTihkZXZf cHJpdikgPj0gOCkKKwkJdG9fc2tpcCA9IDI7CisJZWxzZQorCQl0b19za2lwID0gMTsKKworCWlm IChhdG9taWNfYWRkX3VubGVzcygmcGlwZV9jcmMtPnNraXBwZWQsIDEsIHRvX3NraXApKQogCQly ZXR1cm47Ci0JfQotCXNwaW5fdW5sb2NrKCZwaXBlX2NyYy0+bG9jayk7CiAKIAljcmNzWzBdID0g Y3JjMDsKIAljcmNzWzFdID0gY3JjMTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX3BpcGVfY3JjLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9waXBlX2NyYy5j CmluZGV4IDg0OWUxYjY5YmE3My4uMjVlYzFjMmE2NGI3IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF9waXBlX2NyYy5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX3BpcGVfY3JjLmMKQEAgLTQ1NywxNyArNDU3LDYgQEAgZGlzcGxheV9jcmNfY3RsX3BhcnNl X3NvdXJjZShjb25zdCBjaGFyICpidWYsIGVudW0gaW50ZWxfcGlwZV9jcmNfc291cmNlICpzKQog CXJldHVybiAwOwogfQogCi12b2lkIGludGVsX2Rpc3BsYXlfY3JjX2luaXQoc3RydWN0IGRybV9p OTE1X3ByaXZhdGUgKmRldl9wcml2KQotewotCWVudW0gcGlwZSBwaXBlOwotCi0JZm9yX2VhY2hf cGlwZShkZXZfcHJpdiwgcGlwZSkgewotCQlzdHJ1Y3QgaW50ZWxfcGlwZV9jcmMgKnBpcGVfY3Jj ID0gJmRldl9wcml2LT5waXBlX2NyY1twaXBlXTsKLQotCQlzcGluX2xvY2tfaW5pdCgmcGlwZV9j cmMtPmxvY2spOwotCX0KLX0KLQogaW50IGludGVsX2NydGNfc2V0X2NyY19zb3VyY2Uoc3RydWN0 IGRybV9jcnRjICpjcnRjLCBjb25zdCBjaGFyICpzb3VyY2VfbmFtZSwKIAkJCSAgICAgIHNpemVf dCAqdmFsdWVzX2NudCkKIHsKQEAgLTUwNyw3ICs0OTYsNyBAQCBpbnQgaW50ZWxfY3J0Y19zZXRf Y3JjX3NvdXJjZShzdHJ1Y3QgZHJtX2NydGMgKmNydGMsIGNvbnN0IGNoYXIgKnNvdXJjZV9uYW1l LAogCQkJaHN3X3BpcGVfQV9jcmNfd2EoZGV2X3ByaXYsIGZhbHNlKTsKIAl9CiAKLQlwaXBlX2Ny Yy0+c2tpcHBlZCA9IDA7CisJYXRvbWljX3NldCgmcGlwZV9jcmMtPnNraXBwZWQsIDApOwogCSp2 YWx1ZXNfY250ID0gNTsKIAogb3V0OgpAQCAtNTI5LDggKzUxOCw3IEBAIHZvaWQgaW50ZWxfY3J0 Y19lbmFibGVfcGlwZV9jcmMoc3RydWN0IGludGVsX2NydGMgKmludGVsX2NydGMpCiAJaWYgKGdl dF9uZXdfY3JjX2N0bF9yZWcoZGV2X3ByaXYsIGNydGMtPmluZGV4LCAmcGlwZV9jcmMtPnNvdXJj ZSwgJnZhbCwgZmFsc2UpIDwgMCkKIAkJcmV0dXJuOwogCi0JLyogRG9uJ3QgbmVlZCBwaXBlX2Ny Yy0+bG9jayBoZXJlLCBJUlFzIGFyZSBub3QgZ2VuZXJhdGVkLiAqLwotCXBpcGVfY3JjLT5za2lw cGVkID0gMDsKKwlhdG9taWNfc2V0KCZwaXBlX2NyYy0+c2tpcHBlZCwgMCk7CiAKIAlJOTE1X1dS SVRFKFBJUEVfQ1JDX0NUTChjcnRjLT5pbmRleCksIHZhbCk7CiAJUE9TVElOR19SRUFEKFBJUEVf Q1JDX0NUTChjcnRjLT5pbmRleCkpOwpAQCAtNTQzLDkgKzUzMSw3IEBAIHZvaWQgaW50ZWxfY3J0 Y19kaXNhYmxlX3BpcGVfY3JjKHN0cnVjdCBpbnRlbF9jcnRjICppbnRlbF9jcnRjKQogCXN0cnVj dCBpbnRlbF9waXBlX2NyYyAqcGlwZV9jcmMgPSAmZGV2X3ByaXYtPnBpcGVfY3JjW2NydGMtPmlu ZGV4XTsKIAogCS8qIFN3YWxsb3cgY3JjJ3MgdW50aWwgd2Ugc3RvcCBnZW5lcmF0aW5nIHRoZW0u ICovCi0Jc3Bpbl9sb2NrX2lycSgmcGlwZV9jcmMtPmxvY2spOwotCXBpcGVfY3JjLT5za2lwcGVk ID0gSU5UX01JTjsKLQlzcGluX3VubG9ja19pcnEoJnBpcGVfY3JjLT5sb2NrKTsKKwlhdG9taWNf c2V0KCZwaXBlX2NyYy0+c2tpcHBlZCwgSU5UX01JTik7CiAKIAlJOTE1X1dSSVRFKFBJUEVfQ1JD X0NUTChjcnRjLT5pbmRleCksIDApOwogCVBPU1RJTkdfUkVBRChQSVBFX0NSQ19DVEwoY3J0Yy0+ aW5kZXgpKTsKLS0gCjIuMTguMAoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRl c2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8v aW50ZWwtZ2Z4Cg==