From mboxrd@z Thu Jan  1 00:00:00 1970
From: Ben Widawsky <benjamin.widawsky@intel.com>
Subject: [PATCH] [v2] drm/i915: s/HAS_L3_GPU_CACHE/HAS_L3_DPF
Date: Thu, 19 Sep 2013 10:47:31 -0700
Message-ID: <1379612851-1602-1-git-send-email-benjamin.widawsky@intel.com>
References: <20130918075040.GC4531@intel.com>
Mime-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64
Return-path: <intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org>
Received: from mail.bwidawsk.net (bwidawsk.net [166.78.191.112])
	by gabe.freedesktop.org (Postfix) with ESMTP id CD677E6A66
	for <intel-gfx@lists.freedesktop.org>;
	Thu, 19 Sep 2013 10:47:47 -0700 (PDT)
In-Reply-To: <20130918075040.GC4531@intel.com>
List-Unsubscribe: <http://lists.freedesktop.org/mailman/options/intel-gfx>,
	<mailto:intel-gfx-request@lists.freedesktop.org?subject=unsubscribe>
List-Archive: <http://lists.freedesktop.org/archives/intel-gfx>
List-Post: <mailto:intel-gfx@lists.freedesktop.org>
List-Help: <mailto:intel-gfx-request@lists.freedesktop.org?subject=help>
List-Subscribe: <http://lists.freedesktop.org/mailman/listinfo/intel-gfx>,
	<mailto:intel-gfx-request@lists.freedesktop.org?subject=subscribe>
Sender: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org
Errors-To: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org
To: Intel GFX <intel-gfx@lists.freedesktop.org>
Cc: Ben Widawsky <ben@bwidawsk.net>, Ben Widawsky <benjamin.widawsky@intel.com>
List-Id: intel-gfx@lists.freedesktop.org

V2UnZCBvbmx5IGV2ZXIgdXNlZCB0aGlzIGRlZmluZSB0byBkZW5vdGUgd2hldGhlciBvciBub3Qg
d2UgaGF2ZSB0aGUKZHluYW1pYyBwYXJpdHkgZmVhdHVyZSAoRFBGKSBhbmQgbmV2ZXIgdG8gZGV0
ZXJtaW5lIHdoZXRoZXIgb3Igbm90IEwzCmV4aXN0cy4gQmF5dHJhaWwgaXMgYSBnb29kIGV4YW1w
bGUgb2Ygd2hlcmUgTDMgZXhpc3RzLCBhbmQgbm90IERQRi4KClRoaXMgcGF0Y2ggcHJvdmlkZXMg
Y2xhcmlmeSBpbiB0aGUgY29kZSBmb3IgZnV0dXJlIHVzZSBjYXNlcyB3aGljaCBtaWdodAp3YW50
IHRvIGFjdHVhbGx5IHF1ZXJ5IHdoZXRoZXIgb3Igbm90IEwzIGV4aXN0cy4KCnYyOiBBZGQgLyog
RFBGID09IGR5bmFtaWMgcGFyaXR5IGZlYXR1cmUgKi8KClJldmlld2VkLWJ5OiBWaWxsZSBTeXJq
w6Rsw6QgPHZpbGxlLnN5cmphbGFAbGludXguaW50ZWwuY29tPgpTaWduZWQtb2ZmLWJ5OiBCZW4g
V2lkYXdza3kgPGJlbkBid2lkYXdzay5uZXQ+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkx
NV9kcnYuaCAgICAgICAgIHwgNSArKystLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0u
YyAgICAgICAgIHwgMiArLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9pcnEuYyAgICAgICAg
IHwgNCArKy0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3N5c2ZzLmMgICAgICAgfCA0ICsr
LS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuYyB8IDYgKysrLS0tCiA1
IGZpbGVzIGNoYW5nZWQsIDExIGluc2VydGlvbnMoKyksIDEwIGRlbGV0aW9ucygtKQoKZGlmZiAt
LWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmggYi9kcml2ZXJzL2dwdS9kcm0v
aTkxNS9pOTE1X2Rydi5oCmluZGV4IDAxNWRmNTIuLjA5YTVjODIgMTAwNjQ0Ci0tLSBhL2RyaXZl
cnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkx
NV9kcnYuaApAQCAtMTY5MSw4ICsxNjkxLDkgQEAgc3RydWN0IGRybV9pOTE1X2ZpbGVfcHJpdmF0
ZSB7CiAKICNkZWZpbmUgSEFTX0ZPUkNFX1dBS0UoZGV2KSAoSU5URUxfSU5GTyhkZXYpLT5oYXNf
Zm9yY2Vfd2FrZSkKIAotI2RlZmluZSBIQVNfTDNfR1BVX0NBQ0hFKGRldikgKElTX0lWWUJSSURH
RShkZXYpIHx8IElTX0hBU1dFTEwoZGV2KSkKLSNkZWZpbmUgTlVNX0wzX1NMSUNFUyhkZXYpIChJ
U19IU1dfR1QzKGRldikgPyAyIDogSEFTX0wzX0dQVV9DQUNIRShkZXYpKQorLyogRFBGID09IGR5
bmFtaWMgcGFyaXR5IGZlYXR1cmUgKi8KKyNkZWZpbmUgSEFTX0wzX0RQRihkZXYpIChJU19JVllC
UklER0UoZGV2KSB8fCBJU19IQVNXRUxMKGRldikpCisjZGVmaW5lIE5VTV9MM19TTElDRVMoZGV2
KSAoSVNfSFNXX0dUMyhkZXYpID8gMiA6IEhBU19MM19EUEYoZGV2KSkKIAogI2RlZmluZSBHVF9G
UkVRVUVOQ1lfTVVMVElQTElFUiA1MAogCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkx
NS9pOTE1X2dlbS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYwppbmRleCAxOGQw
N2Q3Li43ODU5ZjkxIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5j
CisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMKQEAgLTQyNjAsNyArNDI2MCw3
IEBAIGludCBpOTE1X2dlbV9sM19yZW1hcChzdHJ1Y3QgaW50ZWxfcmluZ19idWZmZXIgKnJpbmcs
IGludCBzbGljZSkKIAl1MzIgKnJlbWFwX2luZm8gPSBkZXZfcHJpdi0+bDNfcGFyaXR5LnJlbWFw
X2luZm9bc2xpY2VdOwogCWludCBpLCByZXQ7CiAKLQlpZiAoIUhBU19MM19HUFVfQ0FDSEUoZGV2
KSB8fCAhcmVtYXBfaW5mbykKKwlpZiAoIUhBU19MM19EUEYoZGV2KSB8fCAhcmVtYXBfaW5mbykK
IAkJcmV0dXJuIDA7CiAKIAlyZXQgPSBpbnRlbF9yaW5nX2JlZ2luKHJpbmcsIEdFTjdfTDNMT0df
U0laRSAvIDQgKiAzKTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfaXJx
LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2lycS5jCmluZGV4IDFjN2Y2YWIuLmNmYWY0
MzQgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfaXJxLmMKKysrIGIvZHJp
dmVycy9ncHUvZHJtL2k5MTUvaTkxNV9pcnEuYwpAQCAtOTYwLDcgKzk2MCw3IEBAIHN0YXRpYyB2
b2lkIGl2eWJyaWRnZV9wYXJpdHlfZXJyb3JfaXJxX2hhbmRsZXIoc3RydWN0IGRybV9kZXZpY2Ug
KmRldiwgdTMyIGlpcikKIHsKIAlkcm1faTkxNV9wcml2YXRlX3QgKmRldl9wcml2ID0gKGRybV9p
OTE1X3ByaXZhdGVfdCAqKSBkZXYtPmRldl9wcml2YXRlOwogCi0JaWYgKCFIQVNfTDNfR1BVX0NB
Q0hFKGRldikpCisJaWYgKCFIQVNfTDNfRFBGKGRldikpCiAJCXJldHVybjsKIAogCXNwaW5fbG9j
aygmZGV2X3ByaXYtPmlycV9sb2NrKTsKQEAgLTIyOTIsNyArMjI5Miw3IEBAIHN0YXRpYyB2b2lk
IGdlbjVfZ3RfaXJxX3Bvc3RpbnN0YWxsKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJcG1faXJx
cyA9IGd0X2lycXMgPSAwOwogCiAJZGV2X3ByaXYtPmd0X2lycV9tYXNrID0gfjA7Ci0JaWYgKEhB
U19MM19HUFVfQ0FDSEUoZGV2KSkgeworCWlmIChIQVNfTDNfRFBGKGRldikpIHsKIAkJLyogTDMg
cGFyaXR5IGludGVycnVwdCBpcyBhbHdheXMgdW5tYXNrZWQuICovCiAJCWRldl9wcml2LT5ndF9p
cnFfbWFzayA9IH5HVF9QQVJJVFlfRVJST1IoZGV2KTsKIAkJZ3RfaXJxcyB8PSBHVF9QQVJJVFlf
RVJST1IoZGV2KTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfc3lzZnMu
YyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfc3lzZnMuYwppbmRleCBkZWI4Nzg3Li43YjRj
NzljIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3N5c2ZzLmMKKysrIGIv
ZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9zeXNmcy5jCkBAIC05Nyw3ICs5Nyw3IEBAIHN0YXRp
YyBzdHJ1Y3QgYXR0cmlidXRlX2dyb3VwIHJjNl9hdHRyX2dyb3VwID0gewogCiBzdGF0aWMgaW50
IGwzX2FjY2Vzc192YWxpZChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCBsb2ZmX3Qgb2Zmc2V0KQog
ewotCWlmICghSEFTX0wzX0dQVV9DQUNIRShkZXYpKQorCWlmICghSEFTX0wzX0RQRihkZXYpKQog
CQlyZXR1cm4gLUVQRVJNOwogCiAJaWYgKG9mZnNldCAlIDQgIT0gMCkKQEAgLTUyNSw3ICs1MjUs
NyBAQCB2b2lkIGk5MTVfc2V0dXBfc3lzZnMoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAkJCURS
TV9FUlJPUigiUkM2IHJlc2lkZW5jeSBzeXNmcyBzZXR1cCBmYWlsZWRcbiIpOwogCX0KICNlbmRp
ZgotCWlmIChIQVNfTDNfR1BVX0NBQ0hFKGRldikpIHsKKwlpZiAoSEFTX0wzX0RQRihkZXYpKSB7
CiAJCXJldCA9IGRldmljZV9jcmVhdGVfYmluX2ZpbGUoJmRldi0+cHJpbWFyeS0+a2RldiwgJmRw
Zl9hdHRycyk7CiAJCWlmIChyZXQpCiAJCQlEUk1fRVJST1IoImwzIHBhcml0eSBzeXNmcyBzZXR1
cCBmYWlsZWRcbiIpOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmlu
Z2J1ZmZlci5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5jCmluZGV4
IDk1OGI3ZDguLmI2NzEwNGEgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs
X3JpbmdidWZmZXIuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVy
LmMKQEAgLTU2OSw3ICs1NjksNyBAQCBzdGF0aWMgaW50IGluaXRfcmVuZGVyX3Jpbmcoc3RydWN0
IGludGVsX3JpbmdfYnVmZmVyICpyaW5nKQogCWlmIChJTlRFTF9JTkZPKGRldiktPmdlbiA+PSA2
KQogCQlJOTE1X1dSSVRFKElOU1RQTSwgX01BU0tFRF9CSVRfRU5BQkxFKElOU1RQTV9GT1JDRV9P
UkRFUklORykpOwogCi0JaWYgKEhBU19MM19HUFVfQ0FDSEUoZGV2KSkKKwlpZiAoSEFTX0wzX0RQ
RihkZXYpKQogCQlJOTE1X1dSSVRFX0lNUihyaW5nLCB+R1RfUEFSSVRZX0VSUk9SKGRldikpOwog
CiAJcmV0dXJuIHJldDsKQEAgLTk5Nyw3ICs5OTcsNyBAQCBnZW42X3JpbmdfZ2V0X2lycShzdHJ1
Y3QgaW50ZWxfcmluZ19idWZmZXIgKnJpbmcpCiAKIAlzcGluX2xvY2tfaXJxc2F2ZSgmZGV2X3By
aXYtPmlycV9sb2NrLCBmbGFncyk7CiAJaWYgKHJpbmctPmlycV9yZWZjb3VudCsrID09IDApIHsK
LQkJaWYgKEhBU19MM19HUFVfQ0FDSEUoZGV2KSAmJiByaW5nLT5pZCA9PSBSQ1MpCisJCWlmIChI
QVNfTDNfRFBGKGRldikgJiYgcmluZy0+aWQgPT0gUkNTKQogCQkJSTkxNV9XUklURV9JTVIocmlu
ZywKIAkJCQkgICAgICAgfihyaW5nLT5pcnFfZW5hYmxlX21hc2sgfAogCQkJCQkgR1RfUEFSSVRZ
X0VSUk9SKGRldikpKTsKQEAgLTEwMTksNyArMTAxOSw3IEBAIGdlbjZfcmluZ19wdXRfaXJxKHN0
cnVjdCBpbnRlbF9yaW5nX2J1ZmZlciAqcmluZykKIAogCXNwaW5fbG9ja19pcnFzYXZlKCZkZXZf
cHJpdi0+aXJxX2xvY2ssIGZsYWdzKTsKIAlpZiAoLS1yaW5nLT5pcnFfcmVmY291bnQgPT0gMCkg
ewotCQlpZiAoSEFTX0wzX0dQVV9DQUNIRShkZXYpICYmIHJpbmctPmlkID09IFJDUykKKwkJaWYg
KEhBU19MM19EUEYoZGV2KSAmJiByaW5nLT5pZCA9PSBSQ1MpCiAJCQlJOTE1X1dSSVRFX0lNUihy
aW5nLCB+R1RfUEFSSVRZX0VSUk9SKGRldikpOwogCQllbHNlCiAJCQlJOTE1X1dSSVRFX0lNUihy
aW5nLCB+MCk7Ci0tIAoxLjguNAoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f
X19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRl
c2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9p
bnRlbC1nZngK