From: Anuj Phogat Subject: [PATCH v4 1/2] i965/gen9: Pass alignment as function parameter in drm_intel_gem_bo_alloc_internal() Date: Thu, 2 Jul 2015 14:44:10 -0700 Message-ID: <1435873450-5321-1-git-send-email-anuj.phogat@gmail.com> References: <1428711656-5878-1-git-send-email-anuj.phogat@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-pd0-f179.google.com (mail-pd0-f179.google.com [209.85.192.179]) by gabe.freedesktop.org (Postfix) with ESMTPS id 7BFC16E1BB for ; Thu, 2 Jul 2015 14:43:33 -0700 (PDT) Received: by pdjd13 with SMTP id d13so51589405pdj.0 for ; Thu, 02 Jul 2015 14:43:33 -0700 (PDT) In-Reply-To: <1428711656-5878-1-git-send-email-anuj.phogat@gmail.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 Cc: Ben Widawsky List-Id: intel-gfx@lists.freedesktop.org SW4gY2FzZSBvZiBZRi9ZUyB0aWxlZCBidWZmZXJzIGxpYmRybSBuZWVkIG5vdCBrbm93IGFib3V0 IHRoZSB0aWxpbmcKZm9ybWF0IGJlY2F1c2UgdGhlc2UgYnVmZmVycyBkb24ndCBoYXZlIGhhcmR3 YXJlIHN1cHBvcnQgdG8gYmUgdGlsZWQKb3IgZGV0aWxlZCB0aHJvdWdoIGEgZmVuY2VkIHJlZ2lv bi4gQnV0LCBsaWJkcm0gc3RpbGwgbmVlZCB0byBrbm93CmFib3V0IGJ1ZmZlciBhbGlnbm1lbnQg cmVzdHJpY3Rpb25zIGJlY2F1c2Uga2VybmVsIHVzZXMgaXQgd2hlbgpyZXNvbHZpbmcgdGhlIHJl bG9jYXRpb24uCgpNZXNhIHVzZXMgZHJtX2ludGVsX2dlbV9ib19hbGxvY19mb3JfcmVuZGVyKCkg dG8gYWxsb2NhdGUgWWYvWXMgYnVmZmVycy4KU28sIHVzZSB0aGUgcGFzc2VkIGFsaWdubWVudCB2 YWx1ZSBpbiB0aGlzIGZ1bmN0aW9uIHRvIGluaXRpYWxpemUgdGhlCmFsaWduIHZhcmlhYmxlIGlu IGRybV9pbnRlbF9iby4gTm90ZSB0aGF0IHdlIGNvbnRpbnVlIGlnbm9yaW5nIHRoZQphbGlnbm1l bnQgdmFsdWUgcGFzc2VkIHRvIGRybV9pbnRlbF9nZW1fYm9fYWxsb2MoKSB0byBmb2xsb3cgdGhl CnByZXZpb3VzIGJlaGF2aW9yLgoKVjI6IEFkZCBhIGNvbmRpdGlvbiB0byBhdm9pZCBhbGxvY2F0 aW9uIGZyb20gY2FjaGUuIChCZW4pClYzOiBNYWtlIG5vIGNoYW5nZXMgaW4gY2FjaGUgYWxsb2Nh dGlvbiBzdHJhdGVneS4gSnVzdCB1cGRhdGUgdGhlIGFsaWdubWVudC4KICAgIFVwZGF0ZSB0aGUg YXBlcnR1cmUgc2l6ZSBlc3RpbWF0ZSBpbmNsdWRpbmcgdGhlIGFsaWdubWVudC4gKEJlbiwgQ2hy aXMpClY0OiBNb3ZlIGFwZXJ0dXJlIHNpemUgYWRqdXN0bWVudHMgaW5zaWRlIGRybV9pbnRlbF9i b19nZW1fc2V0X2luX2FwZXJ0dXJlX3NpemUoKQogICAgRG9uJ3Qgc3BsaXQgc2VudGVuY2VzIGFj cm9zcyB0aGUgb25lLWxpbmUgaGVhZGVyIGFuZCB0aGUgY2hhbmdlbG9nLiAoQ2hyaXMpCgpTaWdu ZWQtb2ZmLWJ5OiBBbnVqIFBob2dhdCA8YW51ai5waG9nYXRAZ21haWwuY29tPgpDYzogQmVuIFdp ZGF3c2t5IDxiZW5AYndpZGF3c2submV0PgpDYzogQ2hyaXMgV2lsc29uIDxjaHJpc0BjaHJpcy13 aWxzb24uY28udWs+Ci0tLQogaW50ZWwvaW50ZWxfYnVmbWdyX2dlbS5jIHwgMzUgKysrKysrKysr KysrKysrKysrKysrLS0tLS0tLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCAyMSBpbnNlcnRpb25z KCspLCAxNCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9pbnRlbC9pbnRlbF9idWZtZ3JfZ2Vt LmMgYi9pbnRlbC9pbnRlbF9idWZtZ3JfZ2VtLmMKaW5kZXggNjBjMDZmYy4uMzAxODA4MSAxMDA2 NDQKLS0tIGEvaW50ZWwvaW50ZWxfYnVmbWdyX2dlbS5jCisrKyBiL2ludGVsL2ludGVsX2J1Zm1n cl9nZW0uYwpAQCAtODIsNiArODIsNyBAQAogfSB3aGlsZSAoMCkKIAogI2RlZmluZSBBUlJBWV9T SVpFKHgpIChzaXplb2YoeCkgLyBzaXplb2YoKHgpWzBdKSkKKyNkZWZpbmUgTUFYMihBLCBCKSAo KEEpID4gKEIpID8gKEEpIDogKEIpKQogCiB0eXBlZGVmIHN0cnVjdCBfZHJtX2ludGVsX2JvX2dl bSBkcm1faW50ZWxfYm9fZ2VtOwogCkBAIC01MjQsOSArNTI1LDEwIEBAIGRybV9pbnRlbF9hZGRf dmFsaWRhdGVfYnVmZmVyMihkcm1faW50ZWxfYm8gKmJvLCBpbnQgbmVlZF9mZW5jZSkKIAogc3Rh dGljIHZvaWQKIGRybV9pbnRlbF9ib19nZW1fc2V0X2luX2FwZXJ0dXJlX3NpemUoZHJtX2ludGVs X2J1Zm1ncl9nZW0gKmJ1Zm1ncl9nZW0sCi0JCQkJICAgICAgZHJtX2ludGVsX2JvX2dlbSAqYm9f Z2VtKQorCQkJCSAgICAgIGRybV9pbnRlbF9ib19nZW0gKmJvX2dlbSwKKwkJCQkgICAgICB1bnNp Z25lZCBpbnQgYWxpZ25tZW50KQogewotCWludCBzaXplOworCXVuc2lnbmVkIGludCBzaXplOwog CiAJYXNzZXJ0KCFib19nZW0tPnVzZWRfYXNfcmVsb2NfdGFyZ2V0KTsKIApAQCAtNTM4LDcgKzU0 MCw3IEBAIGRybV9pbnRlbF9ib19nZW1fc2V0X2luX2FwZXJ0dXJlX3NpemUoZHJtX2ludGVsX2J1 Zm1ncl9nZW0gKmJ1Zm1ncl9nZW0sCiAJICovCiAJc2l6ZSA9IGJvX2dlbS0+Ym8uc2l6ZTsKIAlp ZiAoYnVmbWdyX2dlbS0+Z2VuIDwgNCAmJiBib19nZW0tPnRpbGluZ19tb2RlICE9IEk5MTVfVElM SU5HX05PTkUpIHsKLQkJaW50IG1pbl9zaXplOworCQl1bnNpZ25lZCBpbnQgbWluX3NpemU7CiAK IAkJaWYgKGJ1Zm1ncl9nZW0tPmhhc19yZWxheGVkX2ZlbmNpbmcpIHsKIAkJCWlmIChidWZtZ3Jf Z2VtLT5nZW4gPT0gMykKQEAgLTU1MiwxMCArNTU0LDEwIEBAIGRybV9pbnRlbF9ib19nZW1fc2V0 X2luX2FwZXJ0dXJlX3NpemUoZHJtX2ludGVsX2J1Zm1ncl9nZW0gKmJ1Zm1ncl9nZW0sCiAJCQlt aW5fc2l6ZSA9IHNpemU7CiAKIAkJLyogQWNjb3VudCBmb3Igd29yc3QtY2FzZSBhbGlnbm1lbnQu ICovCi0JCXNpemUgPSAyICogbWluX3NpemU7CisJCWFsaWdubWVudCA9IE1BWDIoYWxpZ25tZW50 LCBtaW5fc2l6ZSk7CiAJfQogCi0JYm9fZ2VtLT5yZWxvY190cmVlX3NpemUgPSBzaXplOworCWJv X2dlbS0+cmVsb2NfdHJlZV9zaXplID0gc2l6ZSArIGFsaWdubWVudDsKIH0KIAogc3RhdGljIGlu dApAQCAtNjYwLDcgKzY2Miw4IEBAIGRybV9pbnRlbF9nZW1fYm9fYWxsb2NfaW50ZXJuYWwoZHJt X2ludGVsX2J1Zm1nciAqYnVmbWdyLAogCQkJCXVuc2lnbmVkIGxvbmcgc2l6ZSwKIAkJCQl1bnNp Z25lZCBsb25nIGZsYWdzLAogCQkJCXVpbnQzMl90IHRpbGluZ19tb2RlLAotCQkJCXVuc2lnbmVk IGxvbmcgc3RyaWRlKQorCQkJCXVuc2lnbmVkIGxvbmcgc3RyaWRlLAorCQkJCXVuc2lnbmVkIGlu dCBhbGlnbm1lbnQpCiB7CiAJZHJtX2ludGVsX2J1Zm1ncl9nZW0gKmJ1Zm1ncl9nZW0gPSAoZHJt X2ludGVsX2J1Zm1ncl9nZW0gKikgYnVmbWdyOwogCWRybV9pbnRlbF9ib19nZW0gKmJvX2dlbTsK QEAgLTcwMiw3ICs3MDUsOSBAQCByZXRyeToKIAkJCQkJICAgICAgYnVja2V0LT5oZWFkLnByZXYs IGhlYWQpOwogCQkJRFJNTElTVERFTCgmYm9fZ2VtLT5oZWFkKTsKIAkJCWFsbG9jX2Zyb21fY2Fj aGUgPSB0cnVlOworCQkJYm9fZ2VtLT5iby5hbGlnbiA9IGFsaWdubWVudDsKIAkJfSBlbHNlIHsK KwkJCWFzc2VydChhbGlnbm1lbnQgPT0gMCk7CiAJCQkvKiBGb3Igbm9uLXJlbmRlci10YXJnZXQg Qk9zICh3aGVyZSB3ZSdyZSBwcm9iYWJseQogCQkJICogZ29pbmcgdG8gbWFwIGl0IGZpcnN0IHRo aW5nIGluIG9yZGVyIHRvIGZpbGwgaXQKIAkJCSAqIHdpdGggZGF0YSksIGNoZWNrIGlmIHRoZSBs YXN0IEJPIGluIHRoZSBjYWNoZSBpcwpAQCAtNzU5LDYgKzc2NCw3IEBAIHJldHJ5OgogCQkJcmV0 dXJuIE5VTEw7CiAJCX0KIAkJYm9fZ2VtLT5iby5idWZtZ3IgPSBidWZtZ3I7CisJCWJvX2dlbS0+ Ym8uYWxpZ24gPSBhbGlnbm1lbnQ7CiAKIAkJYm9fZ2VtLT50aWxpbmdfbW9kZSA9IEk5MTVfVElM SU5HX05PTkU7CiAJCWJvX2dlbS0+c3dpenpsZV9tb2RlID0gSTkxNV9CSVRfNl9TV0laWkxFX05P TkU7CkBAIC03ODYsNyArNzkyLDcgQEAgcmV0cnk6CiAJYm9fZ2VtLT5hdWJfYW5ub3RhdGlvbnMg PSBOVUxMOwogCWJvX2dlbS0+YXViX2Fubm90YXRpb25fY291bnQgPSAwOwogCi0JZHJtX2ludGVs X2JvX2dlbV9zZXRfaW5fYXBlcnR1cmVfc2l6ZShidWZtZ3JfZ2VtLCBib19nZW0pOworCWRybV9p bnRlbF9ib19nZW1fc2V0X2luX2FwZXJ0dXJlX3NpemUoYnVmbWdyX2dlbSwgYm9fZ2VtLCBhbGln bm1lbnQpOwogCiAJREJHKCJib19jcmVhdGU6IGJ1ZiAlZCAoJXMpICVsZGJcbiIsCiAJICAgIGJv X2dlbS0+Z2VtX2hhbmRsZSwgYm9fZ2VtLT5uYW1lLCBzaXplKTsKQEAgLTgwMiw3ICs4MDgsOCBA QCBkcm1faW50ZWxfZ2VtX2JvX2FsbG9jX2Zvcl9yZW5kZXIoZHJtX2ludGVsX2J1Zm1nciAqYnVm bWdyLAogewogCXJldHVybiBkcm1faW50ZWxfZ2VtX2JvX2FsbG9jX2ludGVybmFsKGJ1Zm1nciwg bmFtZSwgc2l6ZSwKIAkJCQkJICAgICAgIEJPX0FMTE9DX0ZPUl9SRU5ERVIsCi0JCQkJCSAgICAg ICBJOTE1X1RJTElOR19OT05FLCAwKTsKKwkJCQkJICAgICAgIEk5MTVfVElMSU5HX05PTkUsIDAs CisJCQkJCSAgICAgICBhbGlnbm1lbnQpOwogfQogCiBzdGF0aWMgZHJtX2ludGVsX2JvICoKQEAg LTgxMiw3ICs4MTksNyBAQCBkcm1faW50ZWxfZ2VtX2JvX2FsbG9jKGRybV9pbnRlbF9idWZtZ3Ig KmJ1Zm1nciwKIAkJICAgICAgIHVuc2lnbmVkIGludCBhbGlnbm1lbnQpCiB7CiAJcmV0dXJuIGRy bV9pbnRlbF9nZW1fYm9fYWxsb2NfaW50ZXJuYWwoYnVmbWdyLCBuYW1lLCBzaXplLCAwLAotCQkJ CQkgICAgICAgSTkxNV9USUxJTkdfTk9ORSwgMCk7CisJCQkJCSAgICAgICBJOTE1X1RJTElOR19O T05FLCAwLCAwKTsKIH0KIAogc3RhdGljIGRybV9pbnRlbF9ibyAqCkBAIC04NjQsNyArODcxLDcg QEAgZHJtX2ludGVsX2dlbV9ib19hbGxvY190aWxlZChkcm1faW50ZWxfYnVmbWdyICpidWZtZ3Is IGNvbnN0IGNoYXIgKm5hbWUsCiAJCXN0cmlkZSA9IDA7CiAKIAlyZXR1cm4gZHJtX2ludGVsX2dl bV9ib19hbGxvY19pbnRlcm5hbChidWZtZ3IsIG5hbWUsIHNpemUsIGZsYWdzLAotCQkJCQkgICAg ICAgdGlsaW5nLCBzdHJpZGUpOworCQkJCQkgICAgICAgdGlsaW5nLCBzdHJpZGUsIDApOwogfQog CiBzdGF0aWMgZHJtX2ludGVsX2JvICoKQEAgLTkzMSw3ICs5MzgsNyBAQCBkcm1faW50ZWxfZ2Vt X2JvX2FsbG9jX3VzZXJwdHIoZHJtX2ludGVsX2J1Zm1nciAqYnVmbWdyLAogCWJvX2dlbS0+aGFz X2Vycm9yID0gZmFsc2U7CiAJYm9fZ2VtLT5yZXVzYWJsZSA9IGZhbHNlOwogCi0JZHJtX2ludGVs X2JvX2dlbV9zZXRfaW5fYXBlcnR1cmVfc2l6ZShidWZtZ3JfZ2VtLCBib19nZW0pOworCWRybV9p bnRlbF9ib19nZW1fc2V0X2luX2FwZXJ0dXJlX3NpemUoYnVmbWdyX2dlbSwgYm9fZ2VtLCAwKTsK IAogCURCRygiYm9fY3JlYXRlX3VzZXJwdHI6ICIKIAkgICAgInB0ciAlcCBidWYgJWQgKCVzKSBz aXplICVsZGIsIHN0cmlkZSAweCV4LCB0aWxlIG1vZGUgJWRcbiIsCkBAIC0xMDk5LDcgKzExMDYs NyBAQCBkcm1faW50ZWxfYm9fZ2VtX2NyZWF0ZV9mcm9tX25hbWUoZHJtX2ludGVsX2J1Zm1nciAq YnVmbWdyLAogCWJvX2dlbS0+dGlsaW5nX21vZGUgPSBnZXRfdGlsaW5nLnRpbGluZ19tb2RlOwog CWJvX2dlbS0+c3dpenpsZV9tb2RlID0gZ2V0X3RpbGluZy5zd2l6emxlX21vZGU7CiAJLyogWFhY IHN0cmlkZSBpcyB1bmtub3duICovCi0JZHJtX2ludGVsX2JvX2dlbV9zZXRfaW5fYXBlcnR1cmVf c2l6ZShidWZtZ3JfZ2VtLCBib19nZW0pOworCWRybV9pbnRlbF9ib19nZW1fc2V0X2luX2FwZXJ0 dXJlX3NpemUoYnVmbWdyX2dlbSwgYm9fZ2VtLCAwKTsKIAogCURSTUlOSVRMSVNUSEVBRCgmYm9f Z2VtLT52bWFfbGlzdCk7CiAJRFJNTElTVEFERFRBSUwoJmJvX2dlbS0+bmFtZV9saXN0LCAmYnVm bWdyX2dlbS0+bmFtZWQpOwpAQCAtMjY5NCw3ICsyNzAxLDcgQEAgZHJtX2ludGVsX2dlbV9ib19z ZXRfdGlsaW5nKGRybV9pbnRlbF9ibyAqYm8sIHVpbnQzMl90ICogdGlsaW5nX21vZGUsCiAKIAly ZXQgPSBkcm1faW50ZWxfZ2VtX2JvX3NldF90aWxpbmdfaW50ZXJuYWwoYm8sICp0aWxpbmdfbW9k ZSwgc3RyaWRlKTsKIAlpZiAocmV0ID09IDApCi0JCWRybV9pbnRlbF9ib19nZW1fc2V0X2luX2Fw ZXJ0dXJlX3NpemUoYnVmbWdyX2dlbSwgYm9fZ2VtKTsKKwkJZHJtX2ludGVsX2JvX2dlbV9zZXRf aW5fYXBlcnR1cmVfc2l6ZShidWZtZ3JfZ2VtLCBib19nZW0sIDApOwogCiAJKnRpbGluZ19tb2Rl ID0gYm9fZ2VtLT50aWxpbmdfbW9kZTsKIAlyZXR1cm4gcmV0OwpAQCAtMjc5Miw3ICsyNzk5LDcg QEAgZHJtX2ludGVsX2JvX2dlbV9jcmVhdGVfZnJvbV9wcmltZShkcm1faW50ZWxfYnVmbWdyICpi dWZtZ3IsIGludCBwcmltZV9mZCwgaW50IHMKIAlib19nZW0tPnRpbGluZ19tb2RlID0gZ2V0X3Rp bGluZy50aWxpbmdfbW9kZTsKIAlib19nZW0tPnN3aXp6bGVfbW9kZSA9IGdldF90aWxpbmcuc3dp enpsZV9tb2RlOwogCS8qIFhYWCBzdHJpZGUgaXMgdW5rbm93biAqLwotCWRybV9pbnRlbF9ib19n ZW1fc2V0X2luX2FwZXJ0dXJlX3NpemUoYnVmbWdyX2dlbSwgYm9fZ2VtKTsKKwlkcm1faW50ZWxf Ym9fZ2VtX3NldF9pbl9hcGVydHVyZV9zaXplKGJ1Zm1ncl9nZW0sIGJvX2dlbSwgMCk7CiAKIAly ZXR1cm4gJmJvX2dlbS0+Ym87CiB9Ci0tIAoxLjkuMwoKX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhA bGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1h bi9saXN0aW5mby9pbnRlbC1nZngK