From mboxrd@z Thu Jan  1 00:00:00 1970
From: Daniel Stone <daniels@collabora.com>
Subject: [PATCH 1/4] drm/i915: Use intel_fb_obj() everywhere
Date: Fri, 23 Mar 2018 13:45:49 +0000
Message-ID: <20180323134553.15993-1-daniels@collabora.com>
References: <CAPj87rNifw841eX2tyNr3uWYRPd3=91gqcBSqNbPADycryFh2Q@mail.gmail.com>
Mime-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64
Return-path: <intel-gfx-bounces@lists.freedesktop.org>
In-Reply-To: <CAPj87rNifw841eX2tyNr3uWYRPd3=91gqcBSqNbPADycryFh2Q@mail.gmail.com>
List-Unsubscribe: <https://lists.freedesktop.org/mailman/options/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=unsubscribe>
List-Archive: <https://lists.freedesktop.org/archives/intel-gfx>
List-Post: <mailto:intel-gfx@lists.freedesktop.org>
List-Help: <mailto:intel-gfx-request@lists.freedesktop.org?subject=help>
List-Subscribe: <https://lists.freedesktop.org/mailman/listinfo/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=subscribe>
Errors-To: intel-gfx-bounces@lists.freedesktop.org
Sender: "Intel-gfx" <intel-gfx-bounces@lists.freedesktop.org>
To: dri-devel@lists.freedesktop.org
Cc: intel-gfx@lists.freedesktop.org, Rodrigo Vivi <rodrigo.vivi@intel.com>
List-Id: dri-devel@lists.freedesktop.org

V2UgYWxyZWFkeSBoYXZlIGEgbWFjcm8gdG8gcHVsbCB0aGUgR0VNIG9iamVjdCBmcm9tIGEgRkIs
IHNvIHVzZSBpdApldmVyeXdoZXJlLiBXZSdsbCBtYWtlIHVzZSBvZiB0aGlzIGxhdGVyIHRvIG1v
dmUgdGhlIG9iamVjdCBzdG9yYWdlLgoKU2lnbmVkLW9mZi1ieTogRGFuaWVsIFN0b25lIDxkYW5p
ZWxzQGNvbGxhYm9yYS5jb20+CkNjOiBKYW5pIE5pa3VsYSA8amFuaS5uaWt1bGFAbGludXguaW50
ZWwuY29tPgpDYzogSm9vbmFzIExhaHRpbmVuIDxqb29uYXMubGFodGluZW5AbGludXguaW50ZWwu
Y29tPgpDYzogUm9kcmlnbyBWaXZpIDxyb2RyaWdvLnZpdmlAaW50ZWwuY29tPgpDYzogaW50ZWwt
Z2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVf
ZGVidWdmcy5jICB8ICA0ICsrLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXku
YyB8IDE5ICsrKysrKysrKystLS0tLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Zi
ZGV2LmMgICB8ICA5ICsrKysrLS0tLQogMyBmaWxlcyBjaGFuZ2VkLCAxNyBpbnNlcnRpb25zKCsp
LCAxNSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1
X2RlYnVnZnMuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZGVidWdmcy5jCmluZGV4IDc4
MTZjZDUzMTAwYS4uNjg1NDFkZjZmNjAxIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkx
NS9pOTE1X2RlYnVnZnMuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2RlYnVnZnMu
YwpAQCAtMTg5Myw3ICsxODkzLDcgQEAgc3RhdGljIGludCBpOTE1X2dlbV9mcmFtZWJ1ZmZlcl9p
bmZvKHN0cnVjdCBzZXFfZmlsZSAqbSwgdm9pZCAqZGF0YSkKIAkJCSAgIGZiZGV2X2ZiLT5iYXNl
LmZvcm1hdC0+Y3BwWzBdICogOCwKIAkJCSAgIGZiZGV2X2ZiLT5iYXNlLm1vZGlmaWVyLAogCQkJ
ICAgZHJtX2ZyYW1lYnVmZmVyX3JlYWRfcmVmY291bnQoJmZiZGV2X2ZiLT5iYXNlKSk7Ci0JCWRl
c2NyaWJlX29iaihtLCBmYmRldl9mYi0+b2JqKTsKKwkJZGVzY3JpYmVfb2JqKG0sIGludGVsX2Zi
X29iaigmZmJkZXZfZmItPmJhc2UpKTsKIAkJc2VxX3B1dGMobSwgJ1xuJyk7CiAJfQogI2VuZGlm
CkBAIC0xOTExLDcgKzE5MTEsNyBAQCBzdGF0aWMgaW50IGk5MTVfZ2VtX2ZyYW1lYnVmZmVyX2lu
Zm8oc3RydWN0IHNlcV9maWxlICptLCB2b2lkICpkYXRhKQogCQkJICAgZmItPmJhc2UuZm9ybWF0
LT5jcHBbMF0gKiA4LAogCQkJICAgZmItPmJhc2UubW9kaWZpZXIsCiAJCQkgICBkcm1fZnJhbWVi
dWZmZXJfcmVhZF9yZWZjb3VudCgmZmItPmJhc2UpKTsKLQkJZGVzY3JpYmVfb2JqKG0sIGZiLT5v
YmopOworCQlkZXNjcmliZV9vYmoobSwgaW50ZWxfZmJfb2JqKCZmYi0+YmFzZSkpOwogCQlzZXFf
cHV0YyhtLCAnXG4nKTsKIAl9CiAJbXV0ZXhfdW5sb2NrKCZkZXYtPm1vZGVfY29uZmlnLmZiX2xv
Y2spOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jIGIv
ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCmluZGV4IDFiMTZiNTM0ODcxYS4u
NDliMDc3MmU5YWJjIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNw
bGF5LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCkBAIC0yNDc4
LDYgKzI0NzgsNyBAQCBpbnRlbF9maWxsX2ZiX2luZm8oc3RydWN0IGRybV9pOTE1X3ByaXZhdGUg
KmRldl9wcml2LAogewogCXN0cnVjdCBpbnRlbF9mcmFtZWJ1ZmZlciAqaW50ZWxfZmIgPSB0b19p
bnRlbF9mcmFtZWJ1ZmZlcihmYik7CiAJc3RydWN0IGludGVsX3JvdGF0aW9uX2luZm8gKnJvdF9p
bmZvID0gJmludGVsX2ZiLT5yb3RfaW5mbzsKKwlzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAq
b2JqID0gaW50ZWxfZmJfb2JqKGZiKTsKIAl1MzIgZ3R0X29mZnNldF9yb3RhdGVkID0gMDsKIAl1
bnNpZ25lZCBpbnQgbWF4X3NpemUgPSAwOwogCWludCBpLCBudW1fcGxhbmVzID0gZmItPmZvcm1h
dC0+bnVtX3BsYW5lczsKQEAgLTI1NDIsNyArMjU0Myw3IEBAIGludGVsX2ZpbGxfZmJfaW5mbyhz
dHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCiAJCSAqIGZiIGxheW91dCBhZ3JlZXMg
d2l0aCB0aGUgZmVuY2UgbGF5b3V0LiBXZSBhbHJlYWR5IGNoZWNrIHRoYXQgdGhlCiAJCSAqIGZi
IHN0cmlkZSBtYXRjaGVzIHRoZSBmZW5jZSBzdHJpZGUgZWxzZXdoZXJlLgogCQkgKi8KLQkJaWYg
KGkgPT0gMCAmJiBpOTE1X2dlbV9vYmplY3RfaXNfdGlsZWQoaW50ZWxfZmItPm9iaikgJiYKKwkJ
aWYgKGkgPT0gMCAmJiBpOTE1X2dlbV9vYmplY3RfaXNfdGlsZWQob2JqKSAmJgogCQkgICAgKHgg
KyB3aWR0aCkgKiBjcHAgPiBmYi0+cGl0Y2hlc1tpXSkgewogCQkJRFJNX0RFQlVHX0tNUygiYmFk
IGZiIHBsYW5lICVkIG9mZnNldDogMHgleFxuIiwKIAkJCQkgICAgICBpLCBmYi0+b2Zmc2V0c1tp
XSk7CkBAIC0yNjI3LDkgKzI2MjgsOSBAQCBpbnRlbF9maWxsX2ZiX2luZm8oc3RydWN0IGRybV9p
OTE1X3ByaXZhdGUgKmRldl9wcml2LAogCQltYXhfc2l6ZSA9IG1heChtYXhfc2l6ZSwgb2Zmc2V0
ICsgc2l6ZSk7CiAJfQogCi0JaWYgKG1heF9zaXplICogdGlsZV9zaXplID4gaW50ZWxfZmItPm9i
ai0+YmFzZS5zaXplKSB7CisJaWYgKG1heF9zaXplICogdGlsZV9zaXplID4gb2JqLT5iYXNlLnNp
emUpIHsKIAkJRFJNX0RFQlVHX0tNUygiZmIgdG9vIGJpZyBmb3IgYm8gKG5lZWQgJXUgYnl0ZXMs
IGhhdmUgJXp1IGJ5dGVzKVxuIiwKLQkJCSAgICAgIG1heF9zaXplICogdGlsZV9zaXplLCBpbnRl
bF9mYi0+b2JqLT5iYXNlLnNpemUpOworCQkJICAgICAgbWF4X3NpemUgKiB0aWxlX3NpemUsIG9i
ai0+YmFzZS5zaXplKTsKIAkJcmV0dXJuIC1FSU5WQUw7CiAJfQogCkBAIC0xMzkxMCwxNCArMTM5
MTEsMTUgQEAgc3RhdGljIHZvaWQgaW50ZWxfc2V0dXBfb3V0cHV0cyhzdHJ1Y3QgZHJtX2k5MTVf
cHJpdmF0ZSAqZGV2X3ByaXYpCiBzdGF0aWMgdm9pZCBpbnRlbF91c2VyX2ZyYW1lYnVmZmVyX2Rl
c3Ryb3koc3RydWN0IGRybV9mcmFtZWJ1ZmZlciAqZmIpCiB7CiAJc3RydWN0IGludGVsX2ZyYW1l
YnVmZmVyICppbnRlbF9mYiA9IHRvX2ludGVsX2ZyYW1lYnVmZmVyKGZiKTsKKwlzdHJ1Y3QgZHJt
X2k5MTVfZ2VtX29iamVjdCAqb2JqID0gaW50ZWxfZmJfb2JqKGZiKTsKIAogCWRybV9mcmFtZWJ1
ZmZlcl9jbGVhbnVwKGZiKTsKIAotCWk5MTVfZ2VtX29iamVjdF9sb2NrKGludGVsX2ZiLT5vYmop
OwotCVdBUk5fT04oIWludGVsX2ZiLT5vYmotPmZyYW1lYnVmZmVyX3JlZmVyZW5jZXMtLSk7Ci0J
aTkxNV9nZW1fb2JqZWN0X3VubG9jayhpbnRlbF9mYi0+b2JqKTsKKwlpOTE1X2dlbV9vYmplY3Rf
bG9jayhvYmopOworCVdBUk5fT04oIW9iai0+ZnJhbWVidWZmZXJfcmVmZXJlbmNlcy0tKTsKKwlp
OTE1X2dlbV9vYmplY3RfdW5sb2NrKG9iaik7CiAKLQlpOTE1X2dlbV9vYmplY3RfcHV0KGludGVs
X2ZiLT5vYmopOworCWk5MTVfZ2VtX29iamVjdF9wdXQob2JqKTsKIAogCWtmcmVlKGludGVsX2Zi
KTsKIH0KQEAgLTEzOTI2LDggKzEzOTI4LDcgQEAgc3RhdGljIGludCBpbnRlbF91c2VyX2ZyYW1l
YnVmZmVyX2NyZWF0ZV9oYW5kbGUoc3RydWN0IGRybV9mcmFtZWJ1ZmZlciAqZmIsCiAJCQkJCQlz
dHJ1Y3QgZHJtX2ZpbGUgKmZpbGUsCiAJCQkJCQl1bnNpZ25lZCBpbnQgKmhhbmRsZSkKIHsKLQlz
dHJ1Y3QgaW50ZWxfZnJhbWVidWZmZXIgKmludGVsX2ZiID0gdG9faW50ZWxfZnJhbWVidWZmZXIo
ZmIpOwotCXN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpvYmogPSBpbnRlbF9mYi0+b2JqOwor
CXN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpvYmogPSBpbnRlbF9mYl9vYmooZmIpOwogCiAJ
aWYgKG9iai0+dXNlcnB0ci5tbSkgewogCQlEUk1fREVCVUcoImF0dGVtcHRpbmcgdG8gdXNlIGEg
dXNlcnB0ciBmb3IgYSBmcmFtZWJ1ZmZlciwgZGVuaWVkXG4iKTsKZGlmZiAtLWdpdCBhL2RyaXZl
cnMvZ3B1L2RybS9pOTE1L2ludGVsX2ZiZGV2LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl
bF9mYmRldi5jCmluZGV4IDY1YTMzMTM3MjNjOS4uZmRlZjE4NDg4ZmIxIDEwMDY0NAotLS0gYS9k
cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9mYmRldi5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9p
OTE1L2ludGVsX2ZiZGV2LmMKQEAgLTQ3LDcgKzQ3LDcgQEAKIAogc3RhdGljIHZvaWQgaW50ZWxf
ZmJkZXZfaW52YWxpZGF0ZShzdHJ1Y3QgaW50ZWxfZmJkZXYgKmlmYmRldikKIHsKLQlzdHJ1Y3Qg
ZHJtX2k5MTVfZ2VtX29iamVjdCAqb2JqID0gaWZiZGV2LT5mYi0+b2JqOworCXN0cnVjdCBkcm1f
aTkxNV9nZW1fb2JqZWN0ICpvYmogPSBpbnRlbF9mYl9vYmooJmlmYmRldi0+ZmItPmJhc2UpOwog
CXVuc2lnbmVkIGludCBvcmlnaW4gPQogCQlpZmJkZXYtPnZtYV9mbGFncyAmIFBMQU5FX0hBU19G
RU5DRSA/IE9SSUdJTl9HVFQgOiBPUklHSU5fQ1BVOwogCkBAIC0xOTMsNyArMTkzLDcgQEAgc3Rh
dGljIGludCBpbnRlbGZiX2NyZWF0ZShzdHJ1Y3QgZHJtX2ZiX2hlbHBlciAqaGVscGVyLAogCQlk
cm1fZnJhbWVidWZmZXJfcHV0KCZpbnRlbF9mYi0+YmFzZSk7CiAJCWludGVsX2ZiID0gaWZiZGV2
LT5mYiA9IE5VTEw7CiAJfQotCWlmICghaW50ZWxfZmIgfHwgV0FSTl9PTighaW50ZWxfZmItPm9i
aikpIHsKKwlpZiAoIWludGVsX2ZiIHx8IFdBUk5fT04oIWludGVsX2ZiX29iaigmaW50ZWxfZmIt
PmJhc2UpKSkgewogCQlEUk1fREVCVUdfS01TKCJubyBCSU9TIGZiLCBhbGxvY2F0aW5nIGEgbmV3
IG9uZVxuIik7CiAJCXJldCA9IGludGVsZmJfYWxsb2MoaGVscGVyLCBzaXplcyk7CiAJCWlmIChy
ZXQpCkBAIC0yNjUsNyArMjY1LDcgQEAgc3RhdGljIGludCBpbnRlbGZiX2NyZWF0ZShzdHJ1Y3Qg
ZHJtX2ZiX2hlbHBlciAqaGVscGVyLAogCSAqIElmIHRoZSBvYmplY3QgaXMgc3RvbGVuIGhvd2V2
ZXIsIGl0IHdpbGwgYmUgZnVsbCBvZiB3aGF0ZXZlcgogCSAqIGdhcmJhZ2Ugd2FzIGxlZnQgaW4g
dGhlcmUuCiAJICovCi0JaWYgKGludGVsX2ZiLT5vYmotPnN0b2xlbiAmJiAhcHJlYWxsb2MpCisJ
aWYgKGludGVsX2ZiX29iaihmYiktPnN0b2xlbiAmJiAhcHJlYWxsb2MpCiAJCW1lbXNldF9pbyhp
bmZvLT5zY3JlZW5fYmFzZSwgMCwgaW5mby0+c2NyZWVuX3NpemUpOwogCiAJLyogVXNlIGRlZmF1
bHQgc2NyYXRjaCBwaXhtYXAgKGluZm8tPnBpeG1hcC5mbGFncyA9IEZCX1BJWE1BUF9TWVNURU0p
ICovCkBAIC03OTIsNyArNzkyLDggQEAgdm9pZCBpbnRlbF9mYmRldl9zZXRfc3VzcGVuZChzdHJ1
Y3QgZHJtX2RldmljZSAqZGV2LCBpbnQgc3RhdGUsIGJvb2wgc3luY2hyb25vdXMKIAkgKiBiZWVu
IHJlc3RvcmVkIGZyb20gc3dhcC4gSWYgdGhlIG9iamVjdCBpcyBzdG9sZW4gaG93ZXZlciwgaXQg
d2lsbCBiZQogCSAqIGZ1bGwgb2Ygd2hhdGV2ZXIgZ2FyYmFnZSB3YXMgbGVmdCBpbiB0aGVyZS4K
IAkgKi8KLQlpZiAoc3RhdGUgPT0gRkJJTkZPX1NUQVRFX1JVTk5JTkcgJiYgaWZiZGV2LT5mYi0+
b2JqLT5zdG9sZW4pCisJaWYgKHN0YXRlID09IEZCSU5GT19TVEFURV9SVU5OSU5HICYmCisJICAg
IGludGVsX2ZiX29iaigmaWZiZGV2LT5mYi0+YmFzZSktPnN0b2xlbikKIAkJbWVtc2V0X2lvKGlu
Zm8tPnNjcmVlbl9iYXNlLCAwLCBpbmZvLT5zY3JlZW5fc2l6ZSk7CiAKIAlkcm1fZmJfaGVscGVy
X3NldF9zdXNwZW5kKCZpZmJkZXYtPmhlbHBlciwgc3RhdGUpOwotLSAKMi4xNi4yCgpfX19fX19f
X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGlu
ZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVl
ZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK