From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by gabe.freedesktop.org (Postfix) with ESMTPS id 6C86E6E55C for ; Thu, 13 Aug 2020 08:57:05 +0000 (UTC) From: =?UTF-8?q?Zbigniew=20Kempczy=C5=84ski?= Date: Thu, 13 Aug 2020 10:56:29 +0200 Message-Id: <20200813085657.20658-3-zbigniew.kempczynski@intel.com> In-Reply-To: <20200813085657.20658-1-zbigniew.kempczynski@intel.com> References: <20200813085657.20658-1-zbigniew.kempczynski@intel.com> MIME-Version: 1.0 Subject: [igt-dev] [PATCH i-g-t v28 02/30] lib/intel_bufops: change in hw/sw tiling detection List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: igt-dev-bounces@lists.freedesktop.org Sender: "igt-dev" To: igt-dev@lists.freedesktop.org Cc: Chris Wilson List-ID: Tm90IGFsbCBzd2l6emxpbmcgY2FuIGJlIGhhbmRsZWQgYnkgdGhlIHNvZnR3YXJlIChiaXQxNykg c28gZGV0ZWN0Cml0IHByb3Blcmx5IGR1cmluZyBidWZvcHMgY3JlYXRpb24gdGltZSBhbmQgZGlz YWJsZSBpZiBuZWNlc3NhcnkuCgpTaWduZWQtb2ZmLWJ5OiBaYmlnbmlldyBLZW1wY3p5xYRza2kg PHpiaWduaWV3LmtlbXBjenluc2tpQGludGVsLmNvbT4KQ2M6IERvbWluaWsgR3J6ZWdvcnplayA8 ZG9taW5pay5ncnplZ29yemVrQGludGVsLmNvbT4KQ2M6IENocmlzIFdpbHNvbiA8Y2hyaXNAY2hy aXMtd2lsc29uLmNvLnVrPgotLS0KIGxpYi9pbnRlbF9idWZvcHMuYyB8IDQzICsrKysrKysrKysr KysrKysrKysrKysrKysrKysrKysrKysrLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCAzNSBpbnNl cnRpb25zKCspLCA4IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2xpYi9pbnRlbF9idWZvcHMu YyBiL2xpYi9pbnRlbF9idWZvcHMuYwppbmRleCAwOTQzM2JlZC4uMmE5YjA3YTUgMTAwNjQ0Ci0t LSBhL2xpYi9pbnRlbF9idWZvcHMuYworKysgYi9saWIvaW50ZWxfYnVmb3BzLmMKQEAgLTE1Nyw3 ICsxNTcsNyBAQCBzdGF0aWMgaW50IF9fZ2VtX2dldF90aWxpbmcoaW50IGZkLCBzdHJ1Y3QgZHJt X2k5MTVfZ2VtX2dldF90aWxpbmcgKmFyZykKIH0KIAogc3RhdGljIGJvb2wgX19nZXRfdGlsaW5n KGludCBmZCwgdWludDMyX3QgaGFuZGxlLCB1aW50MzJfdCAqdGlsaW5nLAotCQkJIHVpbnQzMl90 ICpzd2l6emxlKQorCQkJIHVpbnQzMl90ICpzd2l6emxlLCB1aW50MzJfdCAqcGh5c19zd2l6emxl KQogewogCXN0cnVjdCBkcm1faTkxNV9nZW1fZ2V0X3RpbGluZyBnZXRfdGlsaW5nID0geyAuaGFu ZGxlID0gaGFuZGxlIH07CiAKQEAgLTE2NiwxMiArMTY2LDEzIEBAIHN0YXRpYyBib29sIF9fZ2V0 X3RpbGluZyhpbnQgZmQsIHVpbnQzMl90IGhhbmRsZSwgdWludDMyX3QgKnRpbGluZywKIAogCSp0 aWxpbmcgPSBnZXRfdGlsaW5nLnRpbGluZ19tb2RlOwogCSpzd2l6emxlID0gZ2V0X3RpbGluZy5z d2l6emxlX21vZGU7CisJKnBoeXNfc3dpenpsZSA9IGdldF90aWxpbmcucGh5c19zd2l6emxlX21v ZGU7CiAJaWd0X2RlYnVnKCJidWYgdGlsaW5nOiAlcywgc3dpenpsZTogJXgsIHBoeXNfc3dpenps ZTogJXhcbiIsCiAJCSAgdGlsaW5nX3N0cihnZXRfdGlsaW5nLnRpbGluZ19tb2RlKSwKIAkJICBn ZXRfdGlsaW5nLnN3aXp6bGVfbW9kZSwKIAkJICBnZXRfdGlsaW5nLnBoeXNfc3dpenpsZV9tb2Rl KTsKIAotCXJldHVybiBnZXRfdGlsaW5nLnBoeXNfc3dpenpsZV9tb2RlID09IGdldF90aWxpbmcu c3dpenpsZV9tb2RlOworCXJldHVybiB0cnVlOwogfQogCiBzdGF0aWMgaW50IF9fc2V0X3RpbGlu ZyhpbnQgZmQsIHVpbnQzMl90IGhhbmRsZSwgdWludDMyX3QgdGlsaW5nLApAQCAtMjEyLDggKzIx MywxMCBAQCBzdGF0aWMgdm9pZCBzZXRfaHdfdGlsZWQoc3RydWN0IGJ1Zl9vcHMgKmJvcHMsIHN0 cnVjdCBpbnRlbF9idWYgKmJ1ZikKIAlpZiAoYnVmLT50aWxpbmcgIT0gSTkxNV9USUxJTkdfWCAm JiBidWYtPnRpbGluZyAhPSBJOTE1X1RJTElOR19ZKQogCQlyZXR1cm47CiAKLQlpZiAoIWJ1Zl9v cHNfaGFzX2h3X2ZlbmNlKGJvcHMsIGJ1Zi0+dGlsaW5nKSkKKwlpZiAoIWJ1Zl9vcHNfaGFzX2h3 X2ZlbmNlKGJvcHMsIGJ1Zi0+dGlsaW5nKSkgeworCQlpZ3RfZGVidWcoIk5vIEhXIGZlbmNlIGZv ciB0aWxpbmc6ICVkXG4iLCBidWYtPnRpbGluZyk7CiAJCXJldHVybjsKKwl9CiAKIAlpZ3RfYXNz ZXJ0X2VxKF9fc2V0X3RpbGluZyhib3BzLT5mZCwKIAkJCQkgICBidWYtPmhhbmRsZSwgYnVmLT50 aWxpbmcsCkBAIC0xMDI5LDEwICsxMDMyLDExIEBAIHN0cnVjdCBidWZfb3BzIGJ1Zl9vcHNfYXJy W10gPSB7CiAJfSwKIH07CiAKLXN0YXRpYyBib29sIHByb2JlX2h3X3RpbGluZyhzdHJ1Y3QgYnVm X29wcyAqYm9wcywgdWludDMyX3QgdGlsaW5nKQorc3RhdGljIGJvb2wgcHJvYmVfaHdfdGlsaW5n KHN0cnVjdCBidWZfb3BzICpib3BzLCB1aW50MzJfdCB0aWxpbmcsCisJCQkgICAgYm9vbCAqc3dp enpsaW5nX3N1cHBvcnRlZCkKIHsKIAl1aW50NjRfdCBzaXplID0gMjU2ICogMjU2OwotCXVpbnQz Ml90IGhhbmRsZSwgYnVmX3RpbGluZywgYnVmX3N3aXp6bGU7CisJdWludDMyX3QgaGFuZGxlLCBi dWZfdGlsaW5nLCBidWZfc3dpenpsZSwgcGh5c19zd2l6emxlOwogCXVpbnQzMl90IHN0cmlkZTsK IAlpbnQgcmV0OwogCWJvb2wgaXNfc2V0ID0gZmFsc2U7CkBAIC0xMDUxLDEyICsxMDU1LDE1IEBA IHN0YXRpYyBib29sIHByb2JlX2h3X3RpbGluZyhzdHJ1Y3QgYnVmX29wcyAqYm9wcywgdWludDMy X3QgdGlsaW5nKQogCWlmIChyZXQpCiAJCWdvdG8gZW5kOwogCi0JaXNfc2V0ID0gX19nZXRfdGls aW5nKGJvcHMtPmZkLCBoYW5kbGUsICZidWZfdGlsaW5nLCAmYnVmX3N3aXp6bGUpOworCWlzX3Nl dCA9IF9fZ2V0X3RpbGluZyhib3BzLT5mZCwgaGFuZGxlLCAmYnVmX3RpbGluZywgJmJ1Zl9zd2l6 emxlLAorCQkJICAgICAgJnBoeXNfc3dpenpsZSk7CiAJaWYgKGlzX3NldCkgewogCQlpZiAodGls aW5nID09IEk5MTVfVElMSU5HX1gpCiAJCQlib3BzLT5zd2l6emxlX3ggPSBidWZfc3dpenpsZTsK IAkJZWxzZSBpZiAodGlsaW5nID09IEk5MTVfVElMSU5HX1kpCiAJCQlib3BzLT5zd2l6emxlX3kg PSBidWZfc3dpenpsZTsKKworCQkqc3dpenpsaW5nX3N1cHBvcnRlZCA9IGJ1Zl9zd2l6emxlID09 IHBoeXNfc3dpenpsZTsKIAl9CiBlbmQ6CiAJZ2VtX2Nsb3NlKGJvcHMtPmZkLCBoYW5kbGUpOwpA QCAtMTE3OSw3ICsxMTg2LDE0IEBAIHN0YXRpYyBzdHJ1Y3QgYnVmX29wcyAqX19idWZfb3BzX2Ny ZWF0ZShpbnQgZmQsIGJvb2wgY2hlY2tfaWRlbXBvdGVuY3kpCiAKIAkvKiBMZXQncyBwcm9iZSBY IGFuZCBZIGh3IHRpbGluZyBzdXBwb3J0ICovCiAJaWYgKGlzX2h3X3RpbGluZ19zdXBwb3J0ZWQo Ym9wcywgSTkxNV9USUxJTkdfWCkpIHsKLQkJYm9vbCBzdXBwb3J0ZWQgPSBwcm9iZV9od190aWxp bmcoYm9wcywgSTkxNV9USUxJTkdfWCk7CisJCWJvb2wgc3dpenpsaW5nX3N1cHBvcnRlZDsKKwkJ Ym9vbCBzdXBwb3J0ZWQgPSBwcm9iZV9od190aWxpbmcoYm9wcywgSTkxNV9USUxJTkdfWCwKKwkJ CQkJCSAmc3dpenpsaW5nX3N1cHBvcnRlZCk7CisKKwkJaWYgKCFzd2l6emxpbmdfc3VwcG9ydGVk KSB7CisJCQlpZ3RfZGVidWcoIlN3aXp6bGluZyBmb3IgWCBpcyBub3Qgc3VwcG9ydGVkXG4iKTsK KwkJCWJvcHMtPnN1cHBvcnRlZF90aWxlcyAmPSB+VElMRV9YOworCQl9CiAKIAkJaWd0X2RlYnVn KCJYIGZlbmNlIHN1cHBvcnQ6ICVzXG4iLCBib29sX3N0cihzdXBwb3J0ZWQpKTsKIAkJaWYgKCFz dXBwb3J0ZWQpIHsKQEAgLTExOTAsNyArMTIwNCwxNCBAQCBzdGF0aWMgc3RydWN0IGJ1Zl9vcHMg Kl9fYnVmX29wc19jcmVhdGUoaW50IGZkLCBib29sIGNoZWNrX2lkZW1wb3RlbmN5KQogCX0KIAog CWlmIChpc19od190aWxpbmdfc3VwcG9ydGVkKGJvcHMsIEk5MTVfVElMSU5HX1kpKSB7Ci0JCWJv b2wgc3VwcG9ydGVkID0gcHJvYmVfaHdfdGlsaW5nKGJvcHMsIEk5MTVfVElMSU5HX1kpOworCQli b29sIHN3aXp6bGluZ19zdXBwb3J0ZWQ7CisJCWJvb2wgc3VwcG9ydGVkID0gcHJvYmVfaHdfdGls aW5nKGJvcHMsIEk5MTVfVElMSU5HX1ksCisJCQkJCQkgJnN3aXp6bGluZ19zdXBwb3J0ZWQpOwor CisJCWlmICghc3dpenpsaW5nX3N1cHBvcnRlZCkgeworCQkJaWd0X2RlYnVnKCJTd2l6emxpbmcg Zm9yIFkgaXMgbm90IHN1cHBvcnRlZFxuIik7CisJCQlib3BzLT5zdXBwb3J0ZWRfdGlsZXMgJj0g flRJTEVfWTsKKwkJfQogCiAJCWlndF9kZWJ1ZygiWSBmZW5jZSBzdXBwb3J0OiAlc1xuIiwgYm9v bF9zdHIoc3VwcG9ydGVkKSk7CiAJCWlmICghc3VwcG9ydGVkKSB7CkBAIC0xMzA3LDYgKzEzMjgs OSBAQCBib29sIGJ1Zl9vcHNfc2V0X3NvZnR3YXJlX3RpbGluZyhzdHJ1Y3QgYnVmX29wcyAqYm9w cywKIAlzd2l0Y2ggKHRpbGluZykgewogCWNhc2UgSTkxNV9USUxJTkdfWDoKIAkJaWYgKHVzZV9z b2Z0d2FyZV90aWxpbmcpIHsKKwkJCWJvb2wgc3VwcG9ydGVkID0gYnVmX29wc19oYXNfdGlsaW5n X3N1cHBvcnQoYm9wcywgdGlsaW5nKTsKKworCQkJaWd0X2Fzc2VydF9mKHN1cHBvcnRlZCwgIkNh bm5vdCBzd2l0Y2ggdG8gWCBzb2Z0d2FyZSB0aWxpbmdcbiIpOwogCQkJaWd0X2RlYnVnKCItPiBj aGFuZ2UgWCB0byBTV1xuIik7CiAJCQlib3BzLT5saW5lYXJfdG9feCA9IGNvcHlfbGluZWFyX3Rv X3g7CiAJCQlib3BzLT54X3RvX2xpbmVhciA9IGNvcHlfeF90b19saW5lYXI7CkBAIC0xMzI0LDYg KzEzNDgsOSBAQCBib29sIGJ1Zl9vcHNfc2V0X3NvZnR3YXJlX3RpbGluZyhzdHJ1Y3QgYnVmX29w cyAqYm9wcywKIAogCWNhc2UgSTkxNV9USUxJTkdfWToKIAkJaWYgKHVzZV9zb2Z0d2FyZV90aWxp bmcpIHsKKwkJCWJvb2wgc3VwcG9ydGVkID0gYnVmX29wc19oYXNfdGlsaW5nX3N1cHBvcnQoYm9w cywgdGlsaW5nKTsKKworCQkJaWd0X2Fzc2VydF9mKHN1cHBvcnRlZCwgIkNhbm5vdCBzd2l0Y2gg dG8gWSBzb2Z0d2FyZSB0aWxpbmdcbiIpOwogCQkJaWd0X2RlYnVnKCItPiBjaGFuZ2UgWSB0byBT V1xuIik7CiAJCQlib3BzLT5saW5lYXJfdG9feSA9IGNvcHlfbGluZWFyX3RvX3k7CiAJCQlib3Bz LT55X3RvX2xpbmVhciA9IGNvcHlfeV90b19saW5lYXI7Ci0tIAoyLjI2LjAKCl9fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmlndC1kZXYgbWFpbGluZyBsaXN0 CmlndC1kZXZAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Au b3JnL21haWxtYW4vbGlzdGluZm8vaWd0LWRldgo=