From mboxrd@z Thu Jan  1 00:00:00 1970
From: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>
Subject: [PATCH 1/2] drm/i915/guc: Move
 intel_guc_reserved_gtt_size to intel_wopcm_guc_size
Date: Tue, 11 Jun 2019 12:00:43 +0100
Message-ID: <20190611110044.7742-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 mga02.intel.com (mga02.intel.com [134.134.136.20])
 by gabe.freedesktop.org (Postfix) with ESMTPS id 734A2890E5
 for <Intel-gfx@lists.freedesktop.org>; Tue, 11 Jun 2019 11:00:58 +0000 (UTC)
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

RnJvbTogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KClJlZHVjZXMg
cG9pbnRlciBjaGFzaW5nIGFuZCBnZXRzIG1vcmUgdG8gdGhlIHBvaW50LgoKdjI6CiAqIFRpZHkg
d2hpdGVzcGFjZS4KICogVGlkeSBjb21tZW50LiAoTWljaGFsKQoKU2lnbmVkLW9mZi1ieTogVHZy
dGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KU3VnZ2VzdGVkLWJ5OiBNaWNo
YWwgV2FqZGVjemtvIDxtaWNoYWwud2FqZGVjemtvQGludGVsLmNvbT4KQ2M6IE1pY2hhbCBXYWpk
ZWN6a28gPG1pY2hhbC53YWpkZWN6a29AaW50ZWwuY29tPgpSZXZpZXdlZC1ieTogTWljaGFsIFdh
amRlY3prbyA8bWljaGFsLndhamRlY3prb0BpbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJt
L2k5MTUvaTkxNV9nZW1fZ3R0LmMgfCAgMiArLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf
Z3VjLmMgICAgfCAxNyAtLS0tLS0tLS0tLS0tLS0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50
ZWxfZ3VjLmggICAgfCAgMSAtCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF93b3BjbS5oICB8
IDE1ICsrKysrKysrKysrKysrKwogNCBmaWxlcyBjaGFuZ2VkLCAxNiBpbnNlcnRpb25zKCspLCAx
OSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dl
bV9ndHQuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5jCmluZGV4IDJlMTU4
NTBiZDk4Ny4uNWI1MTI1ZWU0OWYzIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p
OTE1X2dlbV9ndHQuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuYwpA
QCAtMjgzMCw3ICsyODMwLDcgQEAgaW50IGk5MTVfZ2VtX2luaXRfZ2d0dChzdHJ1Y3QgZHJtX2k5
MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiAJICogd2h5LgogCSAqLwogCWdndHQtPnBpbl9iaWFzID0g
bWF4X3QodTMyLCBJOTE1X0dUVF9QQUdFX1NJWkUsCi0JCQkgICAgICAgaW50ZWxfZ3VjX3Jlc2Vy
dmVkX2d0dF9zaXplKCZkZXZfcHJpdi0+Z3VjKSk7CisJCQkgICAgICAgaW50ZWxfd29wY21fZ3Vj
X3NpemUoJmRldl9wcml2LT53b3BjbSkpOwogCiAJcmV0ID0gaW50ZWxfdmd0X2JhbGxvb24oZGV2
X3ByaXYpOwogCWlmIChyZXQpCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl
bF9ndWMuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1Yy5jCmluZGV4IDQzMjMyMjQy
ZDE2Ny4uZDQ1ZDk3NjI0NDAyIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl
bF9ndWMuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ndWMuYwpAQCAtNjg2LDIz
ICs2ODYsNiBAQCBzdHJ1Y3QgaTkxNV92bWEgKmludGVsX2d1Y19hbGxvY2F0ZV92bWEoc3RydWN0
IGludGVsX2d1YyAqZ3VjLCB1MzIgc2l6ZSkKIAlyZXR1cm4gdm1hOwogfQogCi0vKioKLSAqIGlu
dGVsX2d1Y19yZXNlcnZlZF9ndHRfc2l6ZSgpCi0gKiBAZ3VjOglpbnRlbF9ndWMgc3RydWN0dXJl
Ci0gKgotICogVGhlIEd1QyBXT1BDTSBtYXBwaW5nIHNoYWRvd3MgdGhlIGxvd2VyIHBhcnQgb2Yg
dGhlIEdHVFQsIHNvIGlmIHdlIGFyZSB1c2luZwotICogR3VDIHdlIGNhbid0IGhhdmUgYW55IG9i
amVjdHMgcGlubmVkIGluIHRoYXQgcmVnaW9uLiBUaGlzIGZ1bmN0aW9uIHJldHVybnMKLSAqIHRo
ZSBzaXplIG9mIHRoZSBzaGFkb3dlZCByZWdpb24uCi0gKgotICogUmV0dXJuczoKLSAqIDAgaWYg
R3VDIGlzIG5vdCBwcmVzZW50IG9yIG5vdCBpbiB1c2UuCi0gKiBPdGhlcndpc2UsIHRoZSBHdUMg
V09QQ00gc2l6ZS4KLSAqLwotdTMyIGludGVsX2d1Y19yZXNlcnZlZF9ndHRfc2l6ZShzdHJ1Y3Qg
aW50ZWxfZ3VjICpndWMpCi17Ci0JcmV0dXJuIGd1Y190b19pOTE1KGd1YyktPndvcGNtLmd1Yy5z
aXplOwotfQotCiBpbnQgaW50ZWxfZ3VjX3Jlc2VydmVfZ2d0dF90b3Aoc3RydWN0IGludGVsX2d1
YyAqZ3VjKQogewogCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICppOTE1ID0gZ3VjX3RvX2k5MTUo
Z3VjKTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1Yy5oIGIvZHJp
dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3VjLmgKaW5kZXggZTA3ZTRjNjljZjA4Li44NWMzYjAy
YTBjMDggMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1Yy5oCisrKyBi
L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1Yy5oCkBAIC0xNzIsNyArMTcyLDYgQEAgaW50
IGludGVsX2d1Y19hdXRoX2h1YyhzdHJ1Y3QgaW50ZWxfZ3VjICpndWMsIHUzMiByc2Ffb2Zmc2V0
KTsKIGludCBpbnRlbF9ndWNfc3VzcGVuZChzdHJ1Y3QgaW50ZWxfZ3VjICpndWMpOwogaW50IGlu
dGVsX2d1Y19yZXN1bWUoc3RydWN0IGludGVsX2d1YyAqZ3VjKTsKIHN0cnVjdCBpOTE1X3ZtYSAq
aW50ZWxfZ3VjX2FsbG9jYXRlX3ZtYShzdHJ1Y3QgaW50ZWxfZ3VjICpndWMsIHUzMiBzaXplKTsK
LXUzMiBpbnRlbF9ndWNfcmVzZXJ2ZWRfZ3R0X3NpemUoc3RydWN0IGludGVsX2d1YyAqZ3VjKTsK
IGludCBpbnRlbF9ndWNfcmVzZXJ2ZV9nZ3R0X3RvcChzdHJ1Y3QgaW50ZWxfZ3VjICpndWMpOwog
dm9pZCBpbnRlbF9ndWNfcmVsZWFzZV9nZ3R0X3RvcChzdHJ1Y3QgaW50ZWxfZ3VjICpndWMpOwog
CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF93b3BjbS5oIGIvZHJpdmVy
cy9ncHUvZHJtL2k5MTUvaW50ZWxfd29wY20uaAppbmRleCA2Mjk4OTEwYTM4NGMuLjExNDQwMTk3
MTUyMCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfd29wY20uaAorKysg
Yi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF93b3BjbS5oCkBAIC0yNCw2ICsyNCwyMSBAQCBz
dHJ1Y3QgaW50ZWxfd29wY20gewogCX0gZ3VjOwogfTsKIAorLyoqCisgKiBpbnRlbF93b3BjbV9n
dWNfc2l6ZSgpCisgKiBAd29wY206CWludGVsX3dvcGNtIHN0cnVjdHVyZQorICoKKyAqIFJldHVy
bnMgc2l6ZSBvZiB0aGUgV09QQ00gc2hhZG93ZWQgcmVnaW9uLgorICoKKyAqIFJldHVybnM6Cisg
KiAwIGlmIEd1QyBpcyBub3QgcHJlc2VudCBvciBub3QgaW4gdXNlLgorICogT3RoZXJ3aXNlLCB0
aGUgR3VDIFdPUENNIHNpemUuCisgKi8KK3N0YXRpYyBpbmxpbmUgdTMyIGludGVsX3dvcGNtX2d1
Y19zaXplKHN0cnVjdCBpbnRlbF93b3BjbSAqd29wY20pCit7CisJcmV0dXJuIHdvcGNtLT5ndWMu
c2l6ZTsKK30KKwogdm9pZCBpbnRlbF93b3BjbV9pbml0X2Vhcmx5KHN0cnVjdCBpbnRlbF93b3Bj
bSAqd29wY20pOwogaW50IGludGVsX3dvcGNtX2luaXQoc3RydWN0IGludGVsX3dvcGNtICp3b3Bj
bSk7CiBpbnQgaW50ZWxfd29wY21faW5pdF9odyhzdHJ1Y3QgaW50ZWxfd29wY20gKndvcGNtKTsK
LS0gCjIuMjAuMQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f
X18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3Jn
Cmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4