From mboxrd@z Thu Jan  1 00:00:00 1970
From: Dave Gordon <david.s.gordon@intel.com>
Subject: Re: [PATCH 4/6] drm/i915: Use to_i915() instead of
 guc_to_i915()
Date: Tue, 22 Mar 2016 10:55:40 +0000
Message-ID: <56F124AC.2070105@intel.com>
References: <1458335784-1773-1-git-send-email-chris@chris-wilson.co.uk>
 <1458335784-1773-4-git-send-email-chris@chris-wilson.co.uk>
Mime-Version: 1.0
Content-Type: text/plain; charset="utf-8"; Format="flowed"
Content-Transfer-Encoding: base64
Return-path: <intel-gfx-bounces@lists.freedesktop.org>
Received: from mga11.intel.com (mga11.intel.com [192.55.52.93])
 by gabe.freedesktop.org (Postfix) with ESMTP id 2DF646E752
 for <intel-gfx@lists.freedesktop.org>; Tue, 22 Mar 2016 10:55:45 +0000 (UTC)
In-Reply-To: <1458335784-1773-4-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: Chris Wilson <chris@chris-wilson.co.uk>, intel-gfx@lists.freedesktop.org
List-Id: intel-gfx@lists.freedesktop.org

T24gMTgvMDMvMTYgMjE6MTYsIENocmlzIFdpbHNvbiB3cm90ZToKPiBUaGUgY29udmVuaWVuY2Ug
b2Ygc2F2aW5nIGEgZmV3IGNoYXJhY3RlcnMgYnkgdXNpbmcgYSBjb25zaXN0ZW50Cj4gaW50ZXJm
YWNlIHRvIG9idGFpbiBvdXIgZHJtX2k5MTVfcHJpdmF0ZSBzdHJ1Y3QgZnJvbSBpbnRlbF9ndWMu
Cj4KPiBTaWduZWQtb2ZmLWJ5OiBDaHJpcyBXaWxzb24gPGNocmlzQGNocmlzLXdpbHNvbi5jby51
az4KPiAtLS0KPiAgIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmggICAgICAgICAgICB8
ICA0ICsrKy0KPiAgIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ3VjX3N1Ym1pc3Npb24uYyB8
IDIzICsrKysrKysrKystLS0tLS0tLS0tLS0tCj4gICAyIGZpbGVzIGNoYW5nZWQsIDEzIGluc2Vy
dGlvbnMoKyksIDE0IGRlbGV0aW9ucygtKQoKR2VuZXJhbGx5OiBJIGRvbid0IG1pbmQgdGhpcywg
dGhvdWdoIEkgZG9uJ3QgdGhpbmsgdGhlcmUncyBhbnkgaHVnZSAKYWR2YW50YWdlIC4uLgoKPiBk
aWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaCBiL2RyaXZlcnMvZ3B1
L2RybS9pOTE1L2k5MTVfZHJ2LmgKPiBpbmRleCA5MjM2NWYwNDdlNTMuLmQ1ZmE0MmM5NjExMCAx
MDA2NDQKPiAtLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCj4gKysrIGIvZHJp
dmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaAo+IEBAIC0xOTgyLDcgKzE5ODIsNyBAQCBzdGF0
aWMgaW5saW5lIHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfdG9faTkxNShzdHJ1Y3QgZGV2
aWNlICpkZXYpCj4gICAJcmV0dXJuIF9fdG9faTkxNShkZXZfZ2V0X2RydmRhdGEoZGV2KSk7Cj4g
ICB9Cj4KPiAtc3RhdGljIGlubGluZSBzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZ3VjX3RvX2k5
MTUoc3RydWN0IGludGVsX2d1YyAqZ3VjKQo+ICtzdGF0aWMgaW5saW5lIHN0cnVjdCBkcm1faTkx
NV9wcml2YXRlICpfX2d1Y190b19pOTE1KHN0cnVjdCBpbnRlbF9ndWMgKmd1YykKPiAgIHsKPiAg
IAlyZXR1cm4gY29udGFpbmVyX29mKGd1Yywgc3RydWN0IGRybV9pOTE1X3ByaXZhdGUsIGd1Yyk7
Cj4gICB9Cj4gQEAgLTI0NjMsNiArMjQ2Myw4IEBAIHN0cnVjdCBkcm1faTkxNV9jbWRfdGFibGUg
ewo+ICAgCQlfX3AgPSBfX3RvX2k5MTUoKHN0cnVjdCBkcm1fZGV2aWNlICopcCk7IFwKPiAgIAll
bHNlIGlmIChfX2J1aWx0aW5fdHlwZXNfY29tcGF0aWJsZV9wKHR5cGVvZigqcCksIHN0cnVjdCBk
cm1faTkxNV9nZW1fb2JqZWN0KSkgXAo+ICAgCQlfX3AgPSBfX29ial90b19pOTE1KChzdHJ1Y3Qg
ZHJtX2k5MTVfZ2VtX29iamVjdCAqKXApOyBcCj4gKwllbHNlIGlmIChfX2J1aWx0aW5fdHlwZXNf
Y29tcGF0aWJsZV9wKHR5cGVvZigqcCksIHN0cnVjdCBpbnRlbF9ndWMpKSBcCj4gKwkJX19wID0g
X19ndWNfdG9faTkxNSgoc3RydWN0IGludGVsX2d1YyAqKXApOyBcCgouLi4gc28geWVzLCB0aGlz
IGlzIE9LIC4uLgoKPiAgIAllbHNlIFwKPiAgIAkJQlVJTERfQlVHKCk7IFwKPiAgIAlfX3A7IFwK
PiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9ndWNfc3VibWlzc2lvbi5j
IGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9ndWNfc3VibWlzc2lvbi5jCj4gaW5kZXggYWUx
ZjU4ZDA3M2YyLi44NTBhZWU3OGM0MGYgMTAwNjQ0Cj4gLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5
MTUvaTkxNV9ndWNfc3VibWlzc2lvbi5jCj4gKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkx
NV9ndWNfc3VibWlzc2lvbi5jCj4gQEAgLTc3LDcgKzc3LDcgQEAgc3RhdGljIGlubGluZSBib29s
IGhvc3QyZ3VjX2FjdGlvbl9yZXNwb25zZShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3By
aXYsCj4KPiAgIHN0YXRpYyBpbnQgaG9zdDJndWNfYWN0aW9uKHN0cnVjdCBpbnRlbF9ndWMgKmd1
YywgdTMyICpkYXRhLCB1MzIgbGVuKQo+ICAgewo+IC0Jc3RydWN0IGRybV9pOTE1X3ByaXZhdGUg
KmRldl9wcml2ID0gZ3VjX3RvX2k5MTUoZ3VjKTsKPiArCXN0cnVjdCBkcm1faTkxNV9wcml2YXRl
ICpkZXZfcHJpdiA9IHRvX2k5MTUoZ3VjKTsKCi4uLiBhbmQgdGhlc2UgLi4uCgo+ICAgCXUzMiBz
dGF0dXM7Cj4gICAJaW50IGk7Cj4gICAJaW50IHJldDsKPiBAQCAtMTUyLDcgKzE1Miw3IEBAIHN0
YXRpYyBpbnQgaG9zdDJndWNfcmVsZWFzZV9kb29yYmVsbChzdHJ1Y3QgaW50ZWxfZ3VjICpndWMs
Cj4gICBzdGF0aWMgaW50IGhvc3QyZ3VjX3NhbXBsZV9mb3JjZXdha2Uoc3RydWN0IGludGVsX2d1
YyAqZ3VjLAo+ICAgCQkJCSAgICAgc3RydWN0IGk5MTVfZ3VjX2NsaWVudCAqY2xpZW50KQo+ICAg
ewo+IC0Jc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gZ3VjX3RvX2k5MTUoZ3Vj
KTsKPiArCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUoZ3VjKTsK
PiAgIAlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gZGV2X3ByaXYtPmRldjsKPiAgIAl1MzIgZGF0
YVsyXTsKPgo+IEBAIC0yNTQsNyArMjU0LDcgQEAgc3RhdGljIGludCBndWNfcmluZ19kb29yYmVs
bChzdHJ1Y3QgaTkxNV9ndWNfY2xpZW50ICpnYykKPiAgIHN0YXRpYyB2b2lkIGd1Y19kaXNhYmxl
X2Rvb3JiZWxsKHN0cnVjdCBpbnRlbF9ndWMgKmd1YywKPiAgIAkJCQkgc3RydWN0IGk5MTVfZ3Vj
X2NsaWVudCAqY2xpZW50KQo+ICAgewo+IC0Jc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9w
cml2ID0gZ3VjX3RvX2k5MTUoZ3VjKTsKPiArCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZf
cHJpdiA9IHRvX2k5MTUoZ3VjKTsKPiAgIAlzdHJ1Y3QgZ3VjX2Rvb3JiZWxsX2luZm8gKmRvb3Ji
ZWxsOwo+ICAgCXZvaWQgKmJhc2U7Cj4gICAJaTkxNV9yZWdfdCBkcmJyZWcgPSBHRU44X0RSQlJF
R0woY2xpZW50LT5kb29yYmVsbF9pZCk7Cj4gQEAgLTM3Niw3ICszNzYsNiBAQCBzdGF0aWMgdm9p
ZCBndWNfaW5pdF9wcm9jX2Rlc2Moc3RydWN0IGludGVsX2d1YyAqZ3VjLAo+ICAgc3RhdGljIHZv
aWQgZ3VjX2luaXRfY3R4X2Rlc2Moc3RydWN0IGludGVsX2d1YyAqZ3VjLAo+ICAgCQkJICAgICAg
c3RydWN0IGk5MTVfZ3VjX2NsaWVudCAqY2xpZW50KQo+ICAgewo+IC0Jc3RydWN0IGRybV9pOTE1
X3ByaXZhdGUgKmRldl9wcml2ID0gZ3VjX3RvX2k5MTUoZ3VjKTsKPiAgIAlzdHJ1Y3QgaW50ZWxf
ZW5naW5lX2NzICplbmdpbmU7Cj4gICAJc3RydWN0IGludGVsX2NvbnRleHQgKmN0eCA9IGNsaWVu
dC0+b3duZXI7Cj4gICAJc3RydWN0IGd1Y19jb250ZXh0X2Rlc2MgZGVzYzsKPiBAQCAtMzkwLDcg
KzM4OSw3IEBAIHN0YXRpYyB2b2lkIGd1Y19pbml0X2N0eF9kZXNjKHN0cnVjdCBpbnRlbF9ndWMg
Kmd1YywKPiAgIAlkZXNjLnByaW9yaXR5ID0gY2xpZW50LT5wcmlvcml0eTsKPiAgIAlkZXNjLmRi
X2lkID0gY2xpZW50LT5kb29yYmVsbF9pZDsKPgo+IC0JZm9yX2VhY2hfZW5naW5lKGVuZ2luZSwg
ZGV2X3ByaXYsIGkpIHsKPiArCWZvcl9lYWNoX2VuZ2luZShlbmdpbmUsIGd1YywgaSkgewoKLi4u
IGJ1dCBub3QgdGhpcyAoc2VlIGVhcmxpZXIgbWFpbCksIGFsdGhvdWdoLCB0aGUgb2JqZWN0aW9u
IGlzIGxlc3MgCmhlcmUgYmVjYXVzZSB0aGUgR3VDIGlzIHNpbmd1bGFyIGFuZCBhc3NvY2lhdGVk
IHdpdGggYWxsIGVuZ2luZXMsIHNvIAp0aGVyZSBpc24ndCBtdWNoIGVsc2UgdGhhdCB3ZSBjb3Vs
ZCBleHBlY3QgdG8gaXRlcmF0ZSBvdmVyLgoKT1RPSCB0aGlzIG1heSBhY3R1YWxseSBiZSBsZXNz
IGVmZmljaWVudCwgYmVjYXVzZSB0aGUgY29udmVyc2lvbiBvZiB0aGUgCiJzdHJ1Y3QgaW50ZWxf
Z3VjIiB0byB0aGUgdGhpbmcocykgYWN0dWFsbHkgbmVlZGVkIGZvciB0aGUgaXRlcmF0aW9uIAp3
aWxsIChvciBhdCBsZWFzdCBtYXkpIG9jY3VyIG9uIGVhY2ggaXRlcmF0aW9uIG9mIHRoZSBsb29w
LiBHZW5lcmFsbHkgCkknZCBwcmVmZXIgdG8gcHVsbCBhbGwgc3VjaCBjb252ZXJzaW9ucyBvdXQg
dG8gdGhlIGhlYWQgb2YgdGhlIGZ1bmN0aW9uLCAKYXMgdGhlIG9yaWdpbmFsIGNvZGUgZGlkLgoK
PiAgIAkJc3RydWN0IGd1Y19leGVjbGlzdF9jb250ZXh0ICpscmMgPSAmZGVzYy5scmNbZW5naW5l
LT5ndWNfaWRdOwo+ICAgCQlzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqb2JqOwo+ICAgCQl1
aW50NjRfdCBjdHhfZGVzYzsKPiBAQCAtNzcyLDcgKzc3MSw2IEBAIGVycjoKPgo+ICAgc3RhdGlj
IHZvaWQgZ3VjX2NyZWF0ZV9sb2coc3RydWN0IGludGVsX2d1YyAqZ3VjKQo+ICAgewo+IC0Jc3Ry
dWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gZ3VjX3RvX2k5MTUoZ3VjKTsKPiAgIAlz
dHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqb2JqOwo+ICAgCXVuc2lnbmVkIGxvbmcgb2Zmc2V0
Owo+ICAgCXVpbnQzMl90IHNpemUsIGZsYWdzOwo+IEBAIC03OTEsNyArNzg5LDcgQEAgc3RhdGlj
IHZvaWQgZ3VjX2NyZWF0ZV9sb2coc3RydWN0IGludGVsX2d1YyAqZ3VjKQo+Cj4gICAJb2JqID0g
Z3VjLT5sb2dfb2JqOwo+ICAgCWlmICghb2JqKSB7Cj4gLQkJb2JqID0gZ2VtX2FsbG9jYXRlX2d1
Y19vYmooZGV2X3ByaXYtPmRldiwgc2l6ZSk7Cj4gKwkJb2JqID0gZ2VtX2FsbG9jYXRlX2d1Y19v
YmoodG9faTkxNShndWMpLT5kZXYsIHNpemUpOwoKU2hvdWxkIHdlIGhhdmUgdG9fZGV2KGFueSkg
YXMgd2VsbCBhcyB0b19pOTE1KCk/Cgo+ICAgCQlpZiAoIW9iaikgewo+ICAgCQkJLyogbG9nZ2lu
ZyB3aWxsIGJlIG9mZiAqLwo+ICAgCQkJaTkxNS5ndWNfbG9nX2xldmVsID0gLTE7Cj4gQEAgLTgz
NSw3ICs4MzMsNiBAQCBzdGF0aWMgdm9pZCBpbml0X2d1Y19wb2xpY2llcyhzdHJ1Y3QgZ3VjX3Bv
bGljaWVzICpwb2xpY2llcykKPgo+ICAgc3RhdGljIHZvaWQgZ3VjX2NyZWF0ZV9hZHMoc3RydWN0
IGludGVsX2d1YyAqZ3VjKQo+ICAgewo+IC0Jc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9w
cml2ID0gZ3VjX3RvX2k5MTUoZ3VjKTsKClRoaXMgZGV2X3ByaXYgaXMgdXNlZCBtb3JlIHRoYW4g
b25jZSAoaW4gZmFjdCwgaXQncyB1c2VkIGluIGEgCmZvcl9lYWNoX2VuZ2luZSgpIGxvb3AgYmVs
b3cpLCBzbyBJJ2QgdGhpbmsgaXQgd29ydGgga2VlcGluZyAtLSBhbmQgCnRoZXJlZm9yZSBub25l
IG9mIHRoZSBjaGFuZ2VzIGJlbG93IHdvdWxkIGJlIGFwcGxpY2FibGUuCgouRGF2ZS4KCj4gICAJ
c3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKm9iajsKPiAgIAlzdHJ1Y3QgZ3VjX2FkcyAqYWRz
Owo+ICAgCXN0cnVjdCBndWNfcG9saWNpZXMgKnBvbGljaWVzOwo+IEBAIC04NTEsNyArODQ4LDcg
QEAgc3RhdGljIHZvaWQgZ3VjX2NyZWF0ZV9hZHMoc3RydWN0IGludGVsX2d1YyAqZ3VjKQo+Cj4g
ICAJb2JqID0gZ3VjLT5hZHNfb2JqOwo+ICAgCWlmICghb2JqKSB7Cj4gLQkJb2JqID0gZ2VtX2Fs
bG9jYXRlX2d1Y19vYmooZGV2X3ByaXYtPmRldiwgUEFHRV9BTElHTihzaXplKSk7Cj4gKwkJb2Jq
ID0gZ2VtX2FsbG9jYXRlX2d1Y19vYmoodG9faTkxNShndWMpLT5kZXYsIFBBR0VfQUxJR04oc2l6
ZSkpOwo+ICAgCQlpZiAoIW9iaikKPiAgIAkJCXJldHVybjsKPgo+IEBAIC04NjgsMTAgKzg2NSwx
MCBAQCBzdGF0aWMgdm9pZCBndWNfY3JlYXRlX2FkcyhzdHJ1Y3QgaW50ZWxfZ3VjICpndWMpCj4g
ICAJICogc28gaXRzIGFkZHJlc3Mgd29uJ3QgY2hhbmdlIGFmdGVyIHdlJ3ZlIHRvbGQgdGhlIEd1
QyB3aGVyZQo+ICAgCSAqIHRvIGZpbmQgaXQuCj4gICAJICovCj4gLQllbmdpbmUgPSAmZGV2X3By
aXYtPmVuZ2luZVtSQ1NdOwo+IC0JYWRzLT5nb2xkZW5fY29udGV4dF9scmNhID0gZW5naW5lLT5z
dGF0dXNfcGFnZS5nZnhfYWRkcjsKPiArCWFkcy0+Z29sZGVuX2NvbnRleHRfbHJjYSA9Cj4gKwkJ
dG9faTkxNShndWMpLT5lbmdpbmVbUkNTXS5zdGF0dXNfcGFnZS5nZnhfYWRkcjsKPgo+IC0JZm9y
X2VhY2hfZW5naW5lKGVuZ2luZSwgZGV2X3ByaXYsIGkpCj4gKwlmb3JfZWFjaF9lbmdpbmUoZW5n
aW5lLCBndWMsIGkpCj4gICAJCWFkcy0+ZW5nX3N0YXRlX3NpemVbZW5naW5lLT5ndWNfaWRdID0g
aW50ZWxfbHJfY29udGV4dF9zaXplKGVuZ2luZSk7Cj4KPiAgIAkvKiBHdUMgc2NoZWR1bGluZyBw
b2xpY2llcyAqLwo+IEBAIC04ODQsNyArODgxLDcgQEAgc3RhdGljIHZvaWQgZ3VjX2NyZWF0ZV9h
ZHMoc3RydWN0IGludGVsX2d1YyAqZ3VjKQo+ICAgCS8qIE1NSU8gcmVnIHN0YXRlICovCj4gICAJ
cmVnX3N0YXRlID0gKHZvaWQgKilwb2xpY2llcyArIHNpemVvZihzdHJ1Y3QgZ3VjX3BvbGljaWVz
KTsKPgo+IC0JZm9yX2VhY2hfZW5naW5lKGVuZ2luZSwgZGV2X3ByaXYsIGkpIHsKPiArCWZvcl9l
YWNoX2VuZ2luZShlbmdpbmUsIGd1YywgaSkgewo+ICAgCQlyZWdfc3RhdGUtPm1taW9fd2hpdGVf
bGlzdFtlbmdpbmUtPmd1Y19pZF0ubW1pb19zdGFydCA9Cj4gICAJCQllbmdpbmUtPm1taW9fYmFz
ZSArIEdVQ19NTUlPX1dISVRFX0xJU1RfU1RBUlQ7CgpfX19fX19fX19fX19fX19fX19fX19fX19f
X19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBs
aXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1h
bi9saXN0aW5mby9pbnRlbC1nZngK