From mboxrd@z Thu Jan 1 00:00:00 1970 From: Matt Roper Subject: [PATCH] drm/i915/skl: Correct other-pipe watermark update condition check (v2) Date: Fri, 23 Oct 2015 09:41:34 -0700 Message-ID: <1445618494-703-1-git-send-email-matthew.d.roper@intel.com> References: <20151019132256.GA13786@phenom.ffwll.local> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTP id A460E6E302 for ; Fri, 23 Oct 2015 09:42:06 -0700 (PDT) In-Reply-To: <20151019132256.GA13786@phenom.ffwll.local> 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 List-Id: intel-gfx@lists.freedesktop.org RnJvbTogIkt1bWFyLCBNYWhlc2giIDxtYWhlc2gxLmt1bWFyQGludGVsLmNvbT4KCklmIGRkYiBh bGxvY2F0aW9uIGZvciBwbGFuZXMgaW4gY3VycmVudCBDUlRDIGlzIGNoYW5nZWQsIHRoYXQgZG9l c24ndApsZWFkIHRvIGRkYiBhbGxvY2F0aW9uIGNoYW5nZSBmb3Igb3RoZXIgQ1JUQ3MsIGJlY2F1 c2Ugb3VyIEREQiBhbGxvY2F0aW9uCmlzIG5vdCBkeW5hbWljIGFjY29yZGluZyB0byBwbGFuZSBw YXJhbWV0ZXJzLCBkZGIgaXMgYWxsb2NhdGVkIGFjY29yZGluZwp0byBudW1iZXIgb2YgQ1JUQyBl bmFibGVkLCAmIGRpdmlkZWQgZXF1YWxseSBhbW9uZyBDVFJDJ3MuCgpJbiBjdXJyZW50IGNvbmRp dGlvbiBjaGVjayBkdXJpbmcgV2F0ZXJtYXJrIGNhbGN1bGF0aW9uLCBpZiBudW1iZXIgb2YKcGxh bmUvZGRiIGFsbG9jYXRpb24gY2hhbmdlcyBmb3IgY3VycmVudCBDUlRDLCBXYXRlcm1hcmsgZm9y IG90aGVyIHBpcGVzCmFyZSByZWNhbGN1bGF0ZWQuIEJ1dCB0aGVyZSBpcyBubyBjaGFuZ2UgaW4g RERCIGFsbG9jYXRpb24gb2Ygb3RoZXIgcGlwZQpzbyB3YXRlcm1hcmsgaXMgYWxzbyBub3QgY2hh bmdlZCwgVGhpcyBsZWFkcyB0byB3YXJuaW5nIG1lc3NhZ2VzLgpXQVJOX09OKCF3bV9jaGFuZ2Vk KQoKVGhpcyBwYXRjaCBjb3JyZWN0cyB0aGlzIGFuZCBjaGVjayBpZiBEREIgYWxsb2NhdGlvbiBm b3IgcGlwZXMgaXMgY2hhbmdlZCwKdGhlbiBvbmx5IHJlY2FsY3VsYXRlIHdhdGVybWFya3MuCgp2 MiAoYnkgTWF0dCk6IFJlYmFzZWQgdG8gbGF0ZXN0IC1uaWdodGx5IGFuZCBmaXhlZCBhIHR5cG8K ClNpZ25lZC1vZmYtYnk6IEt1bWFyLCBNYWhlc2ggPG1haGVzaDEua3VtYXJAaW50ZWwuY29tPgpS ZXZpZXdlZC1ieSh2MSk6IFZpbGxlIFN5cmrDpGzDpCA8dmlsbGUuc3lyamFsYUBsaW51eC5pbnRl bC5jb20+ClNpZ25lZC1vZmYtYnk6IE1hdHQgUm9wZXIgPG1hdHRoZXcuZC5yb3BlckBpbnRlbC5j b20+Ci0tLQpJIGRvbid0IHRoaW5rIHRoaXMgc29sdmVzIGFsbCB0aGUgIXdtX2NoYW5nZWQgd2Fy bmluZ3MgKEkgc3RpbGwgc2VlIG9uZSBkdXJpbmcKZmJkZXYgcmVzdG9yZSBmb2xsb3dpbmcgdmFy aW91cyBpZ3QgdGVzdHMpLCBidXQgaXQgc2VlbXMgbGlrZSBhIG1vdmUgaW4gdGhlCnJpZ2h0IGRp cmVjdGlvbiBzbyBJIGZpZ3VyZWQgSSdkIGdvIGFoZWFkIGFuZCByZWJhc2UgTWFoZXNoJyBwYXRj aCBzbyBpdCBjYW4KZ2V0IG1lcmdlZC4KCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5j IHwgMTIgKysrKystLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgNSBpbnNlcnRpb25zKCspLCA3IGRl bGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMg Yi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jCmluZGV4IDBmYjA0NTkuLjA0NjdlMzQg MTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMKKysrIGIvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYwpAQCAtMzA2NCwxNCArMzA2NCwxMiBAQCBzdGF0aWMg Ym9vbCBza2xfZGRiX2FsbG9jYXRpb25fY2hhbmdlZChjb25zdCBzdHJ1Y3Qgc2tsX2RkYl9hbGxv Y2F0aW9uICpuZXdfZGRiLAogCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSBpbnRlbF9jcnRjLT5i YXNlLmRldjsKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBkZXYtPmRldl9w cml2YXRlOwogCWNvbnN0IHN0cnVjdCBza2xfZGRiX2FsbG9jYXRpb24gKmN1cl9kZGIgPSAmZGV2 X3ByaXYtPndtLnNrbF9ody5kZGI7Ci0JZW51bSBwaXBlIHBpcGUgPSBpbnRlbF9jcnRjLT5waXBl OwotCi0JaWYgKG1lbWNtcChuZXdfZGRiLT5wbGFuZVtwaXBlXSwgY3VyX2RkYi0+cGxhbmVbcGlw ZV0sCi0JCSAgIHNpemVvZihuZXdfZGRiLT5wbGFuZVtwaXBlXSkpKQotCQlyZXR1cm4gdHJ1ZTsK IAotCWlmIChtZW1jbXAoJm5ld19kZGItPnBsYW5lW3BpcGVdW1BMQU5FX0NVUlNPUl0sICZjdXJf ZGRiLT5wbGFuZVtwaXBlXVtQTEFORV9DVVJTT1JdLAotCQkgICAgc2l6ZW9mKG5ld19kZGItPnBs YW5lW3BpcGVdW1BMQU5FX0NVUlNPUl0pKSkKKwkvKgorCSAqIElmIGRkYiBhbGxvY2F0aW9uIG9m IHBpcGVzIGNoYW5nZWQsIGl0IG1heSByZXF1aXJlIHJlY2FsY3VsYXRpb24gb2YKKwkgKiB3YXRl cm1hcmtzCisJICovCisJaWYgKG1lbWNtcChuZXdfZGRiLT5waXBlLCBjdXJfZGRiLT5waXBlLCBz aXplb2YobmV3X2RkYi0+cGlwZSkpKQogCQlyZXR1cm4gdHJ1ZTsKIAogCXJldHVybiBmYWxzZTsK LS0gCjIuMS40CgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f XwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcK aHR0cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=