From mboxrd@z Thu Jan 1 00:00:00 1970 From: Chris Wilson Subject: [PATCH 66/70] drm/i915: Remove obj->pin_mappable Date: Tue, 7 Apr 2015 17:28:24 +0100 Message-ID: <1428424108-13650-8-git-send-email-chris@chris-wilson.co.uk> References: <1428420094-18352-1-git-send-email-chris@chris-wilson.co.uk> <1428424108-13650-1-git-send-email-chris@chris-wilson.co.uk> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from relay.fireflyinternet.com (hostedrelay.fireflyinternet.com [109.228.30.76]) by gabe.freedesktop.org (Postfix) with ESMTP id B6E9989ABE for ; Tue, 7 Apr 2015 09:28:49 -0700 (PDT) In-Reply-To: <1428424108-13650-1-git-send-email-chris@chris-wilson.co.uk> 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 VGhlIG9iai0+cGluX21hcHBhYmxlIGZsYWcgb25seSBleGlzdHMgZm9yIGRlYnVnIHB1cnBvc2Vz IGFuZCBpcyBhCmhpbmRyYW5jZSB0aGF0IGlzIG1pc3RyZWF0ZWQgd2l0aCByb3RhdGVkIEdHVFQg dmlld3MuIEZvciBkZWJ1ZwpwdXJwb3NlcywgaXQgc3VmZmljZXMgdG8gbWFyayBvYmplY3RzIHdp dGggcGluX2Rpc3BsYXkgYXMgYmVpbmcgb2Ygbm90ZS4KClNpZ25lZC1vZmYtYnk6IENocmlzIFdp bHNvbiA8Y2hyaXNAY2hyaXMtd2lsc29uLmNvLnVrPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1 L2k5MTVfZGVidWdmcy5jIHwgNiArKystLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2 LmggICAgIHwgMSAtCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jICAgICB8IDYgKy0t LS0tCiAzIGZpbGVzIGNoYW5nZWQsIDQgaW5zZXJ0aW9ucygrKSwgOSBkZWxldGlvbnMoLSkKCmRp ZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2RlYnVnZnMuYyBiL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2k5MTVfZGVidWdmcy5jCmluZGV4IDJlODUxYzZhMzEwYy4uNjUwOGVlYzNj ZjYwIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2RlYnVnZnMuYworKysg Yi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2RlYnVnZnMuYwpAQCAtMTY2LDkgKzE2Niw5IEBA IGRlc2NyaWJlX29iaihzdHJ1Y3Qgc2VxX2ZpbGUgKm0sIHN0cnVjdCBkcm1faTkxNV9nZW1fb2Jq ZWN0ICpvYmopCiAJfQogCWlmIChvYmotPnN0b2xlbikKIAkJc2VxX3ByaW50ZihtLCAiIChzdG9s ZW46ICUwOGxseCkiLCBvYmotPnN0b2xlbi0+c3RhcnQpOwotCWlmIChvYmotPnBpbl9tYXBwYWJs ZSB8fCBvYmotPmZhdWx0X21hcHBhYmxlKSB7CisJaWYgKG9iai0+cGluX2Rpc3BsYXkgfHwgb2Jq LT5mYXVsdF9tYXBwYWJsZSkgewogCQljaGFyIHNbM10sICp0ID0gczsKLQkJaWYgKG9iai0+cGlu X21hcHBhYmxlKQorCQlpZiAob2JqLT5waW5fZGlzcGxheSkKIAkJCSp0KysgPSAncCc7CiAJCWlm IChvYmotPmZhdWx0X21hcHBhYmxlKQogCQkJKnQrKyA9ICdmJzsKQEAgLTQ2NCw3ICs0NjQsNyBA QCBzdGF0aWMgaW50IGk5MTVfZ2VtX29iamVjdF9pbmZvKHN0cnVjdCBzZXFfZmlsZSAqbSwgdm9p ZCogZGF0YSkKIAkJCXNpemUgKz0gaTkxNV9nZW1fb2JqX2dndHRfc2l6ZShvYmopOwogCQkJKytj b3VudDsKIAkJfQotCQlpZiAob2JqLT5waW5fbWFwcGFibGUpIHsKKwkJaWYgKG9iai0+cGluX2Rp c3BsYXkpIHsKIAkJCW1hcHBhYmxlX3NpemUgKz0gaTkxNV9nZW1fb2JqX2dndHRfc2l6ZShvYmop OwogCQkJKyttYXBwYWJsZV9jb3VudDsKIAkJfQpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJt L2k5MTUvaTkxNV9kcnYuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKaW5kZXgg ZWVmZmVmYTEwNjEyLi4yYzcyZWUwMjE0YjUgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2k5MTVfZHJ2LmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaApAQCAt MTk4MCw3ICsxOTgwLDYgQEAgc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3QgewogCSAqIGFjY3Vy YXRlIG1hcHBhYmxlIHdvcmtpbmcgc2V0LgogCSAqLwogCXVuc2lnbmVkIGludCBmYXVsdF9tYXBw YWJsZToxOwotCXVuc2lnbmVkIGludCBwaW5fbWFwcGFibGU6MTsKIAl1bnNpZ25lZCBpbnQgcGlu X2Rpc3BsYXk6MTsKIAogCS8qCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1 X2dlbS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYwppbmRleCBiZDYwYmI1NTI5 MjAuLjNkNDQ2MzkzMDI2NyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9n ZW0uYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jCkBAIC00NDQ1LDkgKzQ0 NDUsNiBAQCBpOTE1X2dlbV9vYmplY3RfZG9fcGluKHN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0 ICpvYmosCiAJV0FSTl9PTihmbGFncyAmIFBJTl9NQVBQQUJMRSAmJiAhb2JqLT5tYXBfYW5kX2Zl bmNlYWJsZSk7CiAKIAl2bWEtPnBpbl9jb3VudCsrOwotCWlmIChmbGFncyAmIFBJTl9NQVBQQUJM RSkKLQkJb2JqLT5waW5fbWFwcGFibGUgfD0gdHJ1ZTsKLQogCXJldHVybiAwOwogfQogCkBAIC00 NDg3LDggKzQ0ODQsNyBAQCBpOTE1X2dlbV9vYmplY3RfZ2d0dF91bnBpbl92aWV3KHN0cnVjdCBk cm1faTkxNV9nZW1fb2JqZWN0ICpvYmosCiAJV0FSTl9PTih2bWEtPnBpbl9jb3VudCA9PSAwKTsK IAlXQVJOX09OKCFpOTE1X2dlbV9vYmpfZ2d0dF9ib3VuZF92aWV3KG9iaiwgdmlldykpOwogCi0J aWYgKC0tdm1hLT5waW5fY291bnQgPT0gMCAmJiB2aWV3LT50eXBlID09IEk5MTVfR0dUVF9WSUVX X05PUk1BTCkKLQkJb2JqLT5waW5fbWFwcGFibGUgPSBmYWxzZTsKKwktLXZtYS0+cGluX2NvdW50 OwogfQogCiBib29sCi0tIAoyLjEuNAoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJl ZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5m by9pbnRlbC1nZngK