From mboxrd@z Thu Jan 1 00:00:00 1970 From: ville.syrjala@linux.intel.com Subject: [PATCH 08/13] drm/i915; Pull some watermarks state into a separate structure Date: Tue, 6 Aug 2013 22:24:07 +0300 Message-ID: <1375817052-32310-9-git-send-email-ville.syrjala@linux.intel.com> References: <1375817052-32310-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 mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTP id E2039E5EC1 for ; Tue, 6 Aug 2013 12:24:59 -0700 (PDT) In-Reply-To: <1375817052-32310-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 RnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KClRo ZXJlIGlzIGEgYnVuY2ggb2YgZ2xvYmFsIHN0YXRlIHRoYXQgbmVlZHMgdG8gYmUgY29uc2lkZXJl ZCB3aGVuCmNoZWNraW5nIHdhdGVybWFya3MgZm9yIHZhbGlkaXR5LiBNb3ZlIG1vc3Qgb2YgdGhh dCB0byBhIG5ldwpzdHJ1Y3R1cmUgaW50ZWxfd21fY29uZmlnLCB0byBhdm9pZCBoYXZpbmcgdG8g cGFzcyBhcm91bmQgc28KbWFueSB2YXJpYWJsZXMuCgpPbmUgbm90YWJsZSB0aGluZyBsZWZ0IG91 dCBpcyB0aGUgRERCIHBhcnRpdGlvbmluZyBpbmZvcm1hdGlvbiwKc2luY2Ugd2Ugb2Z0ZW4gYW55 d2F5IG5lZWQgdG8gY2hlY2sgdGhlIHNhbWUgd2F0ZXJtYXJrcyBhZ2FpbnN0CmJvdGggMS8yIGFu ZCA1LzYgRERCIHBhcnRpdGlvbmluZyBsYXlvdXRzLgoKU2lnbmVkLW9mZi1ieTogVmlsbGUgU3ly asOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF9wbS5jIHwgNDggKysrKysrKysrKysrKysrKysrKysrLS0tLS0tLS0tLS0t LS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCAyNSBpbnNlcnRpb25zKCspLCAyMyBkZWxldGlvbnMo LSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jIGIvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYwppbmRleCBmNTFmODlkLi4wMTRhOGJhIDEwMDY0NAot LS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jCisrKyBiL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX3BtLmMKQEAgLTIxODgsNiArMjE4OCwxNCBAQCBzdHJ1Y3QgaHN3X3dtX3Zh bHVlcyB7CiAJYm9vbCBlbmFibGVfZmJjX3dtOwogfTsKIAorLyogdXNlZCBpbiBjb21wdXRpbmcg dGhlIG5ldyB3YXRlcm1hcmtzIHN0YXRlICovCitzdHJ1Y3QgaW50ZWxfd21fY29uZmlnIHsKKwl1 bnNpZ25lZCBpbnQgcGlwZXNfYWN0aXZlOworCWJvb2wgc3ByaXRlc19lbmFibGVkOworCWJvb2wg c3ByaXRlc19zY2FsZWQ7CisJYm9vbCBmYmNfd21fZW5hYmxlZDsKK307CisKIC8qCiAgKiBGb3Ig Ym90aCBXTV9QSVBFIGFuZCBXTV9MUC4KICAqIG1lbV92YWx1ZSBtdXN0IGJlIGluIDAuMXVzIHVu aXRzLgpAQCAtMjI4MSw4ICsyMjg5LDcgQEAgc3RhdGljIHVuc2lnbmVkIGludCBpbGtfZGlzcGxh eV9maWZvX3NpemUoY29uc3Qgc3RydWN0IGRybV9kZXZpY2UgKmRldikKIC8qIENhbGN1bGF0ZSB0 aGUgbWF4aW11bSBwcmltYXJ5L3Nwcml0ZSBwbGFuZSB3YXRlcm1hcmsgKi8KIHN0YXRpYyB1bnNp Z25lZCBpbnQgaWxrX3BsYW5lX3dtX21heChjb25zdCBzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAog CQkJCSAgICAgaW50IGxldmVsLAotCQkJCSAgICAgdW5zaWduZWQgaW50IHBpcGVzX2FjdGl2ZSwK LQkJCQkgICAgIGJvb2wgc3ByaXRlX2VuYWJsZWQsCisJCQkJICAgICBjb25zdCBzdHJ1Y3QgaW50 ZWxfd21fY29uZmlnICpjb25maWcsCiAJCQkJICAgICBlbnVtIGludGVsX2RkYl9wYXJ0aXRpb25p bmcgZGRiX3BhcnRpdGlvbmluZywKIAkJCQkgICAgIGJvb2wgaXNfc3ByaXRlKQogewpAQCAtMjI5 MCwxMSArMjI5NywxMSBAQCBzdGF0aWMgdW5zaWduZWQgaW50IGlsa19wbGFuZV93bV9tYXgoY29u c3Qgc3RydWN0IGRybV9kZXZpY2UgKmRldiwKIAl1bnNpZ25lZCBpbnQgbWF4OwogCiAJLyogaWYg c3ByaXRlcyBhcmVuJ3QgZW5hYmxlZCwgc3ByaXRlcyBnZXQgbm90aGluZyAqLwotCWlmIChpc19z cHJpdGUgJiYgIXNwcml0ZV9lbmFibGVkKQorCWlmIChpc19zcHJpdGUgJiYgIWNvbmZpZy0+c3By aXRlc19lbmFibGVkKQogCQlyZXR1cm4gMDsKIAogCS8qIEhTVyBhbGxvd3MgTFAxKyB3YXRlcm1h cmtzIGV2ZW4gd2l0aCBtdWx0aXBsZSBwaXBlcyAqLwotCWlmIChsZXZlbCA9PSAwIHx8IHBpcGVz X2FjdGl2ZSA+IDEpIHsKKwlpZiAobGV2ZWwgPT0gMCB8fCBjb25maWctPnBpcGVzX2FjdGl2ZSA+ IDEpIHsKIAkJZmlmb19zaXplIC89IElOVEVMX0lORk8oZGV2KS0+bnVtX3BpcGVzOwogCiAJCS8q CkBAIC0yMzA2LDcgKzIzMTMsNyBAQCBzdGF0aWMgdW5zaWduZWQgaW50IGlsa19wbGFuZV93bV9t YXgoY29uc3Qgc3RydWN0IGRybV9kZXZpY2UgKmRldiwKIAkJCWZpZm9fc2l6ZSAvPSAyOwogCX0K IAotCWlmIChzcHJpdGVfZW5hYmxlZCkgeworCWlmIChjb25maWctPnNwcml0ZXNfZW5hYmxlZCkg ewogCQkvKiBsZXZlbCAwIGlzIGFsd2F5cyBjYWxjdWxhdGVkIHdpdGggMToxIHNwbGl0ICovCiAJ CWlmIChsZXZlbCA+IDAgJiYgZGRiX3BhcnRpdGlvbmluZyA9PSBJTlRFTF9EREJfUEFSVF81XzYp IHsKIAkJCWlmIChpc19zcHJpdGUpCkBAIC0yMzMzLDEwICsyMzQwLDExIEBAIHN0YXRpYyB1bnNp Z25lZCBpbnQgaWxrX3BsYW5lX3dtX21heChjb25zdCBzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAog CiAvKiBDYWxjdWxhdGUgdGhlIG1heGltdW0gY3Vyc29yIHBsYW5lIHdhdGVybWFyayAqLwogc3Rh dGljIHVuc2lnbmVkIGludCBpbGtfY3Vyc29yX3dtX21heChjb25zdCBzdHJ1Y3QgZHJtX2Rldmlj ZSAqZGV2LAotCQkJCSAgICAgIGludCBsZXZlbCwgdW5zaWduZWQgaW50IHBpcGVzX2FjdGl2ZSkK KwkJCQkgICAgICBpbnQgbGV2ZWwsCisJCQkJICAgICAgY29uc3Qgc3RydWN0IGludGVsX3dtX2Nv bmZpZyAqY29uZmlnKQogewogCS8qIEhTVyBMUDErIHdhdGVybWFya3Mgdy8gbXVsdGlwbGUgcGlw ZXMgKi8KLQlpZiAobGV2ZWwgPiAwICYmIHBpcGVzX2FjdGl2ZSA+IDEpCisJaWYgKGxldmVsID4g MCAmJiBjb25maWctPnBpcGVzX2FjdGl2ZSA+IDEpCiAJCXJldHVybiA2NDsKIAogCS8qIG90aHdl d2lzZSBqdXN0IHJlcG9ydCBtYXggdGhhdCByZWdpc3RlcnMgY2FuIGhvbGQgKi8KQEAgLTIzNTUs MTYgKzIzNjMsMTMgQEAgc3RhdGljIHVuc2lnbmVkIGludCBpbGtfZmJjX3dtX21heCh2b2lkKQog CiBzdGF0aWMgdm9pZCBpbGtfd21fbWF4KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAJCSAgICAg ICBpbnQgbGV2ZWwsCi0JCSAgICAgICB1bnNpZ25lZCBpbnQgcGlwZXNfYWN0aXZlLAotCQkgICAg ICAgYm9vbCBzcHJpdGVfZW5hYmxlZCwKKwkJICAgICAgIGNvbnN0IHN0cnVjdCBpbnRlbF93bV9j b25maWcgKmNvbmZpZywKIAkJICAgICAgIGVudW0gaW50ZWxfZGRiX3BhcnRpdGlvbmluZyBkZGJf cGFydGl0aW9uaW5nLAogCQkgICAgICAgc3RydWN0IGhzd193bV9tYXhpbXVtcyAqbWF4KQogewot CW1heC0+cHJpID0gaWxrX3BsYW5lX3dtX21heChkZXYsIGxldmVsLCBwaXBlc19hY3RpdmUsCi0J CQkJICAgIHNwcml0ZV9lbmFibGVkLCBkZGJfcGFydGl0aW9uaW5nLCBmYWxzZSk7Ci0JbWF4LT5z cHIgPSBpbGtfcGxhbmVfd21fbWF4KGRldiwgbGV2ZWwsIHBpcGVzX2FjdGl2ZSwKLQkJCQkgICAg c3ByaXRlX2VuYWJsZWQsIGRkYl9wYXJ0aXRpb25pbmcsIHRydWUpOwotCW1heC0+Y3VyID0gaWxr X2N1cnNvcl93bV9tYXgoZGV2LCBsZXZlbCwgcGlwZXNfYWN0aXZlKTsKKwltYXgtPnByaSA9IGls a19wbGFuZV93bV9tYXgoZGV2LCBsZXZlbCwgY29uZmlnLCBkZGJfcGFydGl0aW9uaW5nLCBmYWxz ZSk7CisJbWF4LT5zcHIgPSBpbGtfcGxhbmVfd21fbWF4KGRldiwgbGV2ZWwsIGNvbmZpZywgZGRi X3BhcnRpdGlvbmluZywgdHJ1ZSk7CisJbWF4LT5jdXIgPSBpbGtfY3Vyc29yX3dtX21heChkZXYs IGxldmVsLCBjb25maWcpOwogCW1heC0+ZmJjID0gaWxrX2ZiY193bV9tYXgoKTsKIH0KIApAQCAt MjYwNCw3ICsyNjA5LDcgQEAgc3RhdGljIHZvaWQgaHN3X2NvbXB1dGVfd21fcGFyYW1ldGVycyhz dHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogCXN0cnVjdCBkcm1fY3J0YyAqY3J0YzsKIAlzdHJ1Y3Qg ZHJtX3BsYW5lICpwbGFuZTsKIAllbnVtIHBpcGUgcGlwZTsKLQlpbnQgcGlwZXNfYWN0aXZlID0g MCwgc3ByaXRlc19lbmFibGVkID0gMDsKKwlzdHJ1Y3QgaW50ZWxfd21fY29uZmlnIGNvbmZpZyA9 IHt9OwogCiAJbGlzdF9mb3JfZWFjaF9lbnRyeShjcnRjLCAmZGV2LT5tb2RlX2NvbmZpZy5jcnRj X2xpc3QsIGhlYWQpIHsKIAkJc3RydWN0IGludGVsX2NydGMgKmludGVsX2NydGMgPSB0b19pbnRl bF9jcnRjKGNydGMpOwpAQCAtMjYxNyw3ICsyNjIyLDcgQEAgc3RhdGljIHZvaWQgaHN3X2NvbXB1 dGVfd21fcGFyYW1ldGVycyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogCQlpZiAoIXAtPmFjdGl2 ZSkKIAkJCWNvbnRpbnVlOwogCi0JCXBpcGVzX2FjdGl2ZSsrOworCQljb25maWcucGlwZXNfYWN0 aXZlKys7CiAKIAkJcC0+cGlwZV9odG90YWwgPSBpbnRlbF9jcnRjLT5jb25maWcuYWRqdXN0ZWRf bW9kZS5odG90YWw7CiAJCXAtPnBpeGVsX3JhdGUgPSBpbGtfcGlwZV9waXhlbF9yYXRlKGRldiwg Y3J0Yyk7CkBAIC0yNjM5LDE3ICsyNjQ0LDE0IEBAIHN0YXRpYyB2b2lkIGhzd19jb21wdXRlX3dt X3BhcmFtZXRlcnMoc3RydWN0IGRybV9kZXZpY2UgKmRldiwKIAkJcC0+c3ByX2J5dGVzX3Blcl9w aXhlbCA9IGludGVsX3BsYW5lLT53bS5ieXRlc19wZXJfcGl4ZWw7CiAJCXAtPnNwcl9ob3Jpel9w aXhlbHMgPSBpbnRlbF9wbGFuZS0+d20uaG9yaXpfcGl4ZWxzOwogCi0JCWlmIChwLT5zcHJpdGVf ZW5hYmxlZCkKLQkJCXNwcml0ZXNfZW5hYmxlZCsrOworCQljb25maWcuc3ByaXRlc19lbmFibGVk IHw9IHAtPnNwcml0ZV9lbmFibGVkOwogCX0KIAotCWlsa193bV9tYXgoZGV2LCAxLCBwaXBlc19h Y3RpdmUsIHNwcml0ZXNfZW5hYmxlZCwKLQkJICAgSU5URUxfRERCX1BBUlRfMV8yLCBscF9tYXhf MV8yKTsKKwlpbGtfd21fbWF4KGRldiwgMSwgJmNvbmZpZywgSU5URUxfRERCX1BBUlRfMV8yLCBs cF9tYXhfMV8yKTsKIAogCS8qIDUvNiBzcGxpdCBvbmx5IGluIHNpbmdsZSBwaXBlIGNvbmZpZyBv biBJVkIrICovCi0JaWYgKElOVEVMX0lORk8oZGV2KS0+Z2VuID49IDcgJiYgcGlwZXNfYWN0aXZl IDw9IDEpCi0JCWlsa193bV9tYXgoZGV2LCAxLCBwaXBlc19hY3RpdmUsIHNwcml0ZXNfZW5hYmxl ZCwKLQkJCSAgIElOVEVMX0REQl9QQVJUXzVfNiwgbHBfbWF4XzVfNik7CisJaWYgKElOVEVMX0lO Rk8oZGV2KS0+Z2VuID49IDcgJiYgY29uZmlnLnBpcGVzX2FjdGl2ZSA8PSAxKQorCQlpbGtfd21f bWF4KGRldiwgMSwgJmNvbmZpZywgSU5URUxfRERCX1BBUlRfNV82LCBscF9tYXhfNV82KTsKIAll bHNlCiAJCSpscF9tYXhfNV82ID0gKmxwX21heF8xXzI7CiB9Ci0tIAoxLjguMS41CgpfX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGlu ZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cDovL2xpc3RzLmZyZWVk ZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=