From mboxrd@z Thu Jan  1 00:00:00 1970
From: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>
Subject: [PATCH 3/3] drm/i915: Use intel_plane_obj_offset from
	more places
Date: Wed, 27 May 2015 10:52:34 +0100
Message-ID: <1432720354-20230-3-git-send-email-tvrtko.ursulin@linux.intel.com>
References: <1432720354-20230-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 mga09.intel.com (mga09.intel.com [134.134.136.24])
 by gabe.freedesktop.org (Postfix) with ESMTP id 71B3F72121
 for <Intel-gfx@lists.freedesktop.org>; Wed, 27 May 2015 02:52:39 -0700 (PDT)
In-Reply-To: <1432720354-20230-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
dS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgfCA4ICsrKysrLS0tCiBkcml2ZXJzL2dwdS9kcm0v
aTkxNS9pbnRlbF9mYmRldi5jICAgfCA5ICsrKysrLS0tLQogMiBmaWxlcyBjaGFuZ2VkLCAxMCBp
bnNlcnRpb25zKCspLCA3IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2Ry
bS9pOTE1L2ludGVsX2Rpc3BsYXkuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3Bs
YXkuYwppbmRleCA2NTdhMzMzLi4wZGM4NzJiIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0v
aTkxNS9pbnRlbF9kaXNwbGF5LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlz
cGxheS5jCkBAIC0yNjI2LDcgKzI2MjYsOCBAQCBpbnRlbF9maW5kX2luaXRpYWxfcGxhbmVfb2Jq
KHN0cnVjdCBpbnRlbF9jcnRjICppbnRlbF9jcnRjLAogCQkJY29udGludWU7CiAKIAkJb2JqID0g
aW50ZWxfZmJfb2JqKGZiKTsKLQkJaWYgKGk5MTVfZ2VtX29ial9nZ3R0X29mZnNldChvYmopID09
IHBsYW5lX2NvbmZpZy0+YmFzZSkgeworCQlpZiAoaW50ZWxfcGxhbmVfb2JqX29mZnNldCh0b19p
bnRlbF9wbGFuZShjLT5wcmltYXJ5KSwgb2JqKSA9PQorCQkgICAgcGxhbmVfY29uZmlnLT5iYXNl
KSB7CiAJCQlkcm1fZnJhbWVidWZmZXJfcmVmZXJlbmNlKGZiKTsKIAkJCWdvdG8gdmFsaWRfZmI7
CiAJCX0KQEAgLTI5MTEsNyArMjkxMiw4IEBAIHVuc2lnbmVkIGxvbmcgaW50ZWxfcGxhbmVfb2Jq
X29mZnNldChzdHJ1Y3QgaW50ZWxfcGxhbmUgKmludGVsX3BsYW5lLAogewogCWNvbnN0IHN0cnVj
dCBpOTE1X2dndHRfdmlldyAqdmlldyA9ICZpOTE1X2dndHRfdmlld19ub3JtYWw7CiAKLQlpZiAo
aW50ZWxfcm90YXRpb25fOTBfb3JfMjcwKGludGVsX3BsYW5lLT5iYXNlLnN0YXRlLT5yb3RhdGlv
bikpCisJaWYgKGludGVsX3BsYW5lICYmCisJICAgIGludGVsX3JvdGF0aW9uXzkwX29yXzI3MChp
bnRlbF9wbGFuZS0+YmFzZS5zdGF0ZS0+cm90YXRpb24pKQogCQl2aWV3ID0gJmk5MTVfZ2d0dF92
aWV3X3JvdGF0ZWQ7CiAKIAlyZXR1cm4gaTkxNV9nZW1fb2JqX2dndHRfb2Zmc2V0X3ZpZXcob2Jq
LCB2aWV3KTsKQEAgLTEzNjYxLDcgKzEzNjYzLDcgQEAgaW50ZWxfY29tbWl0X2N1cnNvcl9wbGFu
ZShzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSwKIAlpZiAoIW9iaikKIAkJYWRkciA9IDA7CiAJZWxz
ZSBpZiAoIUlOVEVMX0lORk8oZGV2KS0+Y3Vyc29yX25lZWRzX3BoeXNpY2FsKQotCQlhZGRyID0g
aTkxNV9nZW1fb2JqX2dndHRfb2Zmc2V0KG9iaik7CisJCWFkZHIgPSBpbnRlbF9wbGFuZV9vYmpf
b2Zmc2V0KHRvX2ludGVsX3BsYW5lKHBsYW5lKSwgb2JqKTsKIAllbHNlCiAJCWFkZHIgPSBvYmot
PnBoeXNfaGFuZGxlLT5idXNhZGRyOwogCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkx
NS9pbnRlbF9mYmRldi5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZmJkZXYuYwppbmRl
eCA0ZTdlN2RhLi40MzM4MzI0IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl
bF9mYmRldi5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2ZiZGV2LmMKQEAgLTE4
MCw2ICsxODAsNyBAQCBzdGF0aWMgaW50IGludGVsZmJfY3JlYXRlKHN0cnVjdCBkcm1fZmJfaGVs
cGVyICpoZWxwZXIsCiAJc3RydWN0IGZiX2luZm8gKmluZm87CiAJc3RydWN0IGRybV9mcmFtZWJ1
ZmZlciAqZmI7CiAJc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKm9iajsKKwl1bnNpZ25lZCBs
b25nIGRpc3BfYWRkcjsKIAlpbnQgc2l6ZSwgcmV0OwogCWJvb2wgcHJlYWxsb2MgPSBmYWxzZTsK
IApAQCAtMjQzLDEyICsyNDQsMTIgQEAgc3RhdGljIGludCBpbnRlbGZiX2NyZWF0ZShzdHJ1Y3Qg
ZHJtX2ZiX2hlbHBlciAqaGVscGVyLAogCWluZm8tPmFwZXJ0dXJlcy0+cmFuZ2VzWzBdLmJhc2Ug
PSBkZXYtPm1vZGVfY29uZmlnLmZiX2Jhc2U7CiAJaW5mby0+YXBlcnR1cmVzLT5yYW5nZXNbMF0u
c2l6ZSA9IGRldl9wcml2LT5ndHQubWFwcGFibGVfZW5kOwogCi0JaW5mby0+Zml4LnNtZW1fc3Rh
cnQgPSBkZXYtPm1vZGVfY29uZmlnLmZiX2Jhc2UgKyBpOTE1X2dlbV9vYmpfZ2d0dF9vZmZzZXQo
b2JqKTsKKwlkaXNwX2FkZHIgPSBpbnRlbF9wbGFuZV9vYmpfb2Zmc2V0KE5VTEwsIG9iaik7CisJ
aW5mby0+Zml4LnNtZW1fc3RhcnQgPSBkZXYtPm1vZGVfY29uZmlnLmZiX2Jhc2UgKyBkaXNwX2Fk
ZHI7CiAJaW5mby0+Zml4LnNtZW1fbGVuID0gc2l6ZTsKIAogCWluZm8tPnNjcmVlbl9iYXNlID0K
LQkJaW9yZW1hcF93YyhkZXZfcHJpdi0+Z3R0Lm1hcHBhYmxlX2Jhc2UgKyBpOTE1X2dlbV9vYmpf
Z2d0dF9vZmZzZXQob2JqKSwKLQkJCSAgIHNpemUpOworCQlpb3JlbWFwX3djKGRldl9wcml2LT5n
dHQubWFwcGFibGVfYmFzZSArIGRpc3BfYWRkciwgc2l6ZSk7CiAJaWYgKCFpbmZvLT5zY3JlZW5f
YmFzZSkgewogCQlyZXQgPSAtRU5PU1BDOwogCQlnb3RvIG91dF91bnBpbjsKQEAgLTI3Miw3ICsy
NzMsNyBAQCBzdGF0aWMgaW50IGludGVsZmJfY3JlYXRlKHN0cnVjdCBkcm1fZmJfaGVscGVyICpo
ZWxwZXIsCiAKIAlEUk1fREVCVUdfS01TKCJhbGxvY2F0ZWQgJWR4JWQgZmI6IDB4JTA4bHgsIGJv
ICVwXG4iLAogCQkgICAgICBmYi0+d2lkdGgsIGZiLT5oZWlnaHQsCi0JCSAgICAgIGk5MTVfZ2Vt
X29ial9nZ3R0X29mZnNldChvYmopLCBvYmopOworCQkgICAgICBkaXNwX2FkZHIsIG9iaik7CiAK
IAltdXRleF91bmxvY2soJmRldi0+c3RydWN0X211dGV4KTsKIAl2Z2Ffc3dpdGNoZXJvb19jbGll
bnRfZmJfc2V0KGRldi0+cGRldiwgaW5mbyk7Ci0tIAoyLjQuMAoKX19fX19fX19fX19fX19fX19f
X19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRl
bC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcv
bWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK