From mboxrd@z Thu Jan 1 00:00:00 1970 From: Rodrigo Vivi Subject: [PATCH] drm/i915: Make wa_tail_dwords flexible for future platforms. Date: Mon, 25 Jan 2016 11:29:19 -0800 Message-ID: <1453750159-26475-1-git-send-email-rodrigo.vivi@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTP id 4383C6E17E for ; Mon, 25 Jan 2016 11:26:46 -0800 (PST) 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: Ben Widawsky , Rodrigo Vivi List-Id: intel-gfx@lists.freedesktop.org Q29tbWl0IDdjMTdkMzc3MyAoZHJtL2k5MTU6IFVzZSBvcmRlcmVkIHNlcW5vIHdyaXRlIGludGVy cnVwdCBnZW5lcmF0aW9uCm9uIGdlbjgrIGV4ZWNsaXN0cykgbW92ZWQgdHdvIE1JX05PT1BzIHRv IHRoZSBhZHZhbmNlX2FuZF9zdWJtaXQgZnVuY3Rpb25zCmFuZCBoYXJkY29kZWQgdGhlIFdBX1RB SUxfRFdPUkRTLiBXaXRoIHRoaXMgd2UgZG9uJ3QgaGF2ZSBhIGNsZWFuIHdheSB0bwppbXBsZW1l bnQgb3IgcmVtb3ZlIFdhSWRsZUxpdGVSZXN0b3JlIGZvciBkaWZmZXJlbnQgcGxhdGZvcm1zLgoK VGhpcyBwYXRjaCBhaW1zIHRvIGxldCBpdCBtb3JlIGZsZXhpYmxlLiBTbyB3ZSBqdXN0IGVtaXQg dGhlIE5PT1BzCmVxdWl2YWxlbnQgb2Ygd2hhdCB3YXMgaW5pdGlhbGl6ZWQuCgpBbHNvIGxldCdz IGp1c3QgaW5jbHVkZSB0aGUgcGxhdGZvcm1zIHdlIGtub3cgdGhhdCBuZWVkcyB0aGlzIFdhLApp LmUgZ2VuOCBhbmQgZ2VuOSBwbGF0Zm9ybXMuCgpDYzogQ2hyaXMgV2lsc29uIDxjaHJpc0BjaHJp cy13aWxzb24uY28udWs+CkNjOiBCZW4gV2lkYXdza3kgPGJlbmphbWluLndpZGF3c2t5QGludGVs LmNvbT4KClNpZ25lZC1vZmYtYnk6IFJvZHJpZ28gVml2aSA8cm9kcmlnby52aXZpQGludGVsLmNv bT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuYyAgICAgICAgfCAzMSArKysr KysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9y aW5nYnVmZmVyLmggfCAgMiArKwogMiBmaWxlcyBjaGFuZ2VkLCAxOSBpbnNlcnRpb25zKCspLCAx NCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9s cmMuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5jCmluZGV4IGRhOTdiYzUuLmQw YjI1M2QgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5jCisrKyBi L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5jCkBAIC03NjQsMTggKzc2NCwxOCBAQCBp bnRlbF9sb2dpY2FsX3JpbmdfYWR2YW5jZV9hbmRfc3VibWl0KHN0cnVjdCBkcm1faTkxNV9nZW1f cmVxdWVzdCAqcmVxdWVzdCkKIHsKIAlzdHJ1Y3QgaW50ZWxfcmluZ2J1ZmZlciAqcmluZ2J1ZiA9 IHJlcXVlc3QtPnJpbmdidWY7CiAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0g cmVxdWVzdC0+aTkxNTsKKwlpbnQgaTsKIAogCWludGVsX2xvZ2ljYWxfcmluZ19hZHZhbmNlKHJp bmdidWYpOwogCXJlcXVlc3QtPnRhaWwgPSByaW5nYnVmLT50YWlsOwogCiAJLyoKLQkgKiBIZXJl IHdlIGFkZCB0d28gZXh0cmEgTk9PUHMgYXMgcGFkZGluZyB0byBhdm9pZAorCSAqIEhlcmUgd2Ug YWRkIGV4dHJhIE5PT1BzIGFzIHBhZGRpbmcgdG8gYXZvaWQKIAkgKiBsaXRlIHJlc3RvcmUgb2Yg YSBjb250ZXh0IHdpdGggSEVBRD09VEFJTC4KLQkgKgotCSAqIENhbGxlciBtdXN0IHJlc2VydmUg V0FfVEFJTF9EV09SRFMgZm9yIHVzIQogCSAqLwotCWludGVsX2xvZ2ljYWxfcmluZ19lbWl0KHJp bmdidWYsIE1JX05PT1ApOwotCWludGVsX2xvZ2ljYWxfcmluZ19lbWl0KHJpbmdidWYsIE1JX05P T1ApOworCWZvciAoaSA9IDA7IGkgPCByaW5nYnVmLT53YV90YWlsX2R3b3JkczsgaSsrKQorCQlp bnRlbF9sb2dpY2FsX3JpbmdfZW1pdChyaW5nYnVmLCBNSV9OT09QKTsKKwogCWludGVsX2xvZ2lj YWxfcmluZ19hZHZhbmNlKHJpbmdidWYpOwogCiAJaWYgKGludGVsX3Jpbmdfc3RvcHBlZChyZXF1 ZXN0LT5yaW5nKSkKQEAgLTg3Niw2ICs4NzYsMTYgQEAgaW50IGludGVsX2xvZ2ljYWxfcmluZ19i ZWdpbihzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcSwgaW50IG51bV9kd29yZHMpCiAJ aWYgKHJldCkKIAkJcmV0dXJuIHJldDsKIAorCWlmIChJU19HRU44KHJlcS0+cmluZy0+ZGV2KSB8 fCBJU19HRU45KHJlcS0+cmluZy0+ZGV2KSkKKwkJLyoKKwkJICogUmVzZXJ2ZSBzcGFjZSBmb3Ig MiBOT09QcyBhdCB0aGUgZW5kIG9mIGVhY2ggcmVxdWVzdCB0byBiZQorCQkgKiB1c2VkIGFzIGEg d29ya2Fyb3VuZCBmb3Igbm90IGJlaW5nIGFsbG93ZWQgdG8gZG8gbGl0ZQorCQkgKiByZXN0b3Jl IHdpdGggSEVBRD09VEFJTCAoV2FJZGxlTGl0ZVJlc3RvcmUpLgorCQkgKi8KKwkJcmVxLT5yaW5n YnVmLT53YV90YWlsX2R3b3JkcyA9IDI7CisKKwludW1fZHdvcmRzICs9IHJlcS0+cmluZ2J1Zi0+ d2FfdGFpbF9kd29yZHM7CisKIAlyZXQgPSBsb2dpY2FsX3JpbmdfcHJlcGFyZShyZXEsIG51bV9k d29yZHMgKiBzaXplb2YodWludDMyX3QpKTsKIAlpZiAocmV0KQogCQlyZXR1cm4gcmV0OwpAQCAt MTg1OCwxMyArMTg2OCw2IEBAIHN0YXRpYyB2b2lkIGJ4dF9hX3NldF9zZXFubyhzdHJ1Y3QgaW50 ZWxfZW5naW5lX2NzICpyaW5nLCB1MzIgc2Vxbm8pCiAJaW50ZWxfZmx1c2hfc3RhdHVzX3BhZ2Uo cmluZywgSTkxNV9HRU1fSFdTX0lOREVYKTsKIH0KIAotLyoKLSAqIFJlc2VydmUgc3BhY2UgZm9y IDIgTk9PUHMgYXQgdGhlIGVuZCBvZiBlYWNoIHJlcXVlc3QgdG8gYmUKLSAqIHVzZWQgYXMgYSB3 b3JrYXJvdW5kIGZvciBub3QgYmVpbmcgYWxsb3dlZCB0byBkbyBsaXRlCi0gKiByZXN0b3JlIHdp dGggSEVBRD09VEFJTCAoV2FJZGxlTGl0ZVJlc3RvcmUpLgotICovCi0jZGVmaW5lIFdBX1RBSUxf RFdPUkRTIDIKLQogc3RhdGljIGlubGluZSB1MzIgaHdzX3NlcW5vX2FkZHJlc3Moc3RydWN0IGlu dGVsX2VuZ2luZV9jcyAqZW5naW5lKQogewogCXJldHVybiBlbmdpbmUtPnN0YXR1c19wYWdlLmdm eF9hZGRyICsgSTkxNV9HRU1fSFdTX0lOREVYX0FERFI7CkBAIC0xODc1LDcgKzE4NzgsNyBAQCBz dGF0aWMgaW50IGdlbjhfZW1pdF9yZXF1ZXN0KHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAq cmVxdWVzdCkKIAlzdHJ1Y3QgaW50ZWxfcmluZ2J1ZmZlciAqcmluZ2J1ZiA9IHJlcXVlc3QtPnJp bmdidWY7CiAJaW50IHJldDsKIAotCXJldCA9IGludGVsX2xvZ2ljYWxfcmluZ19iZWdpbihyZXF1 ZXN0LCA2ICsgV0FfVEFJTF9EV09SRFMpOworCXJldCA9IGludGVsX2xvZ2ljYWxfcmluZ19iZWdp bihyZXF1ZXN0LCA2KTsKIAlpZiAocmV0KQogCQlyZXR1cm4gcmV0OwogCkBAIC0xODk5LDcgKzE5 MDIsNyBAQCBzdGF0aWMgaW50IGdlbjhfZW1pdF9yZXF1ZXN0X3JlbmRlcihzdHJ1Y3QgZHJtX2k5 MTVfZ2VtX3JlcXVlc3QgKnJlcXVlc3QpCiAJc3RydWN0IGludGVsX3JpbmdidWZmZXIgKnJpbmdi dWYgPSByZXF1ZXN0LT5yaW5nYnVmOwogCWludCByZXQ7CiAKLQlyZXQgPSBpbnRlbF9sb2dpY2Fs X3JpbmdfYmVnaW4ocmVxdWVzdCwgNiArIFdBX1RBSUxfRFdPUkRTKTsKKwlyZXQgPSBpbnRlbF9s b2dpY2FsX3JpbmdfYmVnaW4ocmVxdWVzdCwgNik7CiAJaWYgKHJldCkKIAkJcmV0dXJuIHJldDsK IApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5oIGIv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5oCmluZGV4IDU2NmIwYWUuLjYy YjRlMWIgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIu aAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmgKQEAgLTEyMiw2 ICsxMjIsOCBAQCBzdHJ1Y3QgaW50ZWxfcmluZ2J1ZmZlciB7CiAJICogd2UgY2FuIGRldGVjdCBu ZXcgcmV0aXJlbWVudHMuCiAJICovCiAJdTMyIGxhc3RfcmV0aXJlZF9oZWFkOworCisJaW50IHdh X3RhaWxfZHdvcmRzOwogfTsKIAogc3RydWN0CWludGVsX2NvbnRleHQ7Ci0tIAoyLjQuMwoKX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1h aWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5m cmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK