From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Kumar, Mahesh" Subject: [PATCH 3/7] drm/i915/skl: pass pipe_wm in skl_compute_(wm_level/plane_wm) functions Date: Mon, 29 Aug 2016 18:05:18 +0530 Message-ID: <20160829123522.9532-4-mahesh1.kumar@intel.com> References: <20160829123522.9532-1-mahesh1.kumar@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by gabe.freedesktop.org (Postfix) with ESMTPS id 364F56E52E for ; Mon, 29 Aug 2016 12:31:59 +0000 (UTC) In-Reply-To: <20160829123522.9532-1-mahesh1.kumar@intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: intel-gfx@lists.freedesktop.org Cc: Kumar@freedesktop.org List-Id: intel-gfx@lists.freedesktop.org VGhpcyBwYXRjaCBtYWtlIHVzZSBvZiBwbGFuZV93bSB2YXJpYWJsZSBkaXJlY3RseSBpbnN0ZWFk IG9mIHBhc3NpbmcKc2tsX3BsYW5lX3dtIHN0cnVjdC4gdGhpcyB3YXkgcmVkdWNlcyBudW1iZXIg b2YgYXJndW1lbnQgcmVxdWlyZW1lbnQKaW4gd2F0ZXJtYXJrIGNhbGN1bGF0aW9uIGZ1bmN0aW9u cy4KCkl0IGFsc28gZ2l2ZXMgbW9yZSBmcmVlZG9tIG9mIGRlY2lzaW9uIG1ha2luZyB0byBpbXBs ZW1lbnQgQnNwZWMgV00Kd29ya2Fyb3VuZHMuCgpTaWduZWQtb2ZmLWJ5OiBLdW1hciwgTWFoZXNo IDxtYWhlc2gxLmt1bWFyQGludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9wbS5jIHwgMjkgKysrKysrKysrKysrKysrLS0tLS0tLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2Vk LCAxNSBpbnNlcnRpb25zKCspLCAxNCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0u YwppbmRleCBiMmYxN2ViLi41ZmEwMmNiIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9wbS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMKQEAgLTM1 NDAsOSArMzU0MCw3IEBAIHN0YXRpYyBpbnQgc2tsX2NvbXB1dGVfcGxhbmVfd20oY29uc3Qgc3Ry dWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAogCQkJCXN0cnVjdCBpbnRlbF9wbGFuZV9z dGF0ZSAqaW50ZWxfcHN0YXRlLAogCQkJCXVpbnQxNl90IGRkYl9hbGxvY2F0aW9uLAogCQkJCWlu dCBsZXZlbCwKLQkJCQl1aW50MTZfdCAqb3V0X2Jsb2NrcywgLyogb3V0ICovCi0JCQkJdWludDhf dCAqb3V0X2xpbmVzLCAvKiBvdXQgKi8KLQkJCQlib29sICplbmFibGVkIC8qIG91dCAqLykKKwkJ CQlzdHJ1Y3Qgc2tsX3BpcGVfd20gKnBpcGVfd20pCiB7CiAJc3RydWN0IGRybV9wbGFuZV9zdGF0 ZSAqcHN0YXRlID0gJmludGVsX3BzdGF0ZS0+YmFzZTsKIAlzdHJ1Y3QgZHJtX2ZyYW1lYnVmZmVy ICpmYiA9IHBzdGF0ZS0+ZmI7CkBAIC0zNTU1LDYgKzM1NTMsMTEgQEAgc3RhdGljIGludCBza2xf Y29tcHV0ZV9wbGFuZV93bShjb25zdCBzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYs CiAJdWludDMyX3Qgd2lkdGggPSAwLCBoZWlnaHQgPSAwOwogCXVpbnQzMl90IHBsYW5lX3BpeGVs X3JhdGU7CiAJdWludDMyX3QgbGluZXRpbWVfdXMgPSAwOworCWludCBpZCA9IHNrbF93bV9wbGFu ZV9pZCh0b19pbnRlbF9wbGFuZShwc3RhdGUtPnBsYW5lKSk7CisJc3RydWN0IHNrbF93bV9sZXZl bCAqcmVzdWx0ID0gJnBpcGVfd20tPndtW2xldmVsXTsKKwl1aW50MTZfdCAqb3V0X2Jsb2NrcyA9 ICZyZXN1bHQtPnBsYW5lX3Jlc19iW2lkXTsKKwl1aW50OF90ICpvdXRfbGluZXMgPSAmcmVzdWx0 LT5wbGFuZV9yZXNfbFtpZF07CisJYm9vbCAqZW5hYmxlZCA9ICZyZXN1bHQtPnBsYW5lX2VuW2lk XTsKIAogCWlmIChsYXRlbmN5ID09IDAgfHwgIWNzdGF0ZS0+YmFzZS5hY3RpdmUgfHwgIWludGVs X3BzdGF0ZS0+YmFzZS52aXNpYmxlKSB7CiAJCSplbmFibGVkID0gZmFsc2U7CkBAIC0zNjU1LDcg KzM2NTgsNyBAQCBza2xfY29tcHV0ZV93bV9sZXZlbChjb25zdCBzdHJ1Y3QgZHJtX2k5MTVfcHJp dmF0ZSAqZGV2X3ByaXYsCiAJCSAgICAgc3RydWN0IHNrbF9kZGJfYWxsb2NhdGlvbiAqZGRiLAog CQkgICAgIHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjc3RhdGUsCiAJCSAgICAgaW50IGxldmVs LAotCQkgICAgIHN0cnVjdCBza2xfd21fbGV2ZWwgKnJlc3VsdCkKKwkJICAgICBzdHJ1Y3Qgc2ts X3BpcGVfd20gKnBpcGVfd20pCiB7CiAJc3RydWN0IGRybV9hdG9taWNfc3RhdGUgKnN0YXRlID0g Y3N0YXRlLT5iYXNlLnN0YXRlOwogCXN0cnVjdCBpbnRlbF9jcnRjICppbnRlbF9jcnRjID0gdG9f aW50ZWxfY3J0Yyhjc3RhdGUtPmJhc2UuY3J0Yyk7CkBAIC0zNjY2LDEyICszNjY5LDYgQEAgc2ts X2NvbXB1dGVfd21fbGV2ZWwoY29uc3Qgc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2 LAogCWVudW0gcGlwZSBwaXBlID0gaW50ZWxfY3J0Yy0+cGlwZTsKIAlpbnQgcmV0OwogCi0JLyoK LQkgKiBXZSdsbCBvbmx5IGNhbGN1bGF0ZSB3YXRlcm1hcmtzIGZvciBwbGFuZXMgdGhhdCBhcmUg YWN0dWFsbHkKLQkgKiBlbmFibGVkLCBzbyBtYWtlIHN1cmUgYWxsIG90aGVyIHBsYW5lcyBhcmUg c2V0IGFzIGRpc2FibGVkLgotCSAqLwotCW1lbXNldChyZXN1bHQsIDAsIHNpemVvZigqcmVzdWx0 KSk7Ci0KIAlmb3JfZWFjaF9pbnRlbF9wbGFuZV9tYXNrKCZkZXZfcHJpdi0+ZHJtLAogCQkJCSAg aW50ZWxfcGxhbmUsCiAJCQkJICBjc3RhdGUtPmJhc2UucGxhbmVfbWFzaykgewpAQCAtMzcwOSw5 ICszNzA2LDcgQEAgc2tsX2NvbXB1dGVfd21fbGV2ZWwoY29uc3Qgc3RydWN0IGRybV9pOTE1X3By aXZhdGUgKmRldl9wcml2LAogCQkJCQkgICBpbnRlbF9wc3RhdGUsCiAJCQkJCSAgIGRkYl9ibG9j a3MsCiAJCQkJCSAgIGxldmVsLAotCQkJCQkgICAmcmVzdWx0LT5wbGFuZV9yZXNfYltpXSwKLQkJ CQkJICAgJnJlc3VsdC0+cGxhbmVfcmVzX2xbaV0sCi0JCQkJCSAgICZyZXN1bHQtPnBsYW5lX2Vu W2ldKTsKKwkJCQkJICAgcGlwZV93bSk7CiAJCWlmIChyZXQpCiAJCQlyZXR1cm4gcmV0OwogCX0K QEAgLTM3NTksOSArMzc1NCwxNSBAQCBzdGF0aWMgaW50IHNrbF9idWlsZF9waXBlX3dtKHN0cnVj dCBpbnRlbF9jcnRjX3N0YXRlICpjc3RhdGUsCiAJaW50IGxldmVsLCBtYXhfbGV2ZWwgPSBpbGtf d21fbWF4X2xldmVsKGRldik7CiAJaW50IHJldDsKIAorCS8qCisJICogV2UnbGwgb25seSBjYWxj dWxhdGUgd2F0ZXJtYXJrcyBmb3IgcGxhbmVzIHRoYXQgYXJlIGFjdHVhbGx5CisJICogZW5hYmxl ZCwgc28gbWFrZSBzdXJlIGFsbCBvdGhlciBwbGFuZXMgYXJlIHNldCBhcyBkaXNhYmxlZC4KKwkg Ki8KKwltZW1zZXQocGlwZV93bSwgMCwgc2l6ZW9mKCpwaXBlX3dtKSk7CisKIAlmb3IgKGxldmVs ID0gMDsgbGV2ZWwgPD0gbWF4X2xldmVsOyBsZXZlbCsrKSB7CiAJCXJldCA9IHNrbF9jb21wdXRl X3dtX2xldmVsKGRldl9wcml2LCBkZGIsIGNzdGF0ZSwKLQkJCQkJICAgbGV2ZWwsICZwaXBlX3dt LT53bVtsZXZlbF0pOworCQkJCQkgICBsZXZlbCwgcGlwZV93bSk7CiAJCWlmIChyZXQpCiAJCQly ZXR1cm4gcmV0OwogCX0KLS0gCjIuOC4zCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5m cmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0 aW5mby9pbnRlbC1nZngK