From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ben Widawsky Subject: [PATCH 1/5] drm/i915: Cleanup some of the CSB handling Date: Tue, 5 Jan 2016 10:30:05 -0800 Message-ID: <1452018609-10142-2-git-send-email-benjamin.widawsky@intel.com> References: <1452018609-10142-1-git-send-email-benjamin.widawsky@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTP id 2773A6E1D1 for ; Tue, 5 Jan 2016 10:30:34 -0800 (PST) In-Reply-To: <1452018609-10142-1-git-send-email-benjamin.widawsky@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 Cc: Ben Widawsky List-Id: intel-gfx@lists.freedesktop.org SSB0aGluayB0aGlzIHBhdGNoIGlzIGEgd29ydGh3aGlsZSBjbGVhbnVwIGV2ZW4gaWYgaXQgbWln aHQgbG9vayBvbmx5IG1hcmdpbmFsbHkKdXNlZnVsLiBJdCBnZXRzIG1vcmUgdXNlZnVsIGluIHVw Y29taW5nIHBhdGNoZXMgYW5kIGZvciBoYW5kbGluZyBvZiBmdXR1cmUgR0VOCnBsYXRmb3Jtcy4K ClRoZSBvbmx5IG5vbi1tZWNoYW5pY2FsIHBhcnQgb2YgdGhpcyBpcyB0aGUgcmVtb3ZhbCBvZiB0 aGUgZXh0cmEgJiBvcGVyYXRpb24gb24KdGhlIHJpbmctPm5leHRfY29udGV4dF9zdGF0dXNfYnVm ZmVyLiBUaGlzIGlzIHNhZmUgYmVjYXVzZSByaWdodCBhYm92ZSB0aGlzLCB3ZQphbHJlYWR5IGRp ZCBhIG1vZHVsdXMgb3BlcmF0aW9uLgoKU2lnbmVkLW9mZi1ieTogQmVuIFdpZGF3c2t5IDxiZW5q YW1pbi53aWRhd3NreUBpbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9k ZWJ1Z2ZzLmMgfCAgNiArKystLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5jICAg IHwgMTUgKysrKysrKysrLS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuaCAg ICB8IDE4ICsrKysrKysrKysrKysrKystLQogMyBmaWxlcyBjaGFuZ2VkLCAyOCBpbnNlcnRpb25z KCspLCAxMSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p OTE1X2RlYnVnZnMuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZGVidWdmcy5jCmluZGV4 IDBmYzM4YmIuLjNiMDViZDEgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVf ZGVidWdmcy5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZGVidWdmcy5jCkBAIC0y MDkyLDEzICsyMDkyLDEzIEBAIHN0YXRpYyBpbnQgaTkxNV9leGVjbGlzdHMoc3RydWN0IHNlcV9m aWxlICptLCB2b2lkICpkYXRhKQogCQlzZXFfcHJpbnRmKG0sICJcdFN0YXR1cyBwb2ludGVyOiAw eCUwOFhcbiIsIHN0YXR1c19wb2ludGVyKTsKIAogCQlyZWFkX3BvaW50ZXIgPSByaW5nLT5uZXh0 X2NvbnRleHRfc3RhdHVzX2J1ZmZlcjsKLQkJd3JpdGVfcG9pbnRlciA9IHN0YXR1c19wb2ludGVy ICYgMHgwNzsKKwkJd3JpdGVfcG9pbnRlciA9IEdFTjhfQ1NCX1dSSVRFX1BUUihzdGF0dXNfcG9p bnRlcik7CiAJCWlmIChyZWFkX3BvaW50ZXIgPiB3cml0ZV9wb2ludGVyKQotCQkJd3JpdGVfcG9p bnRlciArPSA2OworCQkJd3JpdGVfcG9pbnRlciArPSBHRU44X0NTQl9FTlRSSUVTOwogCQlzZXFf cHJpbnRmKG0sICJcdFJlYWQgcG9pbnRlcjogMHglMDhYLCB3cml0ZSBwb2ludGVyIDB4JTA4WFxu IiwKIAkJCSAgIHJlYWRfcG9pbnRlciwgd3JpdGVfcG9pbnRlcik7CiAKLQkJZm9yIChpID0gMDsg aSA8IDY7IGkrKykgeworCQlmb3IgKGkgPSAwOyBpIDwgR0VOOF9DU0JfRU5UUklFUzsgaSsrKSB7 CiAJCQlzdGF0dXMgPSBJOTE1X1JFQUQoUklOR19DT05URVhUX1NUQVRVU19CVUZfTE8ocmluZywg aSkpOwogCQkJY3R4X2lkID0gSTkxNV9SRUFEKFJJTkdfQ09OVEVYVF9TVEFUVVNfQlVGX0hJKHJp bmcsIGkpKTsKIApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMg Yi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuYwppbmRleCA4MDk2YzZhLi43ZmIyMDM1 IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuYworKysgYi9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuYwpAQCAtNTE2LDcgKzUxNiw3IEBAIHZvaWQgaW50 ZWxfbHJjX2lycV9oYW5kbGVyKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcpCiAJc3RhdHVz X3BvaW50ZXIgPSBJOTE1X1JFQUQoUklOR19DT05URVhUX1NUQVRVU19QVFIocmluZykpOwogCiAJ cmVhZF9wb2ludGVyID0gcmluZy0+bmV4dF9jb250ZXh0X3N0YXR1c19idWZmZXI7Ci0Jd3JpdGVf cG9pbnRlciA9IHN0YXR1c19wb2ludGVyICYgR0VOOF9DU0JfUFRSX01BU0s7CisJd3JpdGVfcG9p bnRlciA9IEdFTjhfQ1NCX1dSSVRFX1BUUihzdGF0dXNfcG9pbnRlcik7CiAJaWYgKHJlYWRfcG9p bnRlciA+IHdyaXRlX3BvaW50ZXIpCiAJCXdyaXRlX3BvaW50ZXIgKz0gR0VOOF9DU0JfRU5UUklF UzsKIApAQCAtNTU5LDEwICs1NTksMTEgQEAgdm9pZCBpbnRlbF9scmNfaXJxX2hhbmRsZXIoc3Ry dWN0IGludGVsX2VuZ2luZV9jcyAqcmluZykKIAlXQVJOKHN1Ym1pdF9jb250ZXh0cyA+IDIsICJN b3JlIHRoYW4gdHdvIGNvbnRleHQgY29tcGxldGUgZXZlbnRzP1xuIik7CiAJcmluZy0+bmV4dF9j b250ZXh0X3N0YXR1c19idWZmZXIgPSB3cml0ZV9wb2ludGVyICUgR0VOOF9DU0JfRU5UUklFUzsK IAorCS8qIFVwZGF0ZSB0aGUgcmVhZCBwb2ludGVyIHRvIHRoZSBvbGQgd3JpdGUgcG9pbnRlci4g TWFudWFsIHJpbmdidWZmZXIKKwkgKiBtYW5hZ2VtZW50IGZ0dyA8L3NhcmNhc20+ICovCiAJSTkx NV9XUklURShSSU5HX0NPTlRFWFRfU1RBVFVTX1BUUihyaW5nKSwKLQkJICAgX01BU0tFRF9GSUVM RChHRU44X0NTQl9QVFJfTUFTSyA8PCA4LAotCQkJCSAoKHUzMilyaW5nLT5uZXh0X2NvbnRleHRf c3RhdHVzX2J1ZmZlciAmCi0JCQkJICBHRU44X0NTQl9QVFJfTUFTSykgPDwgOCkpOworCQkgICBf TUFTS0VEX0ZJRUxEKEdFTjhfQ1NCX1JFQURfUFRSX01BU0ssCisJCQkJIHJpbmctPm5leHRfY29u dGV4dF9zdGF0dXNfYnVmZmVyIDw8IDgpKTsKIH0KIAogc3RhdGljIGludCBleGVjbGlzdHNfY29u dGV4dF9xdWV1ZShzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcXVlc3QpCkBAIC0xNTA2 LDkgKzE1MDcsMTEgQEAgc3RhdGljIGludCBnZW44X2luaXRfY29tbW9uX3Jpbmcoc3RydWN0IGlu dGVsX2VuZ2luZV9jcyAqcmluZykKIAkgKiAgICAgIHwgU3VzcGVuZC10by1pZGxlIChmcmVlemUp IHwgU3VzcGVuZC10by1SQU0gKG1lbSkgfAogCSAqIEJEVyAgfCBDU0IgcmVncyBub3QgcmVzZXQg ICAgICAgfCBDU0IgcmVncyByZXNldCAgICAgICB8CiAJICogQ0hUICB8IENTQiByZWdzIG5vdCBy ZXNldCAgICAgICB8IENTQiByZWdzIG5vdCByZXNldCAgIHwKKwkgKiBTS0wgIHwgICAgICAgICA/ ICAgICAgICAgICAgICAgIHwgICAgICAgICA/ICAgICAgICAgICAgfAorCSAqIEJYVCAgfCAgICAg ICAgID8gICAgICAgICAgICAgICAgfCAgICAgICAgID8gICAgICAgICAgICB8CiAJICovCi0JbmV4 dF9jb250ZXh0X3N0YXR1c19idWZmZXJfaHcgPSAoSTkxNV9SRUFEKFJJTkdfQ09OVEVYVF9TVEFU VVNfUFRSKHJpbmcpKQotCQkJCQkJICAgJiBHRU44X0NTQl9QVFJfTUFTSyk7CisJbmV4dF9jb250 ZXh0X3N0YXR1c19idWZmZXJfaHcgPQorCQlHRU44X0NTQl9XUklURV9QVFIoSTkxNV9SRUFEKFJJ TkdfQ09OVEVYVF9TVEFUVVNfUFRSKHJpbmcpKSk7CiAKIAkvKgogCSAqIFdoZW4gdGhlIENTQiBy ZWdpc3RlcnMgYXJlIHJlc2V0IChhbHNvIGFmdGVyIHBvd2VyLXVwIC8gZ3B1IHJlc2V0KSwKZGlm ZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5oIGIvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfbHJjLmgKaW5kZXggYWU5MGY4Ni4uZGU0MWFkNiAxMDA2NDQKLS0tIGEv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfbHJjLmgKQEAgLTI1LDggKzI1LDYgQEAKICNkZWZpbmUgX0lOVEVMX0xSQ19IXwog CiAjZGVmaW5lIEdFTjhfTFJfQ09OVEVYVF9BTElHTiA0MDk2Ci0jZGVmaW5lIEdFTjhfQ1NCX0VO VFJJRVMgNgotI2RlZmluZSBHRU44X0NTQl9QVFJfTUFTSyAweDA3CiAKIC8qIEV4ZWNsaXN0cyBy ZWdzICovCiAjZGVmaW5lIFJJTkdfRUxTUChyaW5nKQkJCQlfTU1JTygocmluZyktPm1taW9fYmFz ZSArIDB4MjMwKQpAQCAtNDAsNiArMzgsMjIgQEAKICNkZWZpbmUgUklOR19DT05URVhUX1NUQVRV U19CVUZfSEkocmluZywgaSkJX01NSU8oKHJpbmcpLT5tbWlvX2Jhc2UgKyAweDM3MCArIChpKSAq IDggKyA0KQogI2RlZmluZSBSSU5HX0NPTlRFWFRfU1RBVFVTX1BUUihyaW5nKQkJX01NSU8oKHJp bmcpLT5tbWlvX2Jhc2UgKyAweDNhMCkKIAorLyogVGhlIGRvY3Mgc3BlY2lmeSB0aGF0IHRoZSB3 cml0ZSBwb2ludGVyIHdyYXBzIGFyb3VuZCBhZnRlciA1aCwgIkFmdGVyIHN0YXR1cworICogaXMg d3JpdHRlbiBvdXQgdG8gdGhlIGxhc3QgYXZhaWxhYmxlIHN0YXR1cyBRVyBhdCBvZmZzZXQgNWgs IHRoaXMgcG9pbnRlcgorICogd3JhcHMgdG8gMC4iCisgKgorICogVGhlcmVmb3JlLCBvbmUgbXVz dCBpbmZlciB0aGFuIGV2ZW4gdGhvdWdoIHRoZXJlIGFyZSAzIGJpdHMgYXZhaWxhYmxlLCA2IGFu ZAorICogNyBhcHBlYXIgdG8gYmUgKiByZXNlcnZlZC4KKyAqLworI2RlZmluZSBHRU44X0NTQl9F TlRSSUVTIDYKKyNkZWZpbmUgR0VOOF9DU0JfUFRSX01BU0sgMHg3CisjZGVmaW5lIEdFTjhfQ1NC X1JFQURfUFRSX01BU0sgKEdFTjhfQ1NCX1BUUl9NQVNLIDw8IDgpCisjZGVmaW5lIEdFTjhfQ1NC X1dSSVRFX1BUUl9NQVNLIChHRU44X0NTQl9QVFJfTUFTSyA8PCAwKQorI2RlZmluZSBHRU44X0NT Ql9XUklURV9QVFIoY3NiX3N0YXR1cykgXAorCSgoKGNzYl9zdGF0dXMpICYgR0VOOF9DU0JfV1JJ VEVfUFRSX01BU0spID4+IDApCisjZGVmaW5lIEdFTjhfQ1NCX1JFQURfUFRSKGNzYl9zdGF0dXMp IFwKKwkoKChjc2Jfc3RhdHVzKSAmIEdFTjhfQ1NCX1JFQURfUFRSX01BU0spID4+IDgpCisKIC8q IExvZ2ljYWwgUmluZ3MgKi8KIGludCBpbnRlbF9sb2dpY2FsX3JpbmdfYWxsb2NfcmVxdWVzdF9l eHRyYXMoc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXF1ZXN0KTsKIGludCBpbnRlbF9s b2dpY2FsX3JpbmdfcmVzZXJ2ZV9zcGFjZShzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJl cXVlc3QpOwotLSAKMi42LjQKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNr dG9wLm9yZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50 ZWwtZ2Z4Cg==