From mboxrd@z Thu Jan 1 00:00:00 1970 From: chix.ding@intel.com Subject: [RFC 2/5] Rename skl_plane_id to wm_plane_id Date: Wed, 1 Jun 2016 08:10:18 +0100 Message-ID: <1464765021-16206-3-git-send-email-chix.ding@intel.com> References: <1464765021-16206-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: Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTP id 80AAA6E882 for ; Wed, 1 Jun 2016 07:10:36 +0000 (UTC) In-Reply-To: <1464765021-16206-1-git-send-email-chix.ding@intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: intel-gfx@lists.freedesktop.org Cc: yetundex.adebisi@intel.com, Chi Ding List-Id: intel-gfx@lists.freedesktop.org RnJvbTogQ2hpIERpbmcgPGNoaXguZGluZ0BpbnRlbC5jb20+CgpUaGlzIGZ1bmN0aW9uIHdpbGwg YmUgdXNlZCBub3Qgb25seSBieSBTS0wgYnV0IGFsc28gVkxWL0NIVi4KVGhlcmVmb3JlIGl0J3Mg cmVuYW1lZC4KClNpZ25lZC1vZmYtYnk6IENoaSBEaW5nIDxjaGl4LmRpbmdAaW50ZWwuY29tPgoK Y2M6IFZpbGxlIFN5cmrDpGzDpCA8dmlsbGUuc3lyamFsYUBsaW51eC5pbnRlbC5jb20+CmNjOiBt YXR0aGV3LmQucm9wZXJAaW50ZWwuY29tCmNjOiB5ZXR1bmRleC5hZGViaXNpQGludGVsLmNvbQot LS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMgfCA1OSArKysrKysrKysrKysrKysr KysrKystLS0tLS0tLS0tLS0tLS0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDMwIGluc2VydGlvbnMo KyksIDI5IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX3BtLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jCmluZGV4IGI2ZGZkMDIu LmEzOTQyZGYgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMKKysr IGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYwpAQCAtNTQsNiArNTQsMjggQEAKICNk ZWZpbmUgSU5URUxfUkM2cF9FTkFCTEUJCQkoMTw8MSkKICNkZWZpbmUgSU5URUxfUkM2cHBfRU5B QkxFCQkJKDE8PDIpCiAKKy8qCisgKiBSZXR1cm4gdGhlIGluZGV4IG9mIGEgcGxhbmUgaW4gdGhl IEREQiBhbmQgd20gcmVzdWx0IGFycmF5cy4gIFByaW1hcnkKKyAqIHBsYW5lIGlzIGFsd2F5cyBp biBzbG90IDAsIGN1cnNvciBpcyBhbHdheXMgaW4gc2xvdCBJOTE1X01BWF9QTEFORVMtMSwgYW5k CisgKiBvdGhlciB1bml2ZXJzYWwgcGxhbmVzIGFyZSBpbiBpbmRpY2VzIDEuLm4uICBOb3RlIHRo YXQgdGhpcyBtYXkgbGVhdmUgdW51c2VkCisgKiBpbmRpY2VzIGJldHdlZW4gdGhlIHRvcCAic3By aXRlIiBwbGFuZSBhbmQgdGhlIGN1cnNvci4KKyAqLworc3RhdGljIGludAord21fcGxhbmVfaWQo Y29uc3Qgc3RydWN0IGludGVsX3BsYW5lICpwbGFuZSkKK3sKKwlzd2l0Y2ggKHBsYW5lLT5iYXNl LnR5cGUpIHsKKwljYXNlIERSTV9QTEFORV9UWVBFX1BSSU1BUlk6CisJCXJldHVybiAwOworCWNh c2UgRFJNX1BMQU5FX1RZUEVfQ1VSU09SOgorCQlyZXR1cm4gUExBTkVfQ1VSU09SOworCWNhc2Ug RFJNX1BMQU5FX1RZUEVfT1ZFUkxBWToKKwkJcmV0dXJuIHBsYW5lLT5wbGFuZSArIDE7CisJZGVm YXVsdDoKKwkJTUlTU0lOR19DQVNFKHBsYW5lLT5iYXNlLnR5cGUpOworCQlyZXR1cm4gcGxhbmUt PnBsYW5lOworCX0KK30KKwogc3RhdGljIHZvaWQgYnh0X2luaXRfY2xvY2tfZ2F0aW5nKHN0cnVj dCBkcm1fZGV2aWNlICpkZXYpCiB7CiAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2 ID0gZGV2LT5kZXZfcHJpdmF0ZTsKQEAgLTI4MjgsMjcgKzI4NTAsNiBAQCBib29sIGlsa19kaXNh YmxlX2xwX3dtKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAjZGVmaW5lIFNLTF9EREJfU0laRQkJ ODk2CS8qIGluIGJsb2NrcyAqLwogI2RlZmluZSBCWFRfRERCX1NJWkUJCTUxMgogCi0vKgotICog UmV0dXJuIHRoZSBpbmRleCBvZiBhIHBsYW5lIGluIHRoZSBTS0wgRERCIGFuZCB3bSByZXN1bHQg YXJyYXlzLiAgUHJpbWFyeQotICogcGxhbmUgaXMgYWx3YXlzIGluIHNsb3QgMCwgY3Vyc29yIGlz IGFsd2F5cyBpbiBzbG90IEk5MTVfTUFYX1BMQU5FUy0xLCBhbmQKLSAqIG90aGVyIHVuaXZlcnNh bCBwbGFuZXMgYXJlIGluIGluZGljZXMgMS4ubi4gIE5vdGUgdGhhdCB0aGlzIG1heSBsZWF2ZSB1 bnVzZWQKLSAqIGluZGljZXMgYmV0d2VlbiB0aGUgdG9wICJzcHJpdGUiIHBsYW5lIGFuZCB0aGUg Y3Vyc29yLgotICovCi1zdGF0aWMgaW50Ci1za2xfd21fcGxhbmVfaWQoY29uc3Qgc3RydWN0IGlu dGVsX3BsYW5lICpwbGFuZSkKLXsKLQlzd2l0Y2ggKHBsYW5lLT5iYXNlLnR5cGUpIHsKLQljYXNl IERSTV9QTEFORV9UWVBFX1BSSU1BUlk6Ci0JCXJldHVybiAwOwotCWNhc2UgRFJNX1BMQU5FX1RZ UEVfQ1VSU09SOgotCQlyZXR1cm4gUExBTkVfQ1VSU09SOwotCWNhc2UgRFJNX1BMQU5FX1RZUEVf T1ZFUkxBWToKLQkJcmV0dXJuIHBsYW5lLT5wbGFuZSArIDE7Ci0JZGVmYXVsdDoKLQkJTUlTU0lO R19DQVNFKHBsYW5lLT5iYXNlLnR5cGUpOwotCQlyZXR1cm4gcGxhbmUtPnBsYW5lOwotCX0KLX0K IAogc3RhdGljIHZvaWQKIHNrbF9kZGJfZ2V0X3BpcGVfYWxsb2NhdGlvbl9saW1pdHMoc3RydWN0 IGRybV9kZXZpY2UgKmRldiwKQEAgLTMwMTEsNyArMzAxMiw3IEBAIHNrbF9nZXRfdG90YWxfcmVs YXRpdmVfZGF0YV9yYXRlKHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICppbnRlbF9jc3RhdGUpCiAK IAkvKiBDYWxjdWxhdGUgYW5kIGNhY2hlIGRhdGEgcmF0ZSBmb3IgZWFjaCBwbGFuZSAqLwogCWZv cl9lYWNoX3BsYW5lX2luX3N0YXRlKHN0YXRlLCBwbGFuZSwgcHN0YXRlLCBpKSB7Ci0JCWlkID0g c2tsX3dtX3BsYW5lX2lkKHRvX2ludGVsX3BsYW5lKHBsYW5lKSk7CisJCWlkID0gd21fcGxhbmVf aWQodG9faW50ZWxfcGxhbmUocGxhbmUpKTsKIAkJaW50ZWxfcGxhbmUgPSB0b19pbnRlbF9wbGFu ZShwbGFuZSk7CiAKIAkJaWYgKGludGVsX3BsYW5lLT5waXBlICE9IGludGVsX2NydGMtPnBpcGUp CkBAIC0zMDMwLDcgKzMwMzEsNyBAQCBza2xfZ2V0X3RvdGFsX3JlbGF0aXZlX2RhdGFfcmF0ZShz dHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqaW50ZWxfY3N0YXRlKQogCiAJLyogQ2FsY3VsYXRlIENS VEMncyB0b3RhbCBkYXRhIHJhdGUgZnJvbSBjYWNoZWQgdmFsdWVzICovCiAJZm9yX2VhY2hfaW50 ZWxfcGxhbmVfb25fY3J0YyhkZXYsIGludGVsX2NydGMsIGludGVsX3BsYW5lKSB7Ci0JCWludCBp ZCA9IHNrbF93bV9wbGFuZV9pZChpbnRlbF9wbGFuZSk7CisJCWludCBpZCA9IHdtX3BsYW5lX2lk KGludGVsX3BsYW5lKTsKIAogCQkvKiBwYWNrZWQvdXYgKi8KIAkJdG90YWxfZGF0YV9yYXRlICs9 IGludGVsX2NzdGF0ZS0+d20uc2tsLnBsYW5lX2RhdGFfcmF0ZVtpZF07CkBAIC0zMDg4LDcgKzMw ODksNyBAQCBza2xfYWxsb2NhdGVfcGlwZV9kZGIoc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNz dGF0ZSwKIAkvKiAxLiBBbGxvY2F0ZSB0aGUgbWluaW51bSByZXF1aXJlZCBibG9ja3MgZm9yIGVh Y2ggYWN0aXZlIHBsYW5lICovCiAJZm9yX2VhY2hfcGxhbmVfaW5fc3RhdGUoc3RhdGUsIHBsYW5l LCBwc3RhdGUsIGkpIHsKIAkJaW50ZWxfcGxhbmUgPSB0b19pbnRlbF9wbGFuZShwbGFuZSk7Ci0J CWlkID0gc2tsX3dtX3BsYW5lX2lkKGludGVsX3BsYW5lKTsKKwkJaWQgPSB3bV9wbGFuZV9pZChp bnRlbF9wbGFuZSk7CiAKIAkJaWYgKGludGVsX3BsYW5lLT5waXBlICE9IHBpcGUpCiAJCQljb250 aW51ZTsKQEAgLTMxMzAsNyArMzEzMSw3IEBAIHNrbF9hbGxvY2F0ZV9waXBlX2RkYihzdHJ1Y3Qg aW50ZWxfY3J0Y19zdGF0ZSAqY3N0YXRlLAogCWZvcl9lYWNoX2ludGVsX3BsYW5lX29uX2NydGMo ZGV2LCBpbnRlbF9jcnRjLCBpbnRlbF9wbGFuZSkgewogCQl1bnNpZ25lZCBpbnQgZGF0YV9yYXRl LCB5X2RhdGFfcmF0ZTsKIAkJdWludDE2X3QgcGxhbmVfYmxvY2tzLCB5X3BsYW5lX2Jsb2NrcyA9 IDA7Ci0JCWludCBpZCA9IHNrbF93bV9wbGFuZV9pZChpbnRlbF9wbGFuZSk7CisJCWludCBpZCA9 IHdtX3BsYW5lX2lkKGludGVsX3BsYW5lKTsKIAogCQlkYXRhX3JhdGUgPSBjc3RhdGUtPndtLnNr bC5wbGFuZV9kYXRhX3JhdGVbaWRdOwogCkBAIC0zMzIxLDcgKzMzMjIsNyBAQCBzdGF0aWMgaW50 IHNrbF9jb21wdXRlX3BsYW5lX3dtKGNvbnN0IHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZf cHJpdiwKIAkJCURSTV9ERUJVR19LTVMoIlJlcXVlc3RlZCBkaXNwbGF5IGNvbmZpZ3VyYXRpb24g ZXhjZWVkcyBzeXN0ZW0gd2F0ZXJtYXJrIGxpbWl0YXRpb25zXG4iKTsKIAkJCURSTV9ERUJVR19L TVMoIlBsYW5lICVkLiVkOiBibG9ja3MgcmVxdWlyZWQgPSAldS8ldSwgbGluZXMgcmVxdWlyZWQg PSAldS8zMVxuIiwKIAkJCQkgICAgICB0b19pbnRlbF9jcnRjKGNzdGF0ZS0+YmFzZS5jcnRjKS0+ cGlwZSwKLQkJCQkgICAgICBza2xfd21fcGxhbmVfaWQodG9faW50ZWxfcGxhbmUocHN0YXRlLT5w bGFuZSkpLAorCQkJCSAgICAgIHdtX3BsYW5lX2lkKHRvX2ludGVsX3BsYW5lKHBzdGF0ZS0+cGxh bmUpKSwKIAkJCQkgICAgICByZXNfYmxvY2tzLCBkZGJfYWxsb2NhdGlvbiwgcmVzX2xpbmVzKTsK IAogCQkJcmV0dXJuIC1FSU5WQUw7CkBAIC0zMzU5LDcgKzMzNjAsNyBAQCBza2xfY29tcHV0ZV93 bV9sZXZlbChjb25zdCBzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCiAJbWVtc2V0 KHJlc3VsdCwgMCwgc2l6ZW9mKCpyZXN1bHQpKTsKIAogCWZvcl9lYWNoX2ludGVsX3BsYW5lX21h c2soZGV2LCBpbnRlbF9wbGFuZSwgY3N0YXRlLT5iYXNlLnBsYW5lX21hc2spIHsKLQkJaW50IGkg PSBza2xfd21fcGxhbmVfaWQoaW50ZWxfcGxhbmUpOworCQlpbnQgaSA9IHdtX3BsYW5lX2lkKGlu dGVsX3BsYW5lKTsKIAogCQlwbGFuZSA9ICZpbnRlbF9wbGFuZS0+YmFzZTsKIAkJaW50ZWxfcHN0 YXRlID0gTlVMTDsKQEAgLTM0MjgsNyArMzQyOSw3IEBAIHN0YXRpYyB2b2lkIHNrbF9jb21wdXRl X3RyYW5zaXRpb25fd20oc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNzdGF0ZSwKIAogCS8qIFVu dGlsIHdlIGtub3cgbW9yZSwganVzdCBkaXNhYmxlIHRyYW5zaXRpb24gV01zICovCiAJZm9yX2Vh Y2hfaW50ZWxfcGxhbmVfb25fY3J0YyhjcnRjLT5kZXYsIGludGVsX2NydGMsIGludGVsX3BsYW5l KSB7Ci0JCWludCBpID0gc2tsX3dtX3BsYW5lX2lkKGludGVsX3BsYW5lKTsKKwkJaW50IGkgPSB3 bV9wbGFuZV9pZChpbnRlbF9wbGFuZSk7CiAKIAkJdHJhbnNfd20tPnBsYW5lX2VuW2ldID0gZmFs c2U7CiAJfQpAQCAtNDA2OCw3ICs0MDY5LDcgQEAgdm9pZCBza2xfd21fZ2V0X2h3X3N0YXRlKHN0 cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJCWZvcl9lYWNoX2ludGVsX3BsYW5lX29uX2NydGMoZGV2 LCBpbnRlbF9jcnRjLCBpbnRlbF9wbGFuZSkgewogCQkJY29uc3Qgc3RydWN0IGRybV9wbGFuZV9z dGF0ZSAqcHN0YXRlID0KIAkJCQlpbnRlbF9wbGFuZS0+YmFzZS5zdGF0ZTsKLQkJCWludCBpZCA9 IHNrbF93bV9wbGFuZV9pZChpbnRlbF9wbGFuZSk7CisJCQlpbnQgaWQgPSB3bV9wbGFuZV9pZChp bnRlbF9wbGFuZSk7CiAKIAkJCWNzdGF0ZS0+d20uc2tsLnBsYW5lX2RhdGFfcmF0ZVtpZF0gPQog CQkJCXNrbF9wbGFuZV9yZWxhdGl2ZV9kYXRhX3JhdGUoY3N0YXRlLCBwc3RhdGUsIDApOwotLSAK MS44LjAuMQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18K SW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0 dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==