From mboxrd@z Thu Jan 1 00:00:00 1970 From: ville.syrjala@linux.intel.com Subject: [PATCH v3] drm/i915: Fix pipe enabled mask for pipe C in WM calculations Date: Thu, 21 Mar 2013 13:10:44 +0200 Message-ID: <1363864244-10003-1-git-send-email-ville.syrjala@linux.intel.com> References: <20130321095215.GB8780@cantiga.alporthouse.com> 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 449BAE6017 for ; Thu, 21 Mar 2013 04:10:51 -0700 (PDT) In-Reply-To: <20130321095215.GB8780@cantiga.alporthouse.com> 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 a2xlL2RhbnZldCkKdjM6IFBhc3MgUElQRV9bQUJDXSB0byBnNHhfY29tcHV0ZV93bTAoKSAoaWNr bGUpCgpTaWduZWQtb2ZmLWJ5OiBWaWxsZSBTeXJqw6Rsw6QgPHZpbGxlLnN5cmphbGFAbGludXgu aW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMgfCA0NCArKysr KysrKysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0tLS0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDIy IGluc2VydGlvbnMoKyksIDIyIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX3BtLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jCmlu ZGV4IDhhM2Q4OWUuLmQ0N2YzNTQgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX3BtLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYwpAQCAtMTMwMSwx NyArMTMwMSwxNyBAQCBzdGF0aWMgdm9pZCB2YWxsZXl2aWV3X3VwZGF0ZV93bShzdHJ1Y3QgZHJt X2RldmljZSAqZGV2KQogCiAJdmx2X3VwZGF0ZV9kcmFpbl9sYXRlbmN5KGRldik7CiAKLQlpZiAo ZzR4X2NvbXB1dGVfd20wKGRldiwgMCwKKwlpZiAoZzR4X2NvbXB1dGVfd20wKGRldiwgUElQRV9B LAogCQkJICAgICZ2YWxsZXl2aWV3X3dtX2luZm8sIGxhdGVuY3lfbnMsCiAJCQkgICAgJnZhbGxl eXZpZXdfY3Vyc29yX3dtX2luZm8sIGxhdGVuY3lfbnMsCiAJCQkgICAgJnBsYW5lYV93bSwgJmN1 cnNvcmFfd20pKQotCQllbmFibGVkIHw9IDE7CisJCWVuYWJsZWQgfD0gMSA8PCBQSVBFX0E7CiAK LQlpZiAoZzR4X2NvbXB1dGVfd20wKGRldiwgMSwKKwlpZiAoZzR4X2NvbXB1dGVfd20wKGRldiwg UElQRV9CLAogCQkJICAgICZ2YWxsZXl2aWV3X3dtX2luZm8sIGxhdGVuY3lfbnMsCiAJCQkgICAg JnZhbGxleXZpZXdfY3Vyc29yX3dtX2luZm8sIGxhdGVuY3lfbnMsCiAJCQkgICAgJnBsYW5lYl93 bSwgJmN1cnNvcmJfd20pKQotCQllbmFibGVkIHw9IDI7CisJCWVuYWJsZWQgfD0gMSA8PCBQSVBF X0I7CiAKIAlpZiAoc2luZ2xlX3BsYW5lX2VuYWJsZWQoZW5hYmxlZCkgJiYKIAkgICAgZzR4X2Nv bXB1dGVfc3J3bShkZXYsIGZmcyhlbmFibGVkKSAtIDEsCkBAIC0xMzU3LDE3ICsxMzU3LDE3IEBA IHN0YXRpYyB2b2lkIGc0eF91cGRhdGVfd20oc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAlpbnQg cGxhbmVfc3IsIGN1cnNvcl9zcjsKIAl1bnNpZ25lZCBpbnQgZW5hYmxlZCA9IDA7CiAKLQlpZiAo ZzR4X2NvbXB1dGVfd20wKGRldiwgMCwKKwlpZiAoZzR4X2NvbXB1dGVfd20wKGRldiwgUElQRV9B LAogCQkJICAgICZnNHhfd21faW5mbywgbGF0ZW5jeV9ucywKIAkJCSAgICAmZzR4X2N1cnNvcl93 bV9pbmZvLCBsYXRlbmN5X25zLAogCQkJICAgICZwbGFuZWFfd20sICZjdXJzb3JhX3dtKSkKLQkJ ZW5hYmxlZCB8PSAxOworCQllbmFibGVkIHw9IDEgPDwgUElQRV9BOwogCi0JaWYgKGc0eF9jb21w dXRlX3dtMChkZXYsIDEsCisJaWYgKGc0eF9jb21wdXRlX3dtMChkZXYsIFBJUEVfQiwKIAkJCSAg ICAmZzR4X3dtX2luZm8sIGxhdGVuY3lfbnMsCiAJCQkgICAgJmc0eF9jdXJzb3Jfd21faW5mbywg bGF0ZW5jeV9ucywKIAkJCSAgICAmcGxhbmViX3dtLCAmY3Vyc29yYl93bSkpCi0JCWVuYWJsZWQg fD0gMjsKKwkJZW5hYmxlZCB8PSAxIDw8IFBJUEVfQjsKIAogCWlmIChzaW5nbGVfcGxhbmVfZW5h YmxlZChlbmFibGVkKSAmJgogCSAgICBnNHhfY29tcHV0ZV9zcndtKGRldiwgZmZzKGVuYWJsZWQp IC0gMSwKQEAgLTE3MTYsNyArMTcxNiw3IEBAIHN0YXRpYyB2b2lkIGlyb25sYWtlX3VwZGF0ZV93 bShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCXVuc2lnbmVkIGludCBlbmFibGVkOwogCiAJZW5h YmxlZCA9IDA7Ci0JaWYgKGc0eF9jb21wdXRlX3dtMChkZXYsIDAsCisJaWYgKGc0eF9jb21wdXRl X3dtMChkZXYsIFBJUEVfQSwKIAkJCSAgICAmaXJvbmxha2VfZGlzcGxheV93bV9pbmZvLAogCQkJ ICAgIElMS19MUDBfUExBTkVfTEFURU5DWSwKIAkJCSAgICAmaXJvbmxha2VfY3Vyc29yX3dtX2lu Zm8sCkBAIC0xNzI3LDEwICsxNzI3LDEwIEBAIHN0YXRpYyB2b2lkIGlyb25sYWtlX3VwZGF0ZV93 bShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCQlEUk1fREVCVUdfS01TKCJGSUZPIHdhdGVybWFy a3MgRm9yIHBpcGUgQSAtIgogCQkJICAgICAgIiBwbGFuZSAlZCwgIiAiY3Vyc29yOiAlZFxuIiwK IAkJCSAgICAgIHBsYW5lX3dtLCBjdXJzb3Jfd20pOwotCQllbmFibGVkIHw9IDE7CisJCWVuYWJs ZWQgfD0gMSA8PCBQSVBFX0E7CiAJfQogCi0JaWYgKGc0eF9jb21wdXRlX3dtMChkZXYsIDEsCisJ aWYgKGc0eF9jb21wdXRlX3dtMChkZXYsIFBJUEVfQiwKIAkJCSAgICAmaXJvbmxha2VfZGlzcGxh eV93bV9pbmZvLAogCQkJICAgIElMS19MUDBfUExBTkVfTEFURU5DWSwKIAkJCSAgICAmaXJvbmxh a2VfY3Vyc29yX3dtX2luZm8sCkBAIC0xNzQxLDcgKzE3NDEsNyBAQCBzdGF0aWMgdm9pZCBpcm9u bGFrZV91cGRhdGVfd20oc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAkJRFJNX0RFQlVHX0tNUygi RklGTyB3YXRlcm1hcmtzIEZvciBwaXBlIEIgLSIKIAkJCSAgICAgICIgcGxhbmUgJWQsIGN1cnNv cjogJWRcbiIsCiAJCQkgICAgICBwbGFuZV93bSwgY3Vyc29yX3dtKTsKLQkJZW5hYmxlZCB8PSAy OworCQllbmFibGVkIHw9IDEgPDwgUElQRV9COwogCX0KIAogCS8qCkBAIC0xODAxLDcgKzE4MDEs NyBAQCBzdGF0aWMgdm9pZCBzYW5keWJyaWRnZV91cGRhdGVfd20oc3RydWN0IGRybV9kZXZpY2Ug KmRldikKIAl1bnNpZ25lZCBpbnQgZW5hYmxlZDsKIAogCWVuYWJsZWQgPSAwOwotCWlmIChnNHhf Y29tcHV0ZV93bTAoZGV2LCAwLAorCWlmIChnNHhfY29tcHV0ZV93bTAoZGV2LCBQSVBFX0EsCiAJ CQkgICAgJnNhbmR5YnJpZGdlX2Rpc3BsYXlfd21faW5mbywgbGF0ZW5jeSwKIAkJCSAgICAmc2Fu ZHlicmlkZ2VfY3Vyc29yX3dtX2luZm8sIGxhdGVuY3ksCiAJCQkgICAgJnBsYW5lX3dtLCAmY3Vy c29yX3dtKSkgewpAQCAtMTgxMiwxMCArMTgxMiwxMCBAQCBzdGF0aWMgdm9pZCBzYW5keWJyaWRn ZV91cGRhdGVfd20oc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAkJRFJNX0RFQlVHX0tNUygiRklG TyB3YXRlcm1hcmtzIEZvciBwaXBlIEEgLSIKIAkJCSAgICAgICIgcGxhbmUgJWQsICIgImN1cnNv cjogJWRcbiIsCiAJCQkgICAgICBwbGFuZV93bSwgY3Vyc29yX3dtKTsKLQkJZW5hYmxlZCB8PSAx OworCQllbmFibGVkIHw9IDEgPDwgUElQRV9BOwogCX0KIAotCWlmIChnNHhfY29tcHV0ZV93bTAo ZGV2LCAxLAorCWlmIChnNHhfY29tcHV0ZV93bTAoZGV2LCBQSVBFX0IsCiAJCQkgICAgJnNhbmR5 YnJpZGdlX2Rpc3BsYXlfd21faW5mbywgbGF0ZW5jeSwKIAkJCSAgICAmc2FuZHlicmlkZ2VfY3Vy c29yX3dtX2luZm8sIGxhdGVuY3ksCiAJCQkgICAgJnBsYW5lX3dtLCAmY3Vyc29yX3dtKSkgewpA QCAtMTgyNiw3ICsxODI2LDcgQEAgc3RhdGljIHZvaWQgc2FuZHlicmlkZ2VfdXBkYXRlX3dtKHN0 cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJCURSTV9ERUJVR19LTVMoIkZJRk8gd2F0ZXJtYXJrcyBG b3IgcGlwZSBCIC0iCiAJCQkgICAgICAiIHBsYW5lICVkLCBjdXJzb3I6ICVkXG4iLAogCQkJICAg ICAgcGxhbmVfd20sIGN1cnNvcl93bSk7Ci0JCWVuYWJsZWQgfD0gMjsKKwkJZW5hYmxlZCB8PSAx IDw8IFBJUEVfQjsKIAl9CiAKIAkvKgpAQCAtMTkwNCw3ICsxOTA0LDcgQEAgc3RhdGljIHZvaWQg aXZ5YnJpZGdlX3VwZGF0ZV93bShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCXVuc2lnbmVkIGlu dCBlbmFibGVkOwogCiAJZW5hYmxlZCA9IDA7Ci0JaWYgKGc0eF9jb21wdXRlX3dtMChkZXYsIDAs CisJaWYgKGc0eF9jb21wdXRlX3dtMChkZXYsIFBJUEVfQSwKIAkJCSAgICAmc2FuZHlicmlkZ2Vf ZGlzcGxheV93bV9pbmZvLCBsYXRlbmN5LAogCQkJICAgICZzYW5keWJyaWRnZV9jdXJzb3Jfd21f aW5mbywgbGF0ZW5jeSwKIAkJCSAgICAmcGxhbmVfd20sICZjdXJzb3Jfd20pKSB7CkBAIC0xOTE1 LDEwICsxOTE1LDEwIEBAIHN0YXRpYyB2b2lkIGl2eWJyaWRnZV91cGRhdGVfd20oc3RydWN0IGRy bV9kZXZpY2UgKmRldikKIAkJRFJNX0RFQlVHX0tNUygiRklGTyB3YXRlcm1hcmtzIEZvciBwaXBl IEEgLSIKIAkJCSAgICAgICIgcGxhbmUgJWQsICIgImN1cnNvcjogJWRcbiIsCiAJCQkgICAgICBw bGFuZV93bSwgY3Vyc29yX3dtKTsKLQkJZW5hYmxlZCB8PSAxOworCQllbmFibGVkIHw9IDEgPDwg UElQRV9BOwogCX0KIAotCWlmIChnNHhfY29tcHV0ZV93bTAoZGV2LCAxLAorCWlmIChnNHhfY29t cHV0ZV93bTAoZGV2LCBQSVBFX0IsCiAJCQkgICAgJnNhbmR5YnJpZGdlX2Rpc3BsYXlfd21faW5m bywgbGF0ZW5jeSwKIAkJCSAgICAmc2FuZHlicmlkZ2VfY3Vyc29yX3dtX2luZm8sIGxhdGVuY3ks CiAJCQkgICAgJnBsYW5lX3dtLCAmY3Vyc29yX3dtKSkgewpAQCAtMTkyOSwxMCArMTkyOSwxMCBA QCBzdGF0aWMgdm9pZCBpdnlicmlkZ2VfdXBkYXRlX3dtKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYp CiAJCURSTV9ERUJVR19LTVMoIkZJRk8gd2F0ZXJtYXJrcyBGb3IgcGlwZSBCIC0iCiAJCQkgICAg ICAiIHBsYW5lICVkLCBjdXJzb3I6ICVkXG4iLAogCQkJICAgICAgcGxhbmVfd20sIGN1cnNvcl93 bSk7Ci0JCWVuYWJsZWQgfD0gMjsKKwkJZW5hYmxlZCB8PSAxIDw8IFBJUEVfQjsKIAl9CiAKLQlp ZiAoZzR4X2NvbXB1dGVfd20wKGRldiwgMiwKKwlpZiAoZzR4X2NvbXB1dGVfd20wKGRldiwgUElQ RV9DLAogCQkJICAgICZzYW5keWJyaWRnZV9kaXNwbGF5X3dtX2luZm8sIGxhdGVuY3ksCiAJCQkg ICAgJnNhbmR5YnJpZGdlX2N1cnNvcl93bV9pbmZvLCBsYXRlbmN5LAogCQkJICAgICZwbGFuZV93 bSwgJmN1cnNvcl93bSkpIHsKQEAgLTE5NDMsNyArMTk0Myw3IEBAIHN0YXRpYyB2b2lkIGl2eWJy aWRnZV91cGRhdGVfd20oc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAkJRFJNX0RFQlVHX0tNUygi RklGTyB3YXRlcm1hcmtzIEZvciBwaXBlIEMgLSIKIAkJCSAgICAgICIgcGxhbmUgJWQsIGN1cnNv cjogJWRcbiIsCiAJCQkgICAgICBwbGFuZV93bSwgY3Vyc29yX3dtKTsKLQkJZW5hYmxlZCB8PSAz OworCQllbmFibGVkIHw9IDEgPDwgUElQRV9DOwogCX0KIAogCS8qCi0tIAoxLjguMS41CgpfX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFp bGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cDovL2xpc3RzLmZy ZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=