From mboxrd@z Thu Jan  1 00:00:00 1970
From: Matt Roper <matthew.d.roper@intel.com>
Subject: [PATCH 05/10] drm/i915: Make intel_plane_state subclass
	drm_plane_state
Date: Mon,  1 Dec 2014 15:40:13 -0800
Message-ID: <1417477218-9519-5-git-send-email-matthew.d.roper@intel.com>
References: <1417477218-9519-1-git-send-email-matthew.d.roper@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 343376E405
 for <intel-gfx@lists.freedesktop.org>; Mon,  1 Dec 2014 15:40:37 -0800 (PST)
In-Reply-To: <1417477218-9519-1-git-send-email-matthew.d.roper@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

UmV2aWV3ZWQtYnk6IEJvYiBQYWF1d2UgPGJvYi5qLnBhYXV3ZUBpbnRlbC5jb20+ClNpZ25lZC1v
ZmYtYnk6IE1hdHQgUm9wZXIgPG1hdHRoZXcuZC5yb3BlckBpbnRlbC5jb20+Ci0tLQogZHJpdmVy
cy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jIHwgMzQgKysrKysrKysrKysrKysrKystLS0t
LS0tLS0tLS0tLS0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmggICAgIHwgIDMg
Ky0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9zcHJpdGUuYyAgfCAxNiArKysrKysrKy0t
LS0tLS0tCiAzIGZpbGVzIGNoYW5nZWQsIDI2IGluc2VydGlvbnMoKyksIDI3IGRlbGV0aW9ucygt
KQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYyBiL2Ry
aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwppbmRleCAyOGZlN2E4Li5iYmMwZmNk
IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKKysrIGIv
ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCkBAIC0xMTY0Niw4ICsxMTY0Niw4
IEBAIHN0YXRpYyBpbnQKIGludGVsX2NoZWNrX3ByaW1hcnlfcGxhbmUoc3RydWN0IGRybV9wbGFu
ZSAqcGxhbmUsCiAJCQkgIHN0cnVjdCBpbnRlbF9wbGFuZV9zdGF0ZSAqc3RhdGUpCiB7Ci0Jc3Ry
dWN0IGRybV9jcnRjICpjcnRjID0gc3RhdGUtPmNydGM7Ci0Jc3RydWN0IGRybV9mcmFtZWJ1ZmZl
ciAqZmIgPSBzdGF0ZS0+ZmI7CisJc3RydWN0IGRybV9jcnRjICpjcnRjID0gc3RhdGUtPmJhc2Uu
Y3J0YzsKKwlzdHJ1Y3QgZHJtX2ZyYW1lYnVmZmVyICpmYiA9IHN0YXRlLT5iYXNlLmZiOwogCXN0
cnVjdCBkcm1fcmVjdCAqZGVzdCA9ICZzdGF0ZS0+ZHN0OwogCXN0cnVjdCBkcm1fcmVjdCAqc3Jj
ID0gJnN0YXRlLT5zcmM7CiAJY29uc3Qgc3RydWN0IGRybV9yZWN0ICpjbGlwID0gJnN0YXRlLT5j
bGlwOwpAQCAtMTE2NjMsOCArMTE2NjMsOCBAQCBzdGF0aWMgaW50CiBpbnRlbF9wcmVwYXJlX3By
aW1hcnlfcGxhbmUoc3RydWN0IGRybV9wbGFuZSAqcGxhbmUsCiAJCQkgICAgc3RydWN0IGludGVs
X3BsYW5lX3N0YXRlICpzdGF0ZSkKIHsKLQlzdHJ1Y3QgZHJtX2NydGMgKmNydGMgPSBzdGF0ZS0+
Y3J0YzsKLQlzdHJ1Y3QgZHJtX2ZyYW1lYnVmZmVyICpmYiA9IHN0YXRlLT5mYjsKKwlzdHJ1Y3Qg
ZHJtX2NydGMgKmNydGMgPSBzdGF0ZS0+YmFzZS5jcnRjOworCXN0cnVjdCBkcm1fZnJhbWVidWZm
ZXIgKmZiID0gc3RhdGUtPmJhc2UuZmI7CiAJc3RydWN0IGRybV9kZXZpY2UgKmRldiA9IGNydGMt
PmRldjsKIAlzdHJ1Y3QgaW50ZWxfY3J0YyAqaW50ZWxfY3J0YyA9IHRvX2ludGVsX2NydGMoY3J0
Yyk7CiAJZW51bSBwaXBlIHBpcGUgPSBpbnRlbF9jcnRjLT5waXBlOwpAQCAtMTE2OTksOSArMTE2
OTksOSBAQCBzdGF0aWMgdm9pZAogaW50ZWxfY29tbWl0X3ByaW1hcnlfcGxhbmUoc3RydWN0IGRy
bV9wbGFuZSAqcGxhbmUsCiAJCQkgICBzdHJ1Y3QgaW50ZWxfcGxhbmVfc3RhdGUgKnN0YXRlKQog
ewotCXN0cnVjdCBkcm1fY3J0YyAqY3J0YyA9IHN0YXRlLT5jcnRjOwotCXN0cnVjdCBkcm1fZnJh
bWVidWZmZXIgKmZiID0gc3RhdGUtPmZiOwotCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSBjcnRj
LT5kZXY7CisJc3RydWN0IGRybV9jcnRjICpjcnRjID0gc3RhdGUtPmJhc2UuY3J0YzsKKwlzdHJ1
Y3QgZHJtX2ZyYW1lYnVmZmVyICpmYiA9IHN0YXRlLT5iYXNlLmZiOworCXN0cnVjdCBkcm1fZGV2
aWNlICpkZXYgPSBwbGFuZS0+ZGV2OwogCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJp
diA9IGRldi0+ZGV2X3ByaXZhdGU7CiAJc3RydWN0IGludGVsX2NydGMgKmludGVsX2NydGMgPSB0
b19pbnRlbF9jcnRjKGNydGMpOwogCWVudW0gcGlwZSBwaXBlID0gaW50ZWxfY3J0Yy0+cGlwZTsK
QEAgLTExODAwLDggKzExODAwLDggQEAgaW50ZWxfcHJpbWFyeV9wbGFuZV9zZXRwbGFuZShzdHJ1
Y3QgZHJtX3BsYW5lICpwbGFuZSwgc3RydWN0IGRybV9jcnRjICpjcnRjLAogCXN0cnVjdCBpbnRl
bF9jcnRjICppbnRlbF9jcnRjID0gdG9faW50ZWxfY3J0YyhjcnRjKTsKIAlpbnQgcmV0OwogCi0J
c3RhdGUuY3J0YyA9IGNydGM7Ci0Jc3RhdGUuZmIgPSBmYjsKKwlzdGF0ZS5iYXNlLmNydGMgPSBj
cnRjOworCXN0YXRlLmJhc2UuZmIgPSBmYjsKIAogCS8qIHNhbXBsZSBjb29yZGluYXRlcyBpbiAx
Ni4xNiBmaXhlZCBwb2ludCAqLwogCXN0YXRlLnNyYy54MSA9IHNyY194OwpAQCAtMTE5MTQsOSAr
MTE5MTQsOSBAQCBzdGF0aWMgaW50CiBpbnRlbF9jaGVja19jdXJzb3JfcGxhbmUoc3RydWN0IGRy
bV9wbGFuZSAqcGxhbmUsCiAJCQkgc3RydWN0IGludGVsX3BsYW5lX3N0YXRlICpzdGF0ZSkKIHsK
LQlzdHJ1Y3QgZHJtX2NydGMgKmNydGMgPSBzdGF0ZS0+Y3J0YzsKKwlzdHJ1Y3QgZHJtX2NydGMg
KmNydGMgPSBzdGF0ZS0+YmFzZS5jcnRjOwogCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSBjcnRj
LT5kZXY7Ci0Jc3RydWN0IGRybV9mcmFtZWJ1ZmZlciAqZmIgPSBzdGF0ZS0+ZmI7CisJc3RydWN0
IGRybV9mcmFtZWJ1ZmZlciAqZmIgPSBzdGF0ZS0+YmFzZS5mYjsKIAlzdHJ1Y3QgZHJtX3JlY3Qg
KmRlc3QgPSAmc3RhdGUtPmRzdDsKIAlzdHJ1Y3QgZHJtX3JlY3QgKnNyYyA9ICZzdGF0ZS0+c3Jj
OwogCWNvbnN0IHN0cnVjdCBkcm1fcmVjdCAqY2xpcCA9ICZzdGF0ZS0+Y2xpcDsKQEAgLTExOTcx
LDggKzExOTcxLDggQEAgaW50ZWxfcHJlcGFyZV9jdXJzb3JfcGxhbmUoc3RydWN0IGRybV9wbGFu
ZSAqcGxhbmUsCiAJCQkgICBzdHJ1Y3QgaW50ZWxfcGxhbmVfc3RhdGUgKnN0YXRlKQogewogCXN0
cnVjdCBkcm1fZGV2aWNlICpkZXYgPSBwbGFuZS0+ZGV2OwotCXN0cnVjdCBkcm1fZnJhbWVidWZm
ZXIgKmZiID0gc3RhdGUtPmZiOwotCXN0cnVjdCBpbnRlbF9jcnRjICppbnRlbF9jcnRjID0gdG9f
aW50ZWxfY3J0YyhzdGF0ZS0+Y3J0Yyk7CisJc3RydWN0IGRybV9mcmFtZWJ1ZmZlciAqZmIgPSBz
dGF0ZS0+YmFzZS5mYjsKKwlzdHJ1Y3QgaW50ZWxfY3J0YyAqaW50ZWxfY3J0YyA9IHRvX2ludGVs
X2NydGMoc3RhdGUtPmJhc2UuY3J0Yyk7CiAJc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKm9i
aiA9IGludGVsX2ZiX29iaihmYik7CiAJc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKm9sZF9v
YmogPSBpbnRlbF9mYl9vYmoocGxhbmUtPmZiKTsKIAllbnVtIHBpcGUgcGlwZSA9IGludGVsX2Ny
dGMtPnBpcGU7CkBAIC0xMjAwNiwxMSArMTIwMDYsMTEgQEAgc3RhdGljIHZvaWQKIGludGVsX2Nv
bW1pdF9jdXJzb3JfcGxhbmUoc3RydWN0IGRybV9wbGFuZSAqcGxhbmUsCiAJCQkgIHN0cnVjdCBp
bnRlbF9wbGFuZV9zdGF0ZSAqc3RhdGUpCiB7Ci0Jc3RydWN0IGRybV9jcnRjICpjcnRjID0gc3Rh
dGUtPmNydGM7CisJc3RydWN0IGRybV9jcnRjICpjcnRjID0gc3RhdGUtPmJhc2UuY3J0YzsKIAlz
dHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gY3J0Yy0+ZGV2OwogCXN0cnVjdCBpbnRlbF9jcnRjICpp
bnRlbF9jcnRjID0gdG9faW50ZWxfY3J0YyhjcnRjKTsKIAlzdHJ1Y3QgaW50ZWxfcGxhbmUgKmlu
dGVsX3BsYW5lID0gdG9faW50ZWxfcGxhbmUocGxhbmUpOwotCXN0cnVjdCBkcm1faTkxNV9nZW1f
b2JqZWN0ICpvYmogPSBpbnRlbF9mYl9vYmooc3RhdGUtPmZiKTsKKwlzdHJ1Y3QgZHJtX2k5MTVf
Z2VtX29iamVjdCAqb2JqID0gaW50ZWxfZmJfb2JqKHN0YXRlLT5iYXNlLmZiKTsKIAllbnVtIHBp
cGUgcGlwZSA9IGludGVsX2NydGMtPnBpcGU7CiAJdW5zaWduZWQgb2xkX3dpZHRoOwogCXVpbnQz
Ml90IGFkZHI7CkBAIC0xMjA3NSw4ICsxMjA3NSw4IEBAIGludGVsX2N1cnNvcl9wbGFuZV91cGRh
dGUoc3RydWN0IGRybV9wbGFuZSAqcGxhbmUsIHN0cnVjdCBkcm1fY3J0YyAqY3J0YywKIAlzdHJ1
Y3QgaW50ZWxfcGxhbmVfc3RhdGUgc3RhdGU7CiAJaW50IHJldDsKIAotCXN0YXRlLmNydGMgPSBj
cnRjOwotCXN0YXRlLmZiID0gZmI7CisJc3RhdGUuYmFzZS5jcnRjID0gY3J0YzsKKwlzdGF0ZS5i
YXNlLmZiID0gZmI7CiAKIAkvKiBzYW1wbGUgY29vcmRpbmF0ZXMgaW4gMTYuMTYgZml4ZWQgcG9p
bnQgKi8KIAlzdGF0ZS5zcmMueDEgPSBzcmNfeDsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2Ry
bS9pOTE1L2ludGVsX2Rydi5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmgKaW5k
ZXggYWJiMmNmNC4uYjRkMTgxZiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50
ZWxfZHJ2LmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmgKQEAgLTI0NCw4
ICsyNDQsNyBAQCB0eXBlZGVmIHN0cnVjdCBkcGxsIHsKIH0gaW50ZWxfY2xvY2tfdDsKIAogc3Ry
dWN0IGludGVsX3BsYW5lX3N0YXRlIHsKLQlzdHJ1Y3QgZHJtX2NydGMgKmNydGM7Ci0Jc3RydWN0
IGRybV9mcmFtZWJ1ZmZlciAqZmI7CisJc3RydWN0IGRybV9wbGFuZV9zdGF0ZSBiYXNlOwogCXN0
cnVjdCBkcm1fcmVjdCBzcmM7CiAJc3RydWN0IGRybV9yZWN0IGRzdDsKIAlzdHJ1Y3QgZHJtX3Jl
Y3QgY2xpcDsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Nwcml0ZS5j
IGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfc3ByaXRlLmMKaW5kZXggN2Q5YzM0MC4uZmM5
NmQxMyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfc3ByaXRlLmMKKysr
IGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfc3ByaXRlLmMKQEAgLTEwOTYsOSArMTA5Niw5
IEBAIHN0YXRpYyBpbnQKIGludGVsX2NoZWNrX3Nwcml0ZV9wbGFuZShzdHJ1Y3QgZHJtX3BsYW5l
ICpwbGFuZSwKIAkJCSBzdHJ1Y3QgaW50ZWxfcGxhbmVfc3RhdGUgKnN0YXRlKQogewotCXN0cnVj
dCBpbnRlbF9jcnRjICppbnRlbF9jcnRjID0gdG9faW50ZWxfY3J0YyhzdGF0ZS0+Y3J0Yyk7CisJ
c3RydWN0IGludGVsX2NydGMgKmludGVsX2NydGMgPSB0b19pbnRlbF9jcnRjKHN0YXRlLT5iYXNl
LmNydGMpOwogCXN0cnVjdCBpbnRlbF9wbGFuZSAqaW50ZWxfcGxhbmUgPSB0b19pbnRlbF9wbGFu
ZShwbGFuZSk7Ci0Jc3RydWN0IGRybV9mcmFtZWJ1ZmZlciAqZmIgPSBzdGF0ZS0+ZmI7CisJc3Ry
dWN0IGRybV9mcmFtZWJ1ZmZlciAqZmIgPSBzdGF0ZS0+YmFzZS5mYjsKIAlzdHJ1Y3QgZHJtX2k5
MTVfZ2VtX29iamVjdCAqb2JqID0gaW50ZWxfZmJfb2JqKGZiKTsKIAlpbnQgY3J0Y194LCBjcnRj
X3k7CiAJdW5zaWduZWQgaW50IGNydGNfdywgY3J0Y19oOwpAQCAtMTI2MiwxMSArMTI2MiwxMSBA
QCBpbnRlbF9wcmVwYXJlX3Nwcml0ZV9wbGFuZShzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSwKIAkJ
CSAgIHN0cnVjdCBpbnRlbF9wbGFuZV9zdGF0ZSAqc3RhdGUpCiB7CiAJc3RydWN0IGRybV9kZXZp
Y2UgKmRldiA9IHBsYW5lLT5kZXY7Ci0Jc3RydWN0IGRybV9jcnRjICpjcnRjID0gc3RhdGUtPmNy
dGM7CisJc3RydWN0IGRybV9jcnRjICpjcnRjID0gc3RhdGUtPmJhc2UuY3J0YzsKIAlzdHJ1Y3Qg
aW50ZWxfY3J0YyAqaW50ZWxfY3J0YyA9IHRvX2ludGVsX2NydGMoY3J0Yyk7CiAJc3RydWN0IGlu
dGVsX3BsYW5lICppbnRlbF9wbGFuZSA9IHRvX2ludGVsX3BsYW5lKHBsYW5lKTsKIAllbnVtIHBp
cGUgcGlwZSA9IGludGVsX2NydGMtPnBpcGU7Ci0Jc3RydWN0IGRybV9mcmFtZWJ1ZmZlciAqZmIg
PSBzdGF0ZS0+ZmI7CisJc3RydWN0IGRybV9mcmFtZWJ1ZmZlciAqZmIgPSBzdGF0ZS0+YmFzZS5m
YjsKIAlzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqb2JqID0gaW50ZWxfZmJfb2JqKGZiKTsK
IAlzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqb2xkX29iaiA9IGludGVsX3BsYW5lLT5vYmo7
CiAJaW50IHJldDsKQEAgLTEyOTcsMTEgKzEyOTcsMTEgQEAgaW50ZWxfY29tbWl0X3Nwcml0ZV9w
bGFuZShzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSwKIAkJCSAgc3RydWN0IGludGVsX3BsYW5lX3N0
YXRlICpzdGF0ZSkKIHsKIAlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gcGxhbmUtPmRldjsKLQlz
dHJ1Y3QgZHJtX2NydGMgKmNydGMgPSBzdGF0ZS0+Y3J0YzsKKwlzdHJ1Y3QgZHJtX2NydGMgKmNy
dGMgPSBzdGF0ZS0+YmFzZS5jcnRjOwogCXN0cnVjdCBpbnRlbF9jcnRjICppbnRlbF9jcnRjID0g
dG9faW50ZWxfY3J0YyhjcnRjKTsKIAlzdHJ1Y3QgaW50ZWxfcGxhbmUgKmludGVsX3BsYW5lID0g
dG9faW50ZWxfcGxhbmUocGxhbmUpOwogCWVudW0gcGlwZSBwaXBlID0gaW50ZWxfY3J0Yy0+cGlw
ZTsKLQlzdHJ1Y3QgZHJtX2ZyYW1lYnVmZmVyICpmYiA9IHN0YXRlLT5mYjsKKwlzdHJ1Y3QgZHJt
X2ZyYW1lYnVmZmVyICpmYiA9IHN0YXRlLT5iYXNlLmZiOwogCXN0cnVjdCBkcm1faTkxNV9nZW1f
b2JqZWN0ICpvYmogPSBpbnRlbF9mYl9vYmooZmIpOwogCXN0cnVjdCBkcm1faTkxNV9nZW1fb2Jq
ZWN0ICpvbGRfb2JqID0gaW50ZWxfcGxhbmUtPm9iajsKIAlpbnQgY3J0Y194LCBjcnRjX3k7CkBA
IC0xMzkxLDggKzEzOTEsOCBAQCBpbnRlbF91cGRhdGVfcGxhbmUoc3RydWN0IGRybV9wbGFuZSAq
cGxhbmUsIHN0cnVjdCBkcm1fY3J0YyAqY3J0YywKIAlzdHJ1Y3QgaW50ZWxfY3J0YyAqaW50ZWxf
Y3J0YyA9IHRvX2ludGVsX2NydGMoY3J0Yyk7CiAJaW50IHJldDsKIAotCXN0YXRlLmNydGMgPSBj
cnRjOwotCXN0YXRlLmZiID0gZmI7CisJc3RhdGUuYmFzZS5jcnRjID0gY3J0YzsKKwlzdGF0ZS5i
YXNlLmZiID0gZmI7CiAKIAkvKiBzYW1wbGUgY29vcmRpbmF0ZXMgaW4gMTYuMTYgZml4ZWQgcG9p
bnQgKi8KIAlzdGF0ZS5zcmMueDEgPSBzcmNfeDsKLS0gCjEuOC41LjEKCl9fX19fX19fX19fX19f
X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QK
SW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Au
b3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==