From: Daniel Stone Subject: [PATCH v3 1/2] drm/i915: Use intel_fb_obj() everywhere Date: Fri, 18 May 2018 15:30:07 +0100 Message-ID: <20180518143008.4120-1-daniels@collabora.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from bhuna.collabora.co.uk (bhuna.collabora.co.uk [IPv6:2a00:1098:0:82:1000:25:2eeb:e3e3]) by gabe.freedesktop.org (Postfix) with ESMTPS id E22C16EDCE for ; Fri, 18 May 2018 14:30:12 +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 Cc: Rodrigo Vivi List-Id: intel-gfx@lists.freedesktop.org V2UgYWxyZWFkeSBoYXZlIGEgbWFjcm8gdG8gcHVsbCB0aGUgR0VNIG9iamVjdCBmcm9tIGEgRkIs IHNvIHVzZSBpdApldmVyeXdoZXJlLiBXZSdsbCBtYWtlIHVzZSBvZiB0aGlzIGxhdGVyIHRvIG1v dmUgdGhlIG9iamVjdCBzdG9yYWdlLgoKU2lnbmVkLW9mZi1ieTogRGFuaWVsIFN0b25lIDxkYW5p ZWxzQGNvbGxhYm9yYS5jb20+ClJldmlld2VkLWJ5OiBWaWxsZSBTeXJqw6Rsw6QgPHZpbGxlLnN5 cmphbGFAaW50ZWwuY29tPgpDYzogSmFuaSBOaWt1bGEgPGphbmkubmlrdWxhQGxpbnV4LmludGVs LmNvbT4KQ2M6IEpvb25hcyBMYWh0aW5lbiA8am9vbmFzLmxhaHRpbmVuQGxpbnV4LmludGVsLmNv bT4KQ2M6IFJvZHJpZ28gVml2aSA8cm9kcmlnby52aXZpQGludGVsLmNvbT4KQ2M6IGludGVsLWdm eEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rl YnVnZnMuYyAgfCAgNCArKy0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMg fCAxOSArKysrKysrKysrLS0tLS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9mYmRl di5jICAgfCAgOSArKysrKy0tLS0KIDMgZmlsZXMgY2hhbmdlZCwgMTcgaW5zZXJ0aW9ucygrKSwg MTUgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9k ZWJ1Z2ZzLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2RlYnVnZnMuYwppbmRleCA1MjUx NTQ0NWFjNDAuLmU5YjFiOGRmNmVmNSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUv aTkxNV9kZWJ1Z2ZzLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kZWJ1Z2ZzLmMK QEAgLTE5MDgsNyArMTkwOCw3IEBAIHN0YXRpYyBpbnQgaTkxNV9nZW1fZnJhbWVidWZmZXJfaW5m byhzdHJ1Y3Qgc2VxX2ZpbGUgKm0sIHZvaWQgKmRhdGEpCiAJCQkgICBmYmRldl9mYi0+YmFzZS5m b3JtYXQtPmNwcFswXSAqIDgsCiAJCQkgICBmYmRldl9mYi0+YmFzZS5tb2RpZmllciwKIAkJCSAg IGRybV9mcmFtZWJ1ZmZlcl9yZWFkX3JlZmNvdW50KCZmYmRldl9mYi0+YmFzZSkpOwotCQlkZXNj cmliZV9vYmoobSwgZmJkZXZfZmItPm9iaik7CisJCWRlc2NyaWJlX29iaihtLCBpbnRlbF9mYl9v YmooJmZiZGV2X2ZiLT5iYXNlKSk7CiAJCXNlcV9wdXRjKG0sICdcbicpOwogCX0KICNlbmRpZgpA QCAtMTkyNiw3ICsxOTI2LDcgQEAgc3RhdGljIGludCBpOTE1X2dlbV9mcmFtZWJ1ZmZlcl9pbmZv KHN0cnVjdCBzZXFfZmlsZSAqbSwgdm9pZCAqZGF0YSkKIAkJCSAgIGZiLT5iYXNlLmZvcm1hdC0+ Y3BwWzBdICogOCwKIAkJCSAgIGZiLT5iYXNlLm1vZGlmaWVyLAogCQkJICAgZHJtX2ZyYW1lYnVm ZmVyX3JlYWRfcmVmY291bnQoJmZiLT5iYXNlKSk7Ci0JCWRlc2NyaWJlX29iaihtLCBmYi0+b2Jq KTsKKwkJZGVzY3JpYmVfb2JqKG0sIGludGVsX2ZiX29iaigmZmItPmJhc2UpKTsKIAkJc2VxX3B1 dGMobSwgJ1xuJyk7CiAJfQogCW11dGV4X3VubG9jaygmZGV2LT5tb2RlX2NvbmZpZy5mYl9sb2Nr KTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYyBiL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwppbmRleCBjOWVjODhhY2FkOWMuLjFi MmNmNjMxMzA1ZSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxh eS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwpAQCAtMjQ3NCw2 ICsyNDc0LDcgQEAgaW50ZWxfZmlsbF9mYl9pbmZvKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpk ZXZfcHJpdiwKIHsKIAlzdHJ1Y3QgaW50ZWxfZnJhbWVidWZmZXIgKmludGVsX2ZiID0gdG9faW50 ZWxfZnJhbWVidWZmZXIoZmIpOwogCXN0cnVjdCBpbnRlbF9yb3RhdGlvbl9pbmZvICpyb3RfaW5m byA9ICZpbnRlbF9mYi0+cm90X2luZm87CisJc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKm9i aiA9IGludGVsX2ZiX29iaihmYik7CiAJdTMyIGd0dF9vZmZzZXRfcm90YXRlZCA9IDA7CiAJdW5z aWduZWQgaW50IG1heF9zaXplID0gMDsKIAlpbnQgaSwgbnVtX3BsYW5lcyA9IGZiLT5mb3JtYXQt Pm51bV9wbGFuZXM7CkBAIC0yNTM4LDcgKzI1MzksNyBAQCBpbnRlbF9maWxsX2ZiX2luZm8oc3Ry dWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAogCQkgKiBmYiBsYXlvdXQgYWdyZWVzIHdp dGggdGhlIGZlbmNlIGxheW91dC4gV2UgYWxyZWFkeSBjaGVjayB0aGF0IHRoZQogCQkgKiBmYiBz dHJpZGUgbWF0Y2hlcyB0aGUgZmVuY2Ugc3RyaWRlIGVsc2V3aGVyZS4KIAkJICovCi0JCWlmIChp ID09IDAgJiYgaTkxNV9nZW1fb2JqZWN0X2lzX3RpbGVkKGludGVsX2ZiLT5vYmopICYmCisJCWlm IChpID09IDAgJiYgaTkxNV9nZW1fb2JqZWN0X2lzX3RpbGVkKG9iaikgJiYKIAkJICAgICh4ICsg d2lkdGgpICogY3BwID4gZmItPnBpdGNoZXNbaV0pIHsKIAkJCURSTV9ERUJVR19LTVMoImJhZCBm YiBwbGFuZSAlZCBvZmZzZXQ6IDB4JXhcbiIsCiAJCQkJICAgICAgaSwgZmItPm9mZnNldHNbaV0p OwpAQCAtMjYyMyw5ICsyNjI0LDkgQEAgaW50ZWxfZmlsbF9mYl9pbmZvKHN0cnVjdCBkcm1faTkx NV9wcml2YXRlICpkZXZfcHJpdiwKIAkJbWF4X3NpemUgPSBtYXgobWF4X3NpemUsIG9mZnNldCAr IHNpemUpOwogCX0KIAotCWlmIChtYXhfc2l6ZSAqIHRpbGVfc2l6ZSA+IGludGVsX2ZiLT5vYmot PmJhc2Uuc2l6ZSkgeworCWlmIChtYXhfc2l6ZSAqIHRpbGVfc2l6ZSA+IG9iai0+YmFzZS5zaXpl KSB7CiAJCURSTV9ERUJVR19LTVMoImZiIHRvbyBiaWcgZm9yIGJvIChuZWVkICV1IGJ5dGVzLCBo YXZlICV6dSBieXRlcylcbiIsCi0JCQkgICAgICBtYXhfc2l6ZSAqIHRpbGVfc2l6ZSwgaW50ZWxf ZmItPm9iai0+YmFzZS5zaXplKTsKKwkJCSAgICAgIG1heF9zaXplICogdGlsZV9zaXplLCBvYmot PmJhc2Uuc2l6ZSk7CiAJCXJldHVybiAtRUlOVkFMOwogCX0KIApAQCAtMTQwODIsMTQgKzE0MDgz LDE1IEBAIHN0YXRpYyB2b2lkIGludGVsX3NldHVwX291dHB1dHMoc3RydWN0IGRybV9pOTE1X3By aXZhdGUgKmRldl9wcml2KQogc3RhdGljIHZvaWQgaW50ZWxfdXNlcl9mcmFtZWJ1ZmZlcl9kZXN0 cm95KHN0cnVjdCBkcm1fZnJhbWVidWZmZXIgKmZiKQogewogCXN0cnVjdCBpbnRlbF9mcmFtZWJ1 ZmZlciAqaW50ZWxfZmIgPSB0b19pbnRlbF9mcmFtZWJ1ZmZlcihmYik7CisJc3RydWN0IGRybV9p OTE1X2dlbV9vYmplY3QgKm9iaiA9IGludGVsX2ZiX29iaihmYik7CiAKIAlkcm1fZnJhbWVidWZm ZXJfY2xlYW51cChmYik7CiAKLQlpOTE1X2dlbV9vYmplY3RfbG9jayhpbnRlbF9mYi0+b2JqKTsK LQlXQVJOX09OKCFpbnRlbF9mYi0+b2JqLT5mcmFtZWJ1ZmZlcl9yZWZlcmVuY2VzLS0pOwotCWk5 MTVfZ2VtX29iamVjdF91bmxvY2soaW50ZWxfZmItPm9iaik7CisJaTkxNV9nZW1fb2JqZWN0X2xv Y2sob2JqKTsKKwlXQVJOX09OKCFvYmotPmZyYW1lYnVmZmVyX3JlZmVyZW5jZXMtLSk7CisJaTkx NV9nZW1fb2JqZWN0X3VubG9jayhvYmopOwogCi0JaTkxNV9nZW1fb2JqZWN0X3B1dChpbnRlbF9m Yi0+b2JqKTsKKwlpOTE1X2dlbV9vYmplY3RfcHV0KG9iaik7CiAKIAlrZnJlZShpbnRlbF9mYik7 CiB9CkBAIC0xNDA5OCw4ICsxNDEwMCw3IEBAIHN0YXRpYyBpbnQgaW50ZWxfdXNlcl9mcmFtZWJ1 ZmZlcl9jcmVhdGVfaGFuZGxlKHN0cnVjdCBkcm1fZnJhbWVidWZmZXIgKmZiLAogCQkJCQkJc3Ry dWN0IGRybV9maWxlICpmaWxlLAogCQkJCQkJdW5zaWduZWQgaW50ICpoYW5kbGUpCiB7Ci0Jc3Ry dWN0IGludGVsX2ZyYW1lYnVmZmVyICppbnRlbF9mYiA9IHRvX2ludGVsX2ZyYW1lYnVmZmVyKGZi KTsKLQlzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqb2JqID0gaW50ZWxfZmItPm9iajsKKwlz dHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqb2JqID0gaW50ZWxfZmJfb2JqKGZiKTsKIAogCWlm IChvYmotPnVzZXJwdHIubW0pIHsKIAkJRFJNX0RFQlVHKCJhdHRlbXB0aW5nIHRvIHVzZSBhIHVz ZXJwdHIgZm9yIGEgZnJhbWVidWZmZXIsIGRlbmllZFxuIik7CmRpZmYgLS1naXQgYS9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9mYmRldi5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf ZmJkZXYuYwppbmRleCBlOWUwMmI1OGI3YmUuLmZiMmY5ZmNlMzRjZCAxMDA2NDQKLS0tIGEvZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZmJkZXYuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9mYmRldi5jCkBAIC00Nyw3ICs0Nyw3IEBACiAKIHN0YXRpYyB2b2lkIGludGVsX2Zi ZGV2X2ludmFsaWRhdGUoc3RydWN0IGludGVsX2ZiZGV2ICppZmJkZXYpCiB7Ci0Jc3RydWN0IGRy bV9pOTE1X2dlbV9vYmplY3QgKm9iaiA9IGlmYmRldi0+ZmItPm9iajsKKwlzdHJ1Y3QgZHJtX2k5 MTVfZ2VtX29iamVjdCAqb2JqID0gaW50ZWxfZmJfb2JqKCZpZmJkZXYtPmZiLT5iYXNlKTsKIAl1 bnNpZ25lZCBpbnQgb3JpZ2luID0KIAkJaWZiZGV2LT52bWFfZmxhZ3MgJiBQTEFORV9IQVNfRkVO Q0UgPyBPUklHSU5fR1RUIDogT1JJR0lOX0NQVTsKIApAQCAtMTkzLDcgKzE5Myw3IEBAIHN0YXRp YyBpbnQgaW50ZWxmYl9jcmVhdGUoc3RydWN0IGRybV9mYl9oZWxwZXIgKmhlbHBlciwKIAkJZHJt X2ZyYW1lYnVmZmVyX3B1dCgmaW50ZWxfZmItPmJhc2UpOwogCQlpbnRlbF9mYiA9IGlmYmRldi0+ ZmIgPSBOVUxMOwogCX0KLQlpZiAoIWludGVsX2ZiIHx8IFdBUk5fT04oIWludGVsX2ZiLT5vYmop KSB7CisJaWYgKCFpbnRlbF9mYiB8fCBXQVJOX09OKCFpbnRlbF9mYl9vYmooJmludGVsX2ZiLT5i YXNlKSkpIHsKIAkJRFJNX0RFQlVHX0tNUygibm8gQklPUyBmYiwgYWxsb2NhdGluZyBhIG5ldyBv bmVcbiIpOwogCQlyZXQgPSBpbnRlbGZiX2FsbG9jKGhlbHBlciwgc2l6ZXMpOwogCQlpZiAocmV0 KQpAQCAtMjY1LDcgKzI2NSw3IEBAIHN0YXRpYyBpbnQgaW50ZWxmYl9jcmVhdGUoc3RydWN0IGRy bV9mYl9oZWxwZXIgKmhlbHBlciwKIAkgKiBJZiB0aGUgb2JqZWN0IGlzIHN0b2xlbiBob3dldmVy LCBpdCB3aWxsIGJlIGZ1bGwgb2Ygd2hhdGV2ZXIKIAkgKiBnYXJiYWdlIHdhcyBsZWZ0IGluIHRo ZXJlLgogCSAqLwotCWlmIChpbnRlbF9mYi0+b2JqLT5zdG9sZW4gJiYgIXByZWFsbG9jKQorCWlm IChpbnRlbF9mYl9vYmooZmIpLT5zdG9sZW4gJiYgIXByZWFsbG9jKQogCQltZW1zZXRfaW8oaW5m by0+c2NyZWVuX2Jhc2UsIDAsIGluZm8tPnNjcmVlbl9zaXplKTsKIAogCS8qIFVzZSBkZWZhdWx0 IHNjcmF0Y2ggcGl4bWFwIChpbmZvLT5waXhtYXAuZmxhZ3MgPSBGQl9QSVhNQVBfU1lTVEVNKSAq LwpAQCAtNzkyLDcgKzc5Miw4IEBAIHZvaWQgaW50ZWxfZmJkZXZfc2V0X3N1c3BlbmQoc3RydWN0 IGRybV9kZXZpY2UgKmRldiwgaW50IHN0YXRlLCBib29sIHN5bmNocm9ub3VzCiAJICogYmVlbiBy ZXN0b3JlZCBmcm9tIHN3YXAuIElmIHRoZSBvYmplY3QgaXMgc3RvbGVuIGhvd2V2ZXIsIGl0IHdp bGwgYmUKIAkgKiBmdWxsIG9mIHdoYXRldmVyIGdhcmJhZ2Ugd2FzIGxlZnQgaW4gdGhlcmUuCiAJ ICovCi0JaWYgKHN0YXRlID09IEZCSU5GT19TVEFURV9SVU5OSU5HICYmIGlmYmRldi0+ZmItPm9i ai0+c3RvbGVuKQorCWlmIChzdGF0ZSA9PSBGQklORk9fU1RBVEVfUlVOTklORyAmJgorCSAgICBp bnRlbF9mYl9vYmooJmlmYmRldi0+ZmItPmJhc2UpLT5zdG9sZW4pCiAJCW1lbXNldF9pbyhpbmZv LT5zY3JlZW5fYmFzZSwgMCwgaW5mby0+c2NyZWVuX3NpemUpOwogCiAJZHJtX2ZiX2hlbHBlcl9z ZXRfc3VzcGVuZCgmaWZiZGV2LT5oZWxwZXIsIHN0YXRlKTsKLS0gCjIuMTcuMAoKX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcg bGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRl c2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==