From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tvrtko Ursulin Subject: [RFC 13/14] drm/i915/guc: Move intel_guc_reserved_gtt_size to intel_wopcm_guc_size Date: Mon, 10 Jun 2019 16:54:18 +0100 Message-ID: <20190610155419.23723-14-tvrtko.ursulin@linux.intel.com> References: <20190610155419.23723-1-tvrtko.ursulin@linux.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 647C889190 for ; Mon, 10 Jun 2019 15:54:42 +0000 (UTC) In-Reply-To: <20190610155419.23723-1-tvrtko.ursulin@linux.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 List-Id: intel-gfx@lists.freedesktop.org RnJvbTogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KClJlZHVjZXMg cG9pbnRlciBjaGFzaW5nIGFuZCBnZXRzIG1vcmUgdG8gdGhlIHBvaW50LgoKU2lnbmVkLW9mZi1i eTogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KU3VnZ2VzdGVkLWJ5 OiBNaWNoYWwgV2FqZGVjemtvIDxtaWNoYWwud2FqZGVjemtvQGludGVsLmNvbT4KQ2M6IE1pY2hh bCBXYWpkZWN6a28gPG1pY2hhbC53YWpkZWN6a29AaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1 L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5jIHwgIDIgKy0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX2d1Yy5jICAgIHwgMTcgLS0tLS0tLS0tLS0tLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX2d1Yy5oICAgIHwgIDEgLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfd29wY20u aCAgfCAxNyArKysrKysrKysrKysrKysrKwogNCBmaWxlcyBjaGFuZ2VkLCAxOCBpbnNlcnRpb25z KCspLCAxOSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p OTE1X2dlbV9ndHQuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5jCmluZGV4 IDk3OTMwNTM0M2FjMy4uZTYyMDQxZWIxMGI4IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pOTE1X2dlbV9ndHQuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9n dHQuYwpAQCAtMjg1Myw3ICsyODUzLDcgQEAgaW50IGk5MTVfZ2VtX2luaXRfZ2d0dChzdHJ1Y3Qg ZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiAJICogd2h5LgogCSAqLwogCWdndHQtPnBpbl9i aWFzID0gbWF4X3QodTMyLCBJOTE1X0dUVF9QQUdFX1NJWkUsCi0JCQkgICAgICAgaW50ZWxfZ3Vj X3Jlc2VydmVkX2d0dF9zaXplKCZkZXZfcHJpdi0+Z3VjKSk7CisJCQkgICAgICAgaW50ZWxfd29w Y21fZ3VjX3NpemUoJmRldl9wcml2LT53b3BjbSkpOwogCiAJcmV0ID0gaW50ZWxfdmd0X2JhbGxv b24oZ2d0dCk7CiAJaWYgKHJldCkKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX2d1Yy5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3VjLmMKaW5kZXggNDMyMzIy NDJkMTY3Li5kNDVkOTc2MjQ0MDIgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX2d1Yy5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1Yy5jCkBAIC02ODYs MjMgKzY4Niw2IEBAIHN0cnVjdCBpOTE1X3ZtYSAqaW50ZWxfZ3VjX2FsbG9jYXRlX3ZtYShzdHJ1 Y3QgaW50ZWxfZ3VjICpndWMsIHUzMiBzaXplKQogCXJldHVybiB2bWE7CiB9CiAKLS8qKgotICog aW50ZWxfZ3VjX3Jlc2VydmVkX2d0dF9zaXplKCkKLSAqIEBndWM6CWludGVsX2d1YyBzdHJ1Y3R1 cmUKLSAqCi0gKiBUaGUgR3VDIFdPUENNIG1hcHBpbmcgc2hhZG93cyB0aGUgbG93ZXIgcGFydCBv ZiB0aGUgR0dUVCwgc28gaWYgd2UgYXJlIHVzaW5nCi0gKiBHdUMgd2UgY2FuJ3QgaGF2ZSBhbnkg b2JqZWN0cyBwaW5uZWQgaW4gdGhhdCByZWdpb24uIFRoaXMgZnVuY3Rpb24gcmV0dXJucwotICog dGhlIHNpemUgb2YgdGhlIHNoYWRvd2VkIHJlZ2lvbi4KLSAqCi0gKiBSZXR1cm5zOgotICogMCBp ZiBHdUMgaXMgbm90IHByZXNlbnQgb3Igbm90IGluIHVzZS4KLSAqIE90aGVyd2lzZSwgdGhlIEd1 QyBXT1BDTSBzaXplLgotICovCi11MzIgaW50ZWxfZ3VjX3Jlc2VydmVkX2d0dF9zaXplKHN0cnVj dCBpbnRlbF9ndWMgKmd1YykKLXsKLQlyZXR1cm4gZ3VjX3RvX2k5MTUoZ3VjKS0+d29wY20uZ3Vj LnNpemU7Ci19Ci0KIGludCBpbnRlbF9ndWNfcmVzZXJ2ZV9nZ3R0X3RvcChzdHJ1Y3QgaW50ZWxf Z3VjICpndWMpCiB7CiAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmk5MTUgPSBndWNfdG9faTkx NShndWMpOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3VjLmggYi9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ndWMuaAppbmRleCBlMDdlNGM2OWNmMDguLjg1YzNi MDJhMGMwOCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3VjLmgKKysr IGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3VjLmgKQEAgLTE3Miw3ICsxNzIsNiBAQCBp bnQgaW50ZWxfZ3VjX2F1dGhfaHVjKHN0cnVjdCBpbnRlbF9ndWMgKmd1YywgdTMyIHJzYV9vZmZz ZXQpOwogaW50IGludGVsX2d1Y19zdXNwZW5kKHN0cnVjdCBpbnRlbF9ndWMgKmd1Yyk7CiBpbnQg aW50ZWxfZ3VjX3Jlc3VtZShzdHJ1Y3QgaW50ZWxfZ3VjICpndWMpOwogc3RydWN0IGk5MTVfdm1h ICppbnRlbF9ndWNfYWxsb2NhdGVfdm1hKHN0cnVjdCBpbnRlbF9ndWMgKmd1YywgdTMyIHNpemUp OwotdTMyIGludGVsX2d1Y19yZXNlcnZlZF9ndHRfc2l6ZShzdHJ1Y3QgaW50ZWxfZ3VjICpndWMp OwogaW50IGludGVsX2d1Y19yZXNlcnZlX2dndHRfdG9wKHN0cnVjdCBpbnRlbF9ndWMgKmd1Yyk7 CiB2b2lkIGludGVsX2d1Y19yZWxlYXNlX2dndHRfdG9wKHN0cnVjdCBpbnRlbF9ndWMgKmd1Yyk7 CiAKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3dvcGNtLmggYi9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF93b3BjbS5oCmluZGV4IDYyOTg5MTBhMzg0Yy4uMWMzMmQ0 NDlmYzEwIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF93b3BjbS5oCisr KyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3dvcGNtLmgKQEAgLTI0LDYgKzI0LDIzIEBA IHN0cnVjdCBpbnRlbF93b3BjbSB7CiAJfSBndWM7CiB9OwogCisvKioKKyAqIGludGVsX3dvcGNt X2d1Y19zaXplKCkKKyAqIEB3b3BjbToJaW50ZWxfd29wY20gc3RydWN0dXJlCisgKgorICogVGhl IEd1QyBXT1BDTSBtYXBwaW5nIHNoYWRvd3MgdGhlIGxvd2VyIHBhcnQgb2YgdGhlIEdHVFQsIHNv IGlmIHdlIGFyZSB1c2luZworICogR3VDIHdlIGNhbid0IGhhdmUgYW55IG9iamVjdHMgcGlubmVk IGluIHRoYXQgcmVnaW9uLiBUaGlzIGZ1bmN0aW9uIHJldHVybnMKKyAqIHRoZSBzaXplIG9mIHRo ZSBzaGFkb3dlZCByZWdpb24uCisgKgorICogUmV0dXJuczoKKyAqIDAgaWYgR3VDIGlzIG5vdCBw cmVzZW50IG9yIG5vdCBpbiB1c2UuCisgKiBPdGhlcndpc2UsIHRoZSBHdUMgV09QQ00gc2l6ZS4K KyAqLworc3RhdGljIGlubGluZSB1MzIgaW50ZWxfd29wY21fZ3VjX3NpemUoc3RydWN0IGludGVs X3dvcGNtICp3b3BjbSkKK3sKKyAgICByZXR1cm4gd29wY20tPmd1Yy5zaXplOworfQorCiB2b2lk IGludGVsX3dvcGNtX2luaXRfZWFybHkoc3RydWN0IGludGVsX3dvcGNtICp3b3BjbSk7CiBpbnQg aW50ZWxfd29wY21faW5pdChzdHJ1Y3QgaW50ZWxfd29wY20gKndvcGNtKTsKIGludCBpbnRlbF93 b3BjbV9pbml0X2h3KHN0cnVjdCBpbnRlbF93b3BjbSAqd29wY20pOwotLSAKMi4yMC4xCgpfX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFp bGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5m cmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZng=