From mboxrd@z Thu Jan 1 00:00:00 1970 From: Bob Paauwe Subject: [PATCH] drm/i915/skl: Don't clear all watermarks when updating. (v2) Date: Tue, 21 Jul 2015 10:42:53 -0700 Message-ID: <1437500573-21889-1-git-send-email-bob.j.paauwe@intel.com> References: <1436371553-32370-1-git-send-email-bob.j.paauwe@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTP id 3229F6E52A for ; Tue, 21 Jul 2015 10:41:50 -0700 (PDT) In-Reply-To: <1436371553-32370-1-git-send-email-bob.j.paauwe@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 List-Id: intel-gfx@lists.freedesktop.org Q2xlYXJpbmcgdGhlIHdhdGVybWFya3MgZm9yIGFsbCBwaXBlcy9wbGFuZXMgd2hlbiB1cGRhdGlu ZyB0aGUKd2F0ZXJtYXJrcyBmb3IgYSBzaW5nbGUgQ1JUQyBjaGFuZ2Ugc2VlbXMgbGlrZSB0aGUg d3JvbmcgdGhpbmcgdG8KZG8gaGVyZS4gQXMgaXMsIHRoaXMgY29kZSB3aWxsIG9ueSB1cGRhdGUg YW55IHBpcGUvcGxhbmUgd2F0ZXJtYXJrcwp0aGF0IG5lZWQgdXBkYXRpbmcgYW5kIGxlYXZlIHRo ZSByZW1haW5pbmcgc2V0IHRvIHplcm8uICBMYXRlciwgdGhlCndhdGVybWFyayBjaGVja3MgaW4g Y2hlY2tfd21fc3RhdGUoKSB3aWxsIGZsYWcgdGhlc2UgemVybydkIG91dCBwaXBlL3BsYW5lCndh dGVybWFya3MgYW5kIHRocm93IGVycm9ycy4KCkJ5IGNsZWFyaW5nIG9ubHkgdGhlIHdhdGVybWFy ayB2YWx1ZXMgYXNzb2NpYXRlZCB3aXRoIHRoZSBzcGVjaWZpYyBjcnRjCnRoZSBvdGhlciB3YXRl cm1hcmsgdmFsdWVzIG1heSByZW1haW4gdW5jaGFuZ2VkLgoKdjI6IE1ha2Ugc3VyZSBhbGwgdGhl IGRpcnR5IGZsYWdzIGFyZSBjbGVhcmVkLiBEYW1pZW4KICAgIENsZWFyIGFsbCB2YWx1ZXMgYXNz b2ljYXRlZCB3aXRoIGNydGMvcGlwZSBiZWluZyB1cGRhdGVkLiAgRGFtaWVuCgpTaWduZWQtb2Zm LWJ5OiBCb2IgUGFhdXdlIDxib2Iuai5wYWF1d2VAaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX3BtLmMgfCAyNiArKysrKysrKysrKysrKysrKysrKysrKysrLQogMSBm aWxlIGNoYW5nZWQsIDI1IGluc2VydGlvbnMoKyksIDEgZGVsZXRpb24oLSkKCmRpZmYgLS1naXQg YS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUv aW50ZWxfcG0uYwppbmRleCBhMWQ5MmI3Li4yN2MzMTI2IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF9wbS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Bt LmMKQEAgLTM2NzAsNiArMzY3MCwyNiBAQCBzdGF0aWMgdm9pZCBza2xfdXBkYXRlX290aGVyX3Bp cGVfd20oc3RydWN0IGRybV9kZXZpY2UgKmRldiwKIAl9CiB9CiAKK3N0YXRpYyB2b2lkIHNrbF9j bGVhcl93bShzdHJ1Y3Qgc2tsX3dtX3ZhbHVlcyAqd2F0ZXJtYXJrcywgZW51bSBwaXBlIHBpcGUp Cit7CisJd2F0ZXJtYXJrcy0+d21fbGluZXRpbWVbcGlwZV0gPSAwOworCW1lbXNldCh3YXRlcm1h cmtzLT5wbGFuZVtwaXBlXSwgMCwKKwkgICAgICAgc2l6ZW9mKHVpbnQzMl90KSAqIDggKiBJOTE1 X01BWF9QTEFORVMpOworCW1lbXNldCh3YXRlcm1hcmtzLT5jdXJzb3JbcGlwZV0sIDAsIHNpemVv Zih1aW50MzJfdCkgKiA4KTsKKwltZW1zZXQod2F0ZXJtYXJrcy0+cGxhbmVfdHJhbnNbcGlwZV0s CisJICAgICAgIDAsIHNpemVvZih1aW50MzJfdCkgKiBJOTE1X01BWF9QTEFORVMpOworCXdhdGVy bWFya3MtPmN1cnNvcl90cmFuc1twaXBlXSA9IDA7CisKKwkvKiBDbGVhciBkZGIgZW50cmllcyBm b3IgcGlwZSAqLworCW1lbXNldCgmd2F0ZXJtYXJrcy0+ZGRiLnBpcGVbcGlwZV0sIDAsIHNpemVv ZihzdHJ1Y3Qgc2tsX2RkYl9lbnRyeSkpOworCW1lbXNldCgmd2F0ZXJtYXJrcy0+ZGRiLnBsYW5l W3BpcGVdLCAwLAorCSAgICAgICBzaXplb2Yoc3RydWN0IHNrbF9kZGJfZW50cnkpICogSTkxNV9N QVhfUExBTkVTKTsKKwltZW1zZXQoJndhdGVybWFya3MtPmRkYi55X3BsYW5lW3BpcGVdLCAwLAor CSAgICAgICBzaXplb2Yoc3RydWN0IHNrbF9kZGJfZW50cnkpICogSTkxNV9NQVhfUExBTkVTKTsK KwltZW1zZXQoJndhdGVybWFya3MtPmRkYi5jdXJzb3JbcGlwZV0sIDAsIHNpemVvZihzdHJ1Y3Qg c2tsX2RkYl9lbnRyeSkpOworCit9CisKIHN0YXRpYyB2b2lkIHNrbF91cGRhdGVfd20oc3RydWN0 IGRybV9jcnRjICpjcnRjKQogewogCXN0cnVjdCBpbnRlbF9jcnRjICppbnRlbF9jcnRjID0gdG9f aW50ZWxfY3J0YyhjcnRjKTsKQEAgLTM2ODAsNyArMzcwMCwxMSBAQCBzdGF0aWMgdm9pZCBza2xf dXBkYXRlX3dtKHN0cnVjdCBkcm1fY3J0YyAqY3J0YykKIAlzdHJ1Y3Qgc2tsX3BpcGVfd20gcGlw ZV93bSA9IHt9OwogCXN0cnVjdCBpbnRlbF93bV9jb25maWcgY29uZmlnID0ge307CiAKLQltZW1z ZXQocmVzdWx0cywgMCwgc2l6ZW9mKCpyZXN1bHRzKSk7CisKKwkvKiBDbGVhciBhbGwgZGlydHkg ZmxhZ3MgKi8KKwltZW1zZXQocmVzdWx0cy0+ZGlydHksIDAsIHNpemVvZihib29sKSAqIEk5MTVf TUFYX1BJUEVTKTsKKworCXNrbF9jbGVhcl93bShyZXN1bHRzLCBpbnRlbF9jcnRjLT5waXBlKTsK IAogCXNrbF9jb21wdXRlX3dtX2dsb2JhbF9wYXJhbWV0ZXJzKGRldiwgJmNvbmZpZyk7CiAKLS0g CjIuMS4wCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJ bnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0 cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=