From: Matt Roper Subject: [PATCH] drm/i915: Don't WARN() when sprite watermark > 0 for disabled LP2/LP3 levels Date: Thu, 3 Mar 2016 14:18:09 -0800 Message-ID: <1457043489-12885-1-git-send-email-matthew.d.roper@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by gabe.freedesktop.org (Postfix) with ESMTP id 497736E069 for ; Thu, 3 Mar 2016 22:18:22 +0000 (UTC) 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 Zanoni List-Id: intel-gfx@lists.freedesktop.org QXMgb2YgY29tbWl0IGQ4MWYwNGM1ZWYgKCJkcm0vaTkxNTogQWxsb3cgcHJlc2VydmF0aW9uIG9m IHdhdGVybWFya3MsIHYyLiIpCml0J3Mgbm93IHBvc3NpYmxlIHRvIGhhdmUgbm9uLXplcm8gdmFs dWVzIGZvciB3YXRlcm1hcmsgbGV2ZWxzIHRoYXQgYXJlCmRpc2FibGVkIChlLmcuLCBpbiB0aGUg aGlnaGVyIExQIGxldmVscyB0aGF0IGNhbiBvbmx5IGJlIHVzZWQgd2hlbiB0aGUgc3ByaXRlCmlz IGRpc2FibGVkKS4gIFN0b3AgV0FSTigpJ2luZyB3aGVuIHdlIHNlZSB0aGVzZSBub24temVybyBz cHJpdGUgdmFsdWVzIGluIExQMgpvciBMUDMuCgpGaXhlcyB0aGUgU05CIHdhcm5pbmc6CgogICBX QVJOSU5HOiBDUFU6IDEgUElEOiAyNTQwNSBhdCAvaG9tZS9tYXR0cm9wZS93b3JrL2tlcm5lbC9n bXMvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYzoyNTgwIGlsa19wcm9ncmFtX3dhdGVy bWFya3MrMHg3YjIvMHg5ZDAgW2k5MTVdKCkKICAgV0FSTl9PTih3bV9scCAhPSAxKQogICBNb2R1 bGVzIGxpbmtlZCBpbjogaTkxNSBkcm1fa21zX2hlbHBlciBkcm0gYmx1ZXRvb3RoIGZ1c2UgaVRD T193ZHQgaVRDT192ZW5kb3Jfc3VwcG9ydCBzeXNjb3B5YXJlYSBzeXNmaWxscmVjdCBzeXNpbWdi bHQgZmJfc3lzX2ZvcHMgdHBtX3RpcyBtZWlfbWUgZTEwMDBlIHNuZF9oZGFfY29kZWNfaGRtaSBw Y3Nwa3IgdHBtIG1laSBpMmNfaTgwMSBscGNfaWNoIHNuZF9oZGFfY29kZWMgc25kX2hkYV9jb3Jl IFtsYXN0IHVubG9hZGVkOiBkcm1dCiAgIENQVTogMSBQSUQ6IDI1NDA1IENvbW06IGttc191bml2 ZXJzYWxfcCBUYWludGVkOiBHICAgICBVICBXICAgICAgIDQuNS4wLXJjNmFwb2xsb2xha2UrICM0 NjIKICAgSGFyZHdhcmUgbmFtZTogICAgICAgICAgICAgICAgICAvREg2N0dELCBCSU9TIEJMSDY3 MTBILjg2QS4wMTYwLjIwMTIuMTIwNC4xMTU2IDEyLzA0LzIwMTIKICAgIDAwMDAwMDAwMDAwMDAw MDAgZmZmZjg4MDA5ZDQyYjkxOCBmZmZmZmZmZjgxNDNjZmFiIGZmZmY4ODAwOWQ0MmI5NjAKICAg IGZmZmZmZmZmYTAzNjM1ODAgZmZmZjg4MDA5ZDQyYjk1MCBmZmZmZmZmZjgxMDgyNzQ2IGZmZmY4 ODAwYjlhMjQ5MjgKICAgIGZmZmY4ODAwOWQ0MmJhMDAgZmZmZjg4MDA5ZDRhMDAwMCAwMDAwMDAw MDAwMDAwMDAwIGZmZmY4ODAwOWQ0MmJhNmMKICAgQ2FsbCBUcmFjZToKICAgIFs8ZmZmZmZmZmY4 MTQzY2ZhYj5dIGR1bXBfc3RhY2srMHg0ZC8weDcyCiAgICBbPGZmZmZmZmZmODEwODI3NDY+XSB3 YXJuX3Nsb3dwYXRoX2NvbW1vbisweDg2LzB4YzAKICAgIFs8ZmZmZmZmZmY4MTA4MjdjYz5dIHdh cm5fc2xvd3BhdGhfZm10KzB4NGMvMHg1MAogICAgWzxmZmZmZmZmZmEwMjkyODYyPl0gaWxrX3By b2dyYW1fd2F0ZXJtYXJrcysweDdiMi8weDlkMCBbaTkxNV0KICAgIFs8ZmZmZmZmZmZhMDI5MmNi Nz5dIGlsa19pbml0aWFsX3dhdGVybWFya3MrMHgxMDcvMHgxMjAgW2k5MTVdCiAgICBbPGZmZmZm ZmZmYTAyZmVmZmE+XSBpbnRlbF9wcmVfcGxhbmVfdXBkYXRlKzB4MTJhLzB4MTkwIFtpOTE1XQog ICAgWzxmZmZmZmZmZmEwMmZmYjM2Pl0gaW50ZWxfYXRvbWljX2NvbW1pdCsweDU0Ni8weGQ1MCBb aTkxNV0KICAgIFs8ZmZmZmZmZmZhMDEyYzllNz5dIGRybV9hdG9taWNfY29tbWl0KzB4MzcvMHg2 MCBbZHJtXQogICAgWzxmZmZmZmZmZmEwMjE3MzYxPl0gZHJtX2F0b21pY19oZWxwZXJfZGlzYWJs ZV9wbGFuZSsweGIxLzB4ZjAgW2RybV9rbXNfaGVscGVyXQogICAgWzxmZmZmZmZmZmEwMTFjZGI0 Pl0gX19zZXRwbGFuZV9pbnRlcm5hbCsweDE4NC8weDI4MCBbZHJtXQogICAgWzxmZmZmZmZmZmEw MTJiNTdhPl0gPyBkcm1fbW9kZXNldF9sb2NrX2FsbF9jdHgrMHg5YS8weGIwIFtkcm1dCiAgICBb PGZmZmZmZmZmYTAxMjAxMGY+XSBkcm1fbW9kZV9zZXRwbGFuZSsweDEzZi8weDFjMCBbZHJtXQog ICAgWzxmZmZmZmZmZmEwMTExYjUyPl0gZHJtX2lvY3RsKzB4MTQyLzB4NTkwIFtkcm1dCiAgICBb PGZmZmZmZmZmYTAxMWZmZDA+XSA/IGRybV9wbGFuZV9jaGVja19waXhlbF9mb3JtYXQrMHg1MC8w eDUwIFtkcm1dCiAgICBbPGZmZmZmZmZmODExZjI3NDQ+XSA/IG1udHB1dCsweDI0LzB4NDAKICAg IFs8ZmZmZmZmZmY4MTFkMjhkND5dID8gX19mcHV0KzB4MTk0LzB4MjAwCiAgICBbPGZmZmZmZmZm YTAxMmRlYzM+XSBkcm1fY29tcGF0X2lvY3RsKzB4MzMvMHg0MCBbZHJtXQogICAgWzxmZmZmZmZm ZmEwMjllMWMyPl0gaTkxNV9jb21wYXRfaW9jdGwrMHgzMi8weDQwIFtpOTE1XQogICAgWzxmZmZm ZmZmZjgxMjI4ZDcyPl0gY29tcGF0X1N5U19pb2N0bCsweGMyLzB4MzMwCiAgICBbPGZmZmZmZmZm ODEwMDIxZDU+XSA/IGV4aXRfdG9fdXNlcm1vZGVfbG9vcCsweDk1LzB4YjAKICAgIFs8ZmZmZmZm ZmY4MTAwMmQyZT5dIGRvX2Zhc3Rfc3lzY2FsbF8zMisweDllLzB4MjEwCiAgICBbPGZmZmZmZmZm ODE5N2ZhZjI+XSBlbnRyeV9TWVNFTlRFUl9jb21wYXQrMHg1Mi8weDcwCgpDYzogTWFhcnRlbiBM YW5raG9yc3QgPG1hYXJ0ZW4ubGFua2hvcnN0QGxpbnV4LmludGVsLmNvbT4KQ2M6IFBhdWxvIFph bm9uaSA8cGF1bG8uci56YW5vbmlAaW50ZWwuY29tPgpDYzogVmlsbGUgU3lyasOkbMOkIDx2aWxs ZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KVGVzdGNhc2U6IGttc191bml2ZXJzYWxfcGxhbmUK Rml4ZXM6IGQ4MWYwNGM1ZWYgKCJkcm0vaTkxNTogQWxsb3cgcHJlc2VydmF0aW9uIG9mIHdhdGVy bWFya3MsIHYyLiIpClNpZ25lZC1vZmYtYnk6IE1hdHQgUm9wZXIgPG1hdHRoZXcuZC5yb3BlckBp bnRlbC5jb20+Ci0tLQpUaGUgY29tbWVudCBhYm92ZSB0aGlzIGJsb2NrIG9mIGNvZGUgaW5kaWNh dGVzIHRoYXQgd2UgbmVlZCB0byB0dXJuIG9uCldNMVNfTFBfRU4sIGV2ZW4gaWYgdGhlIExQIGxl dmVsIGlzIGRpc2FibGVkLCB0byBhdm9pZCB1bmRlcnJ1bnMuICBJdCdzIG5vdApjbGVhciB0byBt ZSBmcm9tIHRoZSBic3BlYyB3aHkgdGhpcyBpcywgc28gSSdtIHRydXN0aW5nIHRoYXQgdGhlIGNv bW1lbnQKaXMgc3RpbGwgYWNjdXJhdGUsIGV2ZW4gdGhvdWdoIHdlIHdpbmQgdXAgd2l0aCBub24t emVybyB2YWx1ZXMgbW9yZSBvZnRlbgpub3cgdGhhbiB3ZSBwcmV2aW91c2x5IGRpZC4KCiBkcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jIHwgNSArKy0tLQogMSBmaWxlIGNoYW5nZWQsIDIg aW5zZXJ0aW9ucygrKSwgMyBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF9wbS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYwppbmRl eCA4MjM0MzdmLi45Njk4MzYwIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9wbS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMKQEAgLTI1NzYsMTAg KzI1NzYsOSBAQCBzdGF0aWMgdm9pZCBpbGtfY29tcHV0ZV93bV9yZXN1bHRzKHN0cnVjdCBkcm1f ZGV2aWNlICpkZXYsCiAJCSAqIEFsd2F5cyBzZXQgV00xU19MUF9FTiB3aGVuIHNwcl92YWwgIT0g MCwgZXZlbiBpZiB0aGUKIAkJICogbGV2ZWwgaXMgZGlzYWJsZWQuIERvaW5nIG90aGVyd2lzZSBj b3VsZCBjYXVzZSB1bmRlcnJ1bnMuCiAJCSAqLwotCQlpZiAoSU5URUxfSU5GTyhkZXYpLT5nZW4g PD0gNiAmJiByLT5zcHJfdmFsKSB7Ci0JCQlXQVJOX09OKHdtX2xwICE9IDEpOworCQlpZiAoSU5U RUxfSU5GTyhkZXYpLT5nZW4gPD0gNiAmJiByLT5zcHJfdmFsKQogCQkJcmVzdWx0cy0+d21fbHBf c3ByW3dtX2xwIC0gMV0gPSBXTTFTX0xQX0VOIHwgci0+c3ByX3ZhbDsKLQkJfSBlbHNlCisJCWVs c2UKIAkJCXJlc3VsdHMtPndtX2xwX3Nwclt3bV9scCAtIDFdID0gci0+c3ByX3ZhbDsKIAl9CiAK LS0gCjIuMS40CgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f XwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcK aHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK