From mboxrd@z Thu Jan  1 00:00:00 1970
From: Matthew Auld <matthew.auld@intel.com>
Subject: [PATCH 6/9] drm/i915: make dsm struct resource centric
Date: Fri, 24 Nov 2017 21:29:27 +0000
Message-ID: <20171124212930.27467-7-matthew.auld@intel.com>
References: <20171124212930.27467-1-matthew.auld@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 mga14.intel.com (mga14.intel.com [192.55.52.115])
 by gabe.freedesktop.org (Postfix) with ESMTPS id E81586EA15
 for <intel-gfx@lists.freedesktop.org>; Fri, 24 Nov 2017 21:29:42 +0000 (UTC)
In-Reply-To: <20171124212930.27467-1-matthew.auld@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
Cc: Paulo Zanoni <paulo.r.zanoni@intel.com>
List-Id: intel-gfx@lists.freedesktop.org

djI6IGNoZWNrIHJhbmdlX292ZXJmbG93IHdoZW4gd3JpdGluZyB0byAzMmIgcmVnaXN0ZXJzIChD
aHJpcykKICAgIHBlcHBlciBpbiBzb21lIGNvbW1lbnRzIChDaHJpcykKClNpZ25lZC1vZmYtYnk6
IE1hdHRoZXcgQXVsZCA8bWF0dGhldy5hdWxkQGludGVsLmNvbT4KQ2M6IEpvb25hcyBMYWh0aW5l
biA8am9vbmFzLmxhaHRpbmVuQGxpbnV4LmludGVsLmNvbT4KQ2M6IENocmlzIFdpbHNvbiA8Y2hy
aXNAY2hyaXMtd2lsc29uLmNvLnVrPgpDYzogUGF1bG8gWmFub25pIDxwYXVsby5yLnphbm9uaUBp
bnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaCAgICAgICAgfCAx
MyArKysrKysrKysrLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9zdG9sZW4uYyB8
IDE5ICsrKysrKysrKysrLS0tLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2ZiYy5j
ICAgICAgIHwgMTAgKysrKysrKystLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYyAg
ICAgICAgfCAxNyArKysrKysrKysrKysrLS0tLQogNCBmaWxlcyBjaGFuZ2VkLCA0MiBpbnNlcnRp
b25zKCspLCAxNyBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkx
NS9pOTE1X2Rydi5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaAppbmRleCBkNTc1
YTU2ZmMxMDAuLjMxM2FiMWU5OGZjNyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUv
aTkxNV9kcnYuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCkBAIC0xNTM2
LDkgKzE1MzYsNiBAQCBzdHJ1Y3QgaTkxNV9nZW1fbW0gewogCSAqLwogCXN0cnVjdCBwYWdldmVj
IHdjX3N0YXNoOwogCi0JLyoqIFVzYWJsZSBwb3J0aW9uIG9mIHRoZSBHVFQgZm9yIEdFTSAqLwot
CWRtYV9hZGRyX3Qgc3RvbGVuX2Jhc2U7IC8qIGxpbWl0ZWQgdG8gbG93IG1lbW9yeSAoMzItYml0
KSAqLwotCiAJLyoqCiAJICogdG1wZnMgaW5zdGFuY2UgdXNlZCBmb3Igc2htZW0gYmFja2VkIG9i
amVjdHMKIAkgKi8KQEAgLTIyNTIsNiArMjI0OSwxNiBAQCBzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0
ZSB7CiAKIAljb25zdCBzdHJ1Y3QgaW50ZWxfZGV2aWNlX2luZm8gaW5mbzsKIAorCS8qKgorCSAq
IERhdGEgU3RvbGVuIE1lbW9yeSAtIGFrYSAiaTkxNSBzdG9sZW4gbWVtb3J5IiBnaXZlcyB1cyB0
aGUgc3RhcnQgYW5kCisJICogZW5kIG9mIHN0b2xlbiB3aGljaCB3ZSBjYW4gb3B0aW9uYWxseSB1
c2UgdG8gY3JlYXRlIEdFTSBvYmplY3RzCisJICogYmFja2VkIGJ5IHN0b2xlbiBtZW1vcnkuIE5v
dGUgdGhhdCBnZ3R0LT5zdG9sZW5fdXNhYmxlX3NpemUgdGVsbHMgdXMKKwkgKiBleGFjdGx5IGhv
dyBtdWNoIG9mIHRoaXMgd2UgYXJlIGFjdHVhbGx5IGFsbG93ZWQgdG8gdXNlLCBnaXZlbiB0aGF0
CisJICogc29tZSBwb3J0aW9uIG9mIGl0IGlzIGluIGZhY3QgcmVzZXJ2ZWQgZm9yIHVzZSBieSBo
YXJkd2FyZSBmdW5jdGlvbnMsCisJICogd2hpbGUgZ2d0dC0+c3RvbGVuX3NpemUgZ2l2ZXMgdXMg
dGhlIHRvdGFsIHNpemUgb2YgdGhlIHN0b2xlbiByZWdpb24uCisJICovCisJc3RydWN0IHJlc291
cmNlIGRzbTsKKwogCXZvaWQgX19pb21lbSAqcmVnczsKIAogCXN0cnVjdCBpbnRlbF91bmNvcmUg
dW5jb3JlOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fc3RvbGVu
LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9zdG9sZW4uYwppbmRleCBmMWI4ZWVk
YTAwNTguLjM2YzhlYzA0ZmQ3YSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkx
NV9nZW1fc3RvbGVuLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fc3RvbGVu
LmMKQEAgLTE4NSw3ICsxODUsNyBAQCBzdGF0aWMgdm9pZCBnNHhfZ2V0X3N0b2xlbl9yZXNlcnZl
ZChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCiAJdWludDMyX3QgcmVnX3ZhbCA9
IEk5MTVfUkVBRChJU19HTTQ1KGRldl9wcml2KSA/CiAJCQkJICAgICBDVEdfU1RPTEVOX1JFU0VS
VkVEIDoKIAkJCQkgICAgIEVMS19TVE9MRU5fUkVTRVJWRUQpOwotCWRtYV9hZGRyX3Qgc3RvbGVu
X3RvcCA9IGRldl9wcml2LT5tbS5zdG9sZW5fYmFzZSArIGdndHQtPnN0b2xlbl9zaXplOworCWRt
YV9hZGRyX3Qgc3RvbGVuX3RvcCA9IGRldl9wcml2LT5kc20uc3RhcnQgKyBnZ3R0LT5zdG9sZW5f
c2l6ZTsKIAogCWlmICgocmVnX3ZhbCAmIEc0WF9TVE9MRU5fUkVTRVJWRURfRU5BQkxFKSA9PSAw
KSB7CiAJCSpiYXNlID0gMDsKQEAgLTMxNiw3ICszMTYsNyBAQCBzdGF0aWMgdm9pZCBiZHdfZ2V0
X3N0b2xlbl9yZXNlcnZlZChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCiAJCXJl
dHVybjsKIAl9CiAKLQlzdG9sZW5fdG9wID0gZGV2X3ByaXYtPm1tLnN0b2xlbl9iYXNlICsgZ2d0
dC0+c3RvbGVuX3NpemU7CisJc3RvbGVuX3RvcCA9IGRldl9wcml2LT5kc20uc3RhcnQgKyBnZ3R0
LT5zdG9sZW5fc2l6ZTsKIAogCSpiYXNlID0gcmVnX3ZhbCAmIEdFTjZfU1RPTEVOX1JFU0VSVkVE
X0FERFJfTUFTSzsKIApAQCAtMzUyLDExICszNTIsMTQgQEAgaW50IGk5MTVfZ2VtX2luaXRfc3Rv
bGVuKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIAlpZiAoZ2d0dC0+c3RvbGVu
X3NpemUgPT0gMCkKIAkJcmV0dXJuIDA7CiAKLQlkZXZfcHJpdi0+bW0uc3RvbGVuX2Jhc2UgPSBp
OTE1X3N0b2xlbl90b19kbWEoZGV2X3ByaXYpOwotCWlmIChkZXZfcHJpdi0+bW0uc3RvbGVuX2Jh
c2UgPT0gMCkKKwlkZXZfcHJpdi0+ZHNtLnN0YXJ0ID0gaTkxNV9zdG9sZW5fdG9fZG1hKGRldl9w
cml2KTsKKwlpZiAoZGV2X3ByaXYtPmRzbS5zdGFydCA9PSAwKQogCQlyZXR1cm4gMDsKIAotCXN0
b2xlbl90b3AgPSBkZXZfcHJpdi0+bW0uc3RvbGVuX2Jhc2UgKyBnZ3R0LT5zdG9sZW5fc2l6ZTsK
KwlkZXZfcHJpdi0+ZHNtLmVuZCA9IGRldl9wcml2LT5kc20uc3RhcnQgKyBnZ3R0LT5zdG9sZW5f
c2l6ZSAtIDE7CisJZGV2X3ByaXYtPmRzbS5mbGFncyA9IElPUkVTT1VSQ0VfTUVNOworCisJc3Rv
bGVuX3RvcCA9IGRldl9wcml2LT5kc20uZW5kICsgMTsKIAlyZXNlcnZlZF9iYXNlID0gMDsKIAly
ZXNlcnZlZF9zaXplID0gMDsKIApAQCAtMzk3LDEyICs0MDAsMTIgQEAgaW50IGk5MTVfZ2VtX2lu
aXRfc3RvbGVuKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIAkJcmVzZXJ2ZWRf
YmFzZSA9IHN0b2xlbl90b3A7CiAJfQogCi0JaWYgKHJlc2VydmVkX2Jhc2UgPCBkZXZfcHJpdi0+
bW0uc3RvbGVuX2Jhc2UgfHwKKwlpZiAocmVzZXJ2ZWRfYmFzZSA8IGRldl9wcml2LT5kc20uc3Rh
cnQgfHwKIAkgICAgcmVzZXJ2ZWRfYmFzZSArIHJlc2VydmVkX3NpemUgPiBzdG9sZW5fdG9wKSB7
CiAJCWRtYV9hZGRyX3QgcmVzZXJ2ZWRfdG9wID0gcmVzZXJ2ZWRfYmFzZSArIHJlc2VydmVkX3Np
emU7CiAJCURSTV9FUlJPUigiU3RvbGVuIHJlc2VydmVkIGFyZWEgWyVwYWQgLSAlcGFkXSBvdXRz
aWRlIHN0b2xlbiBtZW1vcnkgWyVwYWQgLSAlcGFkXVxuIiwKIAkJCSAgJnJlc2VydmVkX2Jhc2Us
ICZyZXNlcnZlZF90b3AsCi0JCQkgICZkZXZfcHJpdi0+bW0uc3RvbGVuX2Jhc2UsICZzdG9sZW5f
dG9wKTsKKwkJCSAgJmRldl9wcml2LT5kc20uc3RhcnQsICZzdG9sZW5fdG9wKTsKIAkJcmV0dXJu
IDA7CiAJfQogCkBAIC00NjAsNyArNDYzLDcgQEAgaTkxNV9wYWdlc19jcmVhdGVfZm9yX3N0b2xl
bihzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogCXNnLT5vZmZzZXQgPSAwOwogCXNnLT5sZW5ndGgg
PSBzaXplOwogCi0Jc2dfZG1hX2FkZHJlc3Moc2cpID0gKGRtYV9hZGRyX3QpZGV2X3ByaXYtPm1t
LnN0b2xlbl9iYXNlICsgb2Zmc2V0OworCXNnX2RtYV9hZGRyZXNzKHNnKSA9IChkbWFfYWRkcl90
KWRldl9wcml2LT5kc20uc3RhcnQgKyBvZmZzZXQ7CiAJc2dfZG1hX2xlbihzZykgPSBzaXplOwog
CiAJcmV0dXJuIHN0OwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZmJj
LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9mYmMuYwppbmRleCA0YWVmYzY1OGE1Y2Yu
LmEyOTFiYjk2NWUyZSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZmJj
LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZmJjLmMKQEAgLTYxNSwxMCArNjE1
LDE2IEBAIHN0YXRpYyBpbnQgaW50ZWxfZmJjX2FsbG9jX2NmYihzdHJ1Y3QgaW50ZWxfY3J0YyAq
Y3J0YykKIAogCQlmYmMtPmNvbXByZXNzZWRfbGxiID0gY29tcHJlc3NlZF9sbGI7CiAKKwkJR0VN
X0JVR19PTihyYW5nZV9vdmVyZmxvd3NfdCh1NjQsIGRldl9wcml2LT5kc20uc3RhcnQsCisJCQkJ
CSAgICAgZmJjLT5jb21wcmVzc2VkX2ZiLnN0YXJ0LAorCQkJCQkgICAgIFUzMl9NQVgpKTsKKwkJ
R0VNX0JVR19PTihyYW5nZV9vdmVyZmxvd3NfdCh1NjQsIGRldl9wcml2LT5kc20uc3RhcnQsCisJ
CQkJCSAgICAgZmJjLT5jb21wcmVzc2VkX2xsYi0+c3RhcnQsCisJCQkJCSAgICAgVTMyX01BWCkp
OwogCQlJOTE1X1dSSVRFKEZCQ19DRkJfQkFTRSwKLQkJCSAgIGRldl9wcml2LT5tbS5zdG9sZW5f
YmFzZSArIGZiYy0+Y29tcHJlc3NlZF9mYi5zdGFydCk7CisJCQkgICBkZXZfcHJpdi0+ZHNtLnN0
YXJ0ICsgZmJjLT5jb21wcmVzc2VkX2ZiLnN0YXJ0KTsKIAkJSTkxNV9XUklURShGQkNfTExfQkFT
RSwKLQkJCSAgIGRldl9wcml2LT5tbS5zdG9sZW5fYmFzZSArIGNvbXByZXNzZWRfbGxiLT5zdGFy
dCk7CisJCQkgICBkZXZfcHJpdi0+ZHNtLnN0YXJ0ICsgY29tcHJlc3NlZF9sbGItPnN0YXJ0KTsK
IAl9CiAKIAlEUk1fREVCVUdfS01TKCJyZXNlcnZlZCAlbGx1IGJ5dGVzIG9mIGNvbnRpZ3VvdXMg
c3RvbGVuIHNwYWNlIGZvciBGQkMsIHRocmVzaG9sZDogJWRcbiIsCmRpZmYgLS1naXQgYS9kcml2
ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf
cG0uYwppbmRleCBhODBjMzIyYzViNDMuLjZhN2EyOGU4ODliZiAxMDA2NDQKLS0tIGEvZHJpdmVy
cy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl
bF9wbS5jCkBAIC03MDcwLDcgKzcwNzAsNyBAQCBzdGF0aWMgdm9pZCB2YWxsZXl2aWV3X2NoZWNr
X3BjdHgoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogewogCXVuc2lnbmVkIGxv
bmcgcGN0eF9hZGRyID0gSTkxNV9SRUFEKFZMVl9QQ0JSKSAmIH40MDk1OwogCi0JV0FSTl9PTihw
Y3R4X2FkZHIgIT0gZGV2X3ByaXYtPm1tLnN0b2xlbl9iYXNlICsKKwlXQVJOX09OKHBjdHhfYWRk
ciAhPSBkZXZfcHJpdi0+ZHNtLnN0YXJ0ICsKIAkJCSAgICAgZGV2X3ByaXYtPnZsdl9wY3R4LT5z
dG9sZW4tPnN0YXJ0KTsKIH0KIApAQCAtNzA5Myw3ICs3MDkzLDEyIEBAIHN0YXRpYyB2b2lkIGNo
ZXJyeXZpZXdfc2V0dXBfcGN0eChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiAJ
cGNiciA9IEk5MTVfUkVBRChWTFZfUENCUik7CiAJaWYgKChwY2JyID4+IFZMVl9QQ0JSX0FERFJf
U0hJRlQpID09IDApIHsKIAkJRFJNX0RFQlVHX0RSSVZFUigiQklPUyBkaWRuJ3Qgc2V0IHVwIFBD
QlIsIGZpeGluZyB1cFxuIik7Ci0JCXBhZGRyID0gKGRldl9wcml2LT5tbS5zdG9sZW5fYmFzZSAr
CisKKwkJR0VNX0JVR19PTihyYW5nZV9vdmVyZmxvd3NfdChyZXNvdXJjZV9zaXplX3QsCisJCQkJ
CSAgICAgZGV2X3ByaXYtPmRzbS5zdGFydCwKKwkJCQkJICAgICAoZ2d0dC0+c3RvbGVuX3NpemUg
LSBwY3R4X3NpemUpLAorCQkJCQkgICAgIFUzMl9NQVgpKTsKKwkJcGFkZHIgPSAoZGV2X3ByaXYt
PmRzbS5zdGFydCArCiAJCQkgKGdndHQtPnN0b2xlbl9zaXplIC0gcGN0eF9zaXplKSk7CiAKIAkJ
cGN0eF9wYWRkciA9IChwYWRkciAmICh+NDA5NSkpOwpAQCAtNzExNSw3ICs3MTIwLDcgQEAgc3Rh
dGljIHZvaWQgdmFsbGV5dmlld19zZXR1cF9wY3R4KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpk
ZXZfcHJpdikKIAkJLyogQklPUyBzZXQgaXQgdXAgYWxyZWFkeSwgZ3JhYiB0aGUgcHJlLWFsbG9j
J2Qgc3BhY2UgKi8KIAkJaW50IHBjYnJfb2Zmc2V0OwogCi0JCXBjYnJfb2Zmc2V0ID0gKHBjYnIg
JiAofjQwOTUpKSAtIGRldl9wcml2LT5tbS5zdG9sZW5fYmFzZTsKKwkJcGNicl9vZmZzZXQgPSAo
cGNiciAmICh+NDA5NSkpIC0gZGV2X3ByaXYtPmRzbS5zdGFydDsKIAkJcGN0eCA9IGk5MTVfZ2Vt
X29iamVjdF9jcmVhdGVfc3RvbGVuX2Zvcl9wcmVhbGxvY2F0ZWQoZGV2X3ByaXYsCiAJCQkJCQkJ
CSAgICAgIHBjYnJfb2Zmc2V0LAogCQkJCQkJCQkgICAgICBJOTE1X0dUVF9PRkZTRVRfTk9ORSwK
QEAgLTcxMzksNyArNzE0NCwxMSBAQCBzdGF0aWMgdm9pZCB2YWxsZXl2aWV3X3NldHVwX3BjdHgo
c3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogCQlnb3RvIG91dDsKIAl9CiAKLQlw
Y3R4X3BhZGRyID0gZGV2X3ByaXYtPm1tLnN0b2xlbl9iYXNlICsgcGN0eC0+c3RvbGVuLT5zdGFy
dDsKKwlHRU1fQlVHX09OKHJhbmdlX292ZXJmbG93c190KHU2NCwKKwkJCQkgICAgIGRldl9wcml2
LT5kc20uc3RhcnQsCisJCQkJICAgICBwY3R4LT5zdG9sZW4tPnN0YXJ0LAorCQkJCSAgICAgVTMy
X01BWCkpOworCXBjdHhfcGFkZHIgPSBkZXZfcHJpdi0+ZHNtLnN0YXJ0ICsgcGN0eC0+c3RvbGVu
LT5zdGFydDsKIAlJOTE1X1dSSVRFKFZMVl9QQ0JSLCBwY3R4X3BhZGRyKTsKIAogb3V0OgotLSAK
Mi4xNC4zCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJ
bnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0
cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK