From mboxrd@z Thu Jan 1 00:00:00 1970 From: ville.syrjala@linux.intel.com Subject: [PATCH 1/3] drm/i915: Fix watermark code for BDW Date: Tue, 7 Jan 2014 16:14:08 +0200 Message-ID: <1389104050-6426-2-git-send-email-ville.syrjala@linux.intel.com> References: <1389104050-6426-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 mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTP id 7D31BFAEE2 for ; Tue, 7 Jan 2014 06:14:16 -0800 (PST) In-Reply-To: <1389104050-6426-1-git-send-email-ville.syrjala@linux.intel.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 RnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KCkxv b2tzIGxpa2UgSSBmb3Jnb3QgdG8gdXBkYXRlIHRoZSBJTEsvU05CL0lWQiB3YXRlcm1hcmsgcGF0 Y2hlcyB0byBkZWFsCndpdGggQkRXLiBBZGQgdGhlIHJlbGV2YW50IEJEVyBjaGVja3MgdG8gbWFr ZSBzdXJlIHdlIHRha2UgdGhlIEhTVwpjb2RlcGF0aHMgb24gQkRXIGFzIHdlbGwuCgpTaWduZWQt b2ZmLWJ5OiBWaWxsZSBTeXJqw6Rsw6QgPHZpbGxlLnN5cmphbGFAbGludXguaW50ZWwuY29tPgot LS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMgfCAxNCArKysrKysrLS0tLS0tLQog MSBmaWxlIGNoYW5nZWQsIDcgaW5zZXJ0aW9ucygrKSwgNyBkZWxldGlvbnMoLSkKCmRpZmYgLS1n aXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfcG0uYwppbmRleCA0NjkxNzBjLi41NjM3MTgzIDEwMDY0NAotLS0gYS9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs X3BtLmMKQEAgLTIwMTMsNyArMjAxMyw3IEBAIHN0YXRpYyB2b2lkIGludGVsX3JlYWRfd21fbGF0 ZW5jeShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCB1aW50MTZfdCB3bVs1XSkKIHsKIAlzdHJ1Y3Qg ZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBkZXYtPmRldl9wcml2YXRlOwogCi0JaWYgKElT X0hBU1dFTEwoZGV2KSkgeworCWlmIChJU19IQVNXRUxMKGRldikgfHwgSVNfQlJPQURXRUxMKGRl dikpIHsKIAkJdWludDY0X3Qgc3NrcGQgPSBJOTE1X1JFQUQ2NChNQ0hfU1NLUEQpOwogCiAJCXdt WzBdID0gKHNza3BkID4+IDU2KSAmIDB4RkY7CkBAIC0yMDYxLDcgKzIwNjEsNyBAQCBzdGF0aWMg dm9pZCBpbnRlbF9maXh1cF9jdXJfd21fbGF0ZW5jeShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCB1 aW50MTZfdCB3bVs1XSkKIHN0YXRpYyBpbnQgaWxrX3dtX21heF9sZXZlbChjb25zdCBzdHJ1Y3Qg ZHJtX2RldmljZSAqZGV2KQogewogCS8qIGhvdyBtYW55IFdNIGxldmVscyBhcmUgd2UgZXhwZWN0 aW5nICovCi0JaWYgKElTX0hBU1dFTEwoZGV2KSkKKwlpZiAoSVNfSEFTV0VMTChkZXYpIHx8IElT X0JST0FEV0VMTChkZXYpKQogCQlyZXR1cm4gNDsKIAllbHNlIGlmIChJTlRFTF9JTkZPKGRldikt PmdlbiA+PSA2KQogCQlyZXR1cm4gMzsKQEAgLTIxODAsNyArMjE4MCw3IEBAIHN0YXRpYyBib29s IGludGVsX2NvbXB1dGVfcGlwZV93bShzdHJ1Y3QgZHJtX2NydGMgKmNydGMsCiAJCWlsa19jb21w dXRlX3dtX2xldmVsKGRldl9wcml2LCBsZXZlbCwgcGFyYW1zLAogCQkJCSAgICAgJnBpcGVfd20t PndtW2xldmVsXSk7CiAKLQlpZiAoSVNfSEFTV0VMTChkZXYpKQorCWlmIChJU19IQVNXRUxMKGRl dikgfHwgSVNfQlJPQURXRUxMKGRldikpCiAJCXBpcGVfd20tPmxpbmV0aW1lID0gaHN3X2NvbXB1 dGVfbGluZXRpbWVfd20oZGV2LCBjcnRjKTsKIAogCS8qIEF0IGxlYXN0IExQMCBtdXN0IGJlIHZh bGlkICovCkBAIC0yMjc1LDcgKzIyNzUsNyBAQCBzdGF0aWMgdW5zaWduZWQgaW50IGlsa193bV9s cF9sYXRlbmN5KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIGludCBsZXZlbCkKIHsKIAlzdHJ1Y3Qg ZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBkZXYtPmRldl9wcml2YXRlOwogCi0JaWYgKElT X0hBU1dFTEwoZGV2KSkKKwlpZiAoSVNfSEFTV0VMTChkZXYpIHx8IElTX0JST0FEV0VMTChkZXYp KQogCQlyZXR1cm4gMiAqIGxldmVsOwogCWVsc2UKIAkJcmV0dXJuIGRldl9wcml2LT53bS5wcmlf bGF0ZW5jeVtsZXZlbF07CkBAIC0yNDkwLDcgKzI0OTAsNyBAQCBzdGF0aWMgdm9pZCBpbGtfd3Jp dGVfd21fdmFsdWVzKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKIAkJSTkxNV9X UklURShQSVBFX1dNX0xJTkVUSU1FKFBJUEVfQyksIHJlc3VsdHMtPndtX2xpbmV0aW1lWzJdKTsK IAogCWlmIChkaXJ0eSAmIFdNX0RJUlRZX0REQikgewotCQlpZiAoSVNfSEFTV0VMTChkZXYpKSB7 CisJCWlmIChJU19IQVNXRUxMKGRldikgfHwgSVNfQlJPQURXRUxMKGRldikpIHsKIAkJCXZhbCA9 IEk5MTVfUkVBRChXTV9NSVNDKTsKIAkJCWlmIChyZXN1bHRzLT5wYXJ0aXRpb25pbmcgPT0gSU5U RUxfRERCX1BBUlRfMV8yKQogCQkJCXZhbCAmPSB+V01fTUlTQ19EQVRBX1BBUlRJVElPTl81XzY7 CkBAIC0yNjI5LDcgKzI2MjksNyBAQCBzdGF0aWMgdm9pZCBpbGtfcGlwZV93bV9nZXRfaHdfc3Rh dGUoc3RydWN0IGRybV9jcnRjICpjcnRjKQogCX07CiAKIAlody0+d21fcGlwZVtwaXBlXSA9IEk5 MTVfUkVBRCh3bTBfcGlwZV9yZWdbcGlwZV0pOwotCWlmIChJU19IQVNXRUxMKGRldikpCisJaWYg KElTX0hBU1dFTEwoZGV2KSB8fCBJU19CUk9BRFdFTEwoZGV2KSkKIAkJaHctPndtX2xpbmV0aW1l W3BpcGVdID0gSTkxNV9SRUFEKFBJUEVfV01fTElORVRJTUUocGlwZSkpOwogCiAJaWYgKGludGVs X2NydGNfYWN0aXZlKGNydGMpKSB7CkBAIC0yNjc2LDcgKzI2NzYsNyBAQCB2b2lkIGlsa193bV9n ZXRfaHdfc3RhdGUoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAlody0+d21fbHBfc3ByWzFdID0g STkxNV9SRUFEKFdNMlNfTFBfSVZCKTsKIAlody0+d21fbHBfc3ByWzJdID0gSTkxNV9SRUFEKFdN M1NfTFBfSVZCKTsKIAotCWlmIChJU19IQVNXRUxMKGRldikpCisJaWYgKElTX0hBU1dFTEwoZGV2 KSB8fCBJU19CUk9BRFdFTEwoZGV2KSkKIAkJaHctPnBhcnRpdGlvbmluZyA9IChJOTE1X1JFQUQo V01fTUlTQykgJiBXTV9NSVNDX0RBVEFfUEFSVElUSU9OXzVfNikgPwogCQkJSU5URUxfRERCX1BB UlRfNV82IDogSU5URUxfRERCX1BBUlRfMV8yOwogCWVsc2UgaWYgKElTX0lWWUJSSURHRShkZXYp KQotLSAKMS44LjMuMgoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Au b3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1n ZngK