From mboxrd@z Thu Jan 1 00:00:00 1970 From: ville.syrjala@linux.intel.com Subject: [PATCH v2] drm/i915: Pull some watermarks state into a separate structure Date: Wed, 7 Aug 2013 13:29:12 +0300 Message-ID: <1375871352-548-1-git-send-email-ville.syrjala@linux.intel.com> References: <20130806195840.GE8181@cantiga.alporthouse.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by gabe.freedesktop.org (Postfix) with ESMTP id 1C526E6373 for ; Wed, 7 Aug 2013 03:29:16 -0700 (PDT) In-Reply-To: <20130806195840.GE8181@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 RnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KClRo ZXJlIGlzIGEgYnVuY2ggb2YgZ2xvYmFsIHN0YXRlIHRoYXQgbmVlZHMgdG8gYmUgY29uc2lkZXJl ZCB3aGVuCmNoZWNraW5nIHdhdGVybWFya3MgZm9yIHZhbGlkaXR5LiBNb3ZlIG1vc3Qgb2YgdGhh dCB0byBhIG5ldwpzdHJ1Y3R1cmUgaW50ZWxfd21fY29uZmlnLCB0byBhdm9pZCBoYXZpbmcgdG8g cGFzcyBhcm91bmQgc28KbWFueSB2YXJpYWJsZXMuCgpPbmUgbm90YWJsZSB0aGluZyBsZWZ0IG91 dCBpcyB0aGUgRERCIHBhcnRpdGlvbmluZyBpbmZvcm1hdGlvbiwKc2luY2Ugd2Ugb2Z0ZW4gYW55 d2F5IG5lZWQgdG8gY2hlY2sgdGhlIHNhbWUgd2F0ZXJtYXJrcyBhZ2FpbnN0CmJvdGggMS8yIGFu ZCA1LzYgRERCIHBhcnRpdGlvbmluZyBsYXlvdXRzLgoKdjI6IHMvcGlwZXNfYWN0aXZlL251bV9w aXBlc19hY3RpdmUKClJldmlld2VkLWJ5OiBDaHJpcyBXaWxzb24gPGNocmlzQGNocmlzLXdpbHNv bi5jby51az4KU2lnbmVkLW9mZi1ieTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxp bnV4LmludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jIHwgNDgg KysrKysrKysrKysrKysrKysrKysrLS0tLS0tLS0tLS0tLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2Vk LCAyNSBpbnNlcnRpb25zKCspLCAyMyBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0u YwppbmRleCA1ZGFhMzJhLi45ZDA4N2JlIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9wbS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMKQEAgLTIx ODgsNiArMjE4OCwxNCBAQCBzdHJ1Y3QgaHN3X3dtX3ZhbHVlcyB7CiAJYm9vbCBlbmFibGVfZmJj X3dtOwogfTsKIAorLyogdXNlZCBpbiBjb21wdXRpbmcgdGhlIG5ldyB3YXRlcm1hcmtzIHN0YXRl ICovCitzdHJ1Y3QgaW50ZWxfd21fY29uZmlnIHsKKwl1bnNpZ25lZCBpbnQgbnVtX3BpcGVzX2Fj dGl2ZTsKKwlib29sIHNwcml0ZXNfZW5hYmxlZDsKKwlib29sIHNwcml0ZXNfc2NhbGVkOworCWJv b2wgZmJjX3dtX2VuYWJsZWQ7Cit9OworCiAvKgogICogRm9yIGJvdGggV01fUElQRSBhbmQgV01f TFAuCiAgKiBtZW1fdmFsdWUgbXVzdCBiZSBpbiAwLjF1cyB1bml0cy4KQEAgLTIyODEsOCArMjI4 OSw3IEBAIHN0YXRpYyB1bnNpZ25lZCBpbnQgaWxrX2Rpc3BsYXlfZmlmb19zaXplKGNvbnN0IHN0 cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAvKiBDYWxjdWxhdGUgdGhlIG1heGltdW0gcHJpbWFyeS9z cHJpdGUgcGxhbmUgd2F0ZXJtYXJrICovCiBzdGF0aWMgdW5zaWduZWQgaW50IGlsa19wbGFuZV93 bV9tYXgoY29uc3Qgc3RydWN0IGRybV9kZXZpY2UgKmRldiwKIAkJCQkgICAgIGludCBsZXZlbCwK LQkJCQkgICAgIHVuc2lnbmVkIGludCBudW1fcGlwZXNfYWN0aXZlLAotCQkJCSAgICAgYm9vbCBz cHJpdGVfZW5hYmxlZCwKKwkJCQkgICAgIGNvbnN0IHN0cnVjdCBpbnRlbF93bV9jb25maWcgKmNv bmZpZywKIAkJCQkgICAgIGVudW0gaW50ZWxfZGRiX3BhcnRpdGlvbmluZyBkZGJfcGFydGl0aW9u aW5nLAogCQkJCSAgICAgYm9vbCBpc19zcHJpdGUpCiB7CkBAIC0yMjkwLDExICsyMjk3LDExIEBA IHN0YXRpYyB1bnNpZ25lZCBpbnQgaWxrX3BsYW5lX3dtX21heChjb25zdCBzdHJ1Y3QgZHJtX2Rl dmljZSAqZGV2LAogCXVuc2lnbmVkIGludCBtYXg7CiAKIAkvKiBpZiBzcHJpdGVzIGFyZW4ndCBl bmFibGVkLCBzcHJpdGVzIGdldCBub3RoaW5nICovCi0JaWYgKGlzX3Nwcml0ZSAmJiAhc3ByaXRl X2VuYWJsZWQpCisJaWYgKGlzX3Nwcml0ZSAmJiAhY29uZmlnLT5zcHJpdGVzX2VuYWJsZWQpCiAJ CXJldHVybiAwOwogCiAJLyogSFNXIGFsbG93cyBMUDErIHdhdGVybWFya3MgZXZlbiB3aXRoIG11 bHRpcGxlIHBpcGVzICovCi0JaWYgKGxldmVsID09IDAgfHwgbnVtX3BpcGVzX2FjdGl2ZSA+IDEp IHsKKwlpZiAobGV2ZWwgPT0gMCB8fCBjb25maWctPm51bV9waXBlc19hY3RpdmUgPiAxKSB7CiAJ CWZpZm9fc2l6ZSAvPSBJTlRFTF9JTkZPKGRldiktPm51bV9waXBlczsKIAogCQkvKgpAQCAtMjMw Niw3ICsyMzEzLDcgQEAgc3RhdGljIHVuc2lnbmVkIGludCBpbGtfcGxhbmVfd21fbWF4KGNvbnN0 IHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAJCQlmaWZvX3NpemUgLz0gMjsKIAl9CiAKLQlpZiAo c3ByaXRlX2VuYWJsZWQpIHsKKwlpZiAoY29uZmlnLT5zcHJpdGVzX2VuYWJsZWQpIHsKIAkJLyog bGV2ZWwgMCBpcyBhbHdheXMgY2FsY3VsYXRlZCB3aXRoIDE6MSBzcGxpdCAqLwogCQlpZiAobGV2 ZWwgPiAwICYmIGRkYl9wYXJ0aXRpb25pbmcgPT0gSU5URUxfRERCX1BBUlRfNV82KSB7CiAJCQlp ZiAoaXNfc3ByaXRlKQpAQCAtMjMzMywxMCArMjM0MCwxMSBAQCBzdGF0aWMgdW5zaWduZWQgaW50 IGlsa19wbGFuZV93bV9tYXgoY29uc3Qgc3RydWN0IGRybV9kZXZpY2UgKmRldiwKIAogLyogQ2Fs Y3VsYXRlIHRoZSBtYXhpbXVtIGN1cnNvciBwbGFuZSB3YXRlcm1hcmsgKi8KIHN0YXRpYyB1bnNp Z25lZCBpbnQgaWxrX2N1cnNvcl93bV9tYXgoY29uc3Qgc3RydWN0IGRybV9kZXZpY2UgKmRldiwK LQkJCQkgICAgICBpbnQgbGV2ZWwsIHVuc2lnbmVkIGludCBudW1fcGlwZXNfYWN0aXZlKQorCQkJ CSAgICAgIGludCBsZXZlbCwKKwkJCQkgICAgICBjb25zdCBzdHJ1Y3QgaW50ZWxfd21fY29uZmln ICpjb25maWcpCiB7CiAJLyogSFNXIExQMSsgd2F0ZXJtYXJrcyB3LyBtdWx0aXBsZSBwaXBlcyAq LwotCWlmIChsZXZlbCA+IDAgJiYgbnVtX3BpcGVzX2FjdGl2ZSA+IDEpCisJaWYgKGxldmVsID4g MCAmJiBjb25maWctPm51bV9waXBlc19hY3RpdmUgPiAxKQogCQlyZXR1cm4gNjQ7CiAKIAkvKiBv dGhlcndpc2UganVzdCByZXBvcnQgbWF4IHRoYXQgcmVnaXN0ZXJzIGNhbiBob2xkICovCkBAIC0y MzU1LDE2ICsyMzYzLDEzIEBAIHN0YXRpYyB1bnNpZ25lZCBpbnQgaWxrX2ZiY193bV9tYXgodm9p ZCkKIAogc3RhdGljIHZvaWQgaWxrX3dtX21heChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogCQkg ICAgICAgaW50IGxldmVsLAotCQkgICAgICAgdW5zaWduZWQgaW50IG51bV9waXBlc19hY3RpdmUs Ci0JCSAgICAgICBib29sIHNwcml0ZV9lbmFibGVkLAorCQkgICAgICAgY29uc3Qgc3RydWN0IGlu dGVsX3dtX2NvbmZpZyAqY29uZmlnLAogCQkgICAgICAgZW51bSBpbnRlbF9kZGJfcGFydGl0aW9u aW5nIGRkYl9wYXJ0aXRpb25pbmcsCiAJCSAgICAgICBzdHJ1Y3QgaHN3X3dtX21heGltdW1zICpt YXgpCiB7Ci0JbWF4LT5wcmkgPSBpbGtfcGxhbmVfd21fbWF4KGRldiwgbGV2ZWwsIG51bV9waXBl c19hY3RpdmUsCi0JCQkJICAgIHNwcml0ZV9lbmFibGVkLCBkZGJfcGFydGl0aW9uaW5nLCBmYWxz ZSk7Ci0JbWF4LT5zcHIgPSBpbGtfcGxhbmVfd21fbWF4KGRldiwgbGV2ZWwsIG51bV9waXBlc19h Y3RpdmUsCi0JCQkJICAgIHNwcml0ZV9lbmFibGVkLCBkZGJfcGFydGl0aW9uaW5nLCB0cnVlKTsK LQltYXgtPmN1ciA9IGlsa19jdXJzb3Jfd21fbWF4KGRldiwgbGV2ZWwsIG51bV9waXBlc19hY3Rp dmUpOworCW1heC0+cHJpID0gaWxrX3BsYW5lX3dtX21heChkZXYsIGxldmVsLCBjb25maWcsIGRk Yl9wYXJ0aXRpb25pbmcsIGZhbHNlKTsKKwltYXgtPnNwciA9IGlsa19wbGFuZV93bV9tYXgoZGV2 LCBsZXZlbCwgY29uZmlnLCBkZGJfcGFydGl0aW9uaW5nLCB0cnVlKTsKKwltYXgtPmN1ciA9IGls a19jdXJzb3Jfd21fbWF4KGRldiwgbGV2ZWwsIGNvbmZpZyk7CiAJbWF4LT5mYmMgPSBpbGtfZmJj X3dtX21heCgpOwogfQogCkBAIC0yNjE0LDcgKzI2MTksNyBAQCBzdGF0aWMgdm9pZCBoc3dfY29t cHV0ZV93bV9wYXJhbWV0ZXJzKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAJc3RydWN0IGRybV9j cnRjICpjcnRjOwogCXN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lOwogCWVudW0gcGlwZSBwaXBlOwot CWludCBwaXBlc19hY3RpdmUgPSAwLCBzcHJpdGVzX2VuYWJsZWQgPSAwOworCXN0cnVjdCBpbnRl bF93bV9jb25maWcgY29uZmlnID0ge307CiAKIAlsaXN0X2Zvcl9lYWNoX2VudHJ5KGNydGMsICZk ZXYtPm1vZGVfY29uZmlnLmNydGNfbGlzdCwgaGVhZCkgewogCQlzdHJ1Y3QgaW50ZWxfY3J0YyAq aW50ZWxfY3J0YyA9IHRvX2ludGVsX2NydGMoY3J0Yyk7CkBAIC0yNjI3LDcgKzI2MzIsNyBAQCBz dGF0aWMgdm9pZCBoc3dfY29tcHV0ZV93bV9wYXJhbWV0ZXJzKHN0cnVjdCBkcm1fZGV2aWNlICpk ZXYsCiAJCWlmICghcC0+YWN0aXZlKQogCQkJY29udGludWU7CiAKLQkJcGlwZXNfYWN0aXZlKys7 CisJCWNvbmZpZy5udW1fcGlwZXNfYWN0aXZlKys7CiAKIAkJcC0+cGlwZV9odG90YWwgPSBpbnRl bF9jcnRjLT5jb25maWcuYWRqdXN0ZWRfbW9kZS5odG90YWw7CiAJCXAtPnBpeGVsX3JhdGUgPSBp bGtfcGlwZV9waXhlbF9yYXRlKGRldiwgY3J0Yyk7CkBAIC0yNjQ5LDE3ICsyNjU0LDE0IEBAIHN0 YXRpYyB2b2lkIGhzd19jb21wdXRlX3dtX3BhcmFtZXRlcnMoc3RydWN0IGRybV9kZXZpY2UgKmRl diwKIAkJcC0+c3ByX2J5dGVzX3Blcl9waXhlbCA9IGludGVsX3BsYW5lLT53bS5ieXRlc19wZXJf cGl4ZWw7CiAJCXAtPnNwcl9ob3Jpel9waXhlbHMgPSBpbnRlbF9wbGFuZS0+d20uaG9yaXpfcGl4 ZWxzOwogCi0JCWlmIChwLT5zcHJpdGVfZW5hYmxlZCkKLQkJCXNwcml0ZXNfZW5hYmxlZCsrOwor CQljb25maWcuc3ByaXRlc19lbmFibGVkIHw9IHAtPnNwcml0ZV9lbmFibGVkOwogCX0KIAotCWls a193bV9tYXgoZGV2LCAxLCBwaXBlc19hY3RpdmUsIHNwcml0ZXNfZW5hYmxlZCwKLQkJICAgSU5U RUxfRERCX1BBUlRfMV8yLCBscF9tYXhfMV8yKTsKKwlpbGtfd21fbWF4KGRldiwgMSwgJmNvbmZp ZywgSU5URUxfRERCX1BBUlRfMV8yLCBscF9tYXhfMV8yKTsKIAogCS8qIDUvNiBzcGxpdCBvbmx5 IGluIHNpbmdsZSBwaXBlIGNvbmZpZyBvbiBJVkIrICovCi0JaWYgKElOVEVMX0lORk8oZGV2KS0+ Z2VuID49IDcgJiYgcGlwZXNfYWN0aXZlIDw9IDEpCi0JCWlsa193bV9tYXgoZGV2LCAxLCBwaXBl c19hY3RpdmUsIHNwcml0ZXNfZW5hYmxlZCwKLQkJCSAgIElOVEVMX0REQl9QQVJUXzVfNiwgbHBf bWF4XzVfNik7CisJaWYgKElOVEVMX0lORk8oZGV2KS0+Z2VuID49IDcgJiYgY29uZmlnLm51bV9w aXBlc19hY3RpdmUgPD0gMSkKKwkJaWxrX3dtX21heChkZXYsIDEsICZjb25maWcsIElOVEVMX0RE Ql9QQVJUXzVfNiwgbHBfbWF4XzVfNik7CiAJZWxzZQogCQkqbHBfbWF4XzVfNiA9ICpscF9tYXhf MV8yOwogfQotLSAKMS44LjEuNQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRl c2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9p bnRlbC1nZngK