From mboxrd@z Thu Jan 1 00:00:00 1970 From: ville.syrjala@linux.intel.com Subject: [PATCH v2] drm/i915: Fix pipe enabled mask for pipe C in WM calculations Date: Thu, 21 Mar 2013 11:41:45 +0200 Message-ID: <1363858905-32563-1-git-send-email-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 [143.182.124.37]) by gabe.freedesktop.org (Postfix) with ESMTP id EFB67E5DD2 for ; Thu, 21 Mar 2013 02:41:48 -0700 (PDT) List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org Errors-To: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org To: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org RnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KCkZp eCB0aGUgaW5jb3JyZWN0IGVuYWJsZWQgcGlwZXMgbWFzayBmb3IgcGlwZSBDIGluIHRoZSBXTSBj YWxjdWxhdGlvbnMuCgpBZGRpdGlvbmFsbHksIGluIGFuIGVmZm9ydCB0byBtYWtlIHRoZSBjb2Rl IGVhc2llciB0byB1bmRlcnN0YW5kLApwb3B1bGF0ZSB0aGUgbWFzayB3aXRoIDEgPDwgUElQRV9b QUJDXSBpbnN0ZWFkIG9mIHJhdyBudW1iZXJzLgoKdjI6IFVzZSAxIDw8IFBJUEVfW0FCQ10gKGlj a2xlL2RhbnZldCkKClNpZ25lZC1vZmYtYnk6IFZpbGxlIFN5cmrDpGzDpCA8dmlsbGUuc3lyamFs YUBsaW51eC5pbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYyB8 IDIyICsrKysrKysrKysrLS0tLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCAxMSBpbnNlcnRpb25z KCspLCAxMSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF9wbS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYwppbmRleCA4YTNkODll Li4wYmZmMjgyIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jCisr KyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMKQEAgLTEzMDUsMTMgKzEzMDUsMTMg QEAgc3RhdGljIHZvaWQgdmFsbGV5dmlld191cGRhdGVfd20oc3RydWN0IGRybV9kZXZpY2UgKmRl dikKIAkJCSAgICAmdmFsbGV5dmlld193bV9pbmZvLCBsYXRlbmN5X25zLAogCQkJICAgICZ2YWxs ZXl2aWV3X2N1cnNvcl93bV9pbmZvLCBsYXRlbmN5X25zLAogCQkJICAgICZwbGFuZWFfd20sICZj dXJzb3JhX3dtKSkKLQkJZW5hYmxlZCB8PSAxOworCQllbmFibGVkIHw9IDEgPDwgUElQRV9BOwog CiAJaWYgKGc0eF9jb21wdXRlX3dtMChkZXYsIDEsCiAJCQkgICAgJnZhbGxleXZpZXdfd21faW5m bywgbGF0ZW5jeV9ucywKIAkJCSAgICAmdmFsbGV5dmlld19jdXJzb3Jfd21faW5mbywgbGF0ZW5j eV9ucywKIAkJCSAgICAmcGxhbmViX3dtLCAmY3Vyc29yYl93bSkpCi0JCWVuYWJsZWQgfD0gMjsK KwkJZW5hYmxlZCB8PSAxIDw8IFBJUEVfQjsKIAogCWlmIChzaW5nbGVfcGxhbmVfZW5hYmxlZChl bmFibGVkKSAmJgogCSAgICBnNHhfY29tcHV0ZV9zcndtKGRldiwgZmZzKGVuYWJsZWQpIC0gMSwK QEAgLTEzNjEsMTMgKzEzNjEsMTMgQEAgc3RhdGljIHZvaWQgZzR4X3VwZGF0ZV93bShzdHJ1Y3Qg ZHJtX2RldmljZSAqZGV2KQogCQkJICAgICZnNHhfd21faW5mbywgbGF0ZW5jeV9ucywKIAkJCSAg ICAmZzR4X2N1cnNvcl93bV9pbmZvLCBsYXRlbmN5X25zLAogCQkJICAgICZwbGFuZWFfd20sICZj dXJzb3JhX3dtKSkKLQkJZW5hYmxlZCB8PSAxOworCQllbmFibGVkIHw9IDEgPDwgUElQRV9BOwog CiAJaWYgKGc0eF9jb21wdXRlX3dtMChkZXYsIDEsCiAJCQkgICAgJmc0eF93bV9pbmZvLCBsYXRl bmN5X25zLAogCQkJICAgICZnNHhfY3Vyc29yX3dtX2luZm8sIGxhdGVuY3lfbnMsCiAJCQkgICAg JnBsYW5lYl93bSwgJmN1cnNvcmJfd20pKQotCQllbmFibGVkIHw9IDI7CisJCWVuYWJsZWQgfD0g MSA8PCBQSVBFX0I7CiAKIAlpZiAoc2luZ2xlX3BsYW5lX2VuYWJsZWQoZW5hYmxlZCkgJiYKIAkg ICAgZzR4X2NvbXB1dGVfc3J3bShkZXYsIGZmcyhlbmFibGVkKSAtIDEsCkBAIC0xNzI3LDcgKzE3 MjcsNyBAQCBzdGF0aWMgdm9pZCBpcm9ubGFrZV91cGRhdGVfd20oc3RydWN0IGRybV9kZXZpY2Ug KmRldikKIAkJRFJNX0RFQlVHX0tNUygiRklGTyB3YXRlcm1hcmtzIEZvciBwaXBlIEEgLSIKIAkJ CSAgICAgICIgcGxhbmUgJWQsICIgImN1cnNvcjogJWRcbiIsCiAJCQkgICAgICBwbGFuZV93bSwg Y3Vyc29yX3dtKTsKLQkJZW5hYmxlZCB8PSAxOworCQllbmFibGVkIHw9IDEgPDwgUElQRV9BOwog CX0KIAogCWlmIChnNHhfY29tcHV0ZV93bTAoZGV2LCAxLApAQCAtMTc0MSw3ICsxNzQxLDcgQEAg c3RhdGljIHZvaWQgaXJvbmxha2VfdXBkYXRlX3dtKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJ CURSTV9ERUJVR19LTVMoIkZJRk8gd2F0ZXJtYXJrcyBGb3IgcGlwZSBCIC0iCiAJCQkgICAgICAi IHBsYW5lICVkLCBjdXJzb3I6ICVkXG4iLAogCQkJICAgICAgcGxhbmVfd20sIGN1cnNvcl93bSk7 Ci0JCWVuYWJsZWQgfD0gMjsKKwkJZW5hYmxlZCB8PSAxIDw8IFBJUEVfQjsKIAl9CiAKIAkvKgpA QCAtMTgxMiw3ICsxODEyLDcgQEAgc3RhdGljIHZvaWQgc2FuZHlicmlkZ2VfdXBkYXRlX3dtKHN0 cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJCURSTV9ERUJVR19LTVMoIkZJRk8gd2F0ZXJtYXJrcyBG b3IgcGlwZSBBIC0iCiAJCQkgICAgICAiIHBsYW5lICVkLCAiICJjdXJzb3I6ICVkXG4iLAogCQkJ ICAgICAgcGxhbmVfd20sIGN1cnNvcl93bSk7Ci0JCWVuYWJsZWQgfD0gMTsKKwkJZW5hYmxlZCB8 PSAxIDw8IFBJUEVfQTsKIAl9CiAKIAlpZiAoZzR4X2NvbXB1dGVfd20wKGRldiwgMSwKQEAgLTE4 MjYsNyArMTgyNiw3IEBAIHN0YXRpYyB2b2lkIHNhbmR5YnJpZGdlX3VwZGF0ZV93bShzdHJ1Y3Qg ZHJtX2RldmljZSAqZGV2KQogCQlEUk1fREVCVUdfS01TKCJGSUZPIHdhdGVybWFya3MgRm9yIHBp cGUgQiAtIgogCQkJICAgICAgIiBwbGFuZSAlZCwgY3Vyc29yOiAlZFxuIiwKIAkJCSAgICAgIHBs YW5lX3dtLCBjdXJzb3Jfd20pOwotCQllbmFibGVkIHw9IDI7CisJCWVuYWJsZWQgfD0gMSA8PCBQ SVBFX0I7CiAJfQogCiAJLyoKQEAgLTE5MTUsNyArMTkxNSw3IEBAIHN0YXRpYyB2b2lkIGl2eWJy aWRnZV91cGRhdGVfd20oc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAkJRFJNX0RFQlVHX0tNUygi RklGTyB3YXRlcm1hcmtzIEZvciBwaXBlIEEgLSIKIAkJCSAgICAgICIgcGxhbmUgJWQsICIgImN1 cnNvcjogJWRcbiIsCiAJCQkgICAgICBwbGFuZV93bSwgY3Vyc29yX3dtKTsKLQkJZW5hYmxlZCB8 PSAxOworCQllbmFibGVkIHw9IDEgPDwgUElQRV9BOwogCX0KIAogCWlmIChnNHhfY29tcHV0ZV93 bTAoZGV2LCAxLApAQCAtMTkyOSw3ICsxOTI5LDcgQEAgc3RhdGljIHZvaWQgaXZ5YnJpZGdlX3Vw ZGF0ZV93bShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCQlEUk1fREVCVUdfS01TKCJGSUZPIHdh dGVybWFya3MgRm9yIHBpcGUgQiAtIgogCQkJICAgICAgIiBwbGFuZSAlZCwgY3Vyc29yOiAlZFxu IiwKIAkJCSAgICAgIHBsYW5lX3dtLCBjdXJzb3Jfd20pOwotCQllbmFibGVkIHw9IDI7CisJCWVu YWJsZWQgfD0gMSA8PCBQSVBFX0I7CiAJfQogCiAJaWYgKGc0eF9jb21wdXRlX3dtMChkZXYsIDIs CkBAIC0xOTQzLDcgKzE5NDMsNyBAQCBzdGF0aWMgdm9pZCBpdnlicmlkZ2VfdXBkYXRlX3dtKHN0 cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJCURSTV9ERUJVR19LTVMoIkZJRk8gd2F0ZXJtYXJrcyBG b3IgcGlwZSBDIC0iCiAJCQkgICAgICAiIHBsYW5lICVkLCBjdXJzb3I6ICVkXG4iLAogCQkJICAg ICAgcGxhbmVfd20sIGN1cnNvcl93bSk7Ci0JCWVuYWJsZWQgfD0gMzsKKwkJZW5hYmxlZCB8PSAx IDw8IFBJUEVfQzsKIAl9CiAKIAkvKgotLSAKMS44LjEuNQoKX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1n ZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFp bG1hbi9saXN0aW5mby9pbnRlbC1nZngK