From mboxrd@z Thu Jan 1 00:00:00 1970 From: ville.syrjala@linux.intel.com Subject: [PATCH 5/5] drm/i915: Shuffle fifo underrun disable/enable points for gmch platforms Date: Fri, 16 May 2014 19:40:25 +0300 Message-ID: <1400258425-32664-6-git-send-email-ville.syrjala@linux.intel.com> References: <1400258425-32664-1-git-send-email-ville.syrjala@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga03.intel.com (mga03.intel.com [143.182.124.21]) by gabe.freedesktop.org (Postfix) with ESMTP id 5B8696EFF5 for ; Fri, 16 May 2014 09:41:07 -0700 (PDT) In-Reply-To: <1400258425-32664-1-git-send-email-ville.syrjala@linux.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 List-Id: intel-gfx@lists.freedesktop.org RnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KCkdl bjIgcmVwb3J0cyBGSUZPIHVuZGVycnVucyB3aGVuZXZlciBubyBwbGFuZXMgYXJlIGVuYWJsZWQg b24gdGhlIHBpcGUuClNvIGluIG9yZGVyIHRvIGF2b2lkIGZhbHNlIHBvc2l0aXZlcyB3ZSBtdXN0 IGVuYWJsZSB0aGUgRklGTyB1bmRlcnJ1bgpyZXBvcnRpbmcgb25seSB3aGVuIGF0IGxlYXN0IG9u ZSBwbGFuZSBpcyBlbmFibGVkIG9uIHRoZSBwaXBlLiBGb3IKbm93IGp1c3QgbW92ZSB0aGUgdW5k ZXJydW4gcmVwb3J0aW5nIGVuYWJsZS9kaXNhYmxlIHBvaW50cyB0byB0aGUKb3RoZXIgc2lkZSBv ZiB0aGUgcGxhbmUgZW5hYmxlL2Rpc2FibGUgcG9pbnQuIFRoYXQgZG9lc24ndCBjb3ZlciBjYXNl cwp3aGVuIHdlIHR1cm4gb2ZmIGFsbCB0aGUgcGxhbmVzIGZvciB0aGUgcGlwZSBidXQgbGVhdmUg dGhlIHBpcGUgcnVubmluZwpvbiBwdXJwb3NlLCBidXQgaXQncyBiZXR0ZXIgdGhhbiB0aGUgY3Vy cmVudCBzaXR1YXRpb24uCgpPbiBnZW40KyB3ZSBjYW4gYWN0dWFsbHkgbW92ZSB0aGUgdW5kZXJy dW4gcmVwb3J0aW5nIGVuYWJsZS9kaXNhYmxlIHRvCnRoZSBvcHBvc2l0ZSBlbmRzIG9mIHRoZSBj cnRjIGVuYWJsZS9kaXNhYmxlIGhvb2tzLiBJIHN1cHBvc2UgaW4gdGhlb3J5CndlIGNvdWxkIGxl YXZlIHRoZSB1bmRlcnJ1biByZXBvcnRpbmcgZW5hYmxlZCBhbGwgdGhlIHRpbWUsIGV4Y2VwdCBv bgpWTFYgd2hlcmUgUElQRVNUQVQgc3RvcHMgd29ya2luZyB3aGVuIHRoZSBkaXNwbGF5IHBvd2Vy IHdlbGwgaXMgZG93bi4KSWYgd2UgZXZlciBnZXQgYXJvdW5kIHRvIHVuaWZ5aW5nIHRoZSBQSVBF U1RBVCBpcnEgaGFuZGxpbmcgZm9yIGFsbApnbWNoIHBsYXRmb3Jtcywgd2Ugc2hvdWxkIHN0aWxs IGZvbGxvdyB0aGUgVkxWIHJvdXRlIGZvciBvdGhlciBwbGF0Zm9ybXMuCkl0IHdvdWxkIGFsc28g bWljcm8tb3B0aW1pemUgdGhlIGlycSBoYW5kbGVyIGEgYml0IHNpbmNlIHdlIGNvdWxkIHRoZW4K c2tpcCB0aGUgUElQRVNUQVQgcmVhZHMgZm9yIGFsbCBkaXNhYmxlZCBwaXBlcy4KCkdlbjMgaXMg c3RpbGwgYSBteXN0ZXJ5LCBidXQgZm9yIG5vdyBJJ20gZ29pbmcgdG8gYXNzdW1lIGl0IGJlaGF2 ZXMKbGlrZSBnZW40Ky4KClNpZ25lZC1vZmYtYnk6IFZpbGxlIFN5cmrDpGzDpCA8dmlsbGUuc3ly amFsYUBsaW51eC5pbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlz cGxheS5jIHwgMzAgKysrKysrKysrKysrKysrKysrKysrKysrKysrLS0tCiAxIGZpbGUgY2hhbmdl ZCwgMjcgaW5zZXJ0aW9ucygrKSwgMyBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9kaXNwbGF5LmMKaW5kZXggMWI1MTY0Yy4uN2Y2MTA0NyAxMDA2NDQKLS0tIGEvZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX2Rpc3BsYXkuYwpAQCAtNDUxNCw2ICs0NTE0LDggQEAgc3RhdGljIHZvaWQgdmFsbGV5dmll d19jcnRjX2VuYWJsZShzdHJ1Y3QgZHJtX2NydGMgKmNydGMpCiAKIAlpbnRlbF9jcnRjLT5hY3Rp dmUgPSB0cnVlOwogCisJaW50ZWxfc2V0X2NwdV9maWZvX3VuZGVycnVuX3JlcG9ydGluZyhkZXYs IHBpcGUsIHRydWUpOworCiAJZm9yX2VhY2hfZW5jb2Rlcl9vbl9jcnRjKGRldiwgY3J0YywgZW5j b2RlcikKIAkJaWYgKGVuY29kZXItPnByZV9wbGxfZW5hYmxlKQogCQkJZW5jb2Rlci0+cHJlX3Bs bF9lbmFibGUoZW5jb2Rlcik7CkBAIC00NTM3LDcgKzQ1MzksNiBAQCBzdGF0aWMgdm9pZCB2YWxs ZXl2aWV3X2NydGNfZW5hYmxlKHN0cnVjdCBkcm1fY3J0YyAqY3J0YykKIAogCWludGVsX3VwZGF0 ZV93YXRlcm1hcmtzKGNydGMpOwogCWludGVsX2VuYWJsZV9waXBlKGludGVsX2NydGMpOwotCWlu dGVsX3NldF9jcHVfZmlmb191bmRlcnJ1bl9yZXBvcnRpbmcoZGV2LCBwaXBlLCB0cnVlKTsKIAog CWZvcl9lYWNoX2VuY29kZXJfb25fY3J0YyhkZXYsIGNydGMsIGVuY29kZXIpCiAJCWVuY29kZXIt PmVuYWJsZShlbmNvZGVyKTsKQEAgLTQ1NjQsNiArNDU2NSw5IEBAIHN0YXRpYyB2b2lkIGk5eHhf Y3J0Y19lbmFibGUoc3RydWN0IGRybV9jcnRjICpjcnRjKQogCiAJaW50ZWxfY3J0Yy0+YWN0aXZl ID0gdHJ1ZTsKIAorCWlmICghSVNfR0VOMihkZXYpKQorCQlpbnRlbF9zZXRfY3B1X2ZpZm9fdW5k ZXJydW5fcmVwb3J0aW5nKGRldiwgcGlwZSwgdHJ1ZSk7CisKIAlmb3JfZWFjaF9lbmNvZGVyX29u X2NydGMoZGV2LCBjcnRjLCBlbmNvZGVyKQogCQlpZiAoZW5jb2Rlci0+cHJlX2VuYWJsZSkKIAkJ CWVuY29kZXItPnByZV9lbmFibGUoZW5jb2Rlcik7CkBAIC00NTc2LDEzICs0NTgwLDIyIEBAIHN0 YXRpYyB2b2lkIGk5eHhfY3J0Y19lbmFibGUoc3RydWN0IGRybV9jcnRjICpjcnRjKQogCiAJaW50 ZWxfdXBkYXRlX3dhdGVybWFya3MoY3J0Yyk7CiAJaW50ZWxfZW5hYmxlX3BpcGUoaW50ZWxfY3J0 Yyk7Ci0JaW50ZWxfc2V0X2NwdV9maWZvX3VuZGVycnVuX3JlcG9ydGluZyhkZXYsIHBpcGUsIHRy dWUpOwogCiAJZm9yX2VhY2hfZW5jb2Rlcl9vbl9jcnRjKGRldiwgY3J0YywgZW5jb2RlcikKIAkJ ZW5jb2Rlci0+ZW5hYmxlKGVuY29kZXIpOwogCiAJaW50ZWxfY3J0Y19lbmFibGVfcGxhbmVzKGNy dGMpOwogCisJLyoKKwkgKiBHZW4yIHJlcG9ydHMgcGlwZSB1bmRlcnJ1bnMgd2hlbmV2ZXIgYWxs IHBsYW5lcyBhcmUgZGlzYWJsZWQuCisJICogU28gZG9uJ3QgZW5hYmxlIHVuZGVycnVuIHJlcG9y dGluZyBiZWZvcmUgYXQgbGVhc3Qgc29tZSBwbGFuZXMKKwkgKiBhcmUgZW5hYmxlZC4KKwkgKiBG SVhNRTogTmVlZCB0byBmaXggdGhlIGxvZ2ljIHRvIHdvcmsgd2hlbiB3ZSB0dXJuIG9mZiBhbGwg cGxhbmVzCisJICogYnV0IGxlYXZlIHRoZSBwaXBlIHJ1bm5pbmcuCisJICovCisJaWYgKElTX0dF TjIoZGV2KSkKKwkJaW50ZWxfc2V0X2NwdV9maWZvX3VuZGVycnVuX3JlcG9ydGluZyhkZXYsIHBp cGUsIHRydWUpOworCiAJZHJtX3ZibGFua19vbihkZXYsIHBpcGUpOwogCiAJLyogVW5kZXJydW5z IGRvbid0IHJhaXNlIGludGVycnVwdHMsIHNvIGNoZWNrIG1hbnVhbGx5LiAqLwpAQCAtNDYxNSwx MiArNDYyOCwyMCBAQCBzdGF0aWMgdm9pZCBpOXh4X2NydGNfZGlzYWJsZShzdHJ1Y3QgZHJtX2Ny dGMgKmNydGMpCiAJaWYgKCFpbnRlbF9jcnRjLT5hY3RpdmUpCiAJCXJldHVybjsKIAorCS8qCisJ ICogR2VuMiByZXBvcnRzIHBpcGUgdW5kZXJydW5zIHdoZW5ldmVyIGFsbCBwbGFuZXMgYXJlIGRp c2FibGVkLgorCSAqIFNvIGRpYXNibGUgdW5kZXJydW4gcmVwb3J0aW5nIGJlZm9yZSBhbGwgdGhl IHBsYW5lcyBnZXQgZGlzYWJsZWQuCisJICogRklYTUU6IE5lZWQgdG8gZml4IHRoZSBsb2dpYyB0 byB3b3JrIHdoZW4gd2UgdHVybiBvZmYgYWxsIHBsYW5lcworCSAqIGJ1dCBsZWF2ZSB0aGUgcGlw ZSBydW5uaW5nLgorCSAqLworCWlmIChJU19HRU4yKGRldikpCisJCWludGVsX3NldF9jcHVfZmlm b191bmRlcnJ1bl9yZXBvcnRpbmcoZGV2LCBwaXBlLCBmYWxzZSk7CisKIAlpbnRlbF9jcnRjX2Rp c2FibGVfcGxhbmVzKGNydGMpOwogCiAJZm9yX2VhY2hfZW5jb2Rlcl9vbl9jcnRjKGRldiwgY3J0 YywgZW5jb2RlcikKIAkJZW5jb2Rlci0+ZGlzYWJsZShlbmNvZGVyKTsKIAotCWludGVsX3NldF9j cHVfZmlmb191bmRlcnJ1bl9yZXBvcnRpbmcoZGV2LCBwaXBlLCBmYWxzZSk7CiAJaW50ZWxfZGlz YWJsZV9waXBlKGRldl9wcml2LCBwaXBlKTsKIAogCWk5eHhfcGZpdF9kaXNhYmxlKGludGVsX2Ny dGMpOwpAQCAtNDYzOCw2ICs0NjU5LDkgQEAgc3RhdGljIHZvaWQgaTl4eF9jcnRjX2Rpc2FibGUo c3RydWN0IGRybV9jcnRjICpjcnRjKQogCQkJaTl4eF9kaXNhYmxlX3BsbChkZXZfcHJpdiwgcGlw ZSk7CiAJfQogCisJaWYgKCFJU19HRU4yKGRldikpCisJCWludGVsX3NldF9jcHVfZmlmb191bmRl cnJ1bl9yZXBvcnRpbmcoZGV2LCBwaXBlLCBmYWxzZSk7CisKIAlpbnRlbF9jcnRjLT5hY3RpdmUg PSBmYWxzZTsKIAlpbnRlbF91cGRhdGVfd2F0ZXJtYXJrcyhjcnRjKTsKIAotLSAKMS44LjUuNQoK X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4 IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0 cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK