From mboxrd@z Thu Jan  1 00:00:00 1970
From: Chris Wilson <chris@chris-wilson.co.uk>
Subject: [PATCH 3/3] drm/i915: Move common seqno reset to
	intel_engine_cs.c
Date: Mon,  8 Aug 2016 09:00:02 +0100
Message-ID: <1470643202-3038-3-git-send-email-chris@chris-wilson.co.uk>
References: <1470581141-14432-22-git-send-email-chris@chris-wilson.co.uk>
 <1470643202-3038-1-git-send-email-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 mail-wm0-x244.google.com (mail-wm0-x244.google.com
 [IPv6:2a00:1450:400c:c09::244])
 by gabe.freedesktop.org (Postfix) with ESMTPS id 1784F6E34E
 for <intel-gfx@lists.freedesktop.org>; Mon,  8 Aug 2016 08:00:12 +0000 (UTC)
Received: by mail-wm0-x244.google.com with SMTP id i5so13857086wmg.2
 for <intel-gfx@lists.freedesktop.org>; Mon, 08 Aug 2016 01:00:11 -0700 (PDT)
In-Reply-To: <1470643202-3038-1-git-send-email-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

U2luY2UgdGhlIGludGVsX2VuZ2luZV9pbml0X3NlcW5vKCkgaXMgc2hhcmVkIGJ5IGFsbCBlbmdp
bmUgc3VibWlzc2lvbgpiYWNrZW5kcywgbW92ZSBpdCBvdXQgb2YgdGhlIGxlZ2FjeSBpbnRlbF9y
aW5nYnVmZmVyLmMgYW5kCmludG8gdGhlIG5ldyBob21lIGZvciBjb21tb24gcm91dGluZXMsIGlu
dGVsX2VuZ2luZV9jcy5jCgpTaWduZWQtb2ZmLWJ5OiBDaHJpcyBXaWxzb24gPGNocmlzQGNocmlz
LXdpbHNvbi5jby51az4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9lbmdpbmVfY3Mu
YyAgfCA0MiArKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysKIGRyaXZlcnMvZ3B1L2Ry
bS9pOTE1L2ludGVsX3JpbmdidWZmZXIuYyB8IDQyIC0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t
LS0tLS0tLQogMiBmaWxlcyBjaGFuZ2VkLCA0MiBpbnNlcnRpb25zKCspLCA0MiBkZWxldGlvbnMo
LSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9lbmdpbmVfY3MuYyBi
L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2VuZ2luZV9jcy5jCmluZGV4IDFkZWMzNTQ0MWFi
NS4uYjgyNDAxODQ5Y2I1IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9l
bmdpbmVfY3MuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9lbmdpbmVfY3MuYwpA
QCAtMTYxLDYgKzE2MSw0OCBAQCBjbGVhbnVwOgogCXJldHVybiByZXQ7CiB9CiAKK3ZvaWQgaW50
ZWxfZW5naW5lX2luaXRfc2Vxbm8oc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lLCB1MzIg
c2Vxbm8pCit7CisJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gZW5naW5lLT5p
OTE1OworCisJLyogT3VyIHNlbWFwaG9yZSBpbXBsZW1lbnRhdGlvbiBpcyBzdHJpY3RseSBtb25v
dG9uaWMgKGkuZS4gd2UgcHJvY2VlZAorCSAqIHNvIGxvbmcgYXMgdGhlIHNlbWFwaG9yZSB2YWx1
ZSBpbiB0aGUgcmVnaXN0ZXIvcGFnZSBpcyBncmVhdGVyCisJICogdGhhbiB0aGUgc3luYyB2YWx1
ZSksIHNvIHdoZW5ldmVyIHdlIHJlc2V0IHRoZSBzZXFubywKKwkgKiBzbyBsb25nIGFzIHdlIHJl
c2V0IHRoZSB0cmFja2luZyBzZW1hcGhvcmUgdmFsdWUgdG8gMCwgaXQgd2lsbAorCSAqIGFsd2F5
cyBiZSBiZWZvcmUgdGhlIG5leHQgcmVxdWVzdCdzIHNlcW5vLiBJZiB3ZSBkb24ndCByZXNldAor
CSAqIHRoZSBzZW1hcGhvcmUgdmFsdWUsIHRoZW4gd2hlbiB0aGUgc2Vxbm8gbW92ZXMgYmFja3dh
cmRzIGFsbAorCSAqIGZ1dHVyZSB3YWl0cyB3aWxsIGNvbXBsZXRlIGluc3RhbnRseSAoY2F1c2lu
ZyByZW5kZXJpbmcgY29ycnVwdGlvbikuCisJICovCisJaWYgKElTX0dFTjYoZGV2X3ByaXYpIHx8
IElTX0dFTjcoZGV2X3ByaXYpKSB7CisJCUk5MTVfV1JJVEUoUklOR19TWU5DXzAoZW5naW5lLT5t
bWlvX2Jhc2UpLCAwKTsKKwkJSTkxNV9XUklURShSSU5HX1NZTkNfMShlbmdpbmUtPm1taW9fYmFz
ZSksIDApOworCQlpZiAoSEFTX1ZFQk9YKGRldl9wcml2KSkKKwkJCUk5MTVfV1JJVEUoUklOR19T
WU5DXzIoZW5naW5lLT5tbWlvX2Jhc2UpLCAwKTsKKwl9CisJaWYgKGRldl9wcml2LT5zZW1hcGhv
cmVfb2JqKSB7CisJCXN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpvYmogPSBkZXZfcHJpdi0+
c2VtYXBob3JlX29iajsKKwkJc3RydWN0IHBhZ2UgKnBhZ2UgPSBpOTE1X2dlbV9vYmplY3RfZ2V0
X2RpcnR5X3BhZ2Uob2JqLCAwKTsKKwkJdm9pZCAqc2VtYXBob3JlcyA9IGttYXAocGFnZSk7CisJ
CW1lbXNldChzZW1hcGhvcmVzICsgR0VOOF9TRU1BUEhPUkVfT0ZGU0VUKGVuZ2luZS0+aWQsIDAp
LAorCQkgICAgICAgMCwgSTkxNV9OVU1fRU5HSU5FUyAqIGdlbjhfc2VtYXBob3JlX3NlcW5vX3Np
emUpOworCQlrdW5tYXAocGFnZSk7CisJfQorCW1lbXNldChlbmdpbmUtPnNlbWFwaG9yZS5zeW5j
X3NlcW5vLCAwLAorCSAgICAgICBzaXplb2YoZW5naW5lLT5zZW1hcGhvcmUuc3luY19zZXFubykp
OworCisJaW50ZWxfd3JpdGVfc3RhdHVzX3BhZ2UoZW5naW5lLCBJOTE1X0dFTV9IV1NfSU5ERVgs
IHNlcW5vKTsKKwlpZiAoZW5naW5lLT5pcnFfc2Vxbm9fYmFycmllcikKKwkJZW5naW5lLT5pcnFf
c2Vxbm9fYmFycmllcihlbmdpbmUpOworCWVuZ2luZS0+bGFzdF9zdWJtaXR0ZWRfc2Vxbm8gPSBz
ZXFubzsKKworCWVuZ2luZS0+aGFuZ2NoZWNrLnNlcW5vID0gc2Vxbm87CisKKwkvKiBBZnRlciBt
YW51YWxseSBhZHZhbmNpbmcgdGhlIHNlcW5vLCBmYWtlIHRoZSBpbnRlcnJ1cHQgaW4gY2FzZQor
CSAqIHRoZXJlIGFyZSBhbnkgd2FpdGVycyBmb3IgdGhhdCBzZXFuby4KKwkgKi8KKwlpbnRlbF9l
bmdpbmVfd2FrZXVwKGVuZ2luZSk7Cit9CisKIHZvaWQgaW50ZWxfZW5naW5lX2luaXRfaGFuZ2No
ZWNrKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSkKIHsKIAltZW1zZXQoJmVuZ2luZS0+
aGFuZ2NoZWNrLCAwLCBzaXplb2YoZW5naW5lLT5oYW5nY2hlY2spKTsKZGlmZiAtLWdpdCBhL2Ry
aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuYyBiL2RyaXZlcnMvZ3B1L2RybS9p
OTE1L2ludGVsX3JpbmdidWZmZXIuYwppbmRleCBhZjJkODFhZTNlN2QuLjNkNDYxMzY3M2YyNyAx
MDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5jCisrKyBi
L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuYwpAQCAtMjMxMSw0OCArMjMx
MSw2IEBAIGludCBpbnRlbF9yaW5nX2NhY2hlbGluZV9hbGlnbihzdHJ1Y3QgZHJtX2k5MTVfZ2Vt
X3JlcXVlc3QgKnJlcSkKIAlyZXR1cm4gMDsKIH0KIAotdm9pZCBpbnRlbF9lbmdpbmVfaW5pdF9z
ZXFubyhzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUsIHUzMiBzZXFubykKLXsKLQlzdHJ1
Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBlbmdpbmUtPmk5MTU7Ci0KLQkvKiBPdXIg
c2VtYXBob3JlIGltcGxlbWVudGF0aW9uIGlzIHN0cmljdGx5IG1vbm90b25pYyAoaS5lLiB3ZSBw
cm9jZWVkCi0JICogc28gbG9uZyBhcyB0aGUgc2VtYXBob3JlIHZhbHVlIGluIHRoZSByZWdpc3Rl
ci9wYWdlIGlzIGdyZWF0ZXIKLQkgKiB0aGFuIHRoZSBzeW5jIHZhbHVlKSwgc28gd2hlbmV2ZXIg
d2UgcmVzZXQgdGhlIHNlcW5vLAotCSAqIHNvIGxvbmcgYXMgd2UgcmVzZXQgdGhlIHRyYWNraW5n
IHNlbWFwaG9yZSB2YWx1ZSB0byAwLCBpdCB3aWxsCi0JICogYWx3YXlzIGJlIGJlZm9yZSB0aGUg
bmV4dCByZXF1ZXN0J3Mgc2Vxbm8uIElmIHdlIGRvbid0IHJlc2V0Ci0JICogdGhlIHNlbWFwaG9y
ZSB2YWx1ZSwgdGhlbiB3aGVuIHRoZSBzZXFubyBtb3ZlcyBiYWNrd2FyZHMgYWxsCi0JICogZnV0
dXJlIHdhaXRzIHdpbGwgY29tcGxldGUgaW5zdGFudGx5IChjYXVzaW5nIHJlbmRlcmluZyBjb3Jy
dXB0aW9uKS4KLQkgKi8KLQlpZiAoSVNfR0VONihkZXZfcHJpdikgfHwgSVNfR0VONyhkZXZfcHJp
dikpIHsKLQkJSTkxNV9XUklURShSSU5HX1NZTkNfMChlbmdpbmUtPm1taW9fYmFzZSksIDApOwot
CQlJOTE1X1dSSVRFKFJJTkdfU1lOQ18xKGVuZ2luZS0+bW1pb19iYXNlKSwgMCk7Ci0JCWlmIChI
QVNfVkVCT1goZGV2X3ByaXYpKQotCQkJSTkxNV9XUklURShSSU5HX1NZTkNfMihlbmdpbmUtPm1t
aW9fYmFzZSksIDApOwotCX0KLQlpZiAoZGV2X3ByaXYtPnNlbWFwaG9yZV9vYmopIHsKLQkJc3Ry
dWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKm9iaiA9IGRldl9wcml2LT5zZW1hcGhvcmVfb2JqOwot
CQlzdHJ1Y3QgcGFnZSAqcGFnZSA9IGk5MTVfZ2VtX29iamVjdF9nZXRfZGlydHlfcGFnZShvYmos
IDApOwotCQl2b2lkICpzZW1hcGhvcmVzID0ga21hcChwYWdlKTsKLQkJbWVtc2V0KHNlbWFwaG9y
ZXMgKyBHRU44X1NFTUFQSE9SRV9PRkZTRVQoZW5naW5lLT5pZCwgMCksCi0JCSAgICAgICAwLCBJ
OTE1X05VTV9FTkdJTkVTICogZ2VuOF9zZW1hcGhvcmVfc2Vxbm9fc2l6ZSk7Ci0JCWt1bm1hcChw
YWdlKTsKLQl9Ci0JbWVtc2V0KGVuZ2luZS0+c2VtYXBob3JlLnN5bmNfc2Vxbm8sIDAsCi0JICAg
ICAgIHNpemVvZihlbmdpbmUtPnNlbWFwaG9yZS5zeW5jX3NlcW5vKSk7Ci0KLQlpbnRlbF93cml0
ZV9zdGF0dXNfcGFnZShlbmdpbmUsIEk5MTVfR0VNX0hXU19JTkRFWCwgc2Vxbm8pOwotCWlmIChl
bmdpbmUtPmlycV9zZXFub19iYXJyaWVyKQotCQllbmdpbmUtPmlycV9zZXFub19iYXJyaWVyKGVu
Z2luZSk7Ci0JZW5naW5lLT5sYXN0X3N1Ym1pdHRlZF9zZXFubyA9IHNlcW5vOwotCi0JZW5naW5l
LT5oYW5nY2hlY2suc2Vxbm8gPSBzZXFubzsKLQotCS8qIEFmdGVyIG1hbnVhbGx5IGFkdmFuY2lu
ZyB0aGUgc2Vxbm8sIGZha2UgdGhlIGludGVycnVwdCBpbiBjYXNlCi0JICogdGhlcmUgYXJlIGFu
eSB3YWl0ZXJzIGZvciB0aGF0IHNlcW5vLgotCSAqLwotCWludGVsX2VuZ2luZV93YWtldXAoZW5n
aW5lKTsKLX0KLQogc3RhdGljIHZvaWQgZ2VuNl9ic2Rfc3VibWl0X3JlcXVlc3Qoc3RydWN0IGRy
bV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXF1ZXN0KQogewogCXN0cnVjdCBkcm1faTkxNV9wcml2YXRl
ICpkZXZfcHJpdiA9IHJlcXVlc3QtPmk5MTU7Ci0tIAoyLjguMQoKX19fX19fX19fX19fX19fX19f
X19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRl
bC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3Jn
L21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==