From mboxrd@z Thu Jan  1 00:00:00 1970
From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Subject: [PATCH 04/42] drm/i915: use intel_crtc_control
	everywhere
Date: Mon, 11 May 2015 16:24:40 +0200
Message-ID: <1431354318-11995-5-git-send-email-maarten.lankhorst@linux.intel.com>
References: <1431354318-11995-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 3E98E6E3F4
 for <intel-gfx@lists.freedesktop.org>; Mon, 11 May 2015 07:25:43 -0700 (PDT)
In-Reply-To: <1431354318-11995-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
Cc: Ander Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com>
List-Id: intel-gfx@lists.freedesktop.org

U2lnbmVkLW9mZi1ieTogTWFhcnRlbiBMYW5raG9yc3QgPG1hYXJ0ZW4ubGFua2hvcnN0QGxpbnV4
LmludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2RlYnVnZnMuYyAgfCAx
OCArKysrKysrKy0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgfCA2OCAr
KysrKysrKysrKysrLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1
L2ludGVsX2Rydi5oICAgICB8ICAxIC0KIDMgZmlsZXMgY2hhbmdlZCwgMzkgaW5zZXJ0aW9ucygr
KSwgNDggZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkx
NV9kZWJ1Z2ZzLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2RlYnVnZnMuYwppbmRleCBh
ZGJiZGRhYjQyYzYuLmFjZDRkMmM3NjEzYSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5
MTUvaTkxNV9kZWJ1Z2ZzLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kZWJ1Z2Zz
LmMKQEAgLTM2MDYsMTIgKzM2MDYsMTggQEAgc3RhdGljIHZvaWQgaHN3X3RyYW5zX2VkcF9waXBl
X0FfY3JjX3dhKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJICovCiAJaWYgKGNydGMtPmNvbmZp
Zy0+Y3B1X3RyYW5zY29kZXIgPT0gVFJBTlNDT0RFUl9FRFAgJiYKIAkgICAgIWNydGMtPmNvbmZp
Zy0+cGNoX3BmaXQuZW5hYmxlZCkgeworCQlib29sIGFjdGl2ZSA9IGNydGMtPmFjdGl2ZTsKKwor
CQlpZiAoYWN0aXZlKQorCQkJaW50ZWxfY3J0Y19jb250cm9sKCZjcnRjLT5iYXNlLCBmYWxzZSk7
CisKIAkJY3J0Yy0+Y29uZmlnLT5wY2hfcGZpdC5mb3JjZV90aHJ1ID0gdHJ1ZTsKIAogCQlpbnRl
bF9kaXNwbGF5X3Bvd2VyX2dldChkZXZfcHJpdiwKIAkJCQkJUE9XRVJfRE9NQUlOX1BJUEVfUEFO
RUxfRklUVEVSKFBJUEVfQSkpOwogCi0JCWludGVsX2NydGNfcmVzZXQoY3J0Yyk7CisJCWlmIChh
Y3RpdmUpCisJCQlpbnRlbF9jcnRjX2NvbnRyb2woJmNydGMtPmJhc2UsIHRydWUpOwogCX0KIAlk
cm1fbW9kZXNldF91bmxvY2tfYWxsKGRldik7CiB9CkBAIC0zNjMwLDEyICszNjM2LDE4IEBAIHN0
YXRpYyB2b2lkIGhzd191bmRvX3RyYW5zX2VkcF9waXBlX0FfY3JjX3dhKHN0cnVjdCBkcm1fZGV2
aWNlICpkZXYpCiAJICogcm91dGluZy4KIAkgKi8KIAlpZiAoY3J0Yy0+Y29uZmlnLT5wY2hfcGZp
dC5mb3JjZV90aHJ1KSB7Ci0JCWNydGMtPmNvbmZpZy0+cGNoX3BmaXQuZm9yY2VfdGhydSA9IGZh
bHNlOworCQlib29sIGFjdGl2ZSA9IGNydGMtPmFjdGl2ZTsKIAotCQlpbnRlbF9jcnRjX3Jlc2V0
KGNydGMpOworCQlpZiAoYWN0aXZlKQorCQkJaW50ZWxfY3J0Y19jb250cm9sKCZjcnRjLT5iYXNl
LCBmYWxzZSk7CisKKwkJY3J0Yy0+Y29uZmlnLT5wY2hfcGZpdC5mb3JjZV90aHJ1ID0gZmFsc2U7
CiAKIAkJaW50ZWxfZGlzcGxheV9wb3dlcl9wdXQoZGV2X3ByaXYsCiAJCQkJCVBPV0VSX0RPTUFJ
Tl9QSVBFX1BBTkVMX0ZJVFRFUihQSVBFX0EpKTsKKworCQlpZiAoYWN0aXZlKQorCQkJaW50ZWxf
Y3J0Y19jb250cm9sKCZjcnRjLT5iYXNlLCB0cnVlKTsKIAl9CiAJZHJtX21vZGVzZXRfdW5sb2Nr
X2FsbChkZXYpOwogfQpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlz
cGxheS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCmluZGV4IDQyZDBj
YzMyOWIzNy4uNzAyNjlkYTZhNmI4IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p
bnRlbF9kaXNwbGF5LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5j
CkBAIC0zMjA2LDIyICszMjA2LDggQEAgc3RhdGljIHZvaWQgaW50ZWxfdXBkYXRlX3ByaW1hcnlf
cGxhbmVzKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJfQogfQogCi12b2lkIGludGVsX2NydGNf
cmVzZXQoc3RydWN0IGludGVsX2NydGMgKmNydGMpCi17Ci0Jc3RydWN0IGRybV9pOTE1X3ByaXZh
dGUgKmRldl9wcml2ID0gdG9faTkxNShjcnRjLT5iYXNlLmRldik7Ci0KLQlpZiAoIWNydGMtPmFj
dGl2ZSkKLQkJcmV0dXJuOwotCi0JaW50ZWxfY3J0Y19kaXNhYmxlX3BsYW5lcygmY3J0Yy0+YmFz
ZSk7Ci0JZGV2X3ByaXYtPmRpc3BsYXkuY3J0Y19kaXNhYmxlKCZjcnRjLT5iYXNlKTsKLQlkZXZf
cHJpdi0+ZGlzcGxheS5jcnRjX2VuYWJsZSgmY3J0Yy0+YmFzZSk7Ci0JaW50ZWxfY3J0Y19lbmFi
bGVfcGxhbmVzKCZjcnRjLT5iYXNlKTsKLX0KLQogdm9pZCBpbnRlbF9wcmVwYXJlX3Jlc2V0KHN0
cnVjdCBkcm1fZGV2aWNlICpkZXYpCiB7Ci0Jc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9w
cml2ID0gdG9faTkxNShkZXYpOwogCXN0cnVjdCBpbnRlbF9jcnRjICpjcnRjOwogCiAJLyogbm8g
cmVzZXQgc3VwcG9ydCBmb3IgZ2VuMiAqLwpAQCAtMzIzMywxOCArMzIxOSwxMiBAQCB2b2lkIGlu
dGVsX3ByZXBhcmVfcmVzZXQoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAkJcmV0dXJuOwogCiAJ
ZHJtX21vZGVzZXRfbG9ja19hbGwoZGV2KTsKLQogCS8qCiAJICogRGlzYWJsaW5nIHRoZSBjcnRj
cyBncmFjZWZ1bGx5IHNlZW1zIG5pY2VyLiBBbHNvIHRoZQogCSAqIGczMyBkb2NzIHNheSB3ZSBz
aG91bGQgYXQgbGVhc3QgZGlzYWJsZSBhbGwgdGhlIHBsYW5lcy4KIAkgKi8KLQlmb3JfZWFjaF9p
bnRlbF9jcnRjKGRldiwgY3J0YykgewotCQlpZiAoIWNydGMtPmFjdGl2ZSkKLQkJCWNvbnRpbnVl
OwotCi0JCWludGVsX2NydGNfZGlzYWJsZV9wbGFuZXMoJmNydGMtPmJhc2UpOwotCQlkZXZfcHJp
di0+ZGlzcGxheS5jcnRjX2Rpc2FibGUoJmNydGMtPmJhc2UpOwotCX0KKwlmb3JfZWFjaF9pbnRl
bF9jcnRjKGRldiwgY3J0YykKKwkJaW50ZWxfY3J0Y19jb250cm9sKCZjcnRjLT5iYXNlLCBmYWxz
ZSk7CiB9CiAKIHZvaWQgaW50ZWxfZmluaXNoX3Jlc2V0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYp
CkBAIC02MDc5LDI2ICs2MDU5LDI5IEBAIHZvaWQgaW50ZWxfY3J0Y19jb250cm9sKHN0cnVjdCBk
cm1fY3J0YyAqY3J0YywgYm9vbCBlbmFibGUpCiAJZW51bSBpbnRlbF9kaXNwbGF5X3Bvd2VyX2Rv
bWFpbiBkb21haW47CiAJdW5zaWduZWQgbG9uZyBkb21haW5zOwogCisJaWYgKGVuYWJsZSA9PSBp
bnRlbF9jcnRjLT5hY3RpdmUpCisJCXJldHVybjsKKworCWlmIChlbmFibGUgJiYgIWNydGMtPnN0
YXRlLT5lbmFibGUpCisJCXJldHVybjsKKworCWNydGMtPnN0YXRlLT5hY3RpdmUgPSBlbmFibGU7
CiAJaWYgKGVuYWJsZSkgewotCQlpZiAoIWludGVsX2NydGMtPmFjdGl2ZSkgewotCQkJZG9tYWlu
cyA9IGdldF9jcnRjX3Bvd2VyX2RvbWFpbnMoY3J0Yyk7Ci0JCQlmb3JfZWFjaF9wb3dlcl9kb21h
aW4oZG9tYWluLCBkb21haW5zKQotCQkJCWludGVsX2Rpc3BsYXlfcG93ZXJfZ2V0KGRldl9wcml2
LCBkb21haW4pOwotCQkJaW50ZWxfY3J0Yy0+ZW5hYmxlZF9wb3dlcl9kb21haW5zID0gZG9tYWlu
czsKLQotCQkJZGV2X3ByaXYtPmRpc3BsYXkuY3J0Y19lbmFibGUoY3J0Yyk7Ci0JCQlpbnRlbF9j
cnRjX2VuYWJsZV9wbGFuZXMoY3J0Yyk7Ci0JCX0KKwkJZG9tYWlucyA9IGdldF9jcnRjX3Bvd2Vy
X2RvbWFpbnMoY3J0Yyk7CisJCWZvcl9lYWNoX3Bvd2VyX2RvbWFpbihkb21haW4sIGRvbWFpbnMp
CisJCQlpbnRlbF9kaXNwbGF5X3Bvd2VyX2dldChkZXZfcHJpdiwgZG9tYWluKTsKKwkJaW50ZWxf
Y3J0Yy0+ZW5hYmxlZF9wb3dlcl9kb21haW5zID0gZG9tYWluczsKKworCQlkZXZfcHJpdi0+ZGlz
cGxheS5jcnRjX2VuYWJsZShjcnRjKTsKKwkJaW50ZWxfY3J0Y19lbmFibGVfcGxhbmVzKGNydGMp
OwogCX0gZWxzZSB7Ci0JCWlmIChpbnRlbF9jcnRjLT5hY3RpdmUpIHsKLQkJCWludGVsX2NydGNf
ZGlzYWJsZV9wbGFuZXMoY3J0Yyk7Ci0JCQlkZXZfcHJpdi0+ZGlzcGxheS5jcnRjX2Rpc2FibGUo
Y3J0Yyk7Ci0KLQkJCWRvbWFpbnMgPSBpbnRlbF9jcnRjLT5lbmFibGVkX3Bvd2VyX2RvbWFpbnM7
Ci0JCQlmb3JfZWFjaF9wb3dlcl9kb21haW4oZG9tYWluLCBkb21haW5zKQotCQkJCWludGVsX2Rp
c3BsYXlfcG93ZXJfcHV0KGRldl9wcml2LCBkb21haW4pOwotCQkJaW50ZWxfY3J0Yy0+ZW5hYmxl
ZF9wb3dlcl9kb21haW5zID0gMDsKLQkJfQorCQlpbnRlbF9jcnRjX2Rpc2FibGVfcGxhbmVzKGNy
dGMpOworCQlkZXZfcHJpdi0+ZGlzcGxheS5jcnRjX2Rpc2FibGUoY3J0Yyk7CisKKwkJZG9tYWlu
cyA9IGludGVsX2NydGMtPmVuYWJsZWRfcG93ZXJfZG9tYWluczsKKwkJZm9yX2VhY2hfcG93ZXJf
ZG9tYWluKGRvbWFpbiwgZG9tYWlucykKKwkJCWludGVsX2Rpc3BsYXlfcG93ZXJfcHV0KGRldl9w
cml2LCBkb21haW4pOworCQlpbnRlbF9jcnRjLT5lbmFibGVkX3Bvd2VyX2RvbWFpbnMgPSAwOwog
CX0KIH0KIApAQCAtNjExNSw4ICs2MDk4LDYgQEAgdm9pZCBpbnRlbF9jcnRjX3VwZGF0ZV9kcG1z
KHN0cnVjdCBkcm1fY3J0YyAqY3J0YykKIAkJZW5hYmxlIHw9IGludGVsX2VuY29kZXItPmNvbm5l
Y3RvcnNfYWN0aXZlOwogCiAJaW50ZWxfY3J0Y19jb250cm9sKGNydGMsIGVuYWJsZSk7Ci0KLQlj
cnRjLT5zdGF0ZS0+YWN0aXZlID0gZW5hYmxlOwogfQogCiB2b2lkIGludGVsX2VuY29kZXJfZGVz
dHJveShzdHJ1Y3QgZHJtX2VuY29kZXIgKmVuY29kZXIpCkBAIC0xNDU0Myw4ICsxNDUyNCw3IEBA
IHN0YXRpYyB2b2lkIGludGVsX3Nhbml0aXplX2NydGMoc3RydWN0IGludGVsX2NydGMgKmNydGMp
CiAJCXBsYW5lID0gY3J0Yy0+cGxhbmU7CiAJCXRvX2ludGVsX3BsYW5lX3N0YXRlKGNydGMtPmJh
c2UucHJpbWFyeS0+c3RhdGUpLT52aXNpYmxlID0gdHJ1ZTsKIAkJY3J0Yy0+cGxhbmUgPSAhcGxh
bmU7Ci0JCWludGVsX2NydGNfZGlzYWJsZV9wbGFuZXMoJmNydGMtPmJhc2UpOwotCQlkZXZfcHJp
di0+ZGlzcGxheS5jcnRjX2Rpc2FibGUoJmNydGMtPmJhc2UpOworCQlpbnRlbF9jcnRjX2NvbnRy
b2woJmNydGMtPmJhc2UsIGZhbHNlKTsKIAkJY3J0Yy0+cGxhbmUgPSBwbGFuZTsKIAogCQkvKiAu
Li4gYW5kIGJyZWFrIGFsbCBsaW5rcy4gKi8KZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9p
OTE1L2ludGVsX2Rydi5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmgKaW5kZXgg
NGM2OTA0MDM5NDJjLi43MzkwZmU5YmE5N2QgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9p
OTE1L2ludGVsX2Rydi5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oCkBA
IC05OTMsNyArOTkzLDYgQEAgdm9pZCBpbnRlbF9tYXJrX2J1c3koc3RydWN0IGRybV9kZXZpY2Ug
KmRldik7CiB2b2lkIGludGVsX21hcmtfaWRsZShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KTsKIHZv
aWQgaW50ZWxfY3J0Y19yZXN0b3JlX21vZGUoc3RydWN0IGRybV9jcnRjICpjcnRjKTsKIHZvaWQg
aW50ZWxfY3J0Y19jb250cm9sKHN0cnVjdCBkcm1fY3J0YyAqY3J0YywgYm9vbCBlbmFibGUpOwot
dm9pZCBpbnRlbF9jcnRjX3Jlc2V0KHN0cnVjdCBpbnRlbF9jcnRjICpjcnRjKTsKIHZvaWQgaW50
ZWxfY3J0Y191cGRhdGVfZHBtcyhzdHJ1Y3QgZHJtX2NydGMgKmNydGMpOwogdm9pZCBpbnRlbF9l
bmNvZGVyX2Rlc3Ryb3koc3RydWN0IGRybV9lbmNvZGVyICplbmNvZGVyKTsKIGludCBpbnRlbF9j
b25uZWN0b3JfaW5pdChzdHJ1Y3QgaW50ZWxfY29ubmVjdG9yICopOwotLSAKMi4xLjAKCl9fX19f
X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWls
aW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwOi8vbGlzdHMuZnJl
ZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==