From mboxrd@z Thu Jan  1 00:00:00 1970
From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Subject: [PATCH v3 12/19] drm/i915: Move crtc commit updates to
	separate functions.
Date: Mon, 15 Jun 2015 12:33:49 +0200
Message-ID: <1434364436-6366-13-git-send-email-maarten.lankhorst@linux.intel.com>
References: <1434364436-6366-1-git-send-email-maarten.lankhorst@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 mblankhorst.nl (mblankhorst.nl [141.105.120.124])
 by gabe.freedesktop.org (Postfix) with ESMTP id 7F8416E738
 for <intel-gfx@lists.freedesktop.org>; Mon, 15 Jun 2015 03:34:14 -0700 (PDT)
In-Reply-To: <1434364436-6366-1-git-send-email-maarten.lankhorst@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

VG8gYWxsb3cgdGhlbSB0byBiZSB1c2VkIGluIGludGVsX3NldF9tb2RlLgoKU2lnbmVkLW9mZi1i
eTogTWFhcnRlbiBMYW5raG9yc3QgPG1hYXJ0ZW4ubGFua2hvcnN0QGxpbnV4LmludGVsLmNvbT4K
LS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgfCAxMjcgKysrKysrKysr
KysrKysrKysrKy0tLS0tLS0tLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCA2OSBpbnNlcnRpb25z
KCspLCA1OCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p
bnRlbF9kaXNwbGF5LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKaW5k
ZXggNWU3N2MyOTc0Mjg4Li42YWU5YmQwZTAyODMgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2Ry
bS9pOTE1L2ludGVsX2Rpc3BsYXkuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9k
aXNwbGF5LmMKQEAgLTQ3NTMsNiArNDc1Myw3MiBAQCBpbnRlbF9wcmVfZGlzYWJsZV9wcmltYXJ5
KHN0cnVjdCBkcm1fY3J0YyAqY3J0YykKIAloc3dfZGlzYWJsZV9pcHMoaW50ZWxfY3J0Yyk7CiB9
CiAKK3N0YXRpYyB2b2lkIGludGVsX3Bvc3RfcGxhbmVfdXBkYXRlKHN0cnVjdCBpbnRlbF9jcnRj
ICpjcnRjKQoreworCXN0cnVjdCBpbnRlbF9jcnRjX2F0b21pY19jb21taXQgKmF0b21pYyA9ICZj
cnRjLT5hdG9taWM7CisJc3RydWN0IGRybV9kZXZpY2UgKmRldiA9IGNydGMtPmJhc2UuZGV2Owor
CXN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lOworCisJaWYgKGF0b21pYy0+d2FpdF92YmxhbmspCisJ
CWludGVsX3dhaXRfZm9yX3ZibGFuayhkZXYsIGNydGMtPnBpcGUpOworCisJaW50ZWxfZnJvbnRi
dWZmZXJfZmxpcChkZXYsIGF0b21pYy0+ZmJfYml0cyk7CisKKwlpZiAoYXRvbWljLT51cGRhdGVf
ZmJjKSB7CisJCW11dGV4X2xvY2soJmRldi0+c3RydWN0X211dGV4KTsKKwkJaW50ZWxfZmJjX3Vw
ZGF0ZShkZXYpOworCQltdXRleF91bmxvY2soJmRldi0+c3RydWN0X211dGV4KTsKKwl9CisKKwlp
ZiAoYXRvbWljLT5wb3N0X2VuYWJsZV9wcmltYXJ5KQorCQlpbnRlbF9wb3N0X2VuYWJsZV9wcmlt
YXJ5KCZjcnRjLT5iYXNlKTsKKworCWRybV9mb3JfZWFjaF9wbGFuZV9tYXNrKHBsYW5lLCBkZXYs
IGF0b21pYy0+dXBkYXRlX3Nwcml0ZV93YXRlcm1hcmtzKQorCQlpbnRlbF91cGRhdGVfc3ByaXRl
X3dhdGVybWFya3MocGxhbmUsICZjcnRjLT5iYXNlLAorCQkJCQkgICAgICAgMCwgMCwgMCwgZmFs
c2UsIGZhbHNlKTsKKworCW1lbXNldChhdG9taWMsIDAsIHNpemVvZigqYXRvbWljKSk7Cit9CisK
K3N0YXRpYyB2b2lkIGludGVsX3ByZV9wbGFuZV91cGRhdGUoc3RydWN0IGludGVsX2NydGMgKmNy
dGMpCit7CisJc3RydWN0IGRybV9kZXZpY2UgKmRldiA9IGNydGMtPmJhc2UuZGV2OworCXN0cnVj
dCBpbnRlbF9jcnRjX2F0b21pY19jb21taXQgKmF0b21pYyA9ICZjcnRjLT5hdG9taWM7CisJc3Ry
dWN0IGRybV9wbGFuZSAqcDsKKworCS8qIFRyYWNrIGZiJ3MgZm9yIGFueSBwbGFuZXMgYmVpbmcg
ZGlzYWJsZWQgKi8KKworCWRybV9mb3JfZWFjaF9wbGFuZV9tYXNrKHAsIGRldiwgYXRvbWljLT5k
aXNhYmxlZF9wbGFuZXMpIHsKKwkJc3RydWN0IGludGVsX3BsYW5lICpwbGFuZSA9IHRvX2ludGVs
X3BsYW5lKHApOworCQl1bnNpZ25lZCBmYl9iaXRzID0gMDsKKworCQlzd2l0Y2ggKHAtPnR5cGUp
IHsKKwkJY2FzZSBEUk1fUExBTkVfVFlQRV9QUklNQVJZOgorCQkJZmJfYml0cyA9IElOVEVMX0ZS
T05UQlVGRkVSX1BSSU1BUlkocGxhbmUtPnBpcGUpOworCQkJYnJlYWs7CisJCWNhc2UgRFJNX1BM
QU5FX1RZUEVfQ1VSU09SOgorCQkJZmJfYml0cyA9IElOVEVMX0ZST05UQlVGRkVSX0NVUlNPUihw
bGFuZS0+cGlwZSk7CisJCQlicmVhazsKKwkJY2FzZSBEUk1fUExBTkVfVFlQRV9PVkVSTEFZOgor
CQkJZmJfYml0cyA9IElOVEVMX0ZST05UQlVGRkVSX1NQUklURShwbGFuZS0+cGlwZSk7CisJCQli
cmVhazsKKwkJfQorCisJCW11dGV4X2xvY2soJmRldi0+c3RydWN0X211dGV4KTsKKwkJaTkxNV9n
ZW1fdHJhY2tfZmIoaW50ZWxfZmJfb2JqKHBsYW5lLT5iYXNlLmZiKSwgTlVMTCwgZmJfYml0cyk7
CisJCW11dGV4X3VubG9jaygmZGV2LT5zdHJ1Y3RfbXV0ZXgpOworCX0KKworCWlmIChhdG9taWMt
PndhaXRfZm9yX2ZsaXBzKQorCQlpbnRlbF9jcnRjX3dhaXRfZm9yX3BlbmRpbmdfZmxpcHMoJmNy
dGMtPmJhc2UpOworCisJaWYgKGF0b21pYy0+ZGlzYWJsZV9mYmMpCisJCWludGVsX2ZiY19kaXNh
YmxlKGRldik7CisKKwlpZiAoYXRvbWljLT5wcmVfZGlzYWJsZV9wcmltYXJ5KQorCQlpbnRlbF9w
cmVfZGlzYWJsZV9wcmltYXJ5KCZjcnRjLT5iYXNlKTsKK30KKwogc3RhdGljIHZvaWQgaW50ZWxf
Y3J0Y19lbmFibGVfcGxhbmVzKHN0cnVjdCBkcm1fY3J0YyAqY3J0YykKIHsKIAlzdHJ1Y3QgZHJt
X2RldmljZSAqZGV2ID0gY3J0Yy0+ZGV2OwpAQCAtMTM3NjgsNDMgKzEzODM0LDggQEAgc3RhdGlj
IHZvaWQgaW50ZWxfYmVnaW5fY3J0Y19jb21taXQoc3RydWN0IGRybV9jcnRjICpjcnRjLAogCXN0
cnVjdCBkcm1fZGV2aWNlICpkZXYgPSBjcnRjLT5kZXY7CiAJc3RydWN0IGRybV9pOTE1X3ByaXZh
dGUgKmRldl9wcml2ID0gZGV2LT5kZXZfcHJpdmF0ZTsKIAlzdHJ1Y3QgaW50ZWxfY3J0YyAqaW50
ZWxfY3J0YyA9IHRvX2ludGVsX2NydGMoY3J0Yyk7Ci0Jc3RydWN0IGRybV9jcnRjX3N0YXRlICpj
cnRjX3N0YXRlID0gaW50ZWxfY3J0Yy0+YmFzZS5zdGF0ZTsKLQlzdHJ1Y3QgaW50ZWxfcGxhbmUg
KmludGVsX3BsYW5lOwotCXN0cnVjdCBkcm1fcGxhbmUgKnA7Ci0JdW5zaWduZWQgZmJfYml0cyA9
IDA7Ci0KLQkvKiBUcmFjayBmYidzIGZvciBhbnkgcGxhbmVzIGJlaW5nIGRpc2FibGVkICovCi0J
bGlzdF9mb3JfZWFjaF9lbnRyeShwLCAmZGV2LT5tb2RlX2NvbmZpZy5wbGFuZV9saXN0LCBoZWFk
KSB7Ci0JCWludGVsX3BsYW5lID0gdG9faW50ZWxfcGxhbmUocCk7Ci0KLQkJaWYgKGludGVsX2Ny
dGMtPmF0b21pYy5kaXNhYmxlZF9wbGFuZXMgJgotCQkgICAgKDEgPDwgZHJtX3BsYW5lX2luZGV4
KHApKSkgewotCQkJc3dpdGNoIChwLT50eXBlKSB7Ci0JCQljYXNlIERSTV9QTEFORV9UWVBFX1BS
SU1BUlk6Ci0JCQkJZmJfYml0cyA9IElOVEVMX0ZST05UQlVGRkVSX1BSSU1BUlkoaW50ZWxfcGxh
bmUtPnBpcGUpOwotCQkJCWJyZWFrOwotCQkJY2FzZSBEUk1fUExBTkVfVFlQRV9DVVJTT1I6Ci0J
CQkJZmJfYml0cyA9IElOVEVMX0ZST05UQlVGRkVSX0NVUlNPUihpbnRlbF9wbGFuZS0+cGlwZSk7
Ci0JCQkJYnJlYWs7Ci0JCQljYXNlIERSTV9QTEFORV9UWVBFX09WRVJMQVk6Ci0JCQkJZmJfYml0
cyA9IElOVEVMX0ZST05UQlVGRkVSX1NQUklURShpbnRlbF9wbGFuZS0+cGlwZSk7Ci0JCQkJYnJl
YWs7Ci0JCQl9Ci0KLQkJCW11dGV4X2xvY2soJmRldi0+c3RydWN0X211dGV4KTsKLQkJCWk5MTVf
Z2VtX3RyYWNrX2ZiKGludGVsX2ZiX29iaihwLT5mYiksIE5VTEwsIGZiX2JpdHMpOwotCQkJbXV0
ZXhfdW5sb2NrKCZkZXYtPnN0cnVjdF9tdXRleCk7Ci0JCX0KLQl9Ci0KLQlpZiAoaW50ZWxfY3J0
Yy0+YXRvbWljLndhaXRfZm9yX2ZsaXBzKQotCQlpbnRlbF9jcnRjX3dhaXRfZm9yX3BlbmRpbmdf
ZmxpcHMoY3J0Yyk7Ci0KLQlpZiAoaW50ZWxfY3J0Yy0+YXRvbWljLmRpc2FibGVfZmJjKQotCQlp
bnRlbF9mYmNfZGlzYWJsZShkZXYpOwogCi0JaWYgKGludGVsX2NydGMtPmF0b21pYy5wcmVfZGlz
YWJsZV9wcmltYXJ5KQotCQlpbnRlbF9wcmVfZGlzYWJsZV9wcmltYXJ5KGNydGMpOworCWludGVs
X3ByZV9wbGFuZV91cGRhdGUoaW50ZWxfY3J0Yyk7CiAKIAlpZiAoaW50ZWxfY3J0Yy0+YXRvbWlj
LnVwZGF0ZV93bSkKIAkJaW50ZWxfdXBkYXRlX3dhdGVybWFya3MoY3J0Yyk7CkBAIC0xMzgxMiw3
ICsxMzg0Myw3IEBAIHN0YXRpYyB2b2lkIGludGVsX2JlZ2luX2NydGNfY29tbWl0KHN0cnVjdCBk
cm1fY3J0YyAqY3J0YywKIAlpbnRlbF9ydW50aW1lX3BtX2dldChkZXZfcHJpdik7CiAKIAkvKiBQ
ZXJmb3JtIHZibGFuayBldmFzaW9uIGFyb3VuZCBjb21taXQgb3BlcmF0aW9uICovCi0JaWYgKGNy
dGNfc3RhdGUtPmFjdGl2ZSAmJiAhbmVlZHNfbW9kZXNldChjcnRjX3N0YXRlKSkKKwlpZiAoY3J0
Yy0+c3RhdGUtPmFjdGl2ZSAmJiAhbmVlZHNfbW9kZXNldChjcnRjLT5zdGF0ZSkpCiAJCWludGVs
X2NydGMtPmF0b21pYy5ldmFkZSA9CiAJCQlpbnRlbF9waXBlX3VwZGF0ZV9zdGFydChpbnRlbF9j
cnRjLAogCQkJCQkJJmludGVsX2NydGMtPmF0b21pYy5zdGFydF92YmxfY291bnQpOwpAQCAtMTM4
MjcsNyArMTM4NTgsNiBAQCBzdGF0aWMgdm9pZCBpbnRlbF9maW5pc2hfY3J0Y19jb21taXQoc3Ry
dWN0IGRybV9jcnRjICpjcnRjLAogCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSBjcnRjLT5kZXY7
CiAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gZGV2LT5kZXZfcHJpdmF0ZTsK
IAlzdHJ1Y3QgaW50ZWxfY3J0YyAqaW50ZWxfY3J0YyA9IHRvX2ludGVsX2NydGMoY3J0Yyk7Ci0J
c3RydWN0IGRybV9wbGFuZSAqcDsKIAogCWlmIChpbnRlbF9jcnRjLT5hdG9taWMuZXZhZGUpCiAJ
CWludGVsX3BpcGVfdXBkYXRlX2VuZChpbnRlbF9jcnRjLApAQCAtMTM4MzUsMjYgKzEzODY1LDcg
QEAgc3RhdGljIHZvaWQgaW50ZWxfZmluaXNoX2NydGNfY29tbWl0KHN0cnVjdCBkcm1fY3J0YyAq
Y3J0YywKIAogCWludGVsX3J1bnRpbWVfcG1fcHV0KGRldl9wcml2KTsKIAotCWlmIChpbnRlbF9j
cnRjLT5hdG9taWMud2FpdF92YmxhbmsgJiYgaW50ZWxfY3J0Yy0+YWN0aXZlKQotCQlpbnRlbF93
YWl0X2Zvcl92YmxhbmsoZGV2LCBpbnRlbF9jcnRjLT5waXBlKTsKLQotCWludGVsX2Zyb250YnVm
ZmVyX2ZsaXAoZGV2LCBpbnRlbF9jcnRjLT5hdG9taWMuZmJfYml0cyk7Ci0KLQlpZiAoaW50ZWxf
Y3J0Yy0+YXRvbWljLnVwZGF0ZV9mYmMpIHsKLQkJbXV0ZXhfbG9jaygmZGV2LT5zdHJ1Y3RfbXV0
ZXgpOwotCQlpbnRlbF9mYmNfdXBkYXRlKGRldik7Ci0JCW11dGV4X3VubG9jaygmZGV2LT5zdHJ1
Y3RfbXV0ZXgpOwotCX0KLQotCWlmIChpbnRlbF9jcnRjLT5hdG9taWMucG9zdF9lbmFibGVfcHJp
bWFyeSkKLQkJaW50ZWxfcG9zdF9lbmFibGVfcHJpbWFyeShjcnRjKTsKLQotCWRybV9mb3JfZWFj
aF9sZWdhY3lfcGxhbmUocCwgJmRldi0+bW9kZV9jb25maWcucGxhbmVfbGlzdCkKLQkJaWYgKGlu
dGVsX2NydGMtPmF0b21pYy51cGRhdGVfc3ByaXRlX3dhdGVybWFya3MgJiBkcm1fcGxhbmVfaW5k
ZXgocCkpCi0JCQlpbnRlbF91cGRhdGVfc3ByaXRlX3dhdGVybWFya3MocCwgY3J0YywgMCwgMCwg
MCwKLQkJCQkJCSAgICAgICBmYWxzZSwgZmFsc2UpOwotCi0JbWVtc2V0KCZpbnRlbF9jcnRjLT5h
dG9taWMsIDAsIHNpemVvZihpbnRlbF9jcnRjLT5hdG9taWMpKTsKKwlpbnRlbF9wb3N0X3BsYW5l
X3VwZGF0ZShpbnRlbF9jcnRjKTsKIH0KIAogLyoqCi0tIAoyLjEuMAoKX19fX19fX19fX19fX19f
X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJ
bnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5v
cmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK