From mboxrd@z Thu Jan 1 00:00:00 1970 From: Joonas Lahtinen Subject: [PATCH 4/5] drm/i915: Add a partial GGTT view type Date: Fri, 24 Apr 2015 15:09:52 +0300 Message-ID: <1429877392.19506.9.camel@jlahtine-mobl1> References: Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTP id 300388A288 for ; Fri, 24 Apr 2015 05:11:32 -0700 (PDT) In-Reply-To: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: intel-gfx List-Id: intel-gfx@lists.freedesktop.org ClBhcnRpYWwgdmlldyB0eXBlIGFsbG93cyBtYW5pcHVsYXRpbmcgcGFydHMgb2YgaHVnZSBCT3Mg dGhyb3VnaCB0aGUgR0dUVCwKd2hpY2ggd2FzIG5vdCBwcmV2aW91c2x5IHBvc3NpYmxlIGR1ZSB0 byBjb25zdHJhaW50IHRoYXQgd2hvbGUgb2JqZWN0IGhhZAp0byBiZSBtYXBwZWQgZm9yIGFueSBh Y2Nlc3MgdG8gaXQgdGhyb3VnaCBHR1RULgoKU2lnbmVkLW9mZi1ieTogSm9vbmFzIExhaHRpbmVu IDxqb29uYXMubGFodGluZW5AbGludXguaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9p OTE1L2k5MTVfZ2VtX2d0dC5jIHwgICA0NiArKysrKysrKysrKysrKysrKysrKysrKysrKysrKysr KysrKwogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmggfCAgIDE1ICsrKysrKysr KystLQogMiBmaWxlcyBjaGFuZ2VkLCA1OSBpbnNlcnRpb25zKCspLCAyIGRlbGV0aW9ucygtKQoK ZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5jIGIvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmMKaW5kZXggNWJhYmJkMy4uNTkzN2QzZCAxMDA2 NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmMKKysrIGIvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmMKQEAgLTI3NjQsNiArMjc2NCw0NyBAQCBlcnJf c3RfYWxsb2M6CiAJcmV0dXJuIEVSUl9QVFIocmV0KTsKIH0KIAorc3RhdGljIHN0cnVjdCBzZ190 YWJsZSAqCitpbnRlbF9wYXJ0aWFsX3BhZ2VzKGNvbnN0IHN0cnVjdCBpOTE1X2dndHRfdmlldyAq dmlldywKKwkJICAgIHN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpvYmopCit7CisJc3RydWN0 IHNnX3RhYmxlICpzdDsKKwlzdHJ1Y3Qgc2NhdHRlcmxpc3QgKnNnOworCXN0cnVjdCBzZ19wYWdl X2l0ZXIgb2JqX3NnX2l0ZXI7CisJaW50IHJldDsKKworCXN0ID0ga21hbGxvYyhzaXplb2YoKnN0 KSwgR0ZQX0tFUk5FTCk7CisJaWYgKCFzdCkKKwkJZ290byBlcnJfc3RfYWxsb2M7CisKKwlyZXQg PSBzZ19hbGxvY190YWJsZShzdCwgdmlldy0+cGFyYW1zLnBhcnRpYWwuc2l6ZSwgR0ZQX0tFUk5F TCk7CisJaWYgKHJldCkKKwkJZ290byBlcnJfc2dfYWxsb2M7CisKKwlzZyA9IHN0LT5zZ2w7CisJ c3QtPm5lbnRzID0gMDsKKwlmb3JfZWFjaF9zZ19wYWdlKG9iai0+cGFnZXMtPnNnbCwgJm9ial9z Z19pdGVyLCBvYmotPnBhZ2VzLT5uZW50cywKKwkJdmlldy0+cGFyYW1zLnBhcnRpYWwub2Zmc2V0 KQorCXsKKwkJaWYgKHN0LT5uZW50cyA+PSB2aWV3LT5wYXJhbXMucGFydGlhbC5zaXplKQorCQkJ YnJlYWs7CisKKwkJc2dfc2V0X3BhZ2Uoc2csIE5VTEwsIFBBR0VfU0laRSwgMCk7CisJCXNnX2Rt YV9hZGRyZXNzKHNnKSA9IHNnX3BhZ2VfaXRlcl9kbWFfYWRkcmVzcygmb2JqX3NnX2l0ZXIpOwor CQlzZ19kbWFfbGVuKHNnKSA9IFBBR0VfU0laRTsKKworCQlzZyA9IHNnX25leHQoc2cpOworCQlz dC0+bmVudHMrKzsKKwl9CisKKwlyZXR1cm4gc3Q7CisKK2Vycl9zZ19hbGxvYzoKKwlrZnJlZShz dCk7CitlcnJfc3RfYWxsb2M6CisJcmV0dXJuIEVSUl9QVFIoLUVOT01FTSk7Cit9CisKIHN0YXRp YyBpbnQKIGk5MTVfZ2V0X2dndHRfdm1hX3BhZ2VzKHN0cnVjdCBpOTE1X3ZtYSAqdm1hKQogewpA QCAtMjc3Nyw2ICsyODE4LDkgQEAgaTkxNV9nZXRfZ2d0dF92bWFfcGFnZXMoc3RydWN0IGk5MTVf dm1hICp2bWEpCiAJZWxzZSBpZiAodm1hLT5nZ3R0X3ZpZXcudHlwZSA9PSBJOTE1X0dHVFRfVklF V19ST1RBVEVEKQogCQl2bWEtPmdndHRfdmlldy5wYWdlcyA9CiAJCQlpbnRlbF9yb3RhdGVfZmJf b2JqX3BhZ2VzKCZ2bWEtPmdndHRfdmlldywgdm1hLT5vYmopOworCWVsc2UgaWYgKHZtYS0+Z2d0 dF92aWV3LnR5cGUgPT0gSTkxNV9HR1RUX1ZJRVdfUEFSVElBTCkKKwkJdm1hLT5nZ3R0X3ZpZXcu cGFnZXMgPQorCQkJaW50ZWxfcGFydGlhbF9wYWdlcygmdm1hLT5nZ3R0X3ZpZXcsIHZtYS0+b2Jq KTsKIAllbHNlCiAJCVdBUk5fT05DRSgxLCAiR0dUVCB2aWV3ICV1IG5vdCBpbXBsZW1lbnRlZCFc biIsCiAJCQkgIHZtYS0+Z2d0dF92aWV3LnR5cGUpOwpAQCAtMjg1OSw2ICsyOTAzLDggQEAgaTkx NV9nZ3R0X3ZpZXdfc2l6ZShzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqb2JqLAogCWlmICh2 aWV3LT50eXBlID09IEk5MTVfR0dUVF9WSUVXX05PUk1BTCB8fAogCSAgICB2aWV3LT50eXBlID09 IEk5MTVfR0dUVF9WSUVXX1JPVEFURUQpIHsKIAkJcmV0dXJuIG9iai0+YmFzZS5zaXplOworCX0g ZWxzZSBpZiAodmlldy0+dHlwZSA9PSBJOTE1X0dHVFRfVklFV19QQVJUSUFMKSB7CisJCXJldHVy biB2aWV3LT5wYXJhbXMucGFydGlhbC5zaXplIDw8IFBBR0VfU0hJRlQ7CiAJfSBlbHNlIHsKIAkJ V0FSTl9PTkNFKDEsICJHR1RUIHZpZXcgJXUgbm90IGltcGxlbWVudGVkIVxuIiwgdmlldy0+dHlw ZSk7CiAJCXJldHVybiBvYmotPmJhc2Uuc2l6ZTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2k5MTVfZ2VtX2d0dC5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0 LmgKaW5kZXggMzRiN2NjYS4uYWIxYWQ4YSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaTkxNV9nZW1fZ3R0LmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0 LmgKQEAgLTExNyw3ICsxMTcsOCBAQCB0eXBlZGVmIHVpbnQ2NF90IGdlbjhfcGRlX3Q7CiAKIGVu dW0gaTkxNV9nZ3R0X3ZpZXdfdHlwZSB7CiAJSTkxNV9HR1RUX1ZJRVdfTk9STUFMID0gMCwKLQlJ OTE1X0dHVFRfVklFV19ST1RBVEVECisJSTkxNV9HR1RUX1ZJRVdfUk9UQVRFRCwKKwlJOTE1X0dH VFRfVklFV19QQVJUSUFMLAogfTsKIAogc3RydWN0IGludGVsX3JvdGF0aW9uX2luZm8gewpAQCAt MTMwLDYgKzEzMSwxMyBAQCBzdHJ1Y3QgaW50ZWxfcm90YXRpb25faW5mbyB7CiBzdHJ1Y3QgaTkx NV9nZ3R0X3ZpZXcgewogCWVudW0gaTkxNV9nZ3R0X3ZpZXdfdHlwZSB0eXBlOwogCisJdW5pb24g eworCQlzdHJ1Y3QgeworCQkJcGdvZmZfdCBvZmZzZXQ7CisJCQlzaXplX3Qgc2l6ZTsKKwkJfSBw YXJ0aWFsOworCX0gcGFyYW1zOworCiAJc3RydWN0IHNnX3RhYmxlICpwYWdlczsKIAogCXVuaW9u IHsKQEAgLTQ5NSw3ICs1MDMsMTAgQEAgaTkxNV9nZ3R0X3ZpZXdfZXF1YWwoY29uc3Qgc3RydWN0 IGk5MTVfZ2d0dF92aWV3ICphLAogCWlmIChXQVJOX09OKCFhIHx8ICFiKSkKIAkJcmV0dXJuIGZh bHNlOwogCi0JcmV0dXJuIGEtPnR5cGUgPT0gYi0+dHlwZTsKKwlpZiAoYS0+dHlwZSAhPSBiLT50 eXBlKQorCQlyZXR1cm4gZmFsc2U7CisKKwlyZXR1cm4gIW1lbWNtcCgmYS0+cGFyYW1zLCAmYi0+ cGFyYW1zLCBzaXplb2YoYS0+cGFyYW1zKSk7CiB9CiAKIHNpemVfdAotLSAKMS43LjkuNQoKCgpf X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZngg bWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cDovL2xpc3Rz LmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=