From: Tvrtko Ursulin <tursulin@ursulin.net>
Subject: [RFC 08/13] drm/i915: Move intel_engine_context_in/out
 into intel_lrc.c
Date: Wed,  3 Oct 2018 13:04:01 +0100
Message-ID: <20181003120406.6784-9-tvrtko.ursulin@linux.intel.com>
References: <20181003120406.6784-1-tvrtko.ursulin@linux.intel.com>
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-wm1-x341.google.com (mail-wm1-x341.google.com
 [IPv6:2a00:1450:4864:20::341])
 by gabe.freedesktop.org (Postfix) with ESMTPS id 8026D6E45A
 for <Intel-gfx@lists.freedesktop.org>; Wed,  3 Oct 2018 12:04:22 +0000 (UTC)
Received: by mail-wm1-x341.google.com with SMTP id 189-v6so5472302wmw.2
 for <Intel-gfx@lists.freedesktop.org>; Wed, 03 Oct 2018 05:04:22 -0700 (PDT)
In-Reply-To: <20181003120406.6784-1-tvrtko.ursulin@linux.intel.com>
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

RnJvbTogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KCkludGVsX2xy
Yy5jIGlzIHRoZSBvbmx5IGNhbGxlciBhbmQgc28gdG8gYXZvaWQgc29tZSBoZWFkZXIgZmlsZSBv
cmRlcmluZwppc3N1ZXMgaW4gZnV0dXJlIHBhdGNoZXMgbW92ZSB0aGVzZSB0d28gb3ZlciB0aGVy
ZS4KClNpZ25lZC1vZmYtYnk6IFR2cnRrbyBVcnN1bGluIDx0dnJ0a28udXJzdWxpbkBpbnRlbC5j
b20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMgICAgICAgIHwgNTcgKysr
KysrKysrKysrKysrKysrKysrKysrKwogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1
ZmZlci5oIHwgNTUgLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCiAyIGZpbGVzIGNoYW5nZWQsIDU3
IGluc2VydGlvbnMoKyksIDU1IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1
L2RybS9pOTE1L2ludGVsX2xyYy5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMK
aW5kZXggM2U4YjE2YWIxYjMzLi4yZWY1NDFjZTc3NjggMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1
L2RybS9pOTE1L2ludGVsX2xyYy5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xy
Yy5jCkBAIC0zMjksNiArMzI5LDYzIEBAIGV4ZWNsaXN0c19jb250ZXh0X3N0YXR1c19jaGFuZ2Uo
c3RydWN0IGk5MTVfcmVxdWVzdCAqcnEsIHVuc2lnbmVkIGxvbmcgc3RhdHVzKQogCQkJCSAgIHN0
YXR1cywgcnEpOwogfQogCitzdGF0aWMgaW5saW5lIHZvaWQKK2ludGVsX2VuZ2luZV9jb250ZXh0
X2luKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSkKK3sKKwl1bnNpZ25lZCBsb25nIGZs
YWdzOworCisJaWYgKFJFQURfT05DRShlbmdpbmUtPnN0YXRzLmVuYWJsZWQpID09IDApCisJCXJl
dHVybjsKKworCXdyaXRlX3NlcWxvY2tfaXJxc2F2ZSgmZW5naW5lLT5zdGF0cy5sb2NrLCBmbGFn
cyk7CisKKwlpZiAoZW5naW5lLT5zdGF0cy5lbmFibGVkID4gMCkgeworCQlpZiAoZW5naW5lLT5z
dGF0cy5hY3RpdmUrKyA9PSAwKQorCQkJZW5naW5lLT5zdGF0cy5zdGFydCA9IGt0aW1lX2dldCgp
OworCQlHRU1fQlVHX09OKGVuZ2luZS0+c3RhdHMuYWN0aXZlID09IDApOworCX0KKworCXdyaXRl
X3NlcXVubG9ja19pcnFyZXN0b3JlKCZlbmdpbmUtPnN0YXRzLmxvY2ssIGZsYWdzKTsKK30KKwor
c3RhdGljIGlubGluZSB2b2lkCitpbnRlbF9lbmdpbmVfY29udGV4dF9vdXQoc3RydWN0IGludGVs
X2VuZ2luZV9jcyAqZW5naW5lKQoreworCXVuc2lnbmVkIGxvbmcgZmxhZ3M7CisKKwlpZiAoUkVB
RF9PTkNFKGVuZ2luZS0+c3RhdHMuZW5hYmxlZCkgPT0gMCkKKwkJcmV0dXJuOworCisJd3JpdGVf
c2VxbG9ja19pcnFzYXZlKCZlbmdpbmUtPnN0YXRzLmxvY2ssIGZsYWdzKTsKKworCWlmIChlbmdp
bmUtPnN0YXRzLmVuYWJsZWQgPiAwKSB7CisJCWt0aW1lX3QgbGFzdDsKKworCQlpZiAoZW5naW5l
LT5zdGF0cy5hY3RpdmUgJiYgLS1lbmdpbmUtPnN0YXRzLmFjdGl2ZSA9PSAwKSB7CisJCQkvKgor
CQkJICogRGVjcmVtZW50IHRoZSBhY3RpdmUgY29udGV4dCBjb3VudCBhbmQgaW4gY2FzZSBHUFUK
KwkJCSAqIGlzIG5vdyBpZGxlIGFkZCB1cCB0byB0aGUgcnVubmluZyB0b3RhbC4KKwkJCSAqLwor
CQkJbGFzdCA9IGt0aW1lX3N1YihrdGltZV9nZXQoKSwgZW5naW5lLT5zdGF0cy5zdGFydCk7CisK
KwkJCWVuZ2luZS0+c3RhdHMudG90YWwgPSBrdGltZV9hZGQoZW5naW5lLT5zdGF0cy50b3RhbCwK
KwkJCQkJCQlsYXN0KTsKKwkJfSBlbHNlIGlmIChlbmdpbmUtPnN0YXRzLmFjdGl2ZSA9PSAwKSB7
CisJCQkvKgorCQkJICogQWZ0ZXIgdHVybmluZyBvbiBlbmdpbmUgc3RhdHMsIGNvbnRleHQgb3V0
IG1pZ2h0IGJlCisJCQkgKiB0aGUgZmlyc3QgZXZlbnQgaW4gd2hpY2ggY2FzZSB3ZSBhY2NvdW50
IGZyb20gdGhlCisJCQkgKiB0aW1lIHN0YXRzIGdhdGhlcmluZyB3YXMgdHVybmVkIG9uLgorCQkJ
ICovCisJCQlsYXN0ID0ga3RpbWVfc3ViKGt0aW1lX2dldCgpLCBlbmdpbmUtPnN0YXRzLmVuYWJs
ZWRfYXQpOworCisJCQllbmdpbmUtPnN0YXRzLnRvdGFsID0ga3RpbWVfYWRkKGVuZ2luZS0+c3Rh
dHMudG90YWwsCisJCQkJCQkJbGFzdCk7CisJCX0KKwl9CisKKwl3cml0ZV9zZXF1bmxvY2tfaXJx
cmVzdG9yZSgmZW5naW5lLT5zdGF0cy5sb2NrLCBmbGFncyk7Cit9CisKIGlubGluZSB2b2lkCiBl
eGVjbGlzdHNfdXNlcl9iZWdpbihzdHJ1Y3QgaW50ZWxfZW5naW5lX2V4ZWNsaXN0cyAqZXhlY2xp
c3RzLAogCQkgICAgIGNvbnN0IHN0cnVjdCBleGVjbGlzdF9wb3J0ICpwb3J0KQpkaWZmIC0tZ2l0
IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5oIGIvZHJpdmVycy9ncHUv
ZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5oCmluZGV4IDhiNTNlZDA2OTA2My4uYjMwOTJkNzM2
ZjhjIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmgK
KysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5oCkBAIC0xMTUwLDYx
ICsxMTUwLDYgQEAgdm9pZCBpbnRlbF9lbmdpbmVfZHVtcChzdHJ1Y3QgaW50ZWxfZW5naW5lX2Nz
ICplbmdpbmUsCiBzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICoKIGludGVsX2VuZ2luZV9sb29rdXBf
dXNlcihzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqaTkxNSwgdTggY2xhc3MsIHU4IGluc3RhbmNl
KTsKIAotc3RhdGljIGlubGluZSB2b2lkIGludGVsX2VuZ2luZV9jb250ZXh0X2luKHN0cnVjdCBp
bnRlbF9lbmdpbmVfY3MgKmVuZ2luZSkKLXsKLQl1bnNpZ25lZCBsb25nIGZsYWdzOwotCi0JaWYg
KFJFQURfT05DRShlbmdpbmUtPnN0YXRzLmVuYWJsZWQpID09IDApCi0JCXJldHVybjsKLQotCXdy
aXRlX3NlcWxvY2tfaXJxc2F2ZSgmZW5naW5lLT5zdGF0cy5sb2NrLCBmbGFncyk7Ci0KLQlpZiAo
ZW5naW5lLT5zdGF0cy5lbmFibGVkID4gMCkgewotCQlpZiAoZW5naW5lLT5zdGF0cy5hY3RpdmUr
KyA9PSAwKQotCQkJZW5naW5lLT5zdGF0cy5zdGFydCA9IGt0aW1lX2dldCgpOwotCQlHRU1fQlVH
X09OKGVuZ2luZS0+c3RhdHMuYWN0aXZlID09IDApOwotCX0KLQotCXdyaXRlX3NlcXVubG9ja19p
cnFyZXN0b3JlKCZlbmdpbmUtPnN0YXRzLmxvY2ssIGZsYWdzKTsKLX0KLQotc3RhdGljIGlubGlu
ZSB2b2lkIGludGVsX2VuZ2luZV9jb250ZXh0X291dChzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpl
bmdpbmUpCi17Ci0JdW5zaWduZWQgbG9uZyBmbGFnczsKLQotCWlmIChSRUFEX09OQ0UoZW5naW5l
LT5zdGF0cy5lbmFibGVkKSA9PSAwKQotCQlyZXR1cm47Ci0KLQl3cml0ZV9zZXFsb2NrX2lycXNh
dmUoJmVuZ2luZS0+c3RhdHMubG9jaywgZmxhZ3MpOwotCi0JaWYgKGVuZ2luZS0+c3RhdHMuZW5h
YmxlZCA+IDApIHsKLQkJa3RpbWVfdCBsYXN0OwotCi0JCWlmIChlbmdpbmUtPnN0YXRzLmFjdGl2
ZSAmJiAtLWVuZ2luZS0+c3RhdHMuYWN0aXZlID09IDApIHsKLQkJCS8qCi0JCQkgKiBEZWNyZW1l
bnQgdGhlIGFjdGl2ZSBjb250ZXh0IGNvdW50IGFuZCBpbiBjYXNlIEdQVQotCQkJICogaXMgbm93
IGlkbGUgYWRkIHVwIHRvIHRoZSBydW5uaW5nIHRvdGFsLgotCQkJICovCi0JCQlsYXN0ID0ga3Rp
bWVfc3ViKGt0aW1lX2dldCgpLCBlbmdpbmUtPnN0YXRzLnN0YXJ0KTsKLQotCQkJZW5naW5lLT5z
dGF0cy50b3RhbCA9IGt0aW1lX2FkZChlbmdpbmUtPnN0YXRzLnRvdGFsLAotCQkJCQkJCWxhc3Qp
OwotCQl9IGVsc2UgaWYgKGVuZ2luZS0+c3RhdHMuYWN0aXZlID09IDApIHsKLQkJCS8qCi0JCQkg
KiBBZnRlciB0dXJuaW5nIG9uIGVuZ2luZSBzdGF0cywgY29udGV4dCBvdXQgbWlnaHQgYmUKLQkJ
CSAqIHRoZSBmaXJzdCBldmVudCBpbiB3aGljaCBjYXNlIHdlIGFjY291bnQgZnJvbSB0aGUKLQkJ
CSAqIHRpbWUgc3RhdHMgZ2F0aGVyaW5nIHdhcyB0dXJuZWQgb24uCi0JCQkgKi8KLQkJCWxhc3Qg
PSBrdGltZV9zdWIoa3RpbWVfZ2V0KCksIGVuZ2luZS0+c3RhdHMuZW5hYmxlZF9hdCk7Ci0KLQkJ
CWVuZ2luZS0+c3RhdHMudG90YWwgPSBrdGltZV9hZGQoZW5naW5lLT5zdGF0cy50b3RhbCwKLQkJ
CQkJCQlsYXN0KTsKLQkJfQotCX0KLQotCXdyaXRlX3NlcXVubG9ja19pcnFyZXN0b3JlKCZlbmdp
bmUtPnN0YXRzLmxvY2ssIGZsYWdzKTsKLX0KLQogaW50IGludGVsX2VuYWJsZV9lbmdpbmVfc3Rh
dHMoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lKTsKIHZvaWQgaW50ZWxfZGlzYWJsZV9l
bmdpbmVfc3RhdHMoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lKTsKIAotLSAKMi4xNy4x
CgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1n
ZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9s
aXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK