From mboxrd@z Thu Jan  1 00:00:00 1970
From: Chris Wilson <chris@chris-wilson.co.uk>
Subject: [PATCH 13/31] drm/i915: Move the irq_counter inside the
 spinlock
Date: Mon, 25 Jun 2018 10:48:24 +0100
Message-ID: <20180625094842.8499-13-chris@chris-wilson.co.uk>
References: <20180625094842.8499-1-chris@chris-wilson.co.uk>
Mime-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64
Return-path: <intel-gfx-bounces@lists.freedesktop.org>
Received: from fireflyinternet.com (mail.fireflyinternet.com [109.228.58.192])
 by gabe.freedesktop.org (Postfix) with ESMTPS id 9F1C06E173
 for <intel-gfx@lists.freedesktop.org>; Mon, 25 Jun 2018 09:49:24 +0000 (UTC)
In-Reply-To: <20180625094842.8499-1-chris@chris-wilson.co.uk>
List-Unsubscribe: <https://lists.freedesktop.org/mailman/options/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=unsubscribe>
List-Archive: <https://lists.freedesktop.org/archives/intel-gfx>
List-Post: <mailto:intel-gfx@lists.freedesktop.org>
List-Help: <mailto:intel-gfx-request@lists.freedesktop.org?subject=help>
List-Subscribe: <https://lists.freedesktop.org/mailman/listinfo/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=subscribe>
Errors-To: intel-gfx-bounces@lists.freedesktop.org
Sender: "Intel-gfx" <intel-gfx-bounces@lists.freedesktop.org>
To: intel-gfx@lists.freedesktop.org
List-Id: intel-gfx@lists.freedesktop.org

UmF0aGVyIHRoYW4gaGF2ZSBtdWx0aXBsZSBsb2NrZWQgaW5zdHJ1Y3Rpb25zIGluc2lkZSB0aGUg
bm90aWZ5X3JpbmcoKQppcnEgaGFuZGxlciwgbW92ZSB0aGVtIGluc2lkZSB0aGUgc3BpbmxvY2sg
YW5kIHJlZHVjZSB0aGVpciBpbnRyaW5zaWMKbG9ja2luZy4KClNpZ25lZC1vZmYtYnk6IENocmlz
IFdpbHNvbiA8Y2hyaXNAY2hyaXMtd2lsc29uLmNvLnVrPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9p
OTE1L2k5MTVfaXJxLmMgICAgICAgICAgfCAgNCArKy0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9p
OTE1X3JlcXVlc3QuYyAgICAgIHwgIDQgKystLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf
YnJlYWRjcnVtYnMuYyB8IDExICsrKysrKystLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl
bF9yaW5nYnVmZmVyLmggIHwgIDIgKy0KIDQgZmlsZXMgY2hhbmdlZCwgMTIgaW5zZXJ0aW9ucygr
KSwgOSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1
X2lycS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9pcnEuYwppbmRleCA1M2RhZDQ4Zjky
Y2UuLjY3MzBjMWE3ZjEzNSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9p
cnEuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2lycS5jCkBAIC0xMTUzLDggKzEx
NTMsNiBAQCBzdGF0aWMgdm9pZCBub3RpZnlfcmluZyhzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpl
bmdpbmUpCiAJaWYgKHVubGlrZWx5KCFlbmdpbmUtPmJyZWFkY3J1bWJzLmlycV9hcm1lZCkpCiAJ
CXJldHVybjsKIAotCWF0b21pY19pbmMoJmVuZ2luZS0+aXJxX2NvdW50KTsKLQogCXJjdV9yZWFk
X2xvY2soKTsKIAogCXNwaW5fbG9jaygmZW5naW5lLT5icmVhZGNydW1icy5pcnFfbG9jayk7CkBA
IC0xMTg5LDYgKzExODcsOCBAQCBzdGF0aWMgdm9pZCBub3RpZnlfcmluZyhzdHJ1Y3QgaW50ZWxf
ZW5naW5lX2NzICplbmdpbmUpCiAJCQkJdHNrID0gd2FpdC0+dHNrOwogCQkJfQogCQl9CisKKwkJ
ZW5naW5lLT5icmVhZGNydW1icy5pcnFfY291bnQrKzsKIAl9IGVsc2UgewogCQlpZiAoZW5naW5l
LT5icmVhZGNydW1icy5pcnFfYXJtZWQpCiAJCQlfX2ludGVsX2VuZ2luZV9kaXNhcm1fYnJlYWRj
cnVtYnMoZW5naW5lKTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfcmVx
dWVzdC5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9yZXF1ZXN0LmMKaW5kZXggMTFmMTc1
NTU0ZGE4Li42OTYxMjU2NjMxMDUgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5
MTVfcmVxdWVzdC5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfcmVxdWVzdC5jCkBA
IC0xMTYxLDcgKzExNjEsNyBAQCBzdGF0aWMgYm9vbCBfX2k5MTVfc3Bpbl9yZXF1ZXN0KGNvbnN0
IHN0cnVjdCBpOTE1X3JlcXVlc3QgKnJxLAogCSAqIHRha2VzIHRvIHNsZWVwIG9uIGEgcmVxdWVz
dCwgb24gdGhlIG9yZGVyIG9mIGEgbWljcm9zZWNvbmQuCiAJICovCiAKLQlpcnEgPSBhdG9taWNf
cmVhZCgmZW5naW5lLT5pcnFfY291bnQpOworCWlycSA9IFJFQURfT05DRShlbmdpbmUtPmJyZWFk
Y3J1bWJzLmlycV9jb3VudCk7CiAJdGltZW91dF91cyArPSBsb2NhbF9jbG9ja191cygmY3B1KTsK
IAlkbyB7CiAJCWlmIChpOTE1X3NlcW5vX3Bhc3NlZChpbnRlbF9lbmdpbmVfZ2V0X3NlcW5vKGVu
Z2luZSksIHNlcW5vKSkKQEAgLTExNzMsNyArMTE3Myw3IEBAIHN0YXRpYyBib29sIF9faTkxNV9z
cGluX3JlcXVlc3QoY29uc3Qgc3RydWN0IGk5MTVfcmVxdWVzdCAqcnEsCiAJCSAqIGFzc3VtZSB3
ZSB3b24ndCBzZWUgb25lIGluIHRoZSBuZWFyIGZ1dHVyZSBidXQgcmVxdWlyZQogCQkgKiB0aGUg
ZW5naW5lLT5zZXFub19iYXJyaWVyKCkgdG8gZml4dXAgY29oZXJlbmN5LgogCQkgKi8KLQkJaWYg
KGF0b21pY19yZWFkKCZlbmdpbmUtPmlycV9jb3VudCkgIT0gaXJxKQorCQlpZiAoUkVBRF9PTkNF
KGVuZ2luZS0+YnJlYWRjcnVtYnMuaXJxX2NvdW50KSAhPSBpcnEpCiAJCQlicmVhazsKIAogCQlp
ZiAoc2lnbmFsX3BlbmRpbmdfc3RhdGUoc3RhdGUsIGN1cnJlbnQpKQpkaWZmIC0tZ2l0IGEvZHJp
dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfYnJlYWRjcnVtYnMuYyBiL2RyaXZlcnMvZ3B1L2RybS9p
OTE1L2ludGVsX2JyZWFkY3J1bWJzLmMKaW5kZXggODZhOTg3YjhhYzY2Li4xZGI2YmE3ZDkyNmUg
MTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2JyZWFkY3J1bWJzLmMKKysr
IGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfYnJlYWRjcnVtYnMuYwpAQCAtOTgsMTIgKzk4
LDE0IEBAIHN0YXRpYyB2b2lkIGludGVsX2JyZWFkY3J1bWJzX2hhbmdjaGVjayhzdHJ1Y3QgdGlt
ZXJfbGlzdCAqdCkKIAlzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUgPQogCQlmcm9tX3Rp
bWVyKGVuZ2luZSwgdCwgYnJlYWRjcnVtYnMuaGFuZ2NoZWNrKTsKIAlzdHJ1Y3QgaW50ZWxfYnJl
YWRjcnVtYnMgKmIgPSAmZW5naW5lLT5icmVhZGNydW1iczsKKwl1bnNpZ25lZCBpbnQgaXJxX2Nv
dW50OwogCiAJaWYgKCFiLT5pcnFfYXJtZWQpCiAJCXJldHVybjsKIAotCWlmIChiLT5oYW5nY2hl
Y2tfaW50ZXJydXB0cyAhPSBhdG9taWNfcmVhZCgmZW5naW5lLT5pcnFfY291bnQpKSB7Ci0JCWIt
PmhhbmdjaGVja19pbnRlcnJ1cHRzID0gYXRvbWljX3JlYWQoJmVuZ2luZS0+aXJxX2NvdW50KTsK
KwlpcnFfY291bnQgPSBSRUFEX09OQ0UoYi0+aXJxX2NvdW50KTsKKwlpZiAoYi0+aGFuZ2NoZWNr
X2ludGVycnVwdHMgIT0gaXJxX2NvdW50KSB7CisJCWItPmhhbmdjaGVja19pbnRlcnJ1cHRzID0g
aXJxX2NvdW50OwogCQltb2RfdGltZXIoJmItPmhhbmdjaGVjaywgd2FpdF90aW1lb3V0KCkpOwog
CQlyZXR1cm47CiAJfQpAQCAtMjcyLDEzICsyNzQsMTQgQEAgc3RhdGljIGJvb2wgdXNlX2Zha2Vf
aXJxKGNvbnN0IHN0cnVjdCBpbnRlbF9icmVhZGNydW1icyAqYikKIAlpZiAoIXRlc3RfYml0KGVu
Z2luZS0+aWQsICZlbmdpbmUtPmk5MTUtPmdwdV9lcnJvci5taXNzZWRfaXJxX3JpbmdzKSkKIAkJ
cmV0dXJuIGZhbHNlOwogCi0JLyogT25seSBzdGFydCB3aXRoIHRoZSBoZWF2eSB3ZWlnaHQgZmFr
ZSBpcnEgdGltZXIgaWYgd2UgaGF2ZSBub3QKKwkvKgorCSAqIE9ubHkgc3RhcnQgd2l0aCB0aGUg
aGVhdnkgd2VpZ2h0IGZha2UgaXJxIHRpbWVyIGlmIHdlIGhhdmUgbm90CiAJICogc2VlbiBhbnkg
aW50ZXJydXB0cyBzaW5jZSBlbmFibGluZyBpdCB0aGUgZmlyc3QgdGltZS4gSWYgdGhlCiAJICog
aW50ZXJydXB0cyBhcmUgc3RpbGwgYXJyaXZpbmcsIGl0IG1lYW5zIHdlIG1hZGUgYSBtaXN0YWtl
IGluIG91cgogCSAqIGVuZ2luZS0+c2Vxbm9fYmFycmllcigpLCBhIHRpbWluZyBlcnJvciB0aGF0
IHNob3VsZCBiZSB0cmFuc2llbnQKIAkgKiBhbmQgdW5saWtlbHkgdG8gcmVvY2N1ci4KIAkgKi8K
LQlyZXR1cm4gYXRvbWljX3JlYWQoJmVuZ2luZS0+aXJxX2NvdW50KSA9PSBiLT5oYW5nY2hlY2tf
aW50ZXJydXB0czsKKwlyZXR1cm4gUkVBRF9PTkNFKGItPmlycV9jb3VudCkgPT0gYi0+aGFuZ2No
ZWNrX2ludGVycnVwdHM7CiB9CiAKIHN0YXRpYyB2b2lkIGVuYWJsZV9mYWtlX2lycShzdHJ1Y3Qg
aW50ZWxfYnJlYWRjcnVtYnMgKmIpCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p
bnRlbF9yaW5nYnVmZmVyLmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVy
LmgKaW5kZXggOGRkMzRiOWRjMThhLi4zMzYwMmViMWM3N2YgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMv
Z3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkx
NS9pbnRlbF9yaW5nYnVmZmVyLmgKQEAgLTM1Niw3ICszNTYsNiBAQCBzdHJ1Y3QgaW50ZWxfZW5n
aW5lX2NzIHsKIAlzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqZGVmYXVsdF9zdGF0ZTsKIAl2
b2lkICpwaW5uZWRfZGVmYXVsdF9zdGF0ZTsKIAotCWF0b21pY190IGlycV9jb3VudDsKIAl1bnNp
Z25lZCBsb25nIGlycV9wb3N0ZWQ7CiAjZGVmaW5lIEVOR0lORV9JUlFfQlJFQURDUlVNQiAwCiAK
QEAgLTM5MCw2ICszODksNyBAQCBzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzIHsKIAogCQl1bnNpZ25l
ZCBpbnQgaGFuZ2NoZWNrX2ludGVycnVwdHM7CiAJCXVuc2lnbmVkIGludCBpcnFfZW5hYmxlZDsK
KwkJdW5zaWduZWQgaW50IGlycV9jb3VudDsKIAogCQlib29sIGlycV9hcm1lZCA6IDE7CiAJCUk5
MTVfU0VMRlRFU1RfREVDTEFSRShib29sIG1vY2sgOiAxKTsKLS0gCjIuMTguMAoKX19fX19fX19f
X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcg
bGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRl
c2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==