From: ville.syrjala@linux.intel.com Subject: [PATCH 3/3] drm/i915: Fix enum pipe vs. enum transcoder for the PCH transcoder Date: Fri, 1 Sep 2017 17:31:23 +0300 Message-ID: <20170901143123.7590-3-ville.syrjala@linux.intel.com> References: <20170901143123.7590-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 mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTPS id DF89F6E84E for ; Fri, 1 Sep 2017 14:31:32 +0000 (UTC) In-Reply-To: <20170901143123.7590-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: Matthias Kaehlcke List-Id: intel-gfx@lists.freedesktop.org RnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KClVz ZSBlbnVtIHBpcGUgZm9yIFBDSCB0cmFuc2NvZGVycyBhbHNvIGluIHRoZSBGSUZPIHVuZGVycnVu IGNvZGUuCgpGaXhlcyB0aGUgZm9sbG93aW5nIG5ldyBzcGFyc2Ugd2FybmluZ3M6CmludGVsX2Zp Zm9fdW5kZXJydW4uYzozNDA6NDk6IHdhcm5pbmc6IG1peGluZyBkaWZmZXJlbnQgZW51bSB0eXBl cwppbnRlbF9maWZvX3VuZGVycnVuLmM6MzQwOjQ5OiAgICAgaW50IGVudW0gcGlwZSAgdmVyc3Vz CmludGVsX2ZpZm9fdW5kZXJydW4uYzozNDA6NDk6ICAgICBpbnQgZW51bSB0cmFuc2NvZGVyCmlu dGVsX2ZpZm9fdW5kZXJydW4uYzozNDQ6NDk6IHdhcm5pbmc6IG1peGluZyBkaWZmZXJlbnQgZW51 bSB0eXBlcwppbnRlbF9maWZvX3VuZGVycnVuLmM6MzQ0OjQ5OiAgICAgaW50IGVudW0gcGlwZSAg dmVyc3VzCmludGVsX2ZpZm9fdW5kZXJydW4uYzozNDQ6NDk6ICAgICBpbnQgZW51bSB0cmFuc2Nv ZGVyCmludGVsX2ZpZm9fdW5kZXJydW4uYzozOTc6NTc6IHdhcm5pbmc6IG1peGluZyBkaWZmZXJl bnQgZW51bSB0eXBlcwppbnRlbF9maWZvX3VuZGVycnVuLmM6Mzk3OjU3OiAgICAgaW50IGVudW0g cGlwZSAgdmVyc3VzCmludGVsX2ZpZm9fdW5kZXJydW4uYzozOTc6NTc6ICAgICBpbnQgZW51bSB0 cmFuc2NvZGVyCmludGVsX2ZpZm9fdW5kZXJydW4uYzozOTg6MTc6IHdhcm5pbmc6IG1peGluZyBk aWZmZXJlbnQgZW51bSB0eXBlcwppbnRlbF9maWZvX3VuZGVycnVuLmM6Mzk4OjE3OiAgICAgaW50 IGVudW0gcGlwZSAgdmVyc3VzCmludGVsX2ZpZm9fdW5kZXJydW4uYzozOTg6MTc6ICAgICBpbnQg ZW51bSB0cmFuc2NvZGVyCgpDYzogTWF0dGhpYXMgS2FlaGxja2UgPG1rYUBjaHJvbWl1bS5vcmc+ CkZpeGVzOiBhMjE5NjAzMzljOGMgKCJkcm0vaTkxNTogQ29uc2lzdGVudGx5IHVzZSBlbnVtIHBp cGUgZm9yIFBDSCB0cmFuc2NvZGVycyIpClNpZ25lZC1vZmYtYnk6IFZpbGxlIFN5cmrDpGzDpCA8 dmlsbGUuc3lyamFsYUBsaW51eC5pbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUv aTkxNV90cmFjZS5oICAgICAgICAgIHwgIDQgKystLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfZmlmb191bmRlcnJ1bi5jIHwgMjAgKysrKysrKysrKy0tLS0tLS0tLS0KIDIgZmlsZXMgY2hh bmdlZCwgMTIgaW5zZXJ0aW9ucygrKSwgMTIgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJp dmVycy9ncHUvZHJtL2k5MTUvaTkxNV90cmFjZS5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkx NV90cmFjZS5oCmluZGV4IGIyNGE4M2Q0MzU1OS4uNmZkNWM1N2UyMWY2IDEwMDY0NAotLS0gYS9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3RyYWNlLmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaTkxNV90cmFjZS5oCkBAIC0zOCw3ICszOCw3IEBAIFRSQUNFX0VWRU5UKGludGVsX2NwdV9m aWZvX3VuZGVycnVuLAogKTsKIAogVFJBQ0VfRVZFTlQoaW50ZWxfcGNoX2ZpZm9fdW5kZXJydW4s Ci0JICAgIFRQX1BST1RPKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwgZW51bSB0 cmFuc2NvZGVyIHBjaF90cmFuc2NvZGVyKSwKKwkgICAgVFBfUFJPVE8oc3RydWN0IGRybV9pOTE1 X3ByaXZhdGUgKmRldl9wcml2LCBlbnVtIHBpcGUgcGNoX3RyYW5zY29kZXIpLAogCSAgICBUUF9B UkdTKGRldl9wcml2LCBwY2hfdHJhbnNjb2RlciksCiAKIAkgICAgVFBfU1RSVUNUX19lbnRyeSgK QEAgLTQ4LDcgKzQ4LDcgQEAgVFJBQ0VfRVZFTlQoaW50ZWxfcGNoX2ZpZm9fdW5kZXJydW4sCiAJ CQkgICAgICksCiAKIAkgICAgVFBfZmFzdF9hc3NpZ24oCi0JCQkgICBlbnVtIHBpcGUgcGlwZSA9 IChlbnVtIHBpcGUpcGNoX3RyYW5zY29kZXI7CisJCQkgICBlbnVtIHBpcGUgcGlwZSA9IHBjaF90 cmFuc2NvZGVyOwogCQkJICAgX19lbnRyeS0+cGlwZSA9IHBpcGU7CiAJCQkgICBfX2VudHJ5LT5m cmFtZSA9IGRldl9wcml2LT5kcm0uZHJpdmVyLT5nZXRfdmJsYW5rX2NvdW50ZXIoJmRldl9wcml2 LT5kcm0sIHBpcGUpOwogCQkJICAgX19lbnRyeS0+c2NhbmxpbmUgPSBpbnRlbF9nZXRfY3J0Y19z Y2FubGluZShpbnRlbF9nZXRfY3J0Y19mb3JfcGlwZShkZXZfcHJpdiwgcGlwZSkpOwpkaWZmIC0t Z2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZmlmb191bmRlcnJ1bi5jIGIvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfZmlmb191bmRlcnJ1bi5jCmluZGV4IDVhN2NjYTMyYzBmYS4u MDQ2ODk2MDBlMzM3IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9maWZv X3VuZGVycnVuLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZmlmb191bmRlcnJ1 bi5jCkBAIC0xODcsMTEgKzE4NywxMSBAQCBzdGF0aWMgdm9pZCBicm9hZHdlbGxfc2V0X2ZpZm9f dW5kZXJydW5fcmVwb3J0aW5nKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCiB9CiAKIHN0YXRpYyB2 b2lkIGlieF9zZXRfZmlmb191bmRlcnJ1bl9yZXBvcnRpbmcoc3RydWN0IGRybV9kZXZpY2UgKmRl diwKLQkJCQkJICAgIGVudW0gdHJhbnNjb2RlciBwY2hfdHJhbnNjb2RlciwKKwkJCQkJICAgIGVu dW0gcGlwZSBwY2hfdHJhbnNjb2RlciwKIAkJCQkJICAgIGJvb2wgZW5hYmxlKQogewogCXN0cnVj dCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUoZGV2KTsKLQl1aW50MzJfdCBi aXQgPSAocGNoX3RyYW5zY29kZXIgPT0gVFJBTlNDT0RFUl9BKSA/CisJdWludDMyX3QgYml0ID0g KHBjaF90cmFuc2NvZGVyID09IFBJUEVfQSkgPwogCQkgICAgICAgU0RFX1RSQU5TQV9GSUZPX1VO REVSIDogU0RFX1RSQU5TQl9GSUZPX1VOREVSOwogCiAJaWYgKGVuYWJsZSkKQEAgLTIwMyw3ICsy MDMsNyBAQCBzdGF0aWMgdm9pZCBpYnhfc2V0X2ZpZm9fdW5kZXJydW5fcmVwb3J0aW5nKHN0cnVj dCBkcm1fZGV2aWNlICpkZXYsCiBzdGF0aWMgdm9pZCBjcHRfY2hlY2tfcGNoX2ZpZm9fdW5kZXJy dW5zKHN0cnVjdCBpbnRlbF9jcnRjICpjcnRjKQogewogCXN0cnVjdCBkcm1faTkxNV9wcml2YXRl ICpkZXZfcHJpdiA9IHRvX2k5MTUoY3J0Yy0+YmFzZS5kZXYpOwotCWVudW0gdHJhbnNjb2RlciBw Y2hfdHJhbnNjb2RlciA9IChlbnVtIHRyYW5zY29kZXIpIGNydGMtPnBpcGU7CisJZW51bSBwaXBl IHBjaF90cmFuc2NvZGVyID0gY3J0Yy0+cGlwZTsKIAl1aW50MzJfdCBzZXJyX2ludCA9IEk5MTVf UkVBRChTRVJSX0lOVCk7CiAKIAlsb2NrZGVwX2Fzc2VydF9oZWxkKCZkZXZfcHJpdi0+aXJxX2xv Y2spOwpAQCAtMjE1LDEyICsyMTUsMTIgQEAgc3RhdGljIHZvaWQgY3B0X2NoZWNrX3BjaF9maWZv X3VuZGVycnVucyhzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YykKIAlQT1NUSU5HX1JFQUQoU0VSUl9J TlQpOwogCiAJdHJhY2VfaW50ZWxfcGNoX2ZpZm9fdW5kZXJydW4oZGV2X3ByaXYsIHBjaF90cmFu c2NvZGVyKTsKLQlEUk1fRVJST1IoInBjaCBmaWZvIHVuZGVycnVuIG9uIHBjaCB0cmFuc2NvZGVy ICVzXG4iLAotCQkgIHRyYW5zY29kZXJfbmFtZShwY2hfdHJhbnNjb2RlcikpOworCURSTV9FUlJP UigicGNoIGZpZm8gdW5kZXJydW4gb24gcGNoIHRyYW5zY29kZXIgJWNcbiIsCisJCSAgcGlwZV9u YW1lKHBjaF90cmFuc2NvZGVyKSk7CiB9CiAKIHN0YXRpYyB2b2lkIGNwdF9zZXRfZmlmb191bmRl cnJ1bl9yZXBvcnRpbmcoc3RydWN0IGRybV9kZXZpY2UgKmRldiwKLQkJCQkJICAgIGVudW0gdHJh bnNjb2RlciBwY2hfdHJhbnNjb2RlciwKKwkJCQkJICAgIGVudW0gcGlwZSBwY2hfdHJhbnNjb2Rl ciwKIAkJCQkJICAgIGJvb2wgZW5hYmxlLCBib29sIG9sZCkKIHsKIAlzdHJ1Y3QgZHJtX2k5MTVf cHJpdmF0ZSAqZGV2X3ByaXYgPSB0b19pOTE1KGRldik7CkBAIC0yMzgsOCArMjM4LDggQEAgc3Rh dGljIHZvaWQgY3B0X3NldF9maWZvX3VuZGVycnVuX3JlcG9ydGluZyhzdHJ1Y3QgZHJtX2Rldmlj ZSAqZGV2LAogCiAJCWlmIChvbGQgJiYgSTkxNV9SRUFEKFNFUlJfSU5UKSAmCiAJCSAgICBTRVJS X0lOVF9UUkFOU19GSUZPX1VOREVSUlVOKHBjaF90cmFuc2NvZGVyKSkgewotCQkJRFJNX0VSUk9S KCJ1bmNsZWFyZWQgcGNoIGZpZm8gdW5kZXJydW4gb24gcGNoIHRyYW5zY29kZXIgJXNcbiIsCi0J CQkJICB0cmFuc2NvZGVyX25hbWUocGNoX3RyYW5zY29kZXIpKTsKKwkJCURSTV9FUlJPUigidW5j bGVhcmVkIHBjaCBmaWZvIHVuZGVycnVuIG9uIHBjaCB0cmFuc2NvZGVyICVjXG4iLAorCQkJCSAg cGlwZV9uYW1lKHBjaF90cmFuc2NvZGVyKSk7CiAJCX0KIAl9CiB9CkBAIC0zOTUsOCArMzk1LDgg QEAgdm9pZCBpbnRlbF9wY2hfZmlmb191bmRlcnJ1bl9pcnFfaGFuZGxlcihzdHJ1Y3QgZHJtX2k5 MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCiAJaWYgKGludGVsX3NldF9wY2hfZmlmb191bmRlcnJ1bl9y ZXBvcnRpbmcoZGV2X3ByaXYsIHBjaF90cmFuc2NvZGVyLAogCQkJCQkJICBmYWxzZSkpIHsKIAkJ dHJhY2VfaW50ZWxfcGNoX2ZpZm9fdW5kZXJydW4oZGV2X3ByaXYsIHBjaF90cmFuc2NvZGVyKTsK LQkJRFJNX0VSUk9SKCJQQ0ggdHJhbnNjb2RlciAlcyBGSUZPIHVuZGVycnVuXG4iLAotCQkJICB0 cmFuc2NvZGVyX25hbWUocGNoX3RyYW5zY29kZXIpKTsKKwkJRFJNX0VSUk9SKCJQQ0ggdHJhbnNj b2RlciAlYyBGSUZPIHVuZGVycnVuXG4iLAorCQkJICBwaXBlX25hbWUocGNoX3RyYW5zY29kZXIp KTsKIAl9CiB9CiAKLS0gCjIuMTMuNQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJl ZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGlu Zm8vaW50ZWwtZ2Z4Cg==