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_wm_plane_id to
	wm_plane_id
Date: Thu, 23 Jun 2016 14:36:22 +0200
Message-ID: <1466685388-16504-3-git-send-email-chix.ding@intel.com>
References: <1466685388-16504-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 DAC886E3AF
 for <intel-gfx@lists.freedesktop.org>; Thu, 23 Jun 2016 12:36:37 +0000 (UTC)
In-Reply-To: <1466685388-16504-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
NS9pbnRlbF9wbS5jIHwgNTcgKysrKysrKysrKysrKysrKysrKysrLS0tLS0tLS0tLS0tLS0tLS0t
LS0KIDEgZmlsZSBjaGFuZ2VkLCAyOSBpbnNlcnRpb25zKCspLCAyOCBkZWxldGlvbnMoLSkKCmRp
ZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jIGIvZHJpdmVycy9ncHUv
ZHJtL2k5MTUvaW50ZWxfcG0uYwppbmRleCBjOTQ1MjFjYy4uMjk4MjBlMiAxMDA2NDQKLS0tIGEv
ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkx
NS9pbnRlbF9wbS5jCkBAIC01NSw2ICs1NSwyOCBAQAogI2RlZmluZSBJTlRFTF9SQzZwX0VOQUJM
RQkJCSgxPDwxKQogI2RlZmluZSBJTlRFTF9SQzZwcF9FTkFCTEUJCQkoMTw8MikKIAorLyoKKyAq
IFJldHVybiB0aGUgaW5kZXggb2YgYSBwbGFuZSBpbiB0aGUgRERCIGFuZCB3bSByZXN1bHQgYXJy
YXlzLiAgUHJpbWFyeQorICogcGxhbmUgaXMgYWx3YXlzIGluIHNsb3QgMCwgY3Vyc29yIGlzIGFs
d2F5cyBpbiBzbG90IEk5MTVfTUFYX1BMQU5FUy0xLCBhbmQKKyAqIG90aGVyIHVuaXZlcnNhbCBw
bGFuZXMgYXJlIGluIGluZGljZXMgMS4ubi4gIE5vdGUgdGhhdCB0aGlzIG1heSBsZWF2ZSB1bnVz
ZWQKKyAqIGluZGljZXMgYmV0d2VlbiB0aGUgdG9wICJzcHJpdGUiIHBsYW5lIGFuZCB0aGUgY3Vy
c29yLgorICovCitzdGF0aWMgaW50Cit3bV9wbGFuZV9pZChjb25zdCBzdHJ1Y3QgaW50ZWxfcGxh
bmUgKnBsYW5lKQoreworCXN3aXRjaCAocGxhbmUtPmJhc2UudHlwZSkgeworCWNhc2UgRFJNX1BM
QU5FX1RZUEVfUFJJTUFSWToKKwkJcmV0dXJuIDA7CisJY2FzZSBEUk1fUExBTkVfVFlQRV9DVVJT
T1I6CisJCXJldHVybiBQTEFORV9DVVJTT1I7CisJY2FzZSBEUk1fUExBTkVfVFlQRV9PVkVSTEFZ
OgorCQlyZXR1cm4gcGxhbmUtPnBsYW5lICsgMTsKKwlkZWZhdWx0OgorCQlNSVNTSU5HX0NBU0Uo
cGxhbmUtPmJhc2UudHlwZSk7CisJCXJldHVybiBwbGFuZS0+cGxhbmU7CisJfQorfQorCiBzdGF0
aWMgdm9pZCBnZW45X2luaXRfY2xvY2tfZ2F0aW5nKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiB7
CiAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gZGV2LT5kZXZfcHJpdmF0ZTsK
QEAgLTI4NTMsMjcgKzI4NzUsNiBAQCBib29sIGlsa19kaXNhYmxlX2xwX3dtKHN0cnVjdCBkcm1f
ZGV2aWNlICpkZXYpCiAjZGVmaW5lIFNLTF9EREJfU0laRQkJODk2CS8qIGluIGJsb2NrcyAqLwog
I2RlZmluZSBCWFRfRERCX1NJWkUJCTUxMgogCi0vKgotICogUmV0dXJuIHRoZSBpbmRleCBvZiBh
IHBsYW5lIGluIHRoZSBTS0wgRERCIGFuZCB3bSByZXN1bHQgYXJyYXlzLiAgUHJpbWFyeQotICog
cGxhbmUgaXMgYWx3YXlzIGluIHNsb3QgMCwgY3Vyc29yIGlzIGFsd2F5cyBpbiBzbG90IEk5MTVf
TUFYX1BMQU5FUy0xLCBhbmQKLSAqIG90aGVyIHVuaXZlcnNhbCBwbGFuZXMgYXJlIGluIGluZGlj
ZXMgMS4ubi4gIE5vdGUgdGhhdCB0aGlzIG1heSBsZWF2ZSB1bnVzZWQKLSAqIGluZGljZXMgYmV0
d2VlbiB0aGUgdG9wICJzcHJpdGUiIHBsYW5lIGFuZCB0aGUgY3Vyc29yLgotICovCi1zdGF0aWMg
aW50Ci1za2xfd21fcGxhbmVfaWQoY29uc3Qgc3RydWN0IGludGVsX3BsYW5lICpwbGFuZSkKLXsK
LQlzd2l0Y2ggKHBsYW5lLT5iYXNlLnR5cGUpIHsKLQljYXNlIERSTV9QTEFORV9UWVBFX1BSSU1B
Ulk6Ci0JCXJldHVybiAwOwotCWNhc2UgRFJNX1BMQU5FX1RZUEVfQ1VSU09SOgotCQlyZXR1cm4g
UExBTkVfQ1VSU09SOwotCWNhc2UgRFJNX1BMQU5FX1RZUEVfT1ZFUkxBWToKLQkJcmV0dXJuIHBs
YW5lLT5wbGFuZSArIDE7Ci0JZGVmYXVsdDoKLQkJTUlTU0lOR19DQVNFKHBsYW5lLT5iYXNlLnR5
cGUpOwotCQlyZXR1cm4gcGxhbmUtPnBsYW5lOwotCX0KLX0KIAogc3RhdGljIHZvaWQKIHNrbF9k
ZGJfZ2V0X3BpcGVfYWxsb2NhdGlvbl9saW1pdHMoc3RydWN0IGRybV9kZXZpY2UgKmRldiwKQEAg
LTMwODEsNyArMzA4Miw3IEBAIHNrbF9nZXRfdG90YWxfcmVsYXRpdmVfZGF0YV9yYXRlKHN0cnVj
dCBpbnRlbF9jcnRjX3N0YXRlICppbnRlbF9jc3RhdGUpCiAKIAkvKiBDYWxjdWxhdGUgYW5kIGNh
Y2hlIGRhdGEgcmF0ZSBmb3IgZWFjaCBwbGFuZSAqLwogCWZvcl9lYWNoX3BsYW5lX2luX3N0YXRl
KHN0YXRlLCBwbGFuZSwgcHN0YXRlLCBpKSB7Ci0JCWlkID0gc2tsX3dtX3BsYW5lX2lkKHRvX2lu
dGVsX3BsYW5lKHBsYW5lKSk7CisJCWlkID0gd21fcGxhbmVfaWQodG9faW50ZWxfcGxhbmUocGxh
bmUpKTsKIAkJaW50ZWxfcGxhbmUgPSB0b19pbnRlbF9wbGFuZShwbGFuZSk7CiAKIAkJaWYgKGlu
dGVsX3BsYW5lLT5waXBlICE9IGludGVsX2NydGMtPnBpcGUpCkBAIC0zMTAwLDcgKzMxMDEsNyBA
QCBza2xfZ2V0X3RvdGFsX3JlbGF0aXZlX2RhdGFfcmF0ZShzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0
ZSAqaW50ZWxfY3N0YXRlKQogCiAJLyogQ2FsY3VsYXRlIENSVEMncyB0b3RhbCBkYXRhIHJhdGUg
ZnJvbSBjYWNoZWQgdmFsdWVzICovCiAJZm9yX2VhY2hfaW50ZWxfcGxhbmVfb25fY3J0YyhkZXYs
IGludGVsX2NydGMsIGludGVsX3BsYW5lKSB7Ci0JCWludCBpZCA9IHNrbF93bV9wbGFuZV9pZChp
bnRlbF9wbGFuZSk7CisJCWludCBpZCA9IHdtX3BsYW5lX2lkKGludGVsX3BsYW5lKTsKIAogCQkv
KiBwYWNrZWQvdXYgKi8KIAkJdG90YWxfZGF0YV9yYXRlICs9IGludGVsX2NzdGF0ZS0+d20uc2ts
LnBsYW5lX2RhdGFfcmF0ZVtpZF07CkBAIC0zMjIxLDcgKzMyMjIsNyBAQCBza2xfYWxsb2NhdGVf
cGlwZV9kZGIoc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNzdGF0ZSwKIAkvKiAxLiBBbGxvY2F0
ZSB0aGUgbWluaW51bSByZXF1aXJlZCBibG9ja3MgZm9yIGVhY2ggYWN0aXZlIHBsYW5lICovCiAJ
Zm9yX2VhY2hfcGxhbmVfaW5fc3RhdGUoc3RhdGUsIHBsYW5lLCBwc3RhdGUsIGkpIHsKIAkJaW50
ZWxfcGxhbmUgPSB0b19pbnRlbF9wbGFuZShwbGFuZSk7Ci0JCWlkID0gc2tsX3dtX3BsYW5lX2lk
KGludGVsX3BsYW5lKTsKKwkJaWQgPSB3bV9wbGFuZV9pZChpbnRlbF9wbGFuZSk7CiAKIAkJaWYg
KGludGVsX3BsYW5lLT5waXBlICE9IHBpcGUpCiAJCQljb250aW51ZTsKQEAgLTMyNjAsNyArMzI2
MSw3IEBAIHNrbF9hbGxvY2F0ZV9waXBlX2RkYihzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3N0
YXRlLAogCWZvcl9lYWNoX2ludGVsX3BsYW5lX29uX2NydGMoZGV2LCBpbnRlbF9jcnRjLCBpbnRl
bF9wbGFuZSkgewogCQl1bnNpZ25lZCBpbnQgZGF0YV9yYXRlLCB5X2RhdGFfcmF0ZTsKIAkJdWlu
dDE2X3QgcGxhbmVfYmxvY2tzLCB5X3BsYW5lX2Jsb2NrcyA9IDA7Ci0JCWludCBpZCA9IHNrbF93
bV9wbGFuZV9pZChpbnRlbF9wbGFuZSk7CisJCWludCBpZCA9IHdtX3BsYW5lX2lkKGludGVsX3Bs
YW5lKTsKIAogCQlkYXRhX3JhdGUgPSBjc3RhdGUtPndtLnNrbC5wbGFuZV9kYXRhX3JhdGVbaWRd
OwogCkBAIC0zNDc3LDcgKzM0NzgsNyBAQCBzdGF0aWMgaW50IHNrbF9jb21wdXRlX3BsYW5lX3dt
KGNvbnN0IHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKIAkJCURSTV9ERUJVR19L
TVMoIlJlcXVlc3RlZCBkaXNwbGF5IGNvbmZpZ3VyYXRpb24gZXhjZWVkcyBzeXN0ZW0gd2F0ZXJt
YXJrIGxpbWl0YXRpb25zXG4iKTsKIAkJCURSTV9ERUJVR19LTVMoIlBsYW5lICVkLiVkOiBibG9j
a3MgcmVxdWlyZWQgPSAldS8ldSwgbGluZXMgcmVxdWlyZWQgPSAldS8zMVxuIiwKIAkJCQkgICAg
ICB0b19pbnRlbF9jcnRjKGNzdGF0ZS0+YmFzZS5jcnRjKS0+cGlwZSwKLQkJCQkgICAgICBza2xf
d21fcGxhbmVfaWQodG9faW50ZWxfcGxhbmUocHN0YXRlLT5wbGFuZSkpLAorCQkJCSAgICAgIHdt
X3BsYW5lX2lkKHRvX2ludGVsX3BsYW5lKHBzdGF0ZS0+cGxhbmUpKSwKIAkJCQkgICAgICByZXNf
YmxvY2tzLCBkZGJfYWxsb2NhdGlvbiwgcmVzX2xpbmVzKTsKIAogCQkJcmV0dXJuIC1FSU5WQUw7
CkBAIC0zNTE1LDcgKzM1MTYsNyBAQCBza2xfY29tcHV0ZV93bV9sZXZlbChjb25zdCBzdHJ1Y3Qg
ZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCiAJbWVtc2V0KHJlc3VsdCwgMCwgc2l6ZW9mKCpy
ZXN1bHQpKTsKIAogCWZvcl9lYWNoX2ludGVsX3BsYW5lX21hc2soZGV2LCBpbnRlbF9wbGFuZSwg
Y3N0YXRlLT5iYXNlLnBsYW5lX21hc2spIHsKLQkJaW50IGkgPSBza2xfd21fcGxhbmVfaWQoaW50
ZWxfcGxhbmUpOworCQlpbnQgaSA9IHdtX3BsYW5lX2lkKGludGVsX3BsYW5lKTsKIAogCQlwbGFu
ZSA9ICZpbnRlbF9wbGFuZS0+YmFzZTsKIAkJaW50ZWxfcHN0YXRlID0gTlVMTDsKQEAgLTM1ODQs
NyArMzU4NSw3IEBAIHN0YXRpYyB2b2lkIHNrbF9jb21wdXRlX3RyYW5zaXRpb25fd20oc3RydWN0
IGludGVsX2NydGNfc3RhdGUgKmNzdGF0ZSwKIAogCS8qIFVudGlsIHdlIGtub3cgbW9yZSwganVz
dCBkaXNhYmxlIHRyYW5zaXRpb24gV01zICovCiAJZm9yX2VhY2hfaW50ZWxfcGxhbmVfb25fY3J0
YyhjcnRjLT5kZXYsIGludGVsX2NydGMsIGludGVsX3BsYW5lKSB7Ci0JCWludCBpID0gc2tsX3dt
X3BsYW5lX2lkKGludGVsX3BsYW5lKTsKKwkJaW50IGkgPSB3bV9wbGFuZV9pZChpbnRlbF9wbGFu
ZSk7CiAKIAkJdHJhbnNfd20tPnBsYW5lX2VuW2ldID0gZmFsc2U7CiAJfQotLSAKMS44LjAuMQoK
X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4
IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlz
dHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==