From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ben Widawsky Subject: [PATCH 1/2] drm/i915: Fix fbc + rc6 combination on SNB Date: Fri, 1 Nov 2013 17:02:52 -0700 Message-ID: <1383350573-7427-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 mga03.intel.com (mga03.intel.com [143.182.124.21]) by gabe.freedesktop.org (Postfix) with ESMTP id 76073EE90C for ; Fri, 1 Nov 2013 17:02:57 -0700 (PDT) List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: intel-gfx-bounces@lists.freedesktop.org Errors-To: intel-gfx-bounces@lists.freedesktop.org To: Intel GFX Cc: Ben Widawsky , Ben Widawsky List-Id: intel-gfx@lists.freedesktop.org T24gU2FuZHlicmlkZ2Ugd2UgbXVzdCBzZXQgdGhlICJQUEdUVCBSZW5kZXIgVGFyZ2V0IEJhc2Ug QWRkcmVzcyBWYWxpZApmb3IgRkJDIiBiaXQgYXMgbm90ZWQgaW4gdGhlIHByb2dyYW1taW5nIGd1 aWRlLiBXZSBkaWQgdGhpcyBhdCBjbG9jawpnYXRpbmcgaW5pdC4gVGhpc2JpdCBpcyBub3Qgc2F2 ZWQgYW5kIHJlc3RvcmVkIHdpdGggUkM2IHBvd2VyIGNvbnRleHQsCnNvIHRoZSByZXNldHRpbmcg aXQgYXQgcmluZyBmbHVzaCBzaG91bGQgZml4IHRoYXQuCgpUaGUgZWZmZWN0IG9mIG5vdCBkb2lu ZyB0aGlzIHNob3VsZCBiZSBjb3JydXB0aW9uLCBhbmQgbm90IGEgaGFuZyAtIGFzCmhhcyBzbyBv ZnRlbiBiZWVuIHRoZSBjYXNlLgoKTm90ZSB0aGF0IHdlIHNob3VsZCBhY3R1YWxseSBjbGVhciB0 aGlzIGJpdCBhcyB3ZWxsIHdoZW4gbm90IGJsaXR0aW5nIHRvCnRoZSBzY2Fub3V0ICh1c2luZyB0 aGUgYmxpdHRlciBmb3Igb3RoZXIgdGhpbmdzKSwgb3IgZWxzZSBhbGwgb3BlcmF0aW9ucwoKQ2M6 IFN0w6lwaGFuZSBNYXJjaGVzaW4gPG1hcmNoZXVAY2hyb21pdW0ub3JnPgpTaWduZWQtb2ZmLWJ5 OiBCZW4gV2lkYXdza3kgPGJlbkBid2lkYXdzay5uZXQ+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfcG0uYyAgICAgICAgIHwgIDIgLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs X3JpbmdidWZmZXIuYyB8IDI1ICsrKysrKysrKysrKysrKysrKysrKysrKysKIDIgZmlsZXMgY2hh bmdlZCwgMjUgaW5zZXJ0aW9ucygrKSwgMiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf cG0uYwppbmRleCBjYTlhNzc4Li42N2Y0NjBiIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9wbS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMKQEAg LTE5Myw4ICsxOTMsNiBAQCBzdGF0aWMgdm9pZCBzYW5keWJyaWRnZV9ibGl0X2ZiY191cGRhdGUo c3RydWN0IGRybV9kZXZpY2UgKmRldikKIAkvKiBNYWtlIHN1cmUgYmxpdHRlciBub3RpZmllcyBG QkMgb2Ygd3JpdGVzICovCiAJZ2VuNl9ndF9mb3JjZV93YWtlX2dldChkZXZfcHJpdik7CiAJYmx0 X2Vjb3NrcGQgPSBJOTE1X1JFQUQoR0VONl9CTElUVEVSX0VDT1NLUEQpOwotCWJsdF9lY29za3Bk IHw9IEdFTjZfQkxJVFRFUl9GQkNfTk9USUZZIDw8Ci0JCUdFTjZfQkxJVFRFUl9MT0NLX1NISUZU OwogCUk5MTVfV1JJVEUoR0VONl9CTElUVEVSX0VDT1NLUEQsIGJsdF9lY29za3BkKTsKIAlibHRf ZWNvc2twZCB8PSBHRU42X0JMSVRURVJfRkJDX05PVElGWTsKIAlJOTE1X1dSSVRFKEdFTjZfQkxJ VFRFUl9FQ09TS1BELCBibHRfZWNvc2twZCk7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9yaW5nYnVmZmVyLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5n YnVmZmVyLmMKaW5kZXggMmRlYzEzNC4uZGRkNzY4MSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX3JpbmdidWZmZXIuYwpAQCAtMjc4LDYgKzI3OCwyOCBAQCBnZW43X3JlbmRlcl9yaW5nX2Nz X3N0YWxsX3dhKHN0cnVjdCBpbnRlbF9yaW5nX2J1ZmZlciAqcmluZykKIAlyZXR1cm4gMDsKIH0K IAorc3RhdGljIGludCBnZW42X3JpbmdfZmJjX2ZsdXNoKHN0cnVjdCBpbnRlbF9yaW5nX2J1ZmZl ciAqcmluZykKK3sKKwlpbnQgcmV0OworCisJaWYgKCFyaW5nLT5mYmNfZGlydHkpCisJCXJldHVy biAwOworCisJcmV0ID0gaW50ZWxfcmluZ19iZWdpbihyaW5nLCA0KTsKKwlpZiAocmV0KQorCQly ZXR1cm4gcmV0OworCisJaW50ZWxfcmluZ19lbWl0KHJpbmcsIE1JX05PT1ApOworCWludGVsX3Jp bmdfZW1pdChyaW5nLCBNSV9MT0FEX1JFR0lTVEVSX0lNTSgxKSk7CisJaW50ZWxfcmluZ19lbWl0 KHJpbmcsIEdFTjZfQkxJVFRFUl9FQ09TS1BEKTsKKwlpbnRlbF9yaW5nX2VtaXQocmluZywKKwkJ CV9NQVNLRURfQklUX0VOQUJMRShHRU42X0JMSVRURVJfRkJDX05PVElGWSkpOworCWludGVsX3Jp bmdfYWR2YW5jZShyaW5nKTsKKworCXJpbmctPmZiY19kaXJ0eSA9IGZhbHNlOworCXJldHVybiAw OworfQorCiBzdGF0aWMgaW50IGdlbjdfcmluZ19mYmNfZmx1c2goc3RydWN0IGludGVsX3Jpbmdf YnVmZmVyICpyaW5nLCB1MzIgdmFsdWUpCiB7CiAJaW50IHJldDsKQEAgLTE3MTIsNiArMTczNCw5 IEBAIHN0YXRpYyBpbnQgZ2VuNl9yaW5nX2ZsdXNoKHN0cnVjdCBpbnRlbF9yaW5nX2J1ZmZlciAq cmluZywKIAlpbnRlbF9yaW5nX2VtaXQocmluZywgTUlfTk9PUCk7CiAJaW50ZWxfcmluZ19hZHZh bmNlKHJpbmcpOwogCisJaWYgKElTX0dFTjYoZGV2KSAmJiBmbHVzaCkKKwkJcmV0dXJuIGdlbjZf cmluZ19mYmNfZmx1c2gocmluZyk7CisKIAlpZiAoSVNfR0VONyhkZXYpICYmIGZsdXNoKQogCQly ZXR1cm4gZ2VuN19yaW5nX2ZiY19mbHVzaChyaW5nLCBGQkNfUkVORF9DQUNIRV9DTEVBTik7CiAK LS0gCjEuOC40LjIKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9y ZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4 Cg==