From: Ville Syrjala Subject: [PATCH 3/4] drm/i915: Rename pipe CSC to use ilk_ prefix Date: Thu, 22 Feb 2018 23:42:31 +0200 Message-ID: <20180222214232.6064-3-ville.syrjala@linux.intel.com> References: <20180222214232.6064-1-ville.syrjala@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by gabe.freedesktop.org (Postfix) with ESMTPS id 66F2C6EC97 for ; Thu, 22 Feb 2018 21:42:44 +0000 (UTC) In-Reply-To: <20180222214232.6064-1-ville.syrjala@linux.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: Johnson Lin List-Id: intel-gfx@lists.freedesktop.org RnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KClRo ZSBwaXBlIENTQyB3YXMgaW50cm9kdWNlZCBieSBJTEssIHNvIGNoYW5nZSBldmVyeXRoaW5nIHJl bGF0ZWQKdG8gdXNlIGlsa18gYXMgdGhlIHByZWZpeC4KCkNjOiBKb2huc29uIExpbiA8am9obnNv bi5saW5AaW50ZWwuY29tPgpDYzogVW1hIFNoYW5rYXIgPHVtYS5zaGFua2FyQGludGVsLmNvbT4K Q2M6IFNoYXNoYW5rIFNoYXJtYSA8c2hhc2hhbmsuc2hhcm1hQGludGVsLmNvbT4KU2lnbmVkLW9m Zi1ieTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KLS0t CiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9jb2xvci5jIHwgMzkgKysrKysrKysrKysrKysr KysrKy0tLS0tLS0tLS0tLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCAxOSBpbnNlcnRpb25zKCsp LCAyMCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9jb2xvci5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfY29sb3IuYwppbmRleCBjOWFm MjYwYmUxMTMuLmFmMWU2MWQzYmFjZCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUv aW50ZWxfY29sb3IuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9jb2xvci5jCkBA IC02NiwxMyArNjYsMTMgQEAKICAqIG9mIHRoZSBDVE0gY29lZmZpY2llbnQgYW5kIHdlIHdyaXRl IHRoZSB2YWx1ZSBmcm9tIGJpdCAzLiBXZSBhbHNvIHJvdW5kIHRoZQogICogdmFsdWUuCiAgKi8K LSNkZWZpbmUgSTlYWF9DU0NfQ09FRkZfRlAoY29lZmYsIGZiaXRzKQlcCisjZGVmaW5lIElMS19D U0NfQ09FRkZfRlAoY29lZmYsIGZiaXRzKQlcCiAJKGNsYW1wX3ZhbCgoKGNvZWZmKSA+PiAoMzIg LSAoZmJpdHMpIC0gMykpICsgNCwgMCwgMHhmZmYpICYgMHhmZjgpCiAKLSNkZWZpbmUgSTlYWF9D U0NfQ09FRkZfTElNSVRFRF9SQU5HRQlcCi0JSTlYWF9DU0NfQ09FRkZfRlAoQ1RNX0NPRUZGX0xJ TUlURURfUkFOR0UsIDkpCi0jZGVmaW5lIEk5WFhfQ1NDX0NPRUZGXzFfMAkJXAotCSgoNyA8PCAx MikgfCBJOVhYX0NTQ19DT0VGRl9GUChDVE1fQ09FRkZfMV8wLCA4KSkKKyNkZWZpbmUgSUxLX0NT Q19DT0VGRl9MSU1JVEVEX1JBTkdFCVwKKwlJTEtfQ1NDX0NPRUZGX0ZQKENUTV9DT0VGRl9MSU1J VEVEX1JBTkdFLCA5KQorI2RlZmluZSBJTEtfQ1NDX0NPRUZGXzFfMAkJXAorCSgoNyA8PCAxMikg fCBJTEtfQ1NDX0NPRUZGX0ZQKENUTV9DT0VGRl8xXzAsIDgpKQogCiBzdGF0aWMgYm9vbCBjcnRj X3N0YXRlX2lzX2xlZ2FjeV9nYW1tYShzdHJ1Y3QgZHJtX2NydGNfc3RhdGUgKnN0YXRlKQogewpA QCAtMTA4LDcgKzEwOCw3IEBAIHN0YXRpYyB1NjQgKmN0bV9tdWx0X2J5X2xpbWl0ZWQodTY0ICpy ZXN1bHQsIGNvbnN0IHU2NCAqaW5wdXQpCiAJcmV0dXJuIHJlc3VsdDsKIH0KIAotc3RhdGljIHZv aWQgaTl4eF9sb2FkX3ljYmNyX2NvbnZlcnNpb25fbWF0cml4KHN0cnVjdCBpbnRlbF9jcnRjICpp bnRlbF9jcnRjKQorc3RhdGljIHZvaWQgaWxrX2xvYWRfeWNiY3JfY29udmVyc2lvbl9tYXRyaXgo c3RydWN0IGludGVsX2NydGMgKmludGVsX2NydGMpCiB7CiAJaW50IHBpcGUgPSBpbnRlbF9jcnRj LT5waXBlOwogCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUoaW50 ZWxfY3J0Yy0+YmFzZS5kZXYpOwpAQCAtMTMyLDggKzEzMiw3IEBAIHN0YXRpYyB2b2lkIGk5eHhf bG9hZF95Y2Jjcl9jb252ZXJzaW9uX21hdHJpeChzdHJ1Y3QgaW50ZWxfY3J0YyAqaW50ZWxfY3J0 YykKIAlJOTE1X1dSSVRFKFBJUEVfQ1NDX01PREUocGlwZSksIDApOwogfQogCi0vKiBTZXQgdXAg dGhlIHBpcGUgQ1NDIHVuaXQuICovCi1zdGF0aWMgdm9pZCBpOXh4X2xvYWRfY3NjX21hdHJpeChz dHJ1Y3QgZHJtX2NydGNfc3RhdGUgKmNydGNfc3RhdGUpCitzdGF0aWMgdm9pZCBpbGtfbG9hZF9j c2NfbWF0cml4KHN0cnVjdCBkcm1fY3J0Y19zdGF0ZSAqY3J0Y19zdGF0ZSkKIHsKIAlzdHJ1Y3Qg ZHJtX2NydGMgKmNydGMgPSBjcnRjX3N0YXRlLT5jcnRjOwogCXN0cnVjdCBkcm1faTkxNV9wcml2 YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUoY3J0Yy0+ZGV2KTsKQEAgLTE0Myw3ICsxNDIsNyBAQCBz dGF0aWMgdm9pZCBpOXh4X2xvYWRfY3NjX21hdHJpeChzdHJ1Y3QgZHJtX2NydGNfc3RhdGUgKmNy dGNfc3RhdGUpCiAJc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmludGVsX2NydGNfc3RhdGUgPSB0 b19pbnRlbF9jcnRjX3N0YXRlKGNydGNfc3RhdGUpOwogCiAJaWYgKGludGVsX2NydGNfc3RhdGUt PnljYmNyNDIwKSB7Ci0JCWk5eHhfbG9hZF95Y2Jjcl9jb252ZXJzaW9uX21hdHJpeChpbnRlbF9j cnRjKTsKKwkJaWxrX2xvYWRfeWNiY3JfY29udmVyc2lvbl9tYXRyaXgoaW50ZWxfY3J0Yyk7CiAJ CXJldHVybjsKIAl9IGVsc2UgaWYgKGNydGNfc3RhdGUtPmN0bSkgewogCQlzdHJ1Y3QgZHJtX2Nv bG9yX2N0bSAqY3RtID0KQEAgLTE3NSwyMSArMTc0LDIxIEBAIHN0YXRpYyB2b2lkIGk5eHhfbG9h ZF9jc2NfbWF0cml4KHN0cnVjdCBkcm1fY3J0Y19zdGF0ZSAqY3J0Y19zdGF0ZSkKIAogCQkJaWYg KGFic19jb2VmZiA8IENUTV9DT0VGRl8wXzEyNSkKIAkJCQljb2VmZnNbaV0gfD0gKDMgPDwgMTIp IHwKLQkJCQkJSTlYWF9DU0NfQ09FRkZfRlAoYWJzX2NvZWZmLCAxMik7CisJCQkJCUlMS19DU0Nf Q09FRkZfRlAoYWJzX2NvZWZmLCAxMik7CiAJCQllbHNlIGlmIChhYnNfY29lZmYgPCBDVE1fQ09F RkZfMF8yNSkKIAkJCQljb2VmZnNbaV0gfD0gKDIgPDwgMTIpIHwKLQkJCQkJSTlYWF9DU0NfQ09F RkZfRlAoYWJzX2NvZWZmLCAxMSk7CisJCQkJCUlMS19DU0NfQ09FRkZfRlAoYWJzX2NvZWZmLCAx MSk7CiAJCQllbHNlIGlmIChhYnNfY29lZmYgPCBDVE1fQ09FRkZfMF81KQogCQkJCWNvZWZmc1tp XSB8PSAoMSA8PCAxMikgfAotCQkJCQlJOVhYX0NTQ19DT0VGRl9GUChhYnNfY29lZmYsIDEwKTsK KwkJCQkJSUxLX0NTQ19DT0VGRl9GUChhYnNfY29lZmYsIDEwKTsKIAkJCWVsc2UgaWYgKGFic19j b2VmZiA8IENUTV9DT0VGRl8xXzApCi0JCQkJY29lZmZzW2ldIHw9IEk5WFhfQ1NDX0NPRUZGX0ZQ KGFic19jb2VmZiwgOSk7CisJCQkJY29lZmZzW2ldIHw9IElMS19DU0NfQ09FRkZfRlAoYWJzX2Nv ZWZmLCA5KTsKIAkJCWVsc2UgaWYgKGFic19jb2VmZiA8IENUTV9DT0VGRl8yXzApCiAJCQkJY29l ZmZzW2ldIHw9ICg3IDw8IDEyKSB8Ci0JCQkJCUk5WFhfQ1NDX0NPRUZGX0ZQKGFic19jb2VmZiwg OCk7CisJCQkJCUlMS19DU0NfQ09FRkZfRlAoYWJzX2NvZWZmLCA4KTsKIAkJCWVsc2UKIAkJCQlj b2VmZnNbaV0gfD0gKDYgPDwgMTIpIHwKLQkJCQkJSTlYWF9DU0NfQ09FRkZfRlAoYWJzX2NvZWZm LCA3KTsKKwkJCQkJSUxLX0NTQ19DT0VGRl9GUChhYnNfY29lZmYsIDcpOwogCQl9CiAJfSBlbHNl IHsKIAkJLyoKQEAgLTIwMyw5ICsyMDIsOSBAQCBzdGF0aWMgdm9pZCBpOXh4X2xvYWRfY3NjX21h dHJpeChzdHJ1Y3QgZHJtX2NydGNfc3RhdGUgKmNydGNfc3RhdGUpCiAJCWZvciAoaSA9IDA7IGkg PCAzOyBpKyspIHsKIAkJCWlmIChpbnRlbF9jcnRjX3N0YXRlLT5saW1pdGVkX2NvbG9yX3Jhbmdl KQogCQkJCWNvZWZmc1tpICogMyArIGldID0KLQkJCQkJSTlYWF9DU0NfQ09FRkZfTElNSVRFRF9S QU5HRTsKKwkJCQkJSUxLX0NTQ19DT0VGRl9MSU1JVEVEX1JBTkdFOwogCQkJZWxzZQotCQkJCWNv ZWZmc1tpICogMyArIGldID0gSTlYWF9DU0NfQ09FRkZfMV8wOworCQkJCWNvZWZmc1tpICogMyAr IGldID0gSUxLX0NTQ19DT0VGRl8xXzA7CiAJCX0KIAl9CiAKQEAgLTY1MSwxNCArNjUwLDE0IEBA IHZvaWQgaW50ZWxfY29sb3JfaW5pdChzdHJ1Y3QgZHJtX2NydGMgKmNydGMpCiAJCWRldl9wcml2 LT5kaXNwbGF5LmxvYWRfY3NjX21hdHJpeCA9IGNoZXJyeXZpZXdfbG9hZF9jc2NfbWF0cml4Owog CQlkZXZfcHJpdi0+ZGlzcGxheS5sb2FkX2x1dHMgPSBjaGVycnl2aWV3X2xvYWRfbHV0czsKIAl9 IGVsc2UgaWYgKElTX0hBU1dFTEwoZGV2X3ByaXYpKSB7Ci0JCWRldl9wcml2LT5kaXNwbGF5Lmxv YWRfY3NjX21hdHJpeCA9IGk5eHhfbG9hZF9jc2NfbWF0cml4OworCQlkZXZfcHJpdi0+ZGlzcGxh eS5sb2FkX2NzY19tYXRyaXggPSBpbGtfbG9hZF9jc2NfbWF0cml4OwogCQlkZXZfcHJpdi0+ZGlz cGxheS5sb2FkX2x1dHMgPSBoYXN3ZWxsX2xvYWRfbHV0czsKIAl9IGVsc2UgaWYgKElTX0JST0FE V0VMTChkZXZfcHJpdikgfHwgSVNfR0VOOV9CQyhkZXZfcHJpdikgfHwKIAkJICAgSVNfQlJPWFRP TihkZXZfcHJpdikpIHsKLQkJZGV2X3ByaXYtPmRpc3BsYXkubG9hZF9jc2NfbWF0cml4ID0gaTl4 eF9sb2FkX2NzY19tYXRyaXg7CisJCWRldl9wcml2LT5kaXNwbGF5LmxvYWRfY3NjX21hdHJpeCA9 IGlsa19sb2FkX2NzY19tYXRyaXg7CiAJCWRldl9wcml2LT5kaXNwbGF5LmxvYWRfbHV0cyA9IGJy b2Fkd2VsbF9sb2FkX2x1dHM7CiAJfSBlbHNlIGlmIChJU19HRU1JTklMQUtFKGRldl9wcml2KSB8 fCBJU19DQU5OT05MQUtFKGRldl9wcml2KSkgewotCQlkZXZfcHJpdi0+ZGlzcGxheS5sb2FkX2Nz Y19tYXRyaXggPSBpOXh4X2xvYWRfY3NjX21hdHJpeDsKKwkJZGV2X3ByaXYtPmRpc3BsYXkubG9h ZF9jc2NfbWF0cml4ID0gaWxrX2xvYWRfY3NjX21hdHJpeDsKIAkJZGV2X3ByaXYtPmRpc3BsYXku bG9hZF9sdXRzID0gZ2xrX2xvYWRfbHV0czsKIAl9IGVsc2UgewogCQlkZXZfcHJpdi0+ZGlzcGxh eS5sb2FkX2x1dHMgPSBpOXh4X2xvYWRfbHV0czsKLS0gCjIuMTYuMQoKX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJ bnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Au b3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==