From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michal Wajdeczko Subject: [PATCH v2 2/3] drm/i915/guc: Make scratch register base and count flexible Date: Thu, 4 May 2017 12:48:13 +0000 Message-ID: <20170504124813.47776-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 mga14.intel.com (mga14.intel.com [192.55.52.115]) by gabe.freedesktop.org (Postfix) with ESMTPS id 42ECA6E4BE for ; Thu, 4 May 2017 12:48:55 +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 dCBXQVJOL0dFTV9CVUcgY2hhbmdlIGluIHRoZSBjb21taXQgbXNnIChEYW5pZWxlKQoKU2lnbmVk LW9mZi1ieTogTWljaGFsIFdhamRlY3prbyA8bWljaGFsLndhamRlY3prb0BpbnRlbC5jb20+ClN1 Z2dlc3RlZC1ieTogRGFuaWVsZSBDZXJhb2xvIFNwdXJpbyA8ZGFuaWVsZS5jZXJhb2xvc3B1cmlv QGludGVsLmNvbT4KQ2M6IERhbmllbGUgQ2VyYW9sbyBTcHVyaW8gPGRhbmllbGUuY2VyYW9sb3Nw dXJpb0BpbnRlbC5jb20+CkNjOiBKb29uYXMgTGFodGluZW4gPGpvb25hcy5sYWh0aW5lbkBsaW51 eC5pbnRlbC5jb20+ClJldmlld2VkLWJ5OiBEYW5pZWxlIENlcmFvbG8gU3B1cmlvIDxkYW5pZWxl LmNlcmFvbG9zcHVyaW9AaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs X3VjLmMgfCA0MSArKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrLS0tLS0tLQogZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfdWMuaCB8ICA3ICsrKysrKysKIDIgZmlsZXMgY2hhbmdl ZCwgNDEgaW5zZXJ0aW9ucygrKSwgNyBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF91Yy5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfdWMu YwppbmRleCA3MmY0OWU2Li45ZDExYzQyIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF91Yy5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3VjLmMKQEAgLTI2 MCw5ICsyNjAsMzYgQEAgdm9pZCBpbnRlbF91Y19maW5pX2Z3KHN0cnVjdCBkcm1faTkxNV9wcml2 YXRlICpkZXZfcHJpdikKIAlfX2ludGVsX3VjX2Z3X2ZpbmkoJmRldl9wcml2LT5odWMuZncpOwog fQogCitzdGF0aWMgaW5saW5lIGk5MTVfcmVnX3QgZ3VjX3NlbmRfcmVnKHN0cnVjdCBpbnRlbF9n dWMgKmd1YywgdTMyIGkpCit7CisJR0VNX0JVR19PTighZ3VjLT5zZW5kX3JlZ3MuYmFzZSk7CisJ R0VNX0JVR19PTighZ3VjLT5zZW5kX3JlZ3MuY291bnQpOworCUdFTV9CVUdfT04oaSA+PSBndWMt PnNlbmRfcmVncy5jb3VudCk7CisKKwlyZXR1cm4gX01NSU8oZ3VjLT5zZW5kX3JlZ3MuYmFzZSAr IDQgKiBpKTsKK30KKworc3RhdGljIHZvaWQgZ3VjX2luaXRfc2VuZF9yZWdzKHN0cnVjdCBpbnRl bF9ndWMgKmd1YykKK3sKKwlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBndWNf dG9faTkxNShndWMpOworCWVudW0gZm9yY2V3YWtlX2RvbWFpbnMgZndfZG9tYWlucyA9IDA7CisJ dTMyIGk7CisKKwlndWMtPnNlbmRfcmVncy5iYXNlID0gaTkxNV9tbWlvX3JlZ19vZmZzZXQoU09G VF9TQ1JBVENIKDApKTsKKwlndWMtPnNlbmRfcmVncy5jb3VudCA9IFNPRlRfU0NSQVRDSF9DT1VO VCAtIDE7CisKKwlmb3IgKGkgPSAwOyBpIDwgZ3VjLT5zZW5kX3JlZ3MuY291bnQ7IGkrKykgewor CQlmd19kb21haW5zIHw9IGludGVsX3VuY29yZV9mb3JjZXdha2VfZm9yX3JlZyhkZXZfcHJpdiwK KwkJCQkJZ3VjX3NlbmRfcmVnKGd1YywgaSksCisJCQkJCUZXX1JFR19SRUFEIHwgRldfUkVHX1dS SVRFKTsKKwl9CisJZ3VjLT5zZW5kX3JlZ3MuZndfZG9tYWlucyA9IGZ3X2RvbWFpbnM7Cit9CisK IHN0YXRpYyBpbnQgZ3VjX2VuYWJsZV9jb21tdW5pY2F0aW9uKHN0cnVjdCBpbnRlbF9ndWMgKmd1 YykKIHsKIAkvKiBYWFg6IHBsYWNlaG9sZGVyIGZvciBhbHRlcm5hdGUgc2V0dXAgKi8KKwlndWNf aW5pdF9zZW5kX3JlZ3MoZ3VjKTsKIAlndWMtPnNlbmQgPSBpbnRlbF9ndWNfc2VuZF9tbWlvOwog CXJldHVybiAwOwogfQpAQCAtNDA3LDE5ICs0MzQsMTkgQEAgaW50IGludGVsX2d1Y19zZW5kX21t aW8oc3RydWN0IGludGVsX2d1YyAqZ3VjLCBjb25zdCB1MzIgKmFjdGlvbiwgdTMyIGxlbikKIAlp bnQgaTsKIAlpbnQgcmV0OwogCi0JaWYgKFdBUk5fT04obGVuIDwgMSB8fCBsZW4gPiAxNSkpCi0J CXJldHVybiAtRUlOVkFMOworCUdFTV9CVUdfT04oIWxlbik7CisJR0VNX0JVR19PTihsZW4gPiBn dWMtPnNlbmRfcmVncy5jb3VudCk7CiAKIAltdXRleF9sb2NrKCZndWMtPnNlbmRfbXV0ZXgpOwot CWludGVsX3VuY29yZV9mb3JjZXdha2VfZ2V0KGRldl9wcml2LCBGT1JDRVdBS0VfQkxJVFRFUik7 CisJaW50ZWxfdW5jb3JlX2ZvcmNld2FrZV9nZXQoZGV2X3ByaXYsIGd1Yy0+c2VuZF9yZWdzLmZ3 X2RvbWFpbnMpOwogCiAJZGV2X3ByaXYtPmd1Yy5hY3Rpb25fY291bnQgKz0gMTsKIAlkZXZfcHJp di0+Z3VjLmFjdGlvbl9jbWQgPSBhY3Rpb25bMF07CiAKIAlmb3IgKGkgPSAwOyBpIDwgbGVuOyBp KyspCi0JCUk5MTVfV1JJVEUoU09GVF9TQ1JBVENIKGkpLCBhY3Rpb25baV0pOworCQlJOTE1X1dS SVRFKGd1Y19zZW5kX3JlZyhndWMsIGkpLCBhY3Rpb25baV0pOwogCi0JUE9TVElOR19SRUFEKFNP RlRfU0NSQVRDSChpIC0gMSkpOworCVBPU1RJTkdfUkVBRChndWNfc2VuZF9yZWcoZ3VjLCBpIC0g MSkpOwogCiAJaW50ZWxfZ3VjX25vdGlmeShndWMpOwogCkBAIC00MjgsNyArNDU1LDcgQEAgaW50 IGludGVsX2d1Y19zZW5kX21taW8oc3RydWN0IGludGVsX2d1YyAqZ3VjLCBjb25zdCB1MzIgKmFj dGlvbiwgdTMyIGxlbikKIAkgKiBGYXN0IGNvbW1hbmRzIHNob3VsZCBzdGlsbCBjb21wbGV0ZSBp biAxMHVzLgogCSAqLwogCXJldCA9IF9faW50ZWxfd2FpdF9mb3JfcmVnaXN0ZXJfZncoZGV2X3By aXYsCi0JCQkJCSAgIFNPRlRfU0NSQVRDSCgwKSwKKwkJCQkJICAgZ3VjX3NlbmRfcmVnKGd1Yywg MCksCiAJCQkJCSAgIElOVEVMX0dVQ19SRUNWX01BU0ssCiAJCQkJCSAgIElOVEVMX0dVQ19SRUNW X01BU0ssCiAJCQkJCSAgIDEwLCAxMCwgJnN0YXR1cyk7CkBAIC00NTAsNyArNDc3LDcgQEAgaW50 IGludGVsX2d1Y19zZW5kX21taW8oc3RydWN0IGludGVsX2d1YyAqZ3VjLCBjb25zdCB1MzIgKmFj dGlvbiwgdTMyIGxlbikKIAl9CiAJZGV2X3ByaXYtPmd1Yy5hY3Rpb25fc3RhdHVzID0gc3RhdHVz OwogCi0JaW50ZWxfdW5jb3JlX2ZvcmNld2FrZV9wdXQoZGV2X3ByaXYsIEZPUkNFV0FLRV9CTElU VEVSKTsKKwlpbnRlbF91bmNvcmVfZm9yY2V3YWtlX3B1dChkZXZfcHJpdiwgZ3VjLT5zZW5kX3Jl Z3MuZndfZG9tYWlucyk7CiAJbXV0ZXhfdW5sb2NrKCZndWMtPnNlbmRfbXV0ZXgpOwogCiAJcmV0 dXJuIHJldDsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3VjLmggYi9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF91Yy5oCmluZGV4IDA5NzI4OWIuLmEzN2E4Y2MgMTAw NjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3VjLmgKKysrIGIvZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfdWMuaApAQCAtMjA1LDYgKzIwNSwxMyBAQCBzdHJ1Y3QgaW50ZWxf Z3VjIHsKIAl1aW50NjRfdCBzdWJtaXNzaW9uc1tJOTE1X05VTV9FTkdJTkVTXTsKIAl1aW50MzJf dCBsYXN0X3NlcW5vW0k5MTVfTlVNX0VOR0lORVNdOwogCisJLyogR3VDJ3MgRlcgc3BlY2lmaWMg cmVnaXN0ZXJzIHVzZWQgaW4gTU1JTyBzZW5kICovCisJc3RydWN0IHsKKwkJdTMyIGJhc2U7CisJ CXUzMiBjb3VudDsKKwkJdTMyIGZ3X2RvbWFpbnM7IC8qIGVudW0gZm9yY2V3YWtlX2RvbWFpbnMg Ki8KKwl9IHNlbmRfcmVnczsKKwogCS8qIFRvIHNlcmlhbGl6ZSB0aGUgaW50ZWxfZ3VjX3NlbmQg YWN0aW9ucyAqLwogCXN0cnVjdCBtdXRleCBzZW5kX211dGV4OwogCi0tIAoyLjcuNAoKX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxp bmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJl ZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==