From: Daniel Stone Subject: [PATCH v2 1/2] drm/i915: Use intel_fb_obj() everywhere Date: Fri, 18 May 2018 14:48:43 +0100 Message-ID: <20180518134844.13248-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 [46.235.227.227]) by gabe.freedesktop.org (Postfix) with ESMTPS id 605006ED93 for ; Fri, 18 May 2018 13:48:47 +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: =?UTF-8?q?Ville=20Syrj=C3=A4l=C3=A4?= , Rodrigo Vivi List-Id: intel-gfx@lists.freedesktop.org V2UgYWxyZWFkeSBoYXZlIGEgbWFjcm8gdG8gcHVsbCB0aGUgR0VNIG9iamVjdCBmcm9tIGEgRkIs IHNvIHVzZSBpdApldmVyeXdoZXJlLiBXZSdsbCBtYWtlIHVzZSBvZiB0aGlzIGxhdGVyIHRvIG1v dmUgdGhlIG9iamVjdCBzdG9yYWdlLgoKU2lnbmVkLW9mZi1ieTogRGFuaWVsIFN0b25lIDxkYW5p ZWxzQGNvbGxhYm9yYS5jb20+CkNjOiBKYW5pIE5pa3VsYSA8amFuaS5uaWt1bGFAbGludXguaW50 ZWwuY29tPgpDYzogSm9vbmFzIExhaHRpbmVuIDxqb29uYXMubGFodGluZW5AbGludXguaW50ZWwu Y29tPgpDYzogUm9kcmlnbyBWaXZpIDxyb2RyaWdvLnZpdmlAaW50ZWwuY29tPgpDYzogVmlsbGUg U3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGludGVsLmNvbT4KQ2M6IGludGVsLWdmeEBsaXN0cy5m cmVlZGVza3RvcC5vcmcKLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2RlYnVnZnMuYyAg fCAgNCArKy0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgfCAxOSArKysr KysrKysrLS0tLS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9mYmRldi5jICAgfCAg OSArKysrKy0tLS0KIDMgZmlsZXMgY2hhbmdlZCwgMTcgaW5zZXJ0aW9ucygrKSwgMTUgZGVsZXRp b25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kZWJ1Z2ZzLmMg Yi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2RlYnVnZnMuYwppbmRleCA1MjUxNTQ0NWFjNDAu LmU5YjFiOGRmNmVmNSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kZWJ1 Z2ZzLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kZWJ1Z2ZzLmMKQEAgLTE5MDgs NyArMTkwOCw3IEBAIHN0YXRpYyBpbnQgaTkxNV9nZW1fZnJhbWVidWZmZXJfaW5mbyhzdHJ1Y3Qg c2VxX2ZpbGUgKm0sIHZvaWQgKmRhdGEpCiAJCQkgICBmYmRldl9mYi0+YmFzZS5mb3JtYXQtPmNw cFswXSAqIDgsCiAJCQkgICBmYmRldl9mYi0+YmFzZS5tb2RpZmllciwKIAkJCSAgIGRybV9mcmFt ZWJ1ZmZlcl9yZWFkX3JlZmNvdW50KCZmYmRldl9mYi0+YmFzZSkpOwotCQlkZXNjcmliZV9vYmoo bSwgZmJkZXZfZmItPm9iaik7CisJCWRlc2NyaWJlX29iaihtLCBpbnRlbF9mYl9vYmooJmZiZGV2 X2ZiLT5iYXNlKSk7CiAJCXNlcV9wdXRjKG0sICdcbicpOwogCX0KICNlbmRpZgpAQCAtMTkyNiw3 ICsxOTI2LDcgQEAgc3RhdGljIGludCBpOTE1X2dlbV9mcmFtZWJ1ZmZlcl9pbmZvKHN0cnVjdCBz ZXFfZmlsZSAqbSwgdm9pZCAqZGF0YSkKIAkJCSAgIGZiLT5iYXNlLmZvcm1hdC0+Y3BwWzBdICog OCwKIAkJCSAgIGZiLT5iYXNlLm1vZGlmaWVyLAogCQkJICAgZHJtX2ZyYW1lYnVmZmVyX3JlYWRf cmVmY291bnQoJmZiLT5iYXNlKSk7Ci0JCWRlc2NyaWJlX29iaihtLCBmYi0+b2JqKTsKKwkJZGVz Y3JpYmVfb2JqKG0sIGludGVsX2ZiX29iaigmZmItPmJhc2UpKTsKIAkJc2VxX3B1dGMobSwgJ1xu Jyk7CiAJfQogCW11dGV4X3VubG9jaygmZGV2LT5tb2RlX2NvbmZpZy5mYl9sb2NrKTsKZGlmZiAt LWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYyBiL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwppbmRleCBjOWVjODhhY2FkOWMuLjFiMmNmNjMxMzA1 ZSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCisrKyBi L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwpAQCAtMjQ3NCw2ICsyNDc0LDcg QEAgaW50ZWxfZmlsbF9mYl9pbmZvKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwK IHsKIAlzdHJ1Y3QgaW50ZWxfZnJhbWVidWZmZXIgKmludGVsX2ZiID0gdG9faW50ZWxfZnJhbWVi dWZmZXIoZmIpOwogCXN0cnVjdCBpbnRlbF9yb3RhdGlvbl9pbmZvICpyb3RfaW5mbyA9ICZpbnRl bF9mYi0+cm90X2luZm87CisJc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKm9iaiA9IGludGVs X2ZiX29iaihmYik7CiAJdTMyIGd0dF9vZmZzZXRfcm90YXRlZCA9IDA7CiAJdW5zaWduZWQgaW50 IG1heF9zaXplID0gMDsKIAlpbnQgaSwgbnVtX3BsYW5lcyA9IGZiLT5mb3JtYXQtPm51bV9wbGFu ZXM7CkBAIC0yNTM4LDcgKzI1MzksNyBAQCBpbnRlbF9maWxsX2ZiX2luZm8oc3RydWN0IGRybV9p OTE1X3ByaXZhdGUgKmRldl9wcml2LAogCQkgKiBmYiBsYXlvdXQgYWdyZWVzIHdpdGggdGhlIGZl bmNlIGxheW91dC4gV2UgYWxyZWFkeSBjaGVjayB0aGF0IHRoZQogCQkgKiBmYiBzdHJpZGUgbWF0 Y2hlcyB0aGUgZmVuY2Ugc3RyaWRlIGVsc2V3aGVyZS4KIAkJICovCi0JCWlmIChpID09IDAgJiYg aTkxNV9nZW1fb2JqZWN0X2lzX3RpbGVkKGludGVsX2ZiLT5vYmopICYmCisJCWlmIChpID09IDAg JiYgaTkxNV9nZW1fb2JqZWN0X2lzX3RpbGVkKG9iaikgJiYKIAkJICAgICh4ICsgd2lkdGgpICog Y3BwID4gZmItPnBpdGNoZXNbaV0pIHsKIAkJCURSTV9ERUJVR19LTVMoImJhZCBmYiBwbGFuZSAl ZCBvZmZzZXQ6IDB4JXhcbiIsCiAJCQkJICAgICAgaSwgZmItPm9mZnNldHNbaV0pOwpAQCAtMjYy Myw5ICsyNjI0LDkgQEAgaW50ZWxfZmlsbF9mYl9pbmZvKHN0cnVjdCBkcm1faTkxNV9wcml2YXRl ICpkZXZfcHJpdiwKIAkJbWF4X3NpemUgPSBtYXgobWF4X3NpemUsIG9mZnNldCArIHNpemUpOwog CX0KIAotCWlmIChtYXhfc2l6ZSAqIHRpbGVfc2l6ZSA+IGludGVsX2ZiLT5vYmotPmJhc2Uuc2l6 ZSkgeworCWlmIChtYXhfc2l6ZSAqIHRpbGVfc2l6ZSA+IG9iai0+YmFzZS5zaXplKSB7CiAJCURS TV9ERUJVR19LTVMoImZiIHRvbyBiaWcgZm9yIGJvIChuZWVkICV1IGJ5dGVzLCBoYXZlICV6dSBi eXRlcylcbiIsCi0JCQkgICAgICBtYXhfc2l6ZSAqIHRpbGVfc2l6ZSwgaW50ZWxfZmItPm9iai0+ YmFzZS5zaXplKTsKKwkJCSAgICAgIG1heF9zaXplICogdGlsZV9zaXplLCBvYmotPmJhc2Uuc2l6 ZSk7CiAJCXJldHVybiAtRUlOVkFMOwogCX0KIApAQCAtMTQwODIsMTQgKzE0MDgzLDE1IEBAIHN0 YXRpYyB2b2lkIGludGVsX3NldHVwX291dHB1dHMoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRl dl9wcml2KQogc3RhdGljIHZvaWQgaW50ZWxfdXNlcl9mcmFtZWJ1ZmZlcl9kZXN0cm95KHN0cnVj dCBkcm1fZnJhbWVidWZmZXIgKmZiKQogewogCXN0cnVjdCBpbnRlbF9mcmFtZWJ1ZmZlciAqaW50 ZWxfZmIgPSB0b19pbnRlbF9mcmFtZWJ1ZmZlcihmYik7CisJc3RydWN0IGRybV9pOTE1X2dlbV9v YmplY3QgKm9iaiA9IGludGVsX2ZiX29iaihmYik7CiAKIAlkcm1fZnJhbWVidWZmZXJfY2xlYW51 cChmYik7CiAKLQlpOTE1X2dlbV9vYmplY3RfbG9jayhpbnRlbF9mYi0+b2JqKTsKLQlXQVJOX09O KCFpbnRlbF9mYi0+b2JqLT5mcmFtZWJ1ZmZlcl9yZWZlcmVuY2VzLS0pOwotCWk5MTVfZ2VtX29i amVjdF91bmxvY2soaW50ZWxfZmItPm9iaik7CisJaTkxNV9nZW1fb2JqZWN0X2xvY2sob2JqKTsK KwlXQVJOX09OKCFvYmotPmZyYW1lYnVmZmVyX3JlZmVyZW5jZXMtLSk7CisJaTkxNV9nZW1fb2Jq ZWN0X3VubG9jayhvYmopOwogCi0JaTkxNV9nZW1fb2JqZWN0X3B1dChpbnRlbF9mYi0+b2JqKTsK KwlpOTE1X2dlbV9vYmplY3RfcHV0KG9iaik7CiAKIAlrZnJlZShpbnRlbF9mYik7CiB9CkBAIC0x NDA5OCw4ICsxNDEwMCw3IEBAIHN0YXRpYyBpbnQgaW50ZWxfdXNlcl9mcmFtZWJ1ZmZlcl9jcmVh dGVfaGFuZGxlKHN0cnVjdCBkcm1fZnJhbWVidWZmZXIgKmZiLAogCQkJCQkJc3RydWN0IGRybV9m aWxlICpmaWxlLAogCQkJCQkJdW5zaWduZWQgaW50ICpoYW5kbGUpCiB7Ci0Jc3RydWN0IGludGVs X2ZyYW1lYnVmZmVyICppbnRlbF9mYiA9IHRvX2ludGVsX2ZyYW1lYnVmZmVyKGZiKTsKLQlzdHJ1 Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqb2JqID0gaW50ZWxfZmItPm9iajsKKwlzdHJ1Y3QgZHJt X2k5MTVfZ2VtX29iamVjdCAqb2JqID0gaW50ZWxfZmJfb2JqKGZiKTsKIAogCWlmIChvYmotPnVz ZXJwdHIubW0pIHsKIAkJRFJNX0RFQlVHKCJhdHRlbXB0aW5nIHRvIHVzZSBhIHVzZXJwdHIgZm9y IGEgZnJhbWVidWZmZXIsIGRlbmllZFxuIik7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9mYmRldi5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZmJkZXYuYwpp bmRleCBlOWUwMmI1OGI3YmUuLmZiMmY5ZmNlMzRjZCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfZmJkZXYuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9m YmRldi5jCkBAIC00Nyw3ICs0Nyw3IEBACiAKIHN0YXRpYyB2b2lkIGludGVsX2ZiZGV2X2ludmFs aWRhdGUoc3RydWN0IGludGVsX2ZiZGV2ICppZmJkZXYpCiB7Ci0Jc3RydWN0IGRybV9pOTE1X2dl bV9vYmplY3QgKm9iaiA9IGlmYmRldi0+ZmItPm9iajsKKwlzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29i amVjdCAqb2JqID0gaW50ZWxfZmJfb2JqKCZpZmJkZXYtPmZiLT5iYXNlKTsKIAl1bnNpZ25lZCBp bnQgb3JpZ2luID0KIAkJaWZiZGV2LT52bWFfZmxhZ3MgJiBQTEFORV9IQVNfRkVOQ0UgPyBPUklH SU5fR1RUIDogT1JJR0lOX0NQVTsKIApAQCAtMTkzLDcgKzE5Myw3IEBAIHN0YXRpYyBpbnQgaW50 ZWxmYl9jcmVhdGUoc3RydWN0IGRybV9mYl9oZWxwZXIgKmhlbHBlciwKIAkJZHJtX2ZyYW1lYnVm ZmVyX3B1dCgmaW50ZWxfZmItPmJhc2UpOwogCQlpbnRlbF9mYiA9IGlmYmRldi0+ZmIgPSBOVUxM OwogCX0KLQlpZiAoIWludGVsX2ZiIHx8IFdBUk5fT04oIWludGVsX2ZiLT5vYmopKSB7CisJaWYg KCFpbnRlbF9mYiB8fCBXQVJOX09OKCFpbnRlbF9mYl9vYmooJmludGVsX2ZiLT5iYXNlKSkpIHsK IAkJRFJNX0RFQlVHX0tNUygibm8gQklPUyBmYiwgYWxsb2NhdGluZyBhIG5ldyBvbmVcbiIpOwog CQlyZXQgPSBpbnRlbGZiX2FsbG9jKGhlbHBlciwgc2l6ZXMpOwogCQlpZiAocmV0KQpAQCAtMjY1 LDcgKzI2NSw3IEBAIHN0YXRpYyBpbnQgaW50ZWxmYl9jcmVhdGUoc3RydWN0IGRybV9mYl9oZWxw ZXIgKmhlbHBlciwKIAkgKiBJZiB0aGUgb2JqZWN0IGlzIHN0b2xlbiBob3dldmVyLCBpdCB3aWxs IGJlIGZ1bGwgb2Ygd2hhdGV2ZXIKIAkgKiBnYXJiYWdlIHdhcyBsZWZ0IGluIHRoZXJlLgogCSAq LwotCWlmIChpbnRlbF9mYi0+b2JqLT5zdG9sZW4gJiYgIXByZWFsbG9jKQorCWlmIChpbnRlbF9m Yl9vYmooZmIpLT5zdG9sZW4gJiYgIXByZWFsbG9jKQogCQltZW1zZXRfaW8oaW5mby0+c2NyZWVu X2Jhc2UsIDAsIGluZm8tPnNjcmVlbl9zaXplKTsKIAogCS8qIFVzZSBkZWZhdWx0IHNjcmF0Y2gg cGl4bWFwIChpbmZvLT5waXhtYXAuZmxhZ3MgPSBGQl9QSVhNQVBfU1lTVEVNKSAqLwpAQCAtNzky LDcgKzc5Miw4IEBAIHZvaWQgaW50ZWxfZmJkZXZfc2V0X3N1c3BlbmQoc3RydWN0IGRybV9kZXZp Y2UgKmRldiwgaW50IHN0YXRlLCBib29sIHN5bmNocm9ub3VzCiAJICogYmVlbiByZXN0b3JlZCBm cm9tIHN3YXAuIElmIHRoZSBvYmplY3QgaXMgc3RvbGVuIGhvd2V2ZXIsIGl0IHdpbGwgYmUKIAkg KiBmdWxsIG9mIHdoYXRldmVyIGdhcmJhZ2Ugd2FzIGxlZnQgaW4gdGhlcmUuCiAJICovCi0JaWYg KHN0YXRlID09IEZCSU5GT19TVEFURV9SVU5OSU5HICYmIGlmYmRldi0+ZmItPm9iai0+c3RvbGVu KQorCWlmIChzdGF0ZSA9PSBGQklORk9fU1RBVEVfUlVOTklORyAmJgorCSAgICBpbnRlbF9mYl9v YmooJmlmYmRldi0+ZmItPmJhc2UpLT5zdG9sZW4pCiAJCW1lbXNldF9pbyhpbmZvLT5zY3JlZW5f YmFzZSwgMCwgaW5mby0+c2NyZWVuX3NpemUpOwogCiAJZHJtX2ZiX2hlbHBlcl9zZXRfc3VzcGVu ZCgmaWZiZGV2LT5oZWxwZXIsIHN0YXRlKTsKLS0gCjIuMTcuMAoKX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRl bC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3Jn L21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==