From: Ville Syrjala Subject: [PATCH] drm/i915: Replace some PAGE_SIZE with I915_GTT_PAGE_SIZE Date: Thu, 13 Sep 2018 18:04:05 +0300 Message-ID: <20180913150405.706-1-ville.syrjala@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by gabe.freedesktop.org (Postfix) with ESMTPS id 0C93B6E1B2 for ; Thu, 13 Sep 2018 15:04:09 +0000 (UTC) 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 RnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KClVz ZSBJOTE1X0dUVF9QQUdFX1NJWkUgd2hlbiB0YWxraW5nIGFib3V0IEdUVCBwYWdlcyByYXRoZXIg dGhhbgpwaHlzaWNhbCBwYWdlcy4KClRoZXJlIGFyZSBzb21lIFBBR0VfU0hJRlRzIGxlZnQgdGhv dWdoLiBOb3Qgc3VyZSBpZiB3ZSB3YW50IHRvCmludHJvZHVjZSBJOTE1X0dUVF9QQUdFX1NISUZU IG9yIHdoYXQ/CgpDYzogQ2hyaXMgV2lsc29uIDxjaHJpc0BjaHJpcy13aWxzb24uY28udWs+ClN1 Z2dlc3RlZC1ieTogQ2hyaXMgV2lsc29uIDxjaHJpc0BjaHJpcy13aWxzb24uY28udWs+ICMgYXQg bGVhc3Qgc29tZSBvZiBpdCA6KQpTaWduZWQtb2ZmLWJ5OiBWaWxsZSBTeXJqw6Rsw6QgPHZpbGxl LnN5cmphbGFAbGludXguaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVf ZHJ2LmggICAgIHwgIDIgKy0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5jIHwg MTggKysrKysrKysrLS0tLS0tLS0tCiAyIGZpbGVzIGNoYW5nZWQsIDEwIGluc2VydGlvbnMoKyks IDEwIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVf ZHJ2LmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCmluZGV4IDdlYTQ0MjAzM2E1 Ny4uOWNhMDgyOWYxY2ZhIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Ry di5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKQEAgLTIyODQsNyArMjI4 NCw3IEBAIHN0YXRpYyBpbmxpbmUgc3RydWN0IHNjYXR0ZXJsaXN0ICpfX3NnX25leHQoc3RydWN0 IHNjYXR0ZXJsaXN0ICpzZykKICNkZWZpbmUgZm9yX2VhY2hfc2d0X2RtYShfX2RtYXAsIF9faXRl ciwgX19zZ3QpCQkJCVwKIAlmb3IgKChfX2l0ZXIpID0gX19zZ3RfaXRlcigoX19zZ3QpLT5zZ2ws IHRydWUpOwkJCVwKIAkgICAgICgoX19kbWFwKSA9IChfX2l0ZXIpLmRtYSArIChfX2l0ZXIpLmN1 cnIpOwkJCVwKLQkgICAgICgoKF9faXRlcikuY3VyciArPSBQQUdFX1NJWkUpID49IChfX2l0ZXIp Lm1heCkgPwkJXAorCSAgICAgKCgoX19pdGVyKS5jdXJyICs9IEk5MTVfR1RUX1BBR0VfU0laRSkg Pj0gKF9faXRlcikubWF4KSA/CVwKIAkgICAgIChfX2l0ZXIpID0gX19zZ3RfaXRlcihfX3NnX25l eHQoKF9faXRlcikuc2dwKSwgdHJ1ZSksIDAgOiAwKQogCiAvKioKZGlmZiAtLWdpdCBhL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkx NV9nZW1fZ3R0LmMKaW5kZXggZWIwZTQ0NmQ2NDgyLi44YmUxYWNkMDk3ZGIgMTAwNjQ0Ci0tLSBh L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5jCisrKyBiL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2k5MTVfZ2VtX2d0dC5jCkBAIC0xMDUwLDcgKzEwNTAsNyBAQCBnZW44X3BwZ3R0X2lu c2VydF9wdGVfZW50cmllcyhzdHJ1Y3QgaTkxNV9od19wcGd0dCAqcHBndHQsCiAJZG8gewogCQl2 YWRkcltpZHgtPnB0ZV0gPSBwdGVfZW5jb2RlIHwgaXRlci0+ZG1hOwogCi0JCWl0ZXItPmRtYSAr PSBQQUdFX1NJWkU7CisJCWl0ZXItPmRtYSArPSBJOTE1X0dUVF9QQUdFX1NJWkU7CiAJCWlmIChp dGVyLT5kbWEgPj0gaXRlci0+bWF4KSB7CiAJCQlpdGVyLT5zZyA9IF9fc2dfbmV4dChpdGVyLT5z Zyk7CiAJCQlpZiAoIWl0ZXItPnNnKSB7CkBAIC0xNzU5LDcgKzE3NTksNyBAQCBzdGF0aWMgdm9p ZCBnZW42X2R1bXBfcHBndHQoc3RydWN0IGk5MTVfaHdfcHBndHQgKmJhc2UsIHN0cnVjdCBzZXFf ZmlsZSAqbSkKIAogCQkJc2VxX3ByaW50ZihtLCAiXHRcdCglMDNkLCAlMDRkKSAlMDhseDogIiwK IAkJCQkgICBwZGUsIHB0ZSwKLQkJCQkgICAocGRlICogR0VONl9QVEVTICsgcHRlKSAqIFBBR0Vf U0laRSk7CisJCQkJICAgKHBkZSAqIEdFTjZfUFRFUyArIHB0ZSkgKiBJOTE1X0dUVF9QQUdFX1NJ WkUpOwogCQkJZm9yIChpID0gMDsgaSA8IDQ7IGkrKykgewogCQkJCWlmICh2YWRkcltwdGUgKyBp XSAhPSBzY3JhdGNoX3B0ZSkKIAkJCQkJc2VxX3ByaW50ZihtLCAiICUwOHgiLCB2YWRkcltwdGUg KyBpXSk7CkBAIC0xODk5LDcgKzE4OTksNyBAQCBzdGF0aWMgdm9pZCBnZW42X3BwZ3R0X2luc2Vy dF9lbnRyaWVzKHN0cnVjdCBpOTE1X2FkZHJlc3Nfc3BhY2UgKnZtLAogCWRvIHsKIAkJdmFkZHJb YWN0X3B0ZV0gPSBwdGVfZW5jb2RlIHwgR0VONl9QVEVfQUREUl9FTkNPREUoaXRlci5kbWEpOwog Ci0JCWl0ZXIuZG1hICs9IFBBR0VfU0laRTsKKwkJaXRlci5kbWEgKz0gSTkxNV9HVFRfUEFHRV9T SVpFOwogCQlpZiAoaXRlci5kbWEgPT0gaXRlci5tYXgpIHsKIAkJCWl0ZXIuc2cgPSBfX3NnX25l eHQoaXRlci5zZyk7CiAJCQlpZiAoIWl0ZXIuc2cpCkBAIC0yMDM3LDcgKzIwMzcsNyBAQCBzdGF0 aWMgaW50IHBkX3ZtYV9iaW5kKHN0cnVjdCBpOTE1X3ZtYSAqdm1hLAogewogCXN0cnVjdCBpOTE1 X2dndHQgKmdndHQgPSBpOTE1X3ZtX3RvX2dndHQodm1hLT52bSk7CiAJc3RydWN0IGdlbjZfaHdf cHBndHQgKnBwZ3R0ID0gdm1hLT5wcml2YXRlOwotCXUzMiBnZ3R0X29mZnNldCA9IGk5MTVfZ2d0 dF9vZmZzZXQodm1hKSAvIFBBR0VfU0laRTsKKwl1MzIgZ2d0dF9vZmZzZXQgPSBpOTE1X2dndHRf b2Zmc2V0KHZtYSkgLyBJOTE1X0dUVF9QQUdFX1NJWkU7CiAJc3RydWN0IGk5MTVfcGFnZV90YWJs ZSAqcHQ7CiAJdW5zaWduZWQgaW50IHBkZTsKIApAQCAtMjE2Myw3ICsyMTYzLDcgQEAgc3RhdGlj IHN0cnVjdCBpOTE1X2h3X3BwZ3R0ICpnZW42X3BwZ3R0X2NyZWF0ZShzdHJ1Y3QgZHJtX2k5MTVf cHJpdmF0ZSAqaTkxNSkKIAlwcGd0dC0+YmFzZS52bS5pOTE1ID0gaTkxNTsKIAlwcGd0dC0+YmFz ZS52bS5kbWEgPSAmaTkxNS0+ZHJtLnBkZXYtPmRldjsKIAotCXBwZ3R0LT5iYXNlLnZtLnRvdGFs ID0gSTkxNV9QREVTICogR0VONl9QVEVTICogUEFHRV9TSVpFOworCXBwZ3R0LT5iYXNlLnZtLnRv dGFsID0gSTkxNV9QREVTICogR0VONl9QVEVTICogSTkxNV9HVFRfUEFHRV9TSVpFOwogCiAJaTkx NV9hZGRyZXNzX3NwYWNlX2luaXQoJnBwZ3R0LT5iYXNlLnZtLCBpOTE1KTsKIApAQCAtMzAyMyw3 ICszMDIzLDcgQEAgc3RhdGljIHVuc2lnbmVkIGludCBnZW44X2dldF90b3RhbF9ndHRfc2l6ZSh1 MTYgYmR3X2dtY2hfY3RsKQogCQliZHdfZ21jaF9jdGwgPSAxIDw8IGJkd19nbWNoX2N0bDsKIAog I2lmZGVmIENPTkZJR19YODZfMzIKLQkvKiBMaW1pdCAzMmIgcGxhdGZvcm1zIHRvIGEgMkdCIEdH VFQ6IDQgPDwgMjAgLyBwdGUgc2l6ZSAqIFBBR0VfU0laRSAqLworCS8qIExpbWl0IDMyYiBwbGF0 Zm9ybXMgdG8gYSAyR0IgR0dUVDogNCA8PCAyMCAvIHB0ZSBzaXplICogSTkxNV9HVFRfUEFHRV9T SVpFICovCiAJaWYgKGJkd19nbWNoX2N0bCA+IDQpCiAJCWJkd19nbWNoX2N0bCA9IDQ7CiAjZW5k aWYKQEAgLTM3MjcsOSArMzcyNyw5IEBAIHJvdGF0ZV9wYWdlcyhjb25zdCBkbWFfYWRkcl90ICpp biwgdW5zaWduZWQgaW50IG9mZnNldCwKIAkJCSAqIHRoZSBlbnRyaWVzIHNvIHRoZSBzZyBsaXN0 IGNhbiBiZSBoYXBwaWx5IHRyYXZlcnNlZC4KIAkJCSAqIFRoZSBvbmx5IHRoaW5nIHdlIG5lZWQg YXJlIERNQSBhZGRyZXNzZXMuCiAJCQkgKi8KLQkJCXNnX3NldF9wYWdlKHNnLCBOVUxMLCBQQUdF X1NJWkUsIDApOworCQkJc2dfc2V0X3BhZ2Uoc2csIE5VTEwsIEk5MTVfR1RUX1BBR0VfU0laRSwg MCk7CiAJCQlzZ19kbWFfYWRkcmVzcyhzZykgPSBpbltvZmZzZXQgKyBzcmNfaWR4XTsKLQkJCXNn X2RtYV9sZW4oc2cpID0gUEFHRV9TSVpFOworCQkJc2dfZG1hX2xlbihzZykgPSBJOTE1X0dUVF9Q QUdFX1NJWkU7CiAJCQlzZyA9IHNnX25leHQoc2cpOwogCQkJc3JjX2lkeCAtPSBzdHJpZGU7CiAJ CX0KQEAgLTM3NDIsNyArMzc0Miw3IEBAIHN0YXRpYyBub2lubGluZSBzdHJ1Y3Qgc2dfdGFibGUg KgogaW50ZWxfcm90YXRlX3BhZ2VzKHN0cnVjdCBpbnRlbF9yb3RhdGlvbl9pbmZvICpyb3RfaW5m bywKIAkJICAgc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKm9iaikKIHsKLQljb25zdCB1bnNp Z25lZCBsb25nIG5fcGFnZXMgPSBvYmotPmJhc2Uuc2l6ZSAvIFBBR0VfU0laRTsKKwljb25zdCB1 bnNpZ25lZCBsb25nIG5fcGFnZXMgPSBvYmotPmJhc2Uuc2l6ZSAvIEk5MTVfR1RUX1BBR0VfU0la RTsKIAl1bnNpZ25lZCBpbnQgc2l6ZSA9IGludGVsX3JvdGF0aW9uX2luZm9fc2l6ZShyb3RfaW5m byk7CiAJc3RydWN0IHNndF9pdGVyIHNndF9pdGVyOwogCWRtYV9hZGRyX3QgZG1hX2FkZHI7Ci0t IAoyLjE2LjQKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f CkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpo dHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=