From mboxrd@z Thu Jan 1 00:00:00 1970 From: Matt Roper Subject: Re: [RFC 2/5] Rename skl_plane_id to wm_plane_id Date: Fri, 3 Jun 2016 15:58:28 -0700 Message-ID: <20160603225828.GI6245@intel.com> References: <1464765021-16206-1-git-send-email-chix.ding@intel.com> <1464765021-16206-3-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 mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTP id 769686E2E3 for ; Fri, 3 Jun 2016 22:58:29 +0000 (UTC) Content-Disposition: inline In-Reply-To: <1464765021-16206-3-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: chix.ding@intel.com Cc: yetundex.adebisi@intel.com, intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org T24gV2VkLCBKdW4gMDEsIDIwMTYgYXQgMDg6MTA6MThBTSArMDEwMCwgY2hpeC5kaW5nQGludGVs LmNvbSB3cm90ZToKPiBGcm9tOiBDaGkgRGluZyA8Y2hpeC5kaW5nQGludGVsLmNvbT4KPiAKPiBU aGlzIGZ1bmN0aW9uIHdpbGwgYmUgdXNlZCBub3Qgb25seSBieSBTS0wgYnV0IGFsc28gVkxWL0NI Vi4KPiBUaGVyZWZvcmUgaXQncyByZW5hbWVkLgo+IAo+IFNpZ25lZC1vZmYtYnk6IENoaSBEaW5n IDxjaGl4LmRpbmdAaW50ZWwuY29tPgoKQXMgd2l0aCB0aGUgZmlyc3QgcGF0Y2gsIHlvdSBzaG91 bGQgdXBkYXRlIHRoZSBwYXRjaCBoZWFkbGluZS4gIE90aGVyCnRoYW4gdGhhdCwKClJldmlld2Vk LWJ5OiBNYXR0IFJvcGVyIDxtYXR0aGV3LmQucm9wZXJAaW50ZWwuY29tPgoKPiAKPiBjYzogVmls bGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KPiBjYzogbWF0dGhl dy5kLnJvcGVyQGludGVsLmNvbQo+IGNjOiB5ZXR1bmRleC5hZGViaXNpQGludGVsLmNvbQo+IC0t LQo+ICBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jIHwgNTkgKysrKysrKysrKysrKysr KysrKysrLS0tLS0tLS0tLS0tLS0tLS0tLS0KPiAgMSBmaWxlIGNoYW5nZWQsIDMwIGluc2VydGlv bnMoKyksIDI5IGRlbGV0aW9ucygtKQo+IAo+IGRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9wbS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYwo+IGluZGV4 IGI2ZGZkMDIuLmEzOTQyZGYgMTAwNjQ0Cj4gLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfcG0uYwo+ICsrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMKPiBAQCAtNTQs NiArNTQsMjggQEAKPiAgI2RlZmluZSBJTlRFTF9SQzZwX0VOQUJMRQkJCSgxPDwxKQo+ICAjZGVm aW5lIElOVEVMX1JDNnBwX0VOQUJMRQkJCSgxPDwyKQo+ICAKPiArLyoKPiArICogUmV0dXJuIHRo ZSBpbmRleCBvZiBhIHBsYW5lIGluIHRoZSBEREIgYW5kIHdtIHJlc3VsdCBhcnJheXMuICBQcmlt YXJ5Cj4gKyAqIHBsYW5lIGlzIGFsd2F5cyBpbiBzbG90IDAsIGN1cnNvciBpcyBhbHdheXMgaW4g c2xvdCBJOTE1X01BWF9QTEFORVMtMSwgYW5kCj4gKyAqIG90aGVyIHVuaXZlcnNhbCBwbGFuZXMg YXJlIGluIGluZGljZXMgMS4ubi4gIE5vdGUgdGhhdCB0aGlzIG1heSBsZWF2ZSB1bnVzZWQKPiAr ICogaW5kaWNlcyBiZXR3ZWVuIHRoZSB0b3AgInNwcml0ZSIgcGxhbmUgYW5kIHRoZSBjdXJzb3Iu Cj4gKyAqLwo+ICtzdGF0aWMgaW50Cj4gK3dtX3BsYW5lX2lkKGNvbnN0IHN0cnVjdCBpbnRlbF9w bGFuZSAqcGxhbmUpCj4gK3sKPiArCXN3aXRjaCAocGxhbmUtPmJhc2UudHlwZSkgewo+ICsJY2Fz ZSBEUk1fUExBTkVfVFlQRV9QUklNQVJZOgo+ICsJCXJldHVybiAwOwo+ICsJY2FzZSBEUk1fUExB TkVfVFlQRV9DVVJTT1I6Cj4gKwkJcmV0dXJuIFBMQU5FX0NVUlNPUjsKPiArCWNhc2UgRFJNX1BM QU5FX1RZUEVfT1ZFUkxBWToKPiArCQlyZXR1cm4gcGxhbmUtPnBsYW5lICsgMTsKPiArCWRlZmF1 bHQ6Cj4gKwkJTUlTU0lOR19DQVNFKHBsYW5lLT5iYXNlLnR5cGUpOwo+ICsJCXJldHVybiBwbGFu ZS0+cGxhbmU7Cj4gKwl9Cj4gK30KPiArCj4gIHN0YXRpYyB2b2lkIGJ4dF9pbml0X2Nsb2NrX2dh dGluZyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQo+ICB7Cj4gIAlzdHJ1Y3QgZHJtX2k5MTVfcHJp dmF0ZSAqZGV2X3ByaXYgPSBkZXYtPmRldl9wcml2YXRlOwo+IEBAIC0yODI4LDI3ICsyODUwLDYg QEAgYm9vbCBpbGtfZGlzYWJsZV9scF93bShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQo+ICAjZGVm aW5lIFNLTF9EREJfU0laRQkJODk2CS8qIGluIGJsb2NrcyAqLwo+ICAjZGVmaW5lIEJYVF9EREJf U0laRQkJNTEyCj4gIAo+IC0vKgo+IC0gKiBSZXR1cm4gdGhlIGluZGV4IG9mIGEgcGxhbmUgaW4g dGhlIFNLTCBEREIgYW5kIHdtIHJlc3VsdCBhcnJheXMuICBQcmltYXJ5Cj4gLSAqIHBsYW5lIGlz IGFsd2F5cyBpbiBzbG90IDAsIGN1cnNvciBpcyBhbHdheXMgaW4gc2xvdCBJOTE1X01BWF9QTEFO RVMtMSwgYW5kCj4gLSAqIG90aGVyIHVuaXZlcnNhbCBwbGFuZXMgYXJlIGluIGluZGljZXMgMS4u bi4gIE5vdGUgdGhhdCB0aGlzIG1heSBsZWF2ZSB1bnVzZWQKPiAtICogaW5kaWNlcyBiZXR3ZWVu IHRoZSB0b3AgInNwcml0ZSIgcGxhbmUgYW5kIHRoZSBjdXJzb3IuCj4gLSAqLwo+IC1zdGF0aWMg aW50Cj4gLXNrbF93bV9wbGFuZV9pZChjb25zdCBzdHJ1Y3QgaW50ZWxfcGxhbmUgKnBsYW5lKQo+ IC17Cj4gLQlzd2l0Y2ggKHBsYW5lLT5iYXNlLnR5cGUpIHsKPiAtCWNhc2UgRFJNX1BMQU5FX1RZ UEVfUFJJTUFSWToKPiAtCQlyZXR1cm4gMDsKPiAtCWNhc2UgRFJNX1BMQU5FX1RZUEVfQ1VSU09S Ogo+IC0JCXJldHVybiBQTEFORV9DVVJTT1I7Cj4gLQljYXNlIERSTV9QTEFORV9UWVBFX09WRVJM QVk6Cj4gLQkJcmV0dXJuIHBsYW5lLT5wbGFuZSArIDE7Cj4gLQlkZWZhdWx0Ogo+IC0JCU1JU1NJ TkdfQ0FTRShwbGFuZS0+YmFzZS50eXBlKTsKPiAtCQlyZXR1cm4gcGxhbmUtPnBsYW5lOwo+IC0J fQo+IC19Cj4gIAo+ICBzdGF0aWMgdm9pZAo+ICBza2xfZGRiX2dldF9waXBlX2FsbG9jYXRpb25f bGltaXRzKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCj4gQEAgLTMwMTEsNyArMzAxMiw3IEBAIHNr bF9nZXRfdG90YWxfcmVsYXRpdmVfZGF0YV9yYXRlKHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpp bnRlbF9jc3RhdGUpCj4gIAo+ICAJLyogQ2FsY3VsYXRlIGFuZCBjYWNoZSBkYXRhIHJhdGUgZm9y IGVhY2ggcGxhbmUgKi8KPiAgCWZvcl9lYWNoX3BsYW5lX2luX3N0YXRlKHN0YXRlLCBwbGFuZSwg cHN0YXRlLCBpKSB7Cj4gLQkJaWQgPSBza2xfd21fcGxhbmVfaWQodG9faW50ZWxfcGxhbmUocGxh bmUpKTsKPiArCQlpZCA9IHdtX3BsYW5lX2lkKHRvX2ludGVsX3BsYW5lKHBsYW5lKSk7Cj4gIAkJ aW50ZWxfcGxhbmUgPSB0b19pbnRlbF9wbGFuZShwbGFuZSk7Cj4gIAo+ICAJCWlmIChpbnRlbF9w bGFuZS0+cGlwZSAhPSBpbnRlbF9jcnRjLT5waXBlKQo+IEBAIC0zMDMwLDcgKzMwMzEsNyBAQCBz a2xfZ2V0X3RvdGFsX3JlbGF0aXZlX2RhdGFfcmF0ZShzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAq aW50ZWxfY3N0YXRlKQo+ICAKPiAgCS8qIENhbGN1bGF0ZSBDUlRDJ3MgdG90YWwgZGF0YSByYXRl IGZyb20gY2FjaGVkIHZhbHVlcyAqLwo+ICAJZm9yX2VhY2hfaW50ZWxfcGxhbmVfb25fY3J0Yyhk ZXYsIGludGVsX2NydGMsIGludGVsX3BsYW5lKSB7Cj4gLQkJaW50IGlkID0gc2tsX3dtX3BsYW5l X2lkKGludGVsX3BsYW5lKTsKPiArCQlpbnQgaWQgPSB3bV9wbGFuZV9pZChpbnRlbF9wbGFuZSk7 Cj4gIAo+ICAJCS8qIHBhY2tlZC91diAqLwo+ICAJCXRvdGFsX2RhdGFfcmF0ZSArPSBpbnRlbF9j c3RhdGUtPndtLnNrbC5wbGFuZV9kYXRhX3JhdGVbaWRdOwo+IEBAIC0zMDg4LDcgKzMwODksNyBA QCBza2xfYWxsb2NhdGVfcGlwZV9kZGIoc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNzdGF0ZSwK PiAgCS8qIDEuIEFsbG9jYXRlIHRoZSBtaW5pbnVtIHJlcXVpcmVkIGJsb2NrcyBmb3IgZWFjaCBh Y3RpdmUgcGxhbmUgKi8KPiAgCWZvcl9lYWNoX3BsYW5lX2luX3N0YXRlKHN0YXRlLCBwbGFuZSwg cHN0YXRlLCBpKSB7Cj4gIAkJaW50ZWxfcGxhbmUgPSB0b19pbnRlbF9wbGFuZShwbGFuZSk7Cj4g LQkJaWQgPSBza2xfd21fcGxhbmVfaWQoaW50ZWxfcGxhbmUpOwo+ICsJCWlkID0gd21fcGxhbmVf aWQoaW50ZWxfcGxhbmUpOwo+ICAKPiAgCQlpZiAoaW50ZWxfcGxhbmUtPnBpcGUgIT0gcGlwZSkK PiAgCQkJY29udGludWU7Cj4gQEAgLTMxMzAsNyArMzEzMSw3IEBAIHNrbF9hbGxvY2F0ZV9waXBl X2RkYihzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3N0YXRlLAo+ICAJZm9yX2VhY2hfaW50ZWxf cGxhbmVfb25fY3J0YyhkZXYsIGludGVsX2NydGMsIGludGVsX3BsYW5lKSB7Cj4gIAkJdW5zaWdu ZWQgaW50IGRhdGFfcmF0ZSwgeV9kYXRhX3JhdGU7Cj4gIAkJdWludDE2X3QgcGxhbmVfYmxvY2tz LCB5X3BsYW5lX2Jsb2NrcyA9IDA7Cj4gLQkJaW50IGlkID0gc2tsX3dtX3BsYW5lX2lkKGludGVs X3BsYW5lKTsKPiArCQlpbnQgaWQgPSB3bV9wbGFuZV9pZChpbnRlbF9wbGFuZSk7Cj4gIAo+ICAJ CWRhdGFfcmF0ZSA9IGNzdGF0ZS0+d20uc2tsLnBsYW5lX2RhdGFfcmF0ZVtpZF07Cj4gIAo+IEBA IC0zMzIxLDcgKzMzMjIsNyBAQCBzdGF0aWMgaW50IHNrbF9jb21wdXRlX3BsYW5lX3dtKGNvbnN0 IHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKPiAgCQkJRFJNX0RFQlVHX0tNUygi UmVxdWVzdGVkIGRpc3BsYXkgY29uZmlndXJhdGlvbiBleGNlZWRzIHN5c3RlbSB3YXRlcm1hcmsg bGltaXRhdGlvbnNcbiIpOwo+ICAJCQlEUk1fREVCVUdfS01TKCJQbGFuZSAlZC4lZDogYmxvY2tz IHJlcXVpcmVkID0gJXUvJXUsIGxpbmVzIHJlcXVpcmVkID0gJXUvMzFcbiIsCj4gIAkJCQkgICAg ICB0b19pbnRlbF9jcnRjKGNzdGF0ZS0+YmFzZS5jcnRjKS0+cGlwZSwKPiAtCQkJCSAgICAgIHNr bF93bV9wbGFuZV9pZCh0b19pbnRlbF9wbGFuZShwc3RhdGUtPnBsYW5lKSksCj4gKwkJCQkgICAg ICB3bV9wbGFuZV9pZCh0b19pbnRlbF9wbGFuZShwc3RhdGUtPnBsYW5lKSksCj4gIAkJCQkgICAg ICByZXNfYmxvY2tzLCBkZGJfYWxsb2NhdGlvbiwgcmVzX2xpbmVzKTsKPiAgCj4gIAkJCXJldHVy biAtRUlOVkFMOwo+IEBAIC0zMzU5LDcgKzMzNjAsNyBAQCBza2xfY29tcHV0ZV93bV9sZXZlbChj b25zdCBzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCj4gIAltZW1zZXQocmVzdWx0 LCAwLCBzaXplb2YoKnJlc3VsdCkpOwo+ICAKPiAgCWZvcl9lYWNoX2ludGVsX3BsYW5lX21hc2so ZGV2LCBpbnRlbF9wbGFuZSwgY3N0YXRlLT5iYXNlLnBsYW5lX21hc2spIHsKPiAtCQlpbnQgaSA9 IHNrbF93bV9wbGFuZV9pZChpbnRlbF9wbGFuZSk7Cj4gKwkJaW50IGkgPSB3bV9wbGFuZV9pZChp bnRlbF9wbGFuZSk7Cj4gIAo+ICAJCXBsYW5lID0gJmludGVsX3BsYW5lLT5iYXNlOwo+ICAJCWlu dGVsX3BzdGF0ZSA9IE5VTEw7Cj4gQEAgLTM0MjgsNyArMzQyOSw3IEBAIHN0YXRpYyB2b2lkIHNr bF9jb21wdXRlX3RyYW5zaXRpb25fd20oc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNzdGF0ZSwK PiAgCj4gIAkvKiBVbnRpbCB3ZSBrbm93IG1vcmUsIGp1c3QgZGlzYWJsZSB0cmFuc2l0aW9uIFdN cyAqLwo+ICAJZm9yX2VhY2hfaW50ZWxfcGxhbmVfb25fY3J0YyhjcnRjLT5kZXYsIGludGVsX2Ny dGMsIGludGVsX3BsYW5lKSB7Cj4gLQkJaW50IGkgPSBza2xfd21fcGxhbmVfaWQoaW50ZWxfcGxh bmUpOwo+ICsJCWludCBpID0gd21fcGxhbmVfaWQoaW50ZWxfcGxhbmUpOwo+ICAKPiAgCQl0cmFu c193bS0+cGxhbmVfZW5baV0gPSBmYWxzZTsKPiAgCX0KPiBAQCAtNDA2OCw3ICs0MDY5LDcgQEAg dm9pZCBza2xfd21fZ2V0X2h3X3N0YXRlKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCj4gIAkJZm9y X2VhY2hfaW50ZWxfcGxhbmVfb25fY3J0YyhkZXYsIGludGVsX2NydGMsIGludGVsX3BsYW5lKSB7 Cj4gIAkJCWNvbnN0IHN0cnVjdCBkcm1fcGxhbmVfc3RhdGUgKnBzdGF0ZSA9Cj4gIAkJCQlpbnRl bF9wbGFuZS0+YmFzZS5zdGF0ZTsKPiAtCQkJaW50IGlkID0gc2tsX3dtX3BsYW5lX2lkKGludGVs X3BsYW5lKTsKPiArCQkJaW50IGlkID0gd21fcGxhbmVfaWQoaW50ZWxfcGxhbmUpOwo+ICAKPiAg CQkJY3N0YXRlLT53bS5za2wucGxhbmVfZGF0YV9yYXRlW2lkXSA9Cj4gIAkJCQlza2xfcGxhbmVf cmVsYXRpdmVfZGF0YV9yYXRlKGNzdGF0ZSwgcHN0YXRlLCAwKTsKPiAtLSAKPiAxLjguMC4xCj4g CgotLSAKTWF0dCBSb3BlcgpHcmFwaGljcyBTb2Z0d2FyZSBFbmdpbmVlcgpJb1RHIFBsYXRmb3Jt IEVuYWJsaW5nICYgRGV2ZWxvcG1lbnQKSW50ZWwgQ29ycG9yYXRpb24KKDkxNikgMzU2LTI3OTUK X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4 IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlz dHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==