From mboxrd@z Thu Jan 1 00:00:00 1970 From: Matthew Auld Subject: [PATCH 3/6] drm/i915: make dsm struct resource centric Date: Wed, 22 Nov 2017 21:19:17 +0000 Message-ID: <20171122211920.20993-4-matthew.auld@intel.com> References: <20171122211920.20993-1-matthew.auld@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTPS id B359D6E6D2 for ; Wed, 22 Nov 2017 21:19:27 +0000 (UTC) In-Reply-To: <20171122211920.20993-1-matthew.auld@intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: intel-gfx@lists.freedesktop.org Cc: Paulo Zanoni List-Id: intel-gfx@lists.freedesktop.org U2lnbmVkLW9mZi1ieTogTWF0dGhldyBBdWxkIDxtYXR0aGV3LmF1bGRAaW50ZWwuY29tPgpDYzog Sm9vbmFzIExhaHRpbmVuIDxqb29uYXMubGFodGluZW5AbGludXguaW50ZWwuY29tPgpDYzogQ2hy aXMgV2lsc29uIDxjaHJpc0BjaHJpcy13aWxzb24uY28udWs+CkNjOiBQYXVsbyBaYW5vbmkgPHBh dWxvLnIuemFub25pQGludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Ry di5oICAgICAgICB8ICA1ICsrLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9zdG9s ZW4uYyB8IDE5ICsrKysrKysrKysrLS0tLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs X2ZiYy5jICAgICAgIHwgIDQgKystLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYyAg ICAgICAgfCAgOCArKysrLS0tLQogNCBmaWxlcyBjaGFuZ2VkLCAxOSBpbnNlcnRpb25zKCspLCAx NyBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Ry di5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaAppbmRleCBkNTc1YTU2ZmMxMDAu LjYxMzZmOTJkNTE4OCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYu aAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCkBAIC0xNTM2LDkgKzE1MzYs NiBAQCBzdHJ1Y3QgaTkxNV9nZW1fbW0gewogCSAqLwogCXN0cnVjdCBwYWdldmVjIHdjX3N0YXNo OwogCi0JLyoqIFVzYWJsZSBwb3J0aW9uIG9mIHRoZSBHVFQgZm9yIEdFTSAqLwotCWRtYV9hZGRy X3Qgc3RvbGVuX2Jhc2U7IC8qIGxpbWl0ZWQgdG8gbG93IG1lbW9yeSAoMzItYml0KSAqLwotCiAJ LyoqCiAJICogdG1wZnMgaW5zdGFuY2UgdXNlZCBmb3Igc2htZW0gYmFja2VkIG9iamVjdHMKIAkg Ki8KQEAgLTIyNTIsNiArMjI0OSw4IEBAIHN0cnVjdCBkcm1faTkxNV9wcml2YXRlIHsKIAogCWNv bnN0IHN0cnVjdCBpbnRlbF9kZXZpY2VfaW5mbyBpbmZvOwogCisJc3RydWN0IHJlc291cmNlIGRz bTsKKwogCXZvaWQgX19pb21lbSAqcmVnczsKIAogCXN0cnVjdCBpbnRlbF91bmNvcmUgdW5jb3Jl OwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fc3RvbGVuLmMgYi9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9zdG9sZW4uYwppbmRleCBmMWI4ZWVkYTAwNTgu LjM2YzhlYzA0ZmQ3YSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1f c3RvbGVuLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fc3RvbGVuLmMKQEAg LTE4NSw3ICsxODUsNyBAQCBzdGF0aWMgdm9pZCBnNHhfZ2V0X3N0b2xlbl9yZXNlcnZlZChzdHJ1 Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCiAJdWludDMyX3QgcmVnX3ZhbCA9IEk5MTVf UkVBRChJU19HTTQ1KGRldl9wcml2KSA/CiAJCQkJICAgICBDVEdfU1RPTEVOX1JFU0VSVkVEIDoK IAkJCQkgICAgIEVMS19TVE9MRU5fUkVTRVJWRUQpOwotCWRtYV9hZGRyX3Qgc3RvbGVuX3RvcCA9 IGRldl9wcml2LT5tbS5zdG9sZW5fYmFzZSArIGdndHQtPnN0b2xlbl9zaXplOworCWRtYV9hZGRy X3Qgc3RvbGVuX3RvcCA9IGRldl9wcml2LT5kc20uc3RhcnQgKyBnZ3R0LT5zdG9sZW5fc2l6ZTsK IAogCWlmICgocmVnX3ZhbCAmIEc0WF9TVE9MRU5fUkVTRVJWRURfRU5BQkxFKSA9PSAwKSB7CiAJ CSpiYXNlID0gMDsKQEAgLTMxNiw3ICszMTYsNyBAQCBzdGF0aWMgdm9pZCBiZHdfZ2V0X3N0b2xl bl9yZXNlcnZlZChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCiAJCXJldHVybjsK IAl9CiAKLQlzdG9sZW5fdG9wID0gZGV2X3ByaXYtPm1tLnN0b2xlbl9iYXNlICsgZ2d0dC0+c3Rv bGVuX3NpemU7CisJc3RvbGVuX3RvcCA9IGRldl9wcml2LT5kc20uc3RhcnQgKyBnZ3R0LT5zdG9s ZW5fc2l6ZTsKIAogCSpiYXNlID0gcmVnX3ZhbCAmIEdFTjZfU1RPTEVOX1JFU0VSVkVEX0FERFJf TUFTSzsKIApAQCAtMzUyLDExICszNTIsMTQgQEAgaW50IGk5MTVfZ2VtX2luaXRfc3RvbGVuKHN0 cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIAlpZiAoZ2d0dC0+c3RvbGVuX3NpemUg PT0gMCkKIAkJcmV0dXJuIDA7CiAKLQlkZXZfcHJpdi0+bW0uc3RvbGVuX2Jhc2UgPSBpOTE1X3N0 b2xlbl90b19kbWEoZGV2X3ByaXYpOwotCWlmIChkZXZfcHJpdi0+bW0uc3RvbGVuX2Jhc2UgPT0g MCkKKwlkZXZfcHJpdi0+ZHNtLnN0YXJ0ID0gaTkxNV9zdG9sZW5fdG9fZG1hKGRldl9wcml2KTsK KwlpZiAoZGV2X3ByaXYtPmRzbS5zdGFydCA9PSAwKQogCQlyZXR1cm4gMDsKIAotCXN0b2xlbl90 b3AgPSBkZXZfcHJpdi0+bW0uc3RvbGVuX2Jhc2UgKyBnZ3R0LT5zdG9sZW5fc2l6ZTsKKwlkZXZf cHJpdi0+ZHNtLmVuZCA9IGRldl9wcml2LT5kc20uc3RhcnQgKyBnZ3R0LT5zdG9sZW5fc2l6ZSAt IDE7CisJZGV2X3ByaXYtPmRzbS5mbGFncyA9IElPUkVTT1VSQ0VfTUVNOworCisJc3RvbGVuX3Rv cCA9IGRldl9wcml2LT5kc20uZW5kICsgMTsKIAlyZXNlcnZlZF9iYXNlID0gMDsKIAlyZXNlcnZl ZF9zaXplID0gMDsKIApAQCAtMzk3LDEyICs0MDAsMTIgQEAgaW50IGk5MTVfZ2VtX2luaXRfc3Rv bGVuKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIAkJcmVzZXJ2ZWRfYmFzZSA9 IHN0b2xlbl90b3A7CiAJfQogCi0JaWYgKHJlc2VydmVkX2Jhc2UgPCBkZXZfcHJpdi0+bW0uc3Rv bGVuX2Jhc2UgfHwKKwlpZiAocmVzZXJ2ZWRfYmFzZSA8IGRldl9wcml2LT5kc20uc3RhcnQgfHwK IAkgICAgcmVzZXJ2ZWRfYmFzZSArIHJlc2VydmVkX3NpemUgPiBzdG9sZW5fdG9wKSB7CiAJCWRt YV9hZGRyX3QgcmVzZXJ2ZWRfdG9wID0gcmVzZXJ2ZWRfYmFzZSArIHJlc2VydmVkX3NpemU7CiAJ CURSTV9FUlJPUigiU3RvbGVuIHJlc2VydmVkIGFyZWEgWyVwYWQgLSAlcGFkXSBvdXRzaWRlIHN0 b2xlbiBtZW1vcnkgWyVwYWQgLSAlcGFkXVxuIiwKIAkJCSAgJnJlc2VydmVkX2Jhc2UsICZyZXNl cnZlZF90b3AsCi0JCQkgICZkZXZfcHJpdi0+bW0uc3RvbGVuX2Jhc2UsICZzdG9sZW5fdG9wKTsK KwkJCSAgJmRldl9wcml2LT5kc20uc3RhcnQsICZzdG9sZW5fdG9wKTsKIAkJcmV0dXJuIDA7CiAJ fQogCkBAIC00NjAsNyArNDYzLDcgQEAgaTkxNV9wYWdlc19jcmVhdGVfZm9yX3N0b2xlbihzdHJ1 Y3QgZHJtX2RldmljZSAqZGV2LAogCXNnLT5vZmZzZXQgPSAwOwogCXNnLT5sZW5ndGggPSBzaXpl OwogCi0Jc2dfZG1hX2FkZHJlc3Moc2cpID0gKGRtYV9hZGRyX3QpZGV2X3ByaXYtPm1tLnN0b2xl bl9iYXNlICsgb2Zmc2V0OworCXNnX2RtYV9hZGRyZXNzKHNnKSA9IChkbWFfYWRkcl90KWRldl9w cml2LT5kc20uc3RhcnQgKyBvZmZzZXQ7CiAJc2dfZG1hX2xlbihzZykgPSBzaXplOwogCiAJcmV0 dXJuIHN0OwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZmJjLmMgYi9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9mYmMuYwppbmRleCA0YWVmYzY1OGE1Y2YuLjM3NGNm ZThhMzNhZCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZmJjLmMKKysr IGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZmJjLmMKQEAgLTYxNiw5ICs2MTYsOSBAQCBz dGF0aWMgaW50IGludGVsX2ZiY19hbGxvY19jZmIoc3RydWN0IGludGVsX2NydGMgKmNydGMpCiAJ CWZiYy0+Y29tcHJlc3NlZF9sbGIgPSBjb21wcmVzc2VkX2xsYjsKIAogCQlJOTE1X1dSSVRFKEZC Q19DRkJfQkFTRSwKLQkJCSAgIGRldl9wcml2LT5tbS5zdG9sZW5fYmFzZSArIGZiYy0+Y29tcHJl c3NlZF9mYi5zdGFydCk7CisJCQkgICBkZXZfcHJpdi0+ZHNtLnN0YXJ0ICsgZmJjLT5jb21wcmVz c2VkX2ZiLnN0YXJ0KTsKIAkJSTkxNV9XUklURShGQkNfTExfQkFTRSwKLQkJCSAgIGRldl9wcml2 LT5tbS5zdG9sZW5fYmFzZSArIGNvbXByZXNzZWRfbGxiLT5zdGFydCk7CisJCQkgICBkZXZfcHJp di0+ZHNtLnN0YXJ0ICsgY29tcHJlc3NlZF9sbGItPnN0YXJ0KTsKIAl9CiAKIAlEUk1fREVCVUdf S01TKCJyZXNlcnZlZCAlbGx1IGJ5dGVzIG9mIGNvbnRpZ3VvdXMgc3RvbGVuIHNwYWNlIGZvciBG QkMsIHRocmVzaG9sZDogJWRcbiIsCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF9wbS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYwppbmRleCA3ZDQxYWFk NzkxNjYuLjRhMzI2YmJkYWM2YyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfcG0uYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jCkBAIC03MDcwLDcg KzcwNzAsNyBAQCBzdGF0aWMgdm9pZCB2YWxsZXl2aWV3X2NoZWNrX3BjdHgoc3RydWN0IGRybV9p OTE1X3ByaXZhdGUgKmRldl9wcml2KQogewogCXVuc2lnbmVkIGxvbmcgcGN0eF9hZGRyID0gSTkx NV9SRUFEKFZMVl9QQ0JSKSAmIH40MDk1OwogCi0JV0FSTl9PTihwY3R4X2FkZHIgIT0gZGV2X3By aXYtPm1tLnN0b2xlbl9iYXNlICsKKwlXQVJOX09OKHBjdHhfYWRkciAhPSBkZXZfcHJpdi0+ZHNt LnN0YXJ0ICsKIAkJCSAgICAgZGV2X3ByaXYtPnZsdl9wY3R4LT5zdG9sZW4tPnN0YXJ0KTsKIH0K IApAQCAtNzA5Myw3ICs3MDkzLDcgQEAgc3RhdGljIHZvaWQgY2hlcnJ5dmlld19zZXR1cF9wY3R4 KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIAlwY2JyID0gSTkxNV9SRUFEKFZM Vl9QQ0JSKTsKIAlpZiAoKHBjYnIgPj4gVkxWX1BDQlJfQUREUl9TSElGVCkgPT0gMCkgewogCQlE Uk1fREVCVUdfRFJJVkVSKCJCSU9TIGRpZG4ndCBzZXQgdXAgUENCUiwgZml4aW5nIHVwXG4iKTsK LQkJcGFkZHIgPSAoZGV2X3ByaXYtPm1tLnN0b2xlbl9iYXNlICsKKwkJcGFkZHIgPSAoZGV2X3By aXYtPmRzbS5zdGFydCArCiAJCQkgKGdndHQtPnN0b2xlbl9zaXplIC0gcGN0eF9zaXplKSk7CiAK IAkJcGN0eF9wYWRkciA9IChwYWRkciAmICh+NDA5NSkpOwpAQCAtNzExNSw3ICs3MTE1LDcgQEAg c3RhdGljIHZvaWQgdmFsbGV5dmlld19zZXR1cF9wY3R4KHN0cnVjdCBkcm1faTkxNV9wcml2YXRl ICpkZXZfcHJpdikKIAkJLyogQklPUyBzZXQgaXQgdXAgYWxyZWFkeSwgZ3JhYiB0aGUgcHJlLWFs bG9jJ2Qgc3BhY2UgKi8KIAkJaW50IHBjYnJfb2Zmc2V0OwogCi0JCXBjYnJfb2Zmc2V0ID0gKHBj YnIgJiAofjQwOTUpKSAtIGRldl9wcml2LT5tbS5zdG9sZW5fYmFzZTsKKwkJcGNicl9vZmZzZXQg PSAocGNiciAmICh+NDA5NSkpIC0gZGV2X3ByaXYtPmRzbS5zdGFydDsKIAkJcGN0eCA9IGk5MTVf Z2VtX29iamVjdF9jcmVhdGVfc3RvbGVuX2Zvcl9wcmVhbGxvY2F0ZWQoZGV2X3ByaXYsCiAJCQkJ CQkJCSAgICAgIHBjYnJfb2Zmc2V0LAogCQkJCQkJCQkgICAgICBJOTE1X0dUVF9PRkZTRVRfTk9O RSwKQEAgLTcxMzksNyArNzEzOSw3IEBAIHN0YXRpYyB2b2lkIHZhbGxleXZpZXdfc2V0dXBfcGN0 eChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiAJCWdvdG8gb3V0OwogCX0KIAot CXBjdHhfcGFkZHIgPSBkZXZfcHJpdi0+bW0uc3RvbGVuX2Jhc2UgKyBwY3R4LT5zdG9sZW4tPnN0 YXJ0OworCXBjdHhfcGFkZHIgPSBkZXZfcHJpdi0+ZHNtLnN0YXJ0ICsgcGN0eC0+c3RvbGVuLT5z dGFydDsKIAlJOTE1X1dSSVRFKFZMVl9QQ0JSLCBwY3R4X3BhZGRyKTsKIAogb3V0OgotLSAKMi4x NC4zCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRl bC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6 Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK