From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Kumar, Mahesh" Subject: [PATCH v3 1/9] drm/i915/skl: pass pipe_wm in skl_compute_(wm_level/plane_wm) functions Date: Fri, 9 Sep 2016 13:30:58 +0530 Message-ID: <20160909080106.17506-2-mahesh1.kumar@intel.com> References: <20160909080106.17506-1-mahesh1.kumar@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by gabe.freedesktop.org (Postfix) with ESMTPS id 882226E723 for ; Fri, 9 Sep 2016 07:57:31 +0000 (UTC) In-Reply-To: <20160909080106.17506-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: paulo.r.zanoni@intel.com List-Id: intel-gfx@lists.freedesktop.org RnJvbTogTWFoZXNoIEt1bWFyIDxtYWhlc2gxLmt1bWFyQGludGVsLmNvbT4KClRoaXMgcGF0Y2gg bWFrZSB1c2Ugb2YgcGxhbmVfd20gdmFyaWFibGUgZGlyZWN0bHkgaW5zdGVhZCBvZiBwYXNzaW5n CnNrbF9wbGFuZV93bSBzdHJ1Y3QuIHRoaXMgd2F5IHJlZHVjZXMgbnVtYmVyIG9mIGFyZ3VtZW50 IHJlcXVpcmVtZW50CmluIHdhdGVybWFyayBjYWxjdWxhdGlvbiBmdW5jdGlvbnMuCgpJdCBhbHNv IGdpdmVzIG1vcmUgZnJlZWRvbSBvZiBkZWNpc2lvbiBtYWtpbmcgdG8gaW1wbGVtZW50IEJzcGVj IFdNCndvcmthcm91bmRzLgoKU2lnbmVkLW9mZi1ieTogTWFoZXNoIEt1bWFyIDxtYWhlc2gxLmt1 bWFyQGludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jIHwgMjkg KysrKysrKysrKysrKysrLS0tLS0tLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCAxNSBpbnNlcnRp b25zKCspLCAxNCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9wbS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYwppbmRleCA4NmM2 ZDY2Li4zZmRlYzRkIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5j CisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMKQEAgLTM1NDIsOSArMzU0Miw3 IEBAIHN0YXRpYyBpbnQgc2tsX2NvbXB1dGVfcGxhbmVfd20oY29uc3Qgc3RydWN0IGRybV9pOTE1 X3ByaXZhdGUgKmRldl9wcml2LAogCQkJCXN0cnVjdCBpbnRlbF9wbGFuZV9zdGF0ZSAqaW50ZWxf cHN0YXRlLAogCQkJCXVpbnQxNl90IGRkYl9hbGxvY2F0aW9uLAogCQkJCWludCBsZXZlbCwKLQkJ CQl1aW50MTZfdCAqb3V0X2Jsb2NrcywgLyogb3V0ICovCi0JCQkJdWludDhfdCAqb3V0X2xpbmVz LCAvKiBvdXQgKi8KLQkJCQlib29sICplbmFibGVkIC8qIG91dCAqLykKKwkJCQlzdHJ1Y3Qgc2ts X3BpcGVfd20gKnBpcGVfd20pCiB7CiAJc3RydWN0IGRybV9wbGFuZV9zdGF0ZSAqcHN0YXRlID0g JmludGVsX3BzdGF0ZS0+YmFzZTsKIAlzdHJ1Y3QgZHJtX2ZyYW1lYnVmZmVyICpmYiA9IHBzdGF0 ZS0+ZmI7CkBAIC0zNTU3LDYgKzM1NTUsMTEgQEAgc3RhdGljIGludCBza2xfY29tcHV0ZV9wbGFu ZV93bShjb25zdCBzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCiAJdWludDMyX3Qg d2lkdGggPSAwLCBoZWlnaHQgPSAwOwogCXVpbnQzMl90IHBsYW5lX3BpeGVsX3JhdGU7CiAJdWlu dDMyX3QgeV90aWxlX21pbmltdW0sIHlfbWluX3NjYW5saW5lczsKKwlpbnQgaWQgPSBza2xfd21f cGxhbmVfaWQodG9faW50ZWxfcGxhbmUocHN0YXRlLT5wbGFuZSkpOworCXN0cnVjdCBza2xfd21f bGV2ZWwgKnJlc3VsdCA9ICZwaXBlX3dtLT53bVtsZXZlbF07CisJdWludDE2X3QgKm91dF9ibG9j a3MgPSAmcmVzdWx0LT5wbGFuZV9yZXNfYltpZF07CisJdWludDhfdCAqb3V0X2xpbmVzID0gJnJl c3VsdC0+cGxhbmVfcmVzX2xbaWRdOworCWJvb2wgKmVuYWJsZWQgPSAmcmVzdWx0LT5wbGFuZV9l bltpZF07CiAKIAlpZiAobGF0ZW5jeSA9PSAwIHx8ICFjc3RhdGUtPmJhc2UuYWN0aXZlIHx8ICFp bnRlbF9wc3RhdGUtPmJhc2UudmlzaWJsZSkgewogCQkqZW5hYmxlZCA9IGZhbHNlOwpAQCAtMzY3 Myw3ICszNjc2LDcgQEAgc2tsX2NvbXB1dGVfd21fbGV2ZWwoY29uc3Qgc3RydWN0IGRybV9pOTE1 X3ByaXZhdGUgKmRldl9wcml2LAogCQkgICAgIHN0cnVjdCBza2xfZGRiX2FsbG9jYXRpb24gKmRk YiwKIAkJICAgICBzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3N0YXRlLAogCQkgICAgIGludCBs ZXZlbCwKLQkJICAgICBzdHJ1Y3Qgc2tsX3dtX2xldmVsICpyZXN1bHQpCisJCSAgICAgc3RydWN0 IHNrbF9waXBlX3dtICpwaXBlX3dtKQogewogCXN0cnVjdCBkcm1fYXRvbWljX3N0YXRlICpzdGF0 ZSA9IGNzdGF0ZS0+YmFzZS5zdGF0ZTsKIAlzdHJ1Y3QgaW50ZWxfY3J0YyAqaW50ZWxfY3J0YyA9 IHRvX2ludGVsX2NydGMoY3N0YXRlLT5iYXNlLmNydGMpOwpAQCAtMzY4NCwxMiArMzY4Nyw2IEBA IHNrbF9jb21wdXRlX3dtX2xldmVsKGNvbnN0IHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZf cHJpdiwKIAllbnVtIHBpcGUgcGlwZSA9IGludGVsX2NydGMtPnBpcGU7CiAJaW50IHJldDsKIAot CS8qCi0JICogV2UnbGwgb25seSBjYWxjdWxhdGUgd2F0ZXJtYXJrcyBmb3IgcGxhbmVzIHRoYXQg YXJlIGFjdHVhbGx5Ci0JICogZW5hYmxlZCwgc28gbWFrZSBzdXJlIGFsbCBvdGhlciBwbGFuZXMg YXJlIHNldCBhcyBkaXNhYmxlZC4KLQkgKi8KLQltZW1zZXQocmVzdWx0LCAwLCBzaXplb2YoKnJl c3VsdCkpOwotCiAJZm9yX2VhY2hfaW50ZWxfcGxhbmVfbWFzaygmZGV2X3ByaXYtPmRybSwKIAkJ CQkgIGludGVsX3BsYW5lLAogCQkJCSAgY3N0YXRlLT5iYXNlLnBsYW5lX21hc2spIHsKQEAgLTM3 MjcsOSArMzcyNCw3IEBAIHNrbF9jb21wdXRlX3dtX2xldmVsKGNvbnN0IHN0cnVjdCBkcm1faTkx NV9wcml2YXRlICpkZXZfcHJpdiwKIAkJCQkJICAgaW50ZWxfcHN0YXRlLAogCQkJCQkgICBkZGJf YmxvY2tzLAogCQkJCQkgICBsZXZlbCwKLQkJCQkJICAgJnJlc3VsdC0+cGxhbmVfcmVzX2JbaV0s Ci0JCQkJCSAgICZyZXN1bHQtPnBsYW5lX3Jlc19sW2ldLAotCQkJCQkgICAmcmVzdWx0LT5wbGFu ZV9lbltpXSk7CisJCQkJCSAgIHBpcGVfd20pOwogCQlpZiAocmV0KQogCQkJcmV0dXJuIHJldDsK IAl9CkBAIC0zNzc3LDkgKzM3NzIsMTUgQEAgc3RhdGljIGludCBza2xfYnVpbGRfcGlwZV93bShz dHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3N0YXRlLAogCWludCBsZXZlbCwgbWF4X2xldmVsID0g aWxrX3dtX21heF9sZXZlbChkZXYpOwogCWludCByZXQ7CiAKKwkvKgorCSAqIFdlJ2xsIG9ubHkg Y2FsY3VsYXRlIHdhdGVybWFya3MgZm9yIHBsYW5lcyB0aGF0IGFyZSBhY3R1YWxseQorCSAqIGVu YWJsZWQsIHNvIG1ha2Ugc3VyZSBhbGwgb3RoZXIgcGxhbmVzIGFyZSBzZXQgYXMgZGlzYWJsZWQu CisJICovCisJbWVtc2V0KHBpcGVfd20sIDAsIHNpemVvZigqcGlwZV93bSkpOworCiAJZm9yIChs ZXZlbCA9IDA7IGxldmVsIDw9IG1heF9sZXZlbDsgbGV2ZWwrKykgewogCQlyZXQgPSBza2xfY29t cHV0ZV93bV9sZXZlbChkZXZfcHJpdiwgZGRiLCBjc3RhdGUsCi0JCQkJCSAgIGxldmVsLCAmcGlw ZV93bS0+d21bbGV2ZWxdKTsKKwkJCQkJICAgbGV2ZWwsIHBpcGVfd20pOwogCQlpZiAocmV0KQog CQkJcmV0dXJuIHJldDsKIAl9Ci0tIAoyLjguMwoKX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlz dHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4v bGlzdGluZm8vaW50ZWwtZ2Z4Cg==