From mboxrd@z Thu Jan  1 00:00:00 1970
From: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>
Subject: [RFC 3/3] drm/i915: Use intel_plane_obj_offset from
	more places
Date: Tue, 16 Jun 2015 14:34:28 +0100
Message-ID: <1434461668-19661-3-git-send-email-tvrtko.ursulin@linux.intel.com>
References: <1434461668-19661-1-git-send-email-tvrtko.ursulin@linux.intel.com>
Mime-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64
Return-path: <intel-gfx-bounces@lists.freedesktop.org>
Received: from mga01.intel.com (mga01.intel.com [192.55.52.88])
 by gabe.freedesktop.org (Postfix) with ESMTP id 3D6E36E3B4
 for <Intel-gfx@lists.freedesktop.org>; Tue, 16 Jun 2015 06:34:36 -0700 (PDT)
In-Reply-To: <1434461668-19661-1-git-send-email-tvrtko.ursulin@linux.intel.com>
List-Unsubscribe: <http://lists.freedesktop.org/mailman/options/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=unsubscribe>
List-Archive: <http://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: <http://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: Intel-gfx@lists.freedesktop.org
List-Id: intel-gfx@lists.freedesktop.org

RnJvbTogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KClRoZXNlIGFy
ZSB0aGUgZGlzcGxheSBjYWxsIHNpdGVzIHNvIHNob3VsZCB1c2UgdGhlIHByb3BlciBoZWxwZXIu
CgpBbHNvIHJlcXVpcmVzIGludGVsX3BsYW5lX29ial9vZmZzZXQgdG8gYXNzdW1lIG5vcm1hbCB2
aWV3IHdoZW4KcGxhbmUgcG9pbnRlciBpcyBub3QgYXZhaWxhYmxlLgoKU2lnbmVkLW9mZi1ieTog
VHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dw
dS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgfCA2ICsrKystLQogZHJpdmVycy9ncHUvZHJtL2k5
MTUvaW50ZWxfZmJkZXYuYyAgIHwgOSArKysrKy0tLS0KIDIgZmlsZXMgY2hhbmdlZCwgOSBpbnNl
cnRpb25zKCspLCA2IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9p
OTE1L2ludGVsX2Rpc3BsYXkuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXku
YwppbmRleCAxODI0NzdmLi45MmJiMTdhIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkx
NS9pbnRlbF9kaXNwbGF5LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxh
eS5jCkBAIC0yNjI0LDcgKzI2MjQsOCBAQCBpbnRlbF9maW5kX2luaXRpYWxfcGxhbmVfb2JqKHN0
cnVjdCBpbnRlbF9jcnRjICppbnRlbF9jcnRjLAogCQkJY29udGludWU7CiAKIAkJb2JqID0gaW50
ZWxfZmJfb2JqKGZiKTsKLQkJaWYgKGk5MTVfZ2VtX29ial9nZ3R0X29mZnNldChvYmopID09IHBs
YW5lX2NvbmZpZy0+YmFzZSkgeworCQlpZiAoaW50ZWxfcGxhbmVfb2JqX29mZnNldCh0b19pbnRl
bF9wbGFuZV9zdGF0ZShjLT5wcmltYXJ5LT5zdGF0ZSksCisJCQkJCSAgIG9iaikgPT0gcGxhbmVf
Y29uZmlnLT5iYXNlKSB7CiAJCQlkcm1fZnJhbWVidWZmZXJfcmVmZXJlbmNlKGZiKTsKIAkJCWdv
dG8gdmFsaWRfZmI7CiAJCX0KQEAgLTI5MTAsNyArMjkxMSw4IEBAIGludGVsX3BsYW5lX29ial9v
ZmZzZXQoc3RydWN0IGludGVsX3BsYW5lX3N0YXRlICppbnRlbF9wbGFuZV9zdGF0ZSwKIHsKIAlj
b25zdCBzdHJ1Y3QgaTkxNV9nZ3R0X3ZpZXcgKnZpZXcgPSAmaTkxNV9nZ3R0X3ZpZXdfbm9ybWFs
OwogCi0JaWYgKGludGVsX3JvdGF0aW9uXzkwX29yXzI3MChpbnRlbF9wbGFuZV9zdGF0ZS0+YmFz
ZS5yb3RhdGlvbikpCisJaWYgKGludGVsX3BsYW5lX3N0YXRlICYmCisJICAgIGludGVsX3JvdGF0
aW9uXzkwX29yXzI3MChpbnRlbF9wbGFuZV9zdGF0ZS0+YmFzZS5yb3RhdGlvbikpCiAJCXZpZXcg
PSAmaTkxNV9nZ3R0X3ZpZXdfcm90YXRlZDsKIAogCXJldHVybiBpOTE1X2dlbV9vYmpfZ2d0dF9v
ZmZzZXRfdmlldyhvYmosIHZpZXcpOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUv
aW50ZWxfZmJkZXYuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2ZiZGV2LmMKaW5kZXgg
NjM3MmNmYy4uNjU3Mjg0MCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf
ZmJkZXYuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9mYmRldi5jCkBAIC0yMDYs
NiArMjA2LDcgQEAgc3RhdGljIGludCBpbnRlbGZiX2NyZWF0ZShzdHJ1Y3QgZHJtX2ZiX2hlbHBl
ciAqaGVscGVyLAogCXN0cnVjdCBmYl9pbmZvICppbmZvOwogCXN0cnVjdCBkcm1fZnJhbWVidWZm
ZXIgKmZiOwogCXN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpvYmo7CisJdW5zaWduZWQgbG9u
ZyBkaXNwX2FkZHI7CiAJaW50IHNpemUsIHJldDsKIAlib29sIHByZWFsbG9jID0gZmFsc2U7CiAK
QEAgLTI2OSwxMiArMjcwLDEyIEBAIHN0YXRpYyBpbnQgaW50ZWxmYl9jcmVhdGUoc3RydWN0IGRy
bV9mYl9oZWxwZXIgKmhlbHBlciwKIAlpbmZvLT5hcGVydHVyZXMtPnJhbmdlc1swXS5iYXNlID0g
ZGV2LT5tb2RlX2NvbmZpZy5mYl9iYXNlOwogCWluZm8tPmFwZXJ0dXJlcy0+cmFuZ2VzWzBdLnNp
emUgPSBkZXZfcHJpdi0+Z3R0Lm1hcHBhYmxlX2VuZDsKIAotCWluZm8tPmZpeC5zbWVtX3N0YXJ0
ID0gZGV2LT5tb2RlX2NvbmZpZy5mYl9iYXNlICsgaTkxNV9nZW1fb2JqX2dndHRfb2Zmc2V0KG9i
aik7CisJZGlzcF9hZGRyID0gaW50ZWxfcGxhbmVfb2JqX29mZnNldChOVUxMLCBvYmopOworCWlu
Zm8tPmZpeC5zbWVtX3N0YXJ0ID0gZGV2LT5tb2RlX2NvbmZpZy5mYl9iYXNlICsgZGlzcF9hZGRy
OwogCWluZm8tPmZpeC5zbWVtX2xlbiA9IHNpemU7CiAKIAlpbmZvLT5zY3JlZW5fYmFzZSA9Ci0J
CWlvcmVtYXBfd2MoZGV2X3ByaXYtPmd0dC5tYXBwYWJsZV9iYXNlICsgaTkxNV9nZW1fb2JqX2dn
dHRfb2Zmc2V0KG9iaiksCi0JCQkgICBzaXplKTsKKwkJaW9yZW1hcF93YyhkZXZfcHJpdi0+Z3R0
Lm1hcHBhYmxlX2Jhc2UgKyBkaXNwX2FkZHIsIHNpemUpOwogCWlmICghaW5mby0+c2NyZWVuX2Jh
c2UpIHsKIAkJcmV0ID0gLUVOT1NQQzsKIAkJZ290byBvdXRfdW5waW47CkBAIC0yOTgsNyArMjk5
LDcgQEAgc3RhdGljIGludCBpbnRlbGZiX2NyZWF0ZShzdHJ1Y3QgZHJtX2ZiX2hlbHBlciAqaGVs
cGVyLAogCiAJRFJNX0RFQlVHX0tNUygiYWxsb2NhdGVkICVkeCVkIGZiOiAweCUwOGx4LCBibyAl
cFxuIiwKIAkJICAgICAgZmItPndpZHRoLCBmYi0+aGVpZ2h0LAotCQkgICAgICBpOTE1X2dlbV9v
YmpfZ2d0dF9vZmZzZXQob2JqKSwgb2JqKTsKKwkJICAgICAgZGlzcF9hZGRyLCBvYmopOwogCiAJ
bXV0ZXhfdW5sb2NrKCZkZXYtPnN0cnVjdF9tdXRleCk7CiAJdmdhX3N3aXRjaGVyb29fY2xpZW50
X2ZiX3NldChkZXYtPnBkZXYsIGluZm8pOwotLSAKMi40LjIKCl9fX19fX19fX19fX19fX19fX19f
X19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwt
Z2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21h
aWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==