From: Tvrtko Ursulin Subject: [PATCH] drm/i915: Fix VCS ring selection after uapi decoupling Date: Wed, 27 Jan 2016 12:38:43 +0000 Message-ID: <1453898323-30925-1-git-send-email-tvrtko.ursulin@linux.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 993C26E6C0 for ; Wed, 27 Jan 2016 04:38: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: Daniel Vetter List-Id: intel-gfx@lists.freedesktop.org RnJvbTogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KClRoaXMgZ290 IGJyb2tlbiBpbjoKCiAgIGNvbW1pdCBkZTFhZGQzNjA1MjJjODc2YzI1ZWYyYmJiYmFiMWM5NGJk YjUwOWFiCiAgIEF1dGhvcjogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNv bT4KICAgRGF0ZTogICBGcmkgSmFuIDE1IDE1OjEyOjUwIDIwMTYgKzAwMDAKCiAgICAgICBkcm0v aTkxNTogRGVjb3VwbGUgZXhlY2J1ZiB1QVBJIGZyb20gaW50ZXJuYWwgaW1wbGVtZW50YXRpb24K CkJTRCByaW5nIGZsYWdzIG5lZWQgdG8gYmUgc2hpZnRlZCBiZWZvcmUgdGhleSBjYW4gYmUgY29u c2lkZXJlZAppbmRpY2VzIGludG8gdGhlIHJpbmcgYXJyYXkuCgpSZXBvcnRlZCBieSBaaGlwZW5n IEdvbmcuCgpTaWduZWQtb2ZmLWJ5OiBUdnJ0a28gVXJzdWxpbiA8dHZydGtvLnVyc3VsaW5AaW50 ZWwuY29tPgpDYzogRGFuaWVsIFZldHRlciA8ZGFuaWVsLnZldHRlckBmZndsbC5jaD4KQ2M6IENo cmlzIFdpbHNvbiA8Y2hyaXNAY2hyaXMtd2lsc29uLmNvLnVrPgpDYzogWmhpcGVuZyBHb25nIDx6 aGlwZW5nLmdvbmdAaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2Vt X2V4ZWNidWZmZXIuYyB8IDExICsrKysrKystLS0tCiBpbmNsdWRlL3VhcGkvZHJtL2k5MTVfZHJt LmggICAgICAgICAgICAgICAgfCAxMCArKysrKystLS0tCiAyIGZpbGVzIGNoYW5nZWQsIDEzIGlu c2VydGlvbnMoKyksIDggZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJt L2k5MTUvaTkxNV9nZW1fZXhlY2J1ZmZlci5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9n ZW1fZXhlY2J1ZmZlci5jCmluZGV4IDJkYzA4Y2UxMDc5YS4uNmZjNjIwYWYxNGZhIDEwMDY0NAot LS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9leGVjYnVmZmVyLmMKKysrIGIvZHJp dmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZXhlY2J1ZmZlci5jCkBAIC0xMzk1LDEyICsxMzk1 LDE1IEBAIGViX3NlbGVjdF9yaW5nKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwK IAl9CiAKIAlpZiAodXNlcl9yaW5nX2lkID09IEk5MTVfRVhFQ19CU0QgJiYgSEFTX0JTRDIoZGV2 X3ByaXYpKSB7Ci0JCXVuc2lnbmVkIGludCBic2RfaWR4ID0gYXJncy0+ZmxhZ3MgJiBJOTE1X0VY RUNfQlNEX01BU0s7CisJCXVuc2lnbmVkIGludCBic2RfaWR4ID0gKGFyZ3MtPmZsYWdzICYgSTkx NV9FWEVDX0JTRF9NQVNLKSA+PgorCQkJCQlJOTE1X0VYRUNfQlNEX1NISUZUOwogCi0JCWlmIChi c2RfaWR4ID09IEk5MTVfRVhFQ19CU0RfREVGQVVMVCkgeworCQlpZiAoYnNkX2lkeCA9PSAoSTkx NV9FWEVDX0JTRF9ERUZBVUxUID4+IEk5MTVfRVhFQ19CU0RfU0hJRlQpKSB7CiAJCQlic2RfaWR4 ID0gZ2VuOF9kaXNwYXRjaF9ic2RfcmluZyhkZXZfcHJpdiwgZmlsZSk7Ci0JCX0gZWxzZSBpZiAo YnNkX2lkeCA+PSBJOTE1X0VYRUNfQlNEX1JJTkcxICYmCi0JCQkgICBic2RfaWR4IDw9IEk5MTVf RVhFQ19CU0RfUklORzIpIHsKKwkJfSBlbHNlIGlmIChic2RfaWR4ID49CisJCQkgIChJOTE1X0VY RUNfQlNEX1JJTkcxID4+IEk5MTVfRVhFQ19CU0RfU0hJRlQpICYmCisJCQkgIGJzZF9pZHggPD0K KwkJCSAgKEk5MTVfRVhFQ19CU0RfUklORzIgPj4gSTkxNV9FWEVDX0JTRF9TSElGVCkpIHsKIAkJ CWJzZF9pZHgtLTsKIAkJfSBlbHNlIHsKIAkJCURSTV9ERUJVRygiZXhlY2J1ZiB3aXRoIHVua25v d24gYnNkIHJpbmc6ICV1XG4iLApkaWZmIC0tZ2l0IGEvaW5jbHVkZS91YXBpL2RybS9pOTE1X2Ry bS5oIGIvaW5jbHVkZS91YXBpL2RybS9pOTE1X2RybS5oCmluZGV4IDZhMTkzNzEzOTFmYS4uYTU1 MjRjYzk1ZmY4IDEwMDY0NAotLS0gYS9pbmNsdWRlL3VhcGkvZHJtL2k5MTVfZHJtLmgKKysrIGIv aW5jbHVkZS91YXBpL2RybS9pOTE1X2RybS5oCkBAIC03NzIsMTAgKzc3MiwxMiBAQCBzdHJ1Y3Qg ZHJtX2k5MTVfZ2VtX2V4ZWNidWZmZXIyIHsKICNkZWZpbmUgSTkxNV9FWEVDX0hBTkRMRV9MVVQJ CSgxPDwxMikKIAogLyoqIFVzZWQgZm9yIHN3aXRjaGluZyBCU0QgcmluZ3Mgb24gdGhlIHBsYXRm b3JtcyB3aXRoIHR3byBCU0QgcmluZ3MgKi8KLSNkZWZpbmUgSTkxNV9FWEVDX0JTRF9NQVNLCQko Mzw8MTMpCi0jZGVmaW5lIEk5MTVfRVhFQ19CU0RfREVGQVVMVAkJKDA8PDEzKSAvKiBkZWZhdWx0 IHBpbmctcG9uZyBtb2RlICovCi0jZGVmaW5lIEk5MTVfRVhFQ19CU0RfUklORzEJCSgxPDwxMykK LSNkZWZpbmUgSTkxNV9FWEVDX0JTRF9SSU5HMgkJKDI8PDEzKQorI2RlZmluZSBJOTE1X0VYRUNf QlNEX1NISUZUCSAoMTMpCisjZGVmaW5lIEk5MTVfRVhFQ19CU0RfTUFTSwkgKDMgPDwgSTkxNV9F WEVDX0JTRF9TSElGVCkKKy8qIGRlZmF1bHQgcGluZy1wb25nIG1vZGUgKi8KKyNkZWZpbmUgSTkx NV9FWEVDX0JTRF9ERUZBVUxUCSAoMCA8PCBJOTE1X0VYRUNfQlNEX1NISUZUKQorI2RlZmluZSBJ OTE1X0VYRUNfQlNEX1JJTkcxCSAoMSA8PCBJOTE1X0VYRUNfQlNEX1NISUZUKQorI2RlZmluZSBJ OTE1X0VYRUNfQlNEX1JJTkcyCSAoMiA8PCBJOTE1X0VYRUNfQlNEX1NISUZUKQogCiAvKiogVGVs bCB0aGUga2VybmVsIHRoYXQgdGhlIGJhdGNoYnVmZmVyIGlzIHByb2Nlc3NlZCBieQogICogIHRo ZSByZXNvdXJjZSBzdHJlYW1lci4KLS0gCjEuOS4xCgpfX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBs aXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFu L2xpc3RpbmZvL2ludGVsLWdmeAo=