From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michal Wajdeczko Subject: [PATCH v3 2/3] drm/i915/guc: Make scratch register base and count flexible Date: Fri, 5 May 2017 11:35:04 +0000 Message-ID: <20170505113504.57728-1-michal.wajdeczko@intel.com> References: <20170502123937.53556-1-michal.wajdeczko@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTPS id 95B9488FA8 for ; Fri, 5 May 2017 11:35:36 +0000 (UTC) In-Reply-To: <20170502123937.53556-1-michal.wajdeczko@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 V2UgYXJlIHVzaW5nIHNvbWUgc2NyYXRjaCByZWdpc3RlcnMgaW4gTU1JTyBiYXNlZCBzZW5kIGZ1 bmN0aW9uLgpNYWtlIHRoZWlyIGJhc2UgYW5kIGNvdW50IGZsZXhpYmxlIGluIHByZXBhcmF0aW9u IG9mIHVwY29taW5nCkd1QyBmaXJtd2FyZS9oYXJkd2FyZSBjaGFuZ2VzLiBXaGlsZSBhcm91bmQs IGNoYW5nZSBjbWQgbGVuCnBhcmFtZXRlciB2ZXJpZmljYXRpb24gZnJvbSBXQVJOX09OIHRvIEdF TV9CVUdfT04gYXMgd2UgZG9uJ3QKbmVlZCB0aGlzIGFsbCB0aGUgdGltZS4KCnYyOiBjYWxsIG91 dCBXQVJOL0dFTV9CVUcgY2hhbmdlIGluIHRoZSBjb21taXQgbXNnIChEYW5pZWxlKQp2MzogZG9u J3Qgb3ZlcnF1YWxpZnkgdGhlIGludHMgKENocmlzKQoKU2lnbmVkLW9mZi1ieTogTWljaGFsIFdh amRlY3prbyA8bWljaGFsLndhamRlY3prb0BpbnRlbC5jb20+ClN1Z2dlc3RlZC1ieTogRGFuaWVs ZSBDZXJhb2xvIFNwdXJpbyA8ZGFuaWVsZS5jZXJhb2xvc3B1cmlvQGludGVsLmNvbT4KQ2M6IERh bmllbGUgQ2VyYW9sbyBTcHVyaW8gPGRhbmllbGUuY2VyYW9sb3NwdXJpb0BpbnRlbC5jb20+CkNj OiBKb29uYXMgTGFodGluZW4gPGpvb25hcy5sYWh0aW5lbkBsaW51eC5pbnRlbC5jb20+CkNjOiBD aHJpcyBXaWxzb24gPGNocmlzQGNocmlzLXdpbHNvbi5jby51az4KQ2M6IEphbmkgTmlrdWxhIDxq YW5pLm5pa3VsYUBsaW51eC5pbnRlbC5jb20+ClJldmlld2VkLWJ5OiBEYW5pZWxlIENlcmFvbG8g U3B1cmlvIDxkYW5pZWxlLmNlcmFvbG9zcHVyaW9AaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX3VjLmMgfCA0MSArKysrKysrKysrKysrKysrKysrKysrKysrKysrKysr KysrLS0tLS0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfdWMuaCB8ICA3ICsrKysrKysK IDIgZmlsZXMgY2hhbmdlZCwgNDEgaW5zZXJ0aW9ucygrKSwgNyBkZWxldGlvbnMoLSkKCmRpZmYg LS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF91Yy5jIGIvZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfdWMuYwppbmRleCA3MmY0OWU2Li45ZDExYzQyIDEwMDY0NAotLS0gYS9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF91Yy5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX3VjLmMKQEAgLTI2MCw5ICsyNjAsMzYgQEAgdm9pZCBpbnRlbF91Y19maW5pX2Z3KHN0cnVj dCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIAlfX2ludGVsX3VjX2Z3X2ZpbmkoJmRldl9w cml2LT5odWMuZncpOwogfQogCitzdGF0aWMgaW5saW5lIGk5MTVfcmVnX3QgZ3VjX3NlbmRfcmVn KHN0cnVjdCBpbnRlbF9ndWMgKmd1YywgdTMyIGkpCit7CisJR0VNX0JVR19PTighZ3VjLT5zZW5k X3JlZ3MuYmFzZSk7CisJR0VNX0JVR19PTighZ3VjLT5zZW5kX3JlZ3MuY291bnQpOworCUdFTV9C VUdfT04oaSA+PSBndWMtPnNlbmRfcmVncy5jb3VudCk7CisKKwlyZXR1cm4gX01NSU8oZ3VjLT5z ZW5kX3JlZ3MuYmFzZSArIDQgKiBpKTsKK30KKworc3RhdGljIHZvaWQgZ3VjX2luaXRfc2VuZF9y ZWdzKHN0cnVjdCBpbnRlbF9ndWMgKmd1YykKK3sKKwlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAq ZGV2X3ByaXYgPSBndWNfdG9faTkxNShndWMpOworCWVudW0gZm9yY2V3YWtlX2RvbWFpbnMgZndf ZG9tYWlucyA9IDA7CisJdTMyIGk7CisKKwlndWMtPnNlbmRfcmVncy5iYXNlID0gaTkxNV9tbWlv X3JlZ19vZmZzZXQoU09GVF9TQ1JBVENIKDApKTsKKwlndWMtPnNlbmRfcmVncy5jb3VudCA9IFNP RlRfU0NSQVRDSF9DT1VOVCAtIDE7CisKKwlmb3IgKGkgPSAwOyBpIDwgZ3VjLT5zZW5kX3JlZ3Mu Y291bnQ7IGkrKykgeworCQlmd19kb21haW5zIHw9IGludGVsX3VuY29yZV9mb3JjZXdha2VfZm9y X3JlZyhkZXZfcHJpdiwKKwkJCQkJZ3VjX3NlbmRfcmVnKGd1YywgaSksCisJCQkJCUZXX1JFR19S RUFEIHwgRldfUkVHX1dSSVRFKTsKKwl9CisJZ3VjLT5zZW5kX3JlZ3MuZndfZG9tYWlucyA9IGZ3 X2RvbWFpbnM7Cit9CisKIHN0YXRpYyBpbnQgZ3VjX2VuYWJsZV9jb21tdW5pY2F0aW9uKHN0cnVj dCBpbnRlbF9ndWMgKmd1YykKIHsKIAkvKiBYWFg6IHBsYWNlaG9sZGVyIGZvciBhbHRlcm5hdGUg c2V0dXAgKi8KKwlndWNfaW5pdF9zZW5kX3JlZ3MoZ3VjKTsKIAlndWMtPnNlbmQgPSBpbnRlbF9n dWNfc2VuZF9tbWlvOwogCXJldHVybiAwOwogfQpAQCAtNDA3LDE5ICs0MzQsMTkgQEAgaW50IGlu dGVsX2d1Y19zZW5kX21taW8oc3RydWN0IGludGVsX2d1YyAqZ3VjLCBjb25zdCB1MzIgKmFjdGlv biwgdTMyIGxlbikKIAlpbnQgaTsKIAlpbnQgcmV0OwogCi0JaWYgKFdBUk5fT04obGVuIDwgMSB8 fCBsZW4gPiAxNSkpCi0JCXJldHVybiAtRUlOVkFMOworCUdFTV9CVUdfT04oIWxlbik7CisJR0VN X0JVR19PTihsZW4gPiBndWMtPnNlbmRfcmVncy5jb3VudCk7CiAKIAltdXRleF9sb2NrKCZndWMt PnNlbmRfbXV0ZXgpOwotCWludGVsX3VuY29yZV9mb3JjZXdha2VfZ2V0KGRldl9wcml2LCBGT1JD RVdBS0VfQkxJVFRFUik7CisJaW50ZWxfdW5jb3JlX2ZvcmNld2FrZV9nZXQoZGV2X3ByaXYsIGd1 Yy0+c2VuZF9yZWdzLmZ3X2RvbWFpbnMpOwogCiAJZGV2X3ByaXYtPmd1Yy5hY3Rpb25fY291bnQg Kz0gMTsKIAlkZXZfcHJpdi0+Z3VjLmFjdGlvbl9jbWQgPSBhY3Rpb25bMF07CiAKIAlmb3IgKGkg PSAwOyBpIDwgbGVuOyBpKyspCi0JCUk5MTVfV1JJVEUoU09GVF9TQ1JBVENIKGkpLCBhY3Rpb25b aV0pOworCQlJOTE1X1dSSVRFKGd1Y19zZW5kX3JlZyhndWMsIGkpLCBhY3Rpb25baV0pOwogCi0J UE9TVElOR19SRUFEKFNPRlRfU0NSQVRDSChpIC0gMSkpOworCVBPU1RJTkdfUkVBRChndWNfc2Vu ZF9yZWcoZ3VjLCBpIC0gMSkpOwogCiAJaW50ZWxfZ3VjX25vdGlmeShndWMpOwogCkBAIC00Mjgs NyArNDU1LDcgQEAgaW50IGludGVsX2d1Y19zZW5kX21taW8oc3RydWN0IGludGVsX2d1YyAqZ3Vj LCBjb25zdCB1MzIgKmFjdGlvbiwgdTMyIGxlbikKIAkgKiBGYXN0IGNvbW1hbmRzIHNob3VsZCBz dGlsbCBjb21wbGV0ZSBpbiAxMHVzLgogCSAqLwogCXJldCA9IF9faW50ZWxfd2FpdF9mb3JfcmVn aXN0ZXJfZncoZGV2X3ByaXYsCi0JCQkJCSAgIFNPRlRfU0NSQVRDSCgwKSwKKwkJCQkJICAgZ3Vj X3NlbmRfcmVnKGd1YywgMCksCiAJCQkJCSAgIElOVEVMX0dVQ19SRUNWX01BU0ssCiAJCQkJCSAg IElOVEVMX0dVQ19SRUNWX01BU0ssCiAJCQkJCSAgIDEwLCAxMCwgJnN0YXR1cyk7CkBAIC00NTAs NyArNDc3LDcgQEAgaW50IGludGVsX2d1Y19zZW5kX21taW8oc3RydWN0IGludGVsX2d1YyAqZ3Vj LCBjb25zdCB1MzIgKmFjdGlvbiwgdTMyIGxlbikKIAl9CiAJZGV2X3ByaXYtPmd1Yy5hY3Rpb25f c3RhdHVzID0gc3RhdHVzOwogCi0JaW50ZWxfdW5jb3JlX2ZvcmNld2FrZV9wdXQoZGV2X3ByaXYs IEZPUkNFV0FLRV9CTElUVEVSKTsKKwlpbnRlbF91bmNvcmVfZm9yY2V3YWtlX3B1dChkZXZfcHJp diwgZ3VjLT5zZW5kX3JlZ3MuZndfZG9tYWlucyk7CiAJbXV0ZXhfdW5sb2NrKCZndWMtPnNlbmRf bXV0ZXgpOwogCiAJcmV0dXJuIHJldDsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX3VjLmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF91Yy5oCmluZGV4IDA5NzI4 OWIuLjRkZDM5YTcgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3VjLmgK KysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfdWMuaApAQCAtMjA1LDYgKzIwNSwxMyBA QCBzdHJ1Y3QgaW50ZWxfZ3VjIHsKIAl1aW50NjRfdCBzdWJtaXNzaW9uc1tJOTE1X05VTV9FTkdJ TkVTXTsKIAl1aW50MzJfdCBsYXN0X3NlcW5vW0k5MTVfTlVNX0VOR0lORVNdOwogCisJLyogR3VD J3MgRlcgc3BlY2lmaWMgcmVnaXN0ZXJzIHVzZWQgaW4gTU1JTyBzZW5kICovCisJc3RydWN0IHsK KwkJdTMyIGJhc2U7CisJCXVuc2lnbmVkIGludCBjb3VudDsKKwkJdW5zaWduZWQgaW50IGZ3X2Rv bWFpbnM7IC8qIGVudW0gZm9yY2V3YWtlX2RvbWFpbnMgKi8KKwl9IHNlbmRfcmVnczsKKwogCS8q IFRvIHNlcmlhbGl6ZSB0aGUgaW50ZWxfZ3VjX3NlbmQgYWN0aW9ucyAqLwogCXN0cnVjdCBtdXRl eCBzZW5kX211dGV4OwogCi0tIAoyLjcuNAoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMu ZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlz dGluZm8vaW50ZWwtZ2Z4Cg==