From mboxrd@z Thu Jan  1 00:00:00 1970
From: Chi Ding <chix.ding@intel.com>
Subject: [RFC 2/8] drm/i915: Rename skl_plane_id to wm_plane_id
Date: Thu, 23 Jun 2016 10:57:53 +0200
Message-ID: <1466672279-16236-3-git-send-email-chix.ding@intel.com>
References: <1466672279-16236-1-git-send-email-chix.ding@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 71C4C6E8C8
 for <intel-gfx@lists.freedesktop.org>; Thu, 23 Jun 2016 08:58:10 +0000 (UTC)
In-Reply-To: <1466672279-16236-1-git-send-email-chix.ding@intel.com>
List-Unsubscribe: <https://lists.freedesktop.org/mailman/options/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=unsubscribe>
List-Archive: <https://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: <https://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: yetundex.adebisi@intel.com, maarten.lankhorst@linux.intel.com, ville.syrjala@linux.intel.com, matthew.d.roper@intel.com, intel-gfx@lists.freedesktop.org, isg-gms@eclists.intel.com
Cc: Chi Ding <chix.ding@intel.com>
List-Id: intel-gfx@lists.freedesktop.org

RnJvbTogTWFhcnRlbiBMYW5raG9yc3QgPG1hYXJ0ZW4ubGFua2hvcnN0QGxpbnV4LmludGVsLmNv
bT4KClRoaXMgZnVuY3Rpb24gd2lsbCBiZSB1c2VkIG5vdCBvbmx5IGJ5IFNLTCBidXQgYWxzbyBW
TFYvQ0hWLgpUaGVyZWZvcmUgaXQncyByZW5hbWVkCgpTaWduZWQtb2ZmLWJ5OiBNYWFydGVuIExh
bmtob3JzdCA8bWFhcnRlbi5sYW5raG9yc3RAbGludXguaW50ZWwuY29tPgpTaWduZWQtb2ZmLWJ5
OiBDaGkgRGluZyA8Y2hpeC5kaW5nQGludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkx
NS9pbnRlbF9wbS5jIHwgNTkgKysrKysrKysrKysrKysrKysrKysrLS0tLS0tLS0tLS0tLS0tLS0t
LS0KIDEgZmlsZSBjaGFuZ2VkLCAzMCBpbnNlcnRpb25zKCspLCAyOSBkZWxldGlvbnMoLSkKCmRp
ZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jIGIvZHJpdmVycy9ncHUv
ZHJtL2k5MTUvaW50ZWxfcG0uYwppbmRleCAyOWJkZDc5Li5hZGJkNDM4IDEwMDY0NAotLS0gYS9k
cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1
L2ludGVsX3BtLmMKQEAgLTU0LDYgKzU0LDI4IEBACiAjZGVmaW5lIElOVEVMX1JDNnBfRU5BQkxF
CQkJKDE8PDEpCiAjZGVmaW5lIElOVEVMX1JDNnBwX0VOQUJMRQkJCSgxPDwyKQogCisvKgorICog
UmV0dXJuIHRoZSBpbmRleCBvZiBhIHBsYW5lIGluIHRoZSBEREIgYW5kIHdtIHJlc3VsdCBhcnJh
eXMuICBQcmltYXJ5CisgKiBwbGFuZSBpcyBhbHdheXMgaW4gc2xvdCAwLCBjdXJzb3IgaXMgYWx3
YXlzIGluIHNsb3QgSTkxNV9NQVhfUExBTkVTLTEsIGFuZAorICogb3RoZXIgdW5pdmVyc2FsIHBs
YW5lcyBhcmUgaW4gaW5kaWNlcyAxLi5uLiAgTm90ZSB0aGF0IHRoaXMgbWF5IGxlYXZlIHVudXNl
ZAorICogaW5kaWNlcyBiZXR3ZWVuIHRoZSB0b3AgInNwcml0ZSIgcGxhbmUgYW5kIHRoZSBjdXJz
b3IuCisgKi8KK3N0YXRpYyBpbnQKK3dtX3BsYW5lX2lkKGNvbnN0IHN0cnVjdCBpbnRlbF9wbGFu
ZSAqcGxhbmUpCit7CisJc3dpdGNoIChwbGFuZS0+YmFzZS50eXBlKSB7CisJY2FzZSBEUk1fUExB
TkVfVFlQRV9QUklNQVJZOgorCQlyZXR1cm4gMDsKKwljYXNlIERSTV9QTEFORV9UWVBFX0NVUlNP
UjoKKwkJcmV0dXJuIFBMQU5FX0NVUlNPUjsKKwljYXNlIERSTV9QTEFORV9UWVBFX09WRVJMQVk6
CisJCXJldHVybiBwbGFuZS0+cGxhbmUgKyAxOworCWRlZmF1bHQ6CisJCU1JU1NJTkdfQ0FTRShw
bGFuZS0+YmFzZS50eXBlKTsKKwkJcmV0dXJuIHBsYW5lLT5wbGFuZTsKKwl9Cit9CisKIHN0YXRp
YyB2b2lkIGJ4dF9pbml0X2Nsb2NrX2dhdGluZyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogewog
CXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IGRldi0+ZGV2X3ByaXZhdGU7CkBA
IC0yODI4LDI3ICsyODUwLDYgQEAgYm9vbCBpbGtfZGlzYWJsZV9scF93bShzdHJ1Y3QgZHJtX2Rl
dmljZSAqZGV2KQogI2RlZmluZSBTS0xfRERCX1NJWkUJCTg5NgkvKiBpbiBibG9ja3MgKi8KICNk
ZWZpbmUgQlhUX0REQl9TSVpFCQk1MTIKIAotLyoKLSAqIFJldHVybiB0aGUgaW5kZXggb2YgYSBw
bGFuZSBpbiB0aGUgU0tMIEREQiBhbmQgd20gcmVzdWx0IGFycmF5cy4gIFByaW1hcnkKLSAqIHBs
YW5lIGlzIGFsd2F5cyBpbiBzbG90IDAsIGN1cnNvciBpcyBhbHdheXMgaW4gc2xvdCBJOTE1X01B
WF9QTEFORVMtMSwgYW5kCi0gKiBvdGhlciB1bml2ZXJzYWwgcGxhbmVzIGFyZSBpbiBpbmRpY2Vz
IDEuLm4uICBOb3RlIHRoYXQgdGhpcyBtYXkgbGVhdmUgdW51c2VkCi0gKiBpbmRpY2VzIGJldHdl
ZW4gdGhlIHRvcCAic3ByaXRlIiBwbGFuZSBhbmQgdGhlIGN1cnNvci4KLSAqLwotc3RhdGljIGlu
dAotc2tsX3dtX3BsYW5lX2lkKGNvbnN0IHN0cnVjdCBpbnRlbF9wbGFuZSAqcGxhbmUpCi17Ci0J
c3dpdGNoIChwbGFuZS0+YmFzZS50eXBlKSB7Ci0JY2FzZSBEUk1fUExBTkVfVFlQRV9QUklNQVJZ
OgotCQlyZXR1cm4gMDsKLQljYXNlIERSTV9QTEFORV9UWVBFX0NVUlNPUjoKLQkJcmV0dXJuIFBM
QU5FX0NVUlNPUjsKLQljYXNlIERSTV9QTEFORV9UWVBFX09WRVJMQVk6Ci0JCXJldHVybiBwbGFu
ZS0+cGxhbmUgKyAxOwotCWRlZmF1bHQ6Ci0JCU1JU1NJTkdfQ0FTRShwbGFuZS0+YmFzZS50eXBl
KTsKLQkJcmV0dXJuIHBsYW5lLT5wbGFuZTsKLQl9Ci19CiAKIHN0YXRpYyB2b2lkCiBza2xfZGRi
X2dldF9waXBlX2FsbG9jYXRpb25fbGltaXRzKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCkBAIC0z
MDExLDcgKzMwMTIsNyBAQCBza2xfZ2V0X3RvdGFsX3JlbGF0aXZlX2RhdGFfcmF0ZShzdHJ1Y3Qg
aW50ZWxfY3J0Y19zdGF0ZSAqaW50ZWxfY3N0YXRlKQogCiAJLyogQ2FsY3VsYXRlIGFuZCBjYWNo
ZSBkYXRhIHJhdGUgZm9yIGVhY2ggcGxhbmUgKi8KIAlmb3JfZWFjaF9wbGFuZV9pbl9zdGF0ZShz
dGF0ZSwgcGxhbmUsIHBzdGF0ZSwgaSkgewotCQlpZCA9IHNrbF93bV9wbGFuZV9pZCh0b19pbnRl
bF9wbGFuZShwbGFuZSkpOworCQlpZCA9IHdtX3BsYW5lX2lkKHRvX2ludGVsX3BsYW5lKHBsYW5l
KSk7CiAJCWludGVsX3BsYW5lID0gdG9faW50ZWxfcGxhbmUocGxhbmUpOwogCiAJCWlmIChpbnRl
bF9wbGFuZS0+cGlwZSAhPSBpbnRlbF9jcnRjLT5waXBlKQpAQCAtMzAzMCw3ICszMDMxLDcgQEAg
c2tsX2dldF90b3RhbF9yZWxhdGl2ZV9kYXRhX3JhdGUoc3RydWN0IGludGVsX2NydGNfc3RhdGUg
KmludGVsX2NzdGF0ZSkKIAogCS8qIENhbGN1bGF0ZSBDUlRDJ3MgdG90YWwgZGF0YSByYXRlIGZy
b20gY2FjaGVkIHZhbHVlcyAqLwogCWZvcl9lYWNoX2ludGVsX3BsYW5lX29uX2NydGMoZGV2LCBp
bnRlbF9jcnRjLCBpbnRlbF9wbGFuZSkgewotCQlpbnQgaWQgPSBza2xfd21fcGxhbmVfaWQoaW50
ZWxfcGxhbmUpOworCQlpbnQgaWQgPSB3bV9wbGFuZV9pZChpbnRlbF9wbGFuZSk7CiAKIAkJLyog
cGFja2VkL3V2ICovCiAJCXRvdGFsX2RhdGFfcmF0ZSArPSBpbnRlbF9jc3RhdGUtPndtLnNrbC5w
bGFuZV9kYXRhX3JhdGVbaWRdOwpAQCAtMzA4OCw3ICszMDg5LDcgQEAgc2tsX2FsbG9jYXRlX3Bp
cGVfZGRiKHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjc3RhdGUsCiAJLyogMS4gQWxsb2NhdGUg
dGhlIG1pbmludW0gcmVxdWlyZWQgYmxvY2tzIGZvciBlYWNoIGFjdGl2ZSBwbGFuZSAqLwogCWZv
cl9lYWNoX3BsYW5lX2luX3N0YXRlKHN0YXRlLCBwbGFuZSwgcHN0YXRlLCBpKSB7CiAJCWludGVs
X3BsYW5lID0gdG9faW50ZWxfcGxhbmUocGxhbmUpOwotCQlpZCA9IHNrbF93bV9wbGFuZV9pZChp
bnRlbF9wbGFuZSk7CisJCWlkID0gd21fcGxhbmVfaWQoaW50ZWxfcGxhbmUpOwogCiAJCWlmIChp
bnRlbF9wbGFuZS0+cGlwZSAhPSBwaXBlKQogCQkJY29udGludWU7CkBAIC0zMTMwLDcgKzMxMzEs
NyBAQCBza2xfYWxsb2NhdGVfcGlwZV9kZGIoc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNzdGF0
ZSwKIAlmb3JfZWFjaF9pbnRlbF9wbGFuZV9vbl9jcnRjKGRldiwgaW50ZWxfY3J0YywgaW50ZWxf
cGxhbmUpIHsKIAkJdW5zaWduZWQgaW50IGRhdGFfcmF0ZSwgeV9kYXRhX3JhdGU7CiAJCXVpbnQx
Nl90IHBsYW5lX2Jsb2NrcywgeV9wbGFuZV9ibG9ja3MgPSAwOwotCQlpbnQgaWQgPSBza2xfd21f
cGxhbmVfaWQoaW50ZWxfcGxhbmUpOworCQlpbnQgaWQgPSB3bV9wbGFuZV9pZChpbnRlbF9wbGFu
ZSk7CiAKIAkJZGF0YV9yYXRlID0gY3N0YXRlLT53bS5za2wucGxhbmVfZGF0YV9yYXRlW2lkXTsK
IApAQCAtMzMyMSw3ICszMzIyLDcgQEAgc3RhdGljIGludCBza2xfY29tcHV0ZV9wbGFuZV93bShj
b25zdCBzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCiAJCQlEUk1fREVCVUdfS01T
KCJSZXF1ZXN0ZWQgZGlzcGxheSBjb25maWd1cmF0aW9uIGV4Y2VlZHMgc3lzdGVtIHdhdGVybWFy
ayBsaW1pdGF0aW9uc1xuIik7CiAJCQlEUk1fREVCVUdfS01TKCJQbGFuZSAlZC4lZDogYmxvY2tz
IHJlcXVpcmVkID0gJXUvJXUsIGxpbmVzIHJlcXVpcmVkID0gJXUvMzFcbiIsCiAJCQkJICAgICAg
dG9faW50ZWxfY3J0Yyhjc3RhdGUtPmJhc2UuY3J0YyktPnBpcGUsCi0JCQkJICAgICAgc2tsX3dt
X3BsYW5lX2lkKHRvX2ludGVsX3BsYW5lKHBzdGF0ZS0+cGxhbmUpKSwKKwkJCQkgICAgICB3bV9w
bGFuZV9pZCh0b19pbnRlbF9wbGFuZShwc3RhdGUtPnBsYW5lKSksCiAJCQkJICAgICAgcmVzX2Js
b2NrcywgZGRiX2FsbG9jYXRpb24sIHJlc19saW5lcyk7CiAKIAkJCXJldHVybiAtRUlOVkFMOwpA
QCAtMzM1OSw3ICszMzYwLDcgQEAgc2tsX2NvbXB1dGVfd21fbGV2ZWwoY29uc3Qgc3RydWN0IGRy
bV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAogCW1lbXNldChyZXN1bHQsIDAsIHNpemVvZigqcmVz
dWx0KSk7CiAKIAlmb3JfZWFjaF9pbnRlbF9wbGFuZV9tYXNrKGRldiwgaW50ZWxfcGxhbmUsIGNz
dGF0ZS0+YmFzZS5wbGFuZV9tYXNrKSB7Ci0JCWludCBpID0gc2tsX3dtX3BsYW5lX2lkKGludGVs
X3BsYW5lKTsKKwkJaW50IGkgPSB3bV9wbGFuZV9pZChpbnRlbF9wbGFuZSk7CiAKIAkJcGxhbmUg
PSAmaW50ZWxfcGxhbmUtPmJhc2U7CiAJCWludGVsX3BzdGF0ZSA9IE5VTEw7CkBAIC0zNDI4LDcg
KzM0MjksNyBAQCBzdGF0aWMgdm9pZCBza2xfY29tcHV0ZV90cmFuc2l0aW9uX3dtKHN0cnVjdCBp
bnRlbF9jcnRjX3N0YXRlICpjc3RhdGUsCiAKIAkvKiBVbnRpbCB3ZSBrbm93IG1vcmUsIGp1c3Qg
ZGlzYWJsZSB0cmFuc2l0aW9uIFdNcyAqLwogCWZvcl9lYWNoX2ludGVsX3BsYW5lX29uX2NydGMo
Y3J0Yy0+ZGV2LCBpbnRlbF9jcnRjLCBpbnRlbF9wbGFuZSkgewotCQlpbnQgaSA9IHNrbF93bV9w
bGFuZV9pZChpbnRlbF9wbGFuZSk7CisJCWludCBpID0gd21fcGxhbmVfaWQoaW50ZWxfcGxhbmUp
OwogCiAJCXRyYW5zX3dtLT5wbGFuZV9lbltpXSA9IGZhbHNlOwogCX0KQEAgLTQwNjgsNyArNDA2
OSw3IEBAIHZvaWQgc2tsX3dtX2dldF9od19zdGF0ZShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQog
CQlmb3JfZWFjaF9pbnRlbF9wbGFuZV9vbl9jcnRjKGRldiwgaW50ZWxfY3J0YywgaW50ZWxfcGxh
bmUpIHsKIAkJCWNvbnN0IHN0cnVjdCBkcm1fcGxhbmVfc3RhdGUgKnBzdGF0ZSA9CiAJCQkJaW50
ZWxfcGxhbmUtPmJhc2Uuc3RhdGU7Ci0JCQlpbnQgaWQgPSBza2xfd21fcGxhbmVfaWQoaW50ZWxf
cGxhbmUpOworCQkJaW50IGlkID0gd21fcGxhbmVfaWQoaW50ZWxfcGxhbmUpOwogCiAJCQljc3Rh
dGUtPndtLnNrbC5wbGFuZV9kYXRhX3JhdGVbaWRdID0KIAkJCQlza2xfcGxhbmVfcmVsYXRpdmVf
ZGF0YV9yYXRlKGNzdGF0ZSwgcHN0YXRlLCAwKTsKLS0gCjEuOC4wLjEKCl9fX19fX19fX19fX19f
X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QK
SW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9w
Lm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=