Return-Path: Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTPS id 7BDB36F49B for ; Thu, 29 Apr 2021 19:26:36 +0000 (UTC) From: Imre Deak Date: Thu, 29 Apr 2021 22:26:27 +0300 Message-Id: <20210429192628.4056795-3-imre.deak@intel.com> In-Reply-To: <20210429192628.4056795-1-imre.deak@intel.com> References: <20210429192628.4056795-1-imre.deak@intel.com> MIME-Version: 1.0 Subject: [igt-dev] [PATCH i-g-t 2/3] lib/igt_fb: Fix stride for render_copy based FB conversions 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 List-ID: V2hlbiBzZXR0aW5nIHVwIGFuIGludGVsX2J1ZiBmb3IgYSByZW5kZXIgY29weSBvcGVyYXRpb24s IHRoZSByZW5kZXIKYnVmZmVyIHN0cmlkZSBoYXMgdG8gbWF0Y2ggdGhlIGZyYW1lYnVmZmVyIHN0 cmlkZS4gTm90IGVuc3VyaW5nIHRoaXMgbWF5CmxlYWQgdG8gYSBtaXNtYXRjaCBtb2Rlc2V0IGVy cm9yIG9yIGFuIC1FQlVTWSBzZXRfdGlsaW5nIElPQ1RMIGZhaWx1cmUKd2hlbiB0cnlpbmcgdG8g Y2hhbmdlIHRoZSBzdHJpZGUgZm9yIGEgZnJhbWVidWZmZXIgb2JqZWN0LgoKQ2M6IERvbWluaWsg R3J6ZWdvcnplayA8ZG9taW5pay5ncnplZ29yemVrQGludGVsLmNvbT4KQ2M6IFpiaWduaWV3IEtl bXBjennFhHNraSA8emJpZ25pZXcua2VtcGN6eW5za2lAaW50ZWwuY29tPgpTaWduZWQtb2ZmLWJ5 OiBJbXJlIERlYWsgPGltcmUuZGVha0BpbnRlbC5jb20+Ci0tLQogbGliL2lndF9mYi5jICAgICAg IHwgIDMgKystCiBsaWIvaW50ZWxfYnVmb3BzLmMgfCAyNSArKysrKysrKysrKysrKysrKy0tLS0t LS0tCiBsaWIvaW50ZWxfYnVmb3BzLmggfCAgMyArKy0KIDMgZmlsZXMgY2hhbmdlZCwgMjEgaW5z ZXJ0aW9ucygrKSwgMTAgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvbGliL2lndF9mYi5jIGIv bGliL2lndF9mYi5jCmluZGV4IDVjMTY3MDQxMC4uMjA5YmZhY2YwIDEwMDY0NAotLS0gYS9saWIv aWd0X2ZiLmMKKysrIGIvbGliL2lndF9mYi5jCkBAIC0yMjU3LDcgKzIyNTcsOCBAQCBpZ3RfZmJf Y3JlYXRlX2ludGVsX2J1ZihpbnQgZmQsIHN0cnVjdCBidWZfb3BzICpib3BzLAogCQkJCQkJICAg ICBmYi0+d2lkdGgsIGZiLT5oZWlnaHQsCiAJCQkJCQkgICAgIGZiLT5wbGFuZV9icHBbMF0sIDAs CiAJCQkJCQkgICAgIGlndF9mYl9tb2RfdG9fdGlsaW5nKGZiLT5tb2RpZmllciksCi0JCQkJCQkg ICAgIGNvbXByZXNzaW9uLCBmYi0+c2l6ZSk7CisJCQkJCQkgICAgIGNvbXByZXNzaW9uLCBmYi0+ c2l6ZSwKKwkJCQkJCSAgICAgZmItPnN0cmlkZXNbMF0pOwogCWludGVsX2J1Zl9zZXRfbmFtZShi dWYsIG5hbWUpOwogCiAJLyogTWFrZSBzdXJlIHdlIGNsb3NlIGhhbmRsZSBvbiBkZXN0cm95IHBh dGggKi8KZGlmZiAtLWdpdCBhL2xpYi9pbnRlbF9idWZvcHMuYyBiL2xpYi9pbnRlbF9idWZvcHMu YwppbmRleCAzYzFjY2EwY2YuLjVkZWNlNTc2NCAxMDA2NDQKLS0tIGEvbGliL2ludGVsX2J1Zm9w cy5jCisrKyBiL2xpYi9pbnRlbF9idWZvcHMuYwpAQCAtNzA5LDcgKzcwOSw3IEBAIHN0YXRpYyB2 b2lkIF9faW50ZWxfYnVmX2luaXQoc3RydWN0IGJ1Zl9vcHMgKmJvcHMsCiAJCQkgICAgIHN0cnVj dCBpbnRlbF9idWYgKmJ1ZiwKIAkJCSAgICAgaW50IHdpZHRoLCBpbnQgaGVpZ2h0LCBpbnQgYnBw LCBpbnQgYWxpZ25tZW50LAogCQkJICAgICB1aW50MzJfdCByZXFfdGlsaW5nLCB1aW50MzJfdCBj b21wcmVzc2lvbiwKLQkJCSAgICAgdWludDY0X3QgYm9fc2l6ZSkKKwkJCSAgICAgdWludDY0X3Qg Ym9fc2l6ZSwgaW50IGJvX3N0cmlkZSkKIHsKIAl1aW50MzJfdCB0aWxpbmcgPSByZXFfdGlsaW5n OwogCXVpbnQ2NF90IHNpemU7CkBAIC03NDEsNyArNzQxLDkgQEAgc3RhdGljIHZvaWQgX19pbnRl bF9idWZfaW5pdChzdHJ1Y3QgYnVmX29wcyAqYm9wcywKIAkJICogQ0NTIHVuaXRzLCB0aGF0IGlz IDQgKiA2NCBieXRlcy4gVGhlc2UgNCBDQ1MgdW5pdHMgYXJlIGluCiAJCSAqIHR1cm4gbWFwcGVk IGJ5IG9uZSBMMSBBVVggcGFnZSB0YWJsZSBlbnRyeS4KIAkJICovCi0JCWlmIChib3BzLT5pbnRl bF9nZW4gPj0gMTIpCisJCWlmIChib19zdHJpZGUpCisJCQlidWYtPnN1cmZhY2VbMF0uc3RyaWRl ID0gYm9fc3RyaWRlOworCQllbHNlIGlmIChib3BzLT5pbnRlbF9nZW4gPj0gMTIpCiAJCQlidWYt PnN1cmZhY2VbMF0uc3RyaWRlID0gQUxJR04od2lkdGggKiAoYnBwIC8gOCksIDEyOCAqIDQpOwog CQllbHNlCiAJCQlidWYtPnN1cmZhY2VbMF0uc3RyaWRlID0gQUxJR04od2lkdGggKiAoYnBwIC8g OCksIDEyOCk7CkBAIC03NjUsMTAgKzc2NywxNiBAQCBzdGF0aWMgdm9pZCBfX2ludGVsX2J1Zl9p bml0KHN0cnVjdCBidWZfb3BzICpib3BzLAogCQlpZiAodGlsaW5nKSB7CiAJCQlkZXZpZCA9ICBp bnRlbF9nZXRfZHJtX2RldmlkKGJvcHMtPmZkKTsKIAkJCXRpbGVfd2lkdGggPSBnZXRfc3RyaWRl KGRldmlkLCB0aWxpbmcpOwotCQkJYnVmLT5zdXJmYWNlWzBdLnN0cmlkZSA9IEFMSUdOKHdpZHRo ICogKGJwcCAvIDgpLCB0aWxlX3dpZHRoKTsKKwkJCWlmIChib19zdHJpZGUpCisJCQkJYnVmLT5z dXJmYWNlWzBdLnN0cmlkZSA9IGJvX3N0cmlkZTsKKwkJCWVsc2UKKwkJCQlidWYtPnN1cmZhY2Vb MF0uc3RyaWRlID0gQUxJR04od2lkdGggKiAoYnBwIC8gOCksIHRpbGVfd2lkdGgpOwogCQkJYWxp Z25faCA9IHRpbGluZyA9PSBJOTE1X1RJTElOR19YID8gOCA6IDMyOwogCQl9IGVsc2UgewotCQkJ YnVmLT5zdXJmYWNlWzBdLnN0cmlkZSA9IEFMSUdOKHdpZHRoICogKGJwcCAvIDgpLCBhbGlnbm1l bnQgPzogMSk7CisJCQlpZiAoYm9fc3RyaWRlKQorCQkJCWJ1Zi0+c3VyZmFjZVswXS5zdHJpZGUg PSBib19zdHJpZGU7CisJCQllbHNlCisJCQkJYnVmLT5zdXJmYWNlWzBdLnN0cmlkZSA9IEFMSUdO KHdpZHRoICogKGJwcCAvIDgpLCBhbGlnbm1lbnQgPzogMSk7CiAJCX0KIAogCQlidWYtPnN1cmZh Y2VbMF0uc2l6ZSA9IGJ1Zi0+c3VyZmFjZVswXS5zdHJpZGUgKiBoZWlnaHQ7CkBAIC04MTYsNyAr ODI0LDcgQEAgdm9pZCBpbnRlbF9idWZfaW5pdChzdHJ1Y3QgYnVmX29wcyAqYm9wcywKIAkJICAg IHVpbnQzMl90IHRpbGluZywgdWludDMyX3QgY29tcHJlc3Npb24pCiB7CiAJX19pbnRlbF9idWZf aW5pdChib3BzLCAwLCBidWYsIHdpZHRoLCBoZWlnaHQsIGJwcCwgYWxpZ25tZW50LAotCQkJIHRp bGluZywgY29tcHJlc3Npb24sIDApOworCQkJIHRpbGluZywgY29tcHJlc3Npb24sIDAsIDApOwog CiAJaW50ZWxfYnVmX3NldF9vd25lcnNoaXAoYnVmLCB0cnVlKTsKIH0KQEAgLTg3NSw3ICs4ODMs NyBAQCB2b2lkIGludGVsX2J1Zl9pbml0X3VzaW5nX2hhbmRsZShzdHJ1Y3QgYnVmX29wcyAqYm9w cywKIAkJCQkgdWludDMyX3QgcmVxX3RpbGluZywgdWludDMyX3QgY29tcHJlc3Npb24pCiB7CiAJ X19pbnRlbF9idWZfaW5pdChib3BzLCBoYW5kbGUsIGJ1Ziwgd2lkdGgsIGhlaWdodCwgYnBwLCBh bGlnbm1lbnQsCi0JCQkgcmVxX3RpbGluZywgY29tcHJlc3Npb24sIDApOworCQkJIHJlcV90aWxp bmcsIGNvbXByZXNzaW9uLCAwLCAwKTsKIH0KIAogLyoqCkBAIC05NTAsNyArOTU4LDggQEAgc3Ry dWN0IGludGVsX2J1ZiAqaW50ZWxfYnVmX2NyZWF0ZV91c2luZ19oYW5kbGVfYW5kX3NpemUoc3Ry dWN0IGJ1Zl9vcHMgKmJvcHMsCiAJCQkJCQkJIGludCBicHAsIGludCBhbGlnbm1lbnQsCiAJCQkJ CQkJIHVpbnQzMl90IHJlcV90aWxpbmcsCiAJCQkJCQkJIHVpbnQzMl90IGNvbXByZXNzaW9uLAot CQkJCQkJCSB1aW50NjRfdCBzaXplKQorCQkJCQkJCSB1aW50NjRfdCBzaXplLAorCQkJCQkJCSBp bnQgc3RyaWRlKQogewogCXN0cnVjdCBpbnRlbF9idWYgKmJ1ZjsKIApAQCAtOTYwLDcgKzk2OSw3 IEBAIHN0cnVjdCBpbnRlbF9idWYgKmludGVsX2J1Zl9jcmVhdGVfdXNpbmdfaGFuZGxlX2FuZF9z aXplKHN0cnVjdCBidWZfb3BzICpib3BzLAogCWlndF9hc3NlcnQoYnVmKTsKIAogCV9faW50ZWxf YnVmX2luaXQoYm9wcywgaGFuZGxlLCBidWYsIHdpZHRoLCBoZWlnaHQsIGJwcCwgYWxpZ25tZW50 LAotCQkJIHJlcV90aWxpbmcsIGNvbXByZXNzaW9uLCBzaXplKTsKKwkJCSByZXFfdGlsaW5nLCBj b21wcmVzc2lvbiwgc2l6ZSwgc3RyaWRlKTsKIAogCXJldHVybiBidWY7CiB9CmRpZmYgLS1naXQg YS9saWIvaW50ZWxfYnVmb3BzLmggYi9saWIvaW50ZWxfYnVmb3BzLmgKaW5kZXggMWEzZDg2OTI1 Li4xMmMyZDUyMzkgMTAwNjQ0Ci0tLSBhL2xpYi9pbnRlbF9idWZvcHMuaAorKysgYi9saWIvaW50 ZWxfYnVmb3BzLmgKQEAgLTE1MSw3ICsxNTEsOCBAQCBzdHJ1Y3QgaW50ZWxfYnVmICppbnRlbF9i dWZfY3JlYXRlX3VzaW5nX2hhbmRsZV9hbmRfc2l6ZShzdHJ1Y3QgYnVmX29wcyAqYm9wcywKIAkJ CQkJCQkgaW50IGJwcCwgaW50IGFsaWdubWVudCwKIAkJCQkJCQkgdWludDMyX3QgcmVxX3RpbGlu ZywKIAkJCQkJCQkgdWludDMyX3QgY29tcHJlc3Npb24sCi0JCQkJCQkJIHVpbnQ2NF90IHNpemUp OworCQkJCQkJCSB1aW50NjRfdCBzaXplLAorCQkJCQkJCSBpbnQgc3RyaWRlKTsKIHZvaWQgaW50 ZWxfYnVmX2Rlc3Ryb3koc3RydWN0IGludGVsX2J1ZiAqYnVmKTsKIAogdm9pZCAqaW50ZWxfYnVm X2NwdV9tYXAoc3RydWN0IGludGVsX2J1ZiAqYnVmLCBib29sIHdyaXRlKTsKLS0gCjIuMjcuMAoK X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KaWd0LWRldiBt YWlsaW5nIGxpc3QKaWd0LWRldkBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5m cmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pZ3QtZGV2Cg==