From mboxrd@z Thu Jan  1 00:00:00 1970
From: Matt Roper <matthew.d.roper@intel.com>
Subject: [PATCH] drm/i915: Ensure plane->state->fb stays in sync
	with plane->fb
Date: Tue,  3 Feb 2015 13:10:04 -0800
Message-ID: <1422997804-3871-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 mga14.intel.com (mga14.intel.com [192.55.52.115])
 by gabe.freedesktop.org (Postfix) with ESMTP id 661E66E0C6
 for <intel-gfx@lists.freedesktop.org>; Tue,  3 Feb 2015 13:10:16 -0800 (PST)
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

cGxhbmUtPnN0YXRlLT5mYiBhbmQgcGxhbmUtPmZiIHNob3VsZCBhbHdheXMgcmVmZXJlbmNlIHRo
ZSBzYW1lIEZCIHNvCnRoYXQgYXRvbWljIGFuZCBsZWdhY3kgY29kZXBhdGhzIGhhdmUgdGhlIHNh
bWUgdmlldyBvZiBkaXNwbGF5IHN0YXRlLgpJbiBjb21taXQKCiAgICAgICAgY29tbWl0IGRiMDY4
NDIwNTYwNTExZGU4MGFjNTkyMjI2NDRmMmJkZjI3OGMzZDUKICAgICAgICBBdXRob3I6IE1hdHQg
Um9wZXIgPG1hdHRoZXcuZC5yb3BlckBpbnRlbC5jb20+CiAgICAgICAgRGF0ZTogICBGcmkgSmFu
IDMwIDE2OjIyOjM2IDIwMTUgLTA4MDAKCiAgICAgICAgICAgIGRybS9pOTE1OiBLZWVwIHBsYW5l
LT5zdGF0ZSB1cGRhdGVkIG9uIHBhZ2VmbGlwCgp3ZSBhbHJlYWR5IGZpeGVkIG9uZSBjYXNlIHdo
ZXJlIHRoZXNlIHR3byBwb2ludGVycyBjb3VsZCBnZXQgb3V0IG9mCnN5bmMuICBIb3dldmVyIGl0
IHR1cm5zIG91dCB0aGVyZSBhcmUgYSBmZXcgb3RoZXIgcGxhY2VzIChtYWlubHkgZGVhbGluZwp3
aXRoIGluaXRpYWwgRkIgc2V0dXAgYXQgYm9vdCkgdGhhdCBkaXJlY3RseSBzZXQgcGxhbmUtPmZi
IGFuZCBuZWdsZWN0CnRvIHVwZGF0ZSBwbGFuZS0+c3RhdGUtPmZiLiAgSWYgd2UgbmV2ZXIgZG8g
YSBzdWNjZXNzZnVsIHVwZGF0ZSB0aHJvdWdoCnRoZSBhdG9taWMgcGlwZWxpbmUsIHRoZSBSbUZC
IGNsZWFudXAgY29kZSB3aWxsIGxvb2sgYXQgdGhlCnBsYW5lLT5zdGF0ZS0+ZmIgcG9pbnRlciwg
d2hpY2ggaGFzIG5ldmVyIGFjdHVhbGx5IGJlZW4gc2V0IHRvIGEKbGVnaXRpbWF0ZSB2YWx1ZSwg
YW5kIHRyeSB0byBjbGVhbiBpdCB1cCwgbGVhZGluZyB0byBCVUcncy4KCkFkZCBhIHF1aWNrIGhl
bHBlciBmdW5jdGlvbiB0byBzeW5jaHJvbml6ZSBwbGFuZS0+c3RhdGUtPmZiIHdpdGgKcGxhbmUt
PmZiIChhbmQgdXBkYXRlIHJlZmVyZW5jZSBjb3VudHMgYWNjb3JkaW5nbHkpIGFuZCBjYWxsIGl0
CmV2ZXJ5d2hlcmUgdGhlIGRyaXZlciB0cmllcyB0byBtYW51YWxseSBzZXQgcGxhbmUtPmZiIG91
dHNpZGUgb2YgdGhlCmF0b21pYyBwaXBlbGluZS4KCkJ1Z3ppbGxhOiBodHRwczovL2J1Z3MuZnJl
ZWRlc2t0b3Aub3JnL3Nob3dfYnVnLmNnaT9pZD04ODkwOQpTaWduZWQtb2ZmLWJ5OiBNYXR0IFJv
cGVyIDxtYXR0aGV3LmQucm9wZXJAaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1
L2ludGVsX2Rpc3BsYXkuYyB8IDI5ICsrKysrKysrKysrKysrKysrKysrKystLS0tLS0tCiAxIGZp
bGUgY2hhbmdlZCwgMjIgaW5zZXJ0aW9ucygrKSwgNyBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQg
YS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgYi9kcml2ZXJzL2dwdS9kcm0v
aTkxNS9pbnRlbF9kaXNwbGF5LmMKaW5kZXggMjEzYjg3MC4uZTVjMDU3OSAxMDA2NDQKLS0tIGEv
ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCisrKyBiL2RyaXZlcnMvZ3B1L2Ry
bS9pOTE1L2ludGVsX2Rpc3BsYXkuYwpAQCAtMjQxMCw2ICsyNDEwLDIwIEBAIG91dF91bnJlZl9v
Ymo6CiAJcmV0dXJuIGZhbHNlOwogfQogCisvKiBVcGRhdGUgcGxhbmUtPnN0YXRlLT5mYiB0byBt
YXRjaCBwbGFuZS0+ZmIgYWZ0ZXIgZHJpdmVyLWludGVybmFsIHVwZGF0ZXMgKi8KK3N0YXRpYyB2
b2lkCit1cGRhdGVfc3RhdGVfZmIoc3RydWN0IGRybV9wbGFuZSAqcGxhbmUpCit7CisJaWYgKHBs
YW5lLT5mYiA9PSBwbGFuZS0+c3RhdGUtPmZiKQorCQlyZXR1cm47CisKKwlpZiAocGxhbmUtPnN0
YXRlLT5mYikKKwkJZHJtX2ZyYW1lYnVmZmVyX3VucmVmZXJlbmNlKHBsYW5lLT5zdGF0ZS0+ZmIp
OworCXBsYW5lLT5zdGF0ZS0+ZmIgPSBwbGFuZS0+ZmI7CisJaWYgKHBsYW5lLT5zdGF0ZS0+ZmIp
CisJCWRybV9mcmFtZWJ1ZmZlcl9yZWZlcmVuY2UocGxhbmUtPnN0YXRlLT5mYik7Cit9CisKIHN0
YXRpYyB2b2lkCiBpbnRlbF9maW5kX3BsYW5lX29iaihzdHJ1Y3QgaW50ZWxfY3J0YyAqaW50ZWxf
Y3J0YywKIAkJICAgICBzdHJ1Y3QgaW50ZWxfaW5pdGlhbF9wbGFuZV9jb25maWcgKnBsYW5lX2Nv
bmZpZykKQEAgLTI0NTYsNiArMjQ3MCw4IEBAIGludGVsX2ZpbmRfcGxhbmVfb2JqKHN0cnVjdCBp
bnRlbF9jcnRjICppbnRlbF9jcnRjLAogCQkJYnJlYWs7CiAJCX0KIAl9CisKKwl1cGRhdGVfc3Rh
dGVfZmIoaW50ZWxfY3J0Yy0+YmFzZS5wcmltYXJ5KTsKIH0KIAogc3RhdGljIHZvaWQgaTl4eF91
cGRhdGVfcHJpbWFyeV9wbGFuZShzdHJ1Y3QgZHJtX2NydGMgKmNydGMsCkBAIC02NjM1LDYgKzY2
NTEsNyBAQCBpOXh4X2dldF9pbml0aWFsX3BsYW5lX2NvbmZpZyhzdHJ1Y3QgaW50ZWxfY3J0YyAq
Y3J0YywKIAkJICAgICAgcGxhbmVfY29uZmlnLT5zaXplKTsKIAogCWNydGMtPmJhc2UucHJpbWFy
eS0+ZmIgPSBmYjsKKwl1cGRhdGVfc3RhdGVfZmIoY3J0Yy0+YmFzZS5wcmltYXJ5KTsKIH0KIAog
c3RhdGljIHZvaWQgY2h2X2NydGNfY2xvY2tfZ2V0KHN0cnVjdCBpbnRlbF9jcnRjICpjcnRjLApA
QCAtNzY3Miw2ICs3Njg5LDcgQEAgc2t5bGFrZV9nZXRfaW5pdGlhbF9wbGFuZV9jb25maWcoc3Ry
dWN0IGludGVsX2NydGMgKmNydGMsCiAJCSAgICAgIHBsYW5lX2NvbmZpZy0+c2l6ZSk7CiAKIAlj
cnRjLT5iYXNlLnByaW1hcnktPmZiID0gZmI7CisJdXBkYXRlX3N0YXRlX2ZiKGNydGMtPmJhc2Uu
cHJpbWFyeSk7CiAJcmV0dXJuOwogCiBlcnJvcjoKQEAgLTc3NjMsNiArNzc4MSw3IEBAIGlyb25s
YWtlX2dldF9pbml0aWFsX3BsYW5lX2NvbmZpZyhzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YywKIAkJ
ICAgICAgcGxhbmVfY29uZmlnLT5zaXplKTsKIAogCWNydGMtPmJhc2UucHJpbWFyeS0+ZmIgPSBm
YjsKKwl1cGRhdGVfc3RhdGVfZmIoY3J0Yy0+YmFzZS5wcmltYXJ5KTsKIH0KIAogc3RhdGljIGJv
b2wgaXJvbmxha2VfZ2V0X3BpcGVfY29uZmlnKHN0cnVjdCBpbnRlbF9jcnRjICpjcnRjLApAQCAt
OTgwMCwxMyArOTgxOSw3IEBAIHN0YXRpYyBpbnQgaW50ZWxfY3J0Y19wYWdlX2ZsaXAoc3RydWN0
IGRybV9jcnRjICpjcnRjLAogCWRybV9nZW1fb2JqZWN0X3JlZmVyZW5jZSgmb2JqLT5iYXNlKTsK
IAogCWNydGMtPnByaW1hcnktPmZiID0gZmI7Ci0KLQkvKiBLZWVwIHN0YXRlIHN0cnVjdHVyZSBp
biBzeW5jICovCi0JaWYgKGNydGMtPnByaW1hcnktPnN0YXRlLT5mYikKLQkJZHJtX2ZyYW1lYnVm
ZmVyX3VucmVmZXJlbmNlKGNydGMtPnByaW1hcnktPnN0YXRlLT5mYik7Ci0JY3J0Yy0+cHJpbWFy
eS0+c3RhdGUtPmZiID0gZmI7Ci0JaWYgKGNydGMtPnByaW1hcnktPnN0YXRlLT5mYikKLQkJZHJt
X2ZyYW1lYnVmZmVyX3JlZmVyZW5jZShjcnRjLT5wcmltYXJ5LT5zdGF0ZS0+ZmIpOworCXVwZGF0
ZV9zdGF0ZV9mYihjcnRjLT5wcmltYXJ5KTsKIAogCXdvcmstPnBlbmRpbmdfZmxpcF9vYmogPSBv
Ymo7CiAKQEAgLTk4NzUsNiArOTg4OCw3IEBAIGNsZWFudXBfdW5waW46CiBjbGVhbnVwX3BlbmRp
bmc6CiAJYXRvbWljX2RlYygmaW50ZWxfY3J0Yy0+dW5waW5fd29ya19jb3VudCk7CiAJY3J0Yy0+
cHJpbWFyeS0+ZmIgPSBvbGRfZmI7CisJdXBkYXRlX3N0YXRlX2ZiKGNydGMtPnByaW1hcnkpOwog
CWRybV9mcmFtZWJ1ZmZlcl91bnJlZmVyZW5jZSh3b3JrLT5vbGRfZmIpOwogCWRybV9nZW1fb2Jq
ZWN0X3VucmVmZXJlbmNlKCZvYmotPmJhc2UpOwogCW11dGV4X3VubG9jaygmZGV2LT5zdHJ1Y3Rf
bXV0ZXgpOwpAQCAtMTM3MDksNiArMTM3MjMsNyBAQCB2b2lkIGludGVsX21vZGVzZXRfZ2VtX2lu
aXQoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAkJCQkgIHRvX2ludGVsX2NydGMoYyktPnBpcGUp
OwogCQkJZHJtX2ZyYW1lYnVmZmVyX3VucmVmZXJlbmNlKGMtPnByaW1hcnktPmZiKTsKIAkJCWMt
PnByaW1hcnktPmZiID0gTlVMTDsKKwkJCXVwZGF0ZV9zdGF0ZV9mYihjLT5wcmltYXJ5KTsKIAkJ
fQogCX0KIAltdXRleF91bmxvY2soJmRldi0+c3RydWN0X211dGV4KTsKLS0gCjEuOC41LjEKCl9f
X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBt
YWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwOi8vbGlzdHMu
ZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==