From: Mika Kuoppala Subject: [PATCH 1/3] drm/i915: Do uncore early sanitize after domain init Date: Wed, 28 Jan 2015 14:43:24 +0200 Message-ID: <1422449006-4028-1-git-send-email-mika.kuoppala@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 9FD836E6A2 for ; Wed, 28 Jan 2015 04:44:01 -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 List-Id: intel-gfx@lists.freedesktop.org aW50ZWxfdW5jb3JlX2Vhcmx5X3Nhbml0aXplKCkgd2lsbCByZXNldCB0aGUgZm9yY2V3YWtlIHJl Z2lzdGVycy4gV2hlbgpmb3JjZXdha2UgZG9tYWlucyB3ZXJlIGludHJvZHVjZWQsIHRoZSBkb21h aW4gaW5pdCB3YXMgZG9uZSBhZnRlciB0aGUKc2FuaXRpemF0aW9uIG9mIHRoZSBmb3JjZXdha2Ug cmVnaXN0ZXJzLiBBbmQgYXMgdGhlIHJlc2V0dGluZyBvZgpyZWdpc3RlcnMgdXNlIHRoZSBkb21h aW4gYWNjZXNzb3JzLCB3ZSB0cmllZCB0byByZXNldCB0aGUgZm9yY2V3YWtlCnJlZ2lzdGVycyB3 aXRoIHVuaXRpYWxpemVkIGZvcmNld2FrZSBkb21haW5zIGFuZCBmYWlsZWQuCgpGaXggdGhpcyBi eSBzYW5pdGl6aW5nIGFmdGVyIGFsbCB0aGUgZG9tYWlucyBoYXZlIGJlZW4gaW5pdGlhbGl6ZWQu IERvCnBlciBkb21haW4gY2xlYXJpbmcgb2YgZm9yY2V3YWtlIHJlZ2lzdGVyIG9uIGRvbWFpbiBp bml0IHNvIHRoYXQKSVZCIGNhbiBkbyBlYXJseSBhY2Nlc3MgdG8gRUNPQlVTIGRvIGRldGVybWlu ZSB0aGUgZmluYWwgY29uZmlndXJhdGlvbi4KClRoaXMgcmVncmVzc2lvbiB3YXMgaW50cm9kdWNl ZCBpbgoKY29tbWl0IDA1YTJmYjE1N2U0NGE1M2M3OTEzMzgwNWQzMGVhYWRhNDM5MTE5NDEKQXV0 aG9yOiBNaWthIEt1b3BwYWxhIDxtaWthLmt1b3BwYWxhQGxpbnV4LmludGVsLmNvbT4KRGF0ZTog ICBNb24gSmFuIDE5IDE2OjIwOjQzIDIwMTUgKzAyMDAKCiAgICBkcm0vaTkxNTogQ29uc29saWRh dGUgZm9yY2V3YWtlIGNvZGUKCnYyOiBDYXJ2ZSBvdXQgZWxsYyBkZXRlY3QsIGZ3X2RvbWFpbl9y ZXNldCBmb3IgaXZiL2Vjb2J1cyAoQ2hyaXMpCgpCdWd6aWxsYTogaHR0cHM6Ly9idWdzLmZyZWVk ZXNrdG9wLm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODg4MDUKQ2M6IENocmlzIFdpbHNvbiA8Y2hyaXNA Y2hyaXMtd2lsc29uLmNvLnVrPgpSZXBvcnRlZC1ieTogT2xvZiBKb2hhbnNzb24gPG9sb2ZAbGl4 b20ubmV0PgpUZXN0ZWQtYnk6IERhcnJlbiBIYXJ0IDxkdmhhcnRAbGludXguaW50ZWwuY29tPiAo djEpClNpZ25lZC1vZmYtYnk6IE1pa2EgS3VvcHBhbGEgPG1pa2Eua3VvcHBhbGFAaW50ZWwuY29t PgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3VuY29yZS5jIHwgMzggKysrKysrKysr KysrKysrKysrKysrKysrKysrKystLS0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDMwIGluc2VydGlv bnMoKyksIDggZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUv aW50ZWxfdW5jb3JlLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF91bmNvcmUuYwppbmRl eCBiMzk1MWYyLi5iZTJjN2ZjIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF91bmNvcmUuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF91bmNvcmUuYwpAQCAt NzIsNiArNzIsNyBAQCBhc3NlcnRfZGV2aWNlX25vdF9zdXNwZW5kZWQoc3RydWN0IGRybV9pOTE1 X3ByaXZhdGUgKmRldl9wcml2KQogc3RhdGljIGlubGluZSB2b2lkCiBmd19kb21haW5fcmVzZXQo Y29uc3Qgc3RydWN0IGludGVsX3VuY29yZV9mb3JjZXdha2VfZG9tYWluICpkKQogeworCVdBUk5f T04oZC0+cmVnX3NldCA9PSAwKTsKIAlfX3Jhd19pOTE1X3dyaXRlMzIoZC0+aTkxNSwgZC0+cmVn X3NldCwgZC0+dmFsX3Jlc2V0KTsKIH0KIApAQCAtMTY2LDYgKzE2Nyw4IEBAIGZ3X2RvbWFpbnNf cmVzZXQoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LCBlbnVtIGZvcmNld2FrZV9k b21haW5zIGZ3X2RvCiAJc3RydWN0IGludGVsX3VuY29yZV9mb3JjZXdha2VfZG9tYWluICpkOwog CWVudW0gZm9yY2V3YWtlX2RvbWFpbl9pZCBpZDsKIAorCVdBUk5fT04oZGV2X3ByaXYtPnVuY29y ZS5md19kb21haW5zID09IDApOworCiAJZm9yX2VhY2hfZndfZG9tYWluX21hc2soZCwgZndfZG9t YWlucywgZGV2X3ByaXYsIGlkKQogCQlmd19kb21haW5fcmVzZXQoZCk7CiAKQEAgLTMyMSwxNCAr MzI0LDEwIEBAIHZvaWQgaW50ZWxfdW5jb3JlX2ZvcmNld2FrZV9yZXNldChzdHJ1Y3QgZHJtX2Rl dmljZSAqZGV2LCBib29sIHJlc3RvcmUpCiAJc3Bpbl91bmxvY2tfaXJxcmVzdG9yZSgmZGV2X3By aXYtPnVuY29yZS5sb2NrLCBpcnFmbGFncyk7CiB9CiAKLXN0YXRpYyB2b2lkIF9faW50ZWxfdW5j b3JlX2Vhcmx5X3Nhbml0aXplKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCi0JCQkJCSAgYm9vbCBy ZXN0b3JlX2ZvcmNld2FrZSkKK3N0YXRpYyB2b2lkIGludGVsX3VuY29yZV9lbGxjX2RldGVjdChz dHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogewogCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZf cHJpdiA9IGRldi0+ZGV2X3ByaXZhdGU7CiAKLQlpZiAoSEFTX0ZQR0FfREJHX1VOQ0xBSU1FRChk ZXYpKQotCQlfX3Jhd19pOTE1X3dyaXRlMzIoZGV2X3ByaXYsIEZQR0FfREJHLCBGUEdBX0RCR19S TV9OT0NMQUlNKTsKLQogCWlmICgoSVNfSEFTV0VMTChkZXYpIHx8IElTX0JST0FEV0VMTChkZXYp KSAmJgogCSAgICAoX19yYXdfaTkxNV9yZWFkMzIoZGV2X3ByaXYsIEhTV19FRFJBTV9QUkVTRU5U KSA9PSAxKSkgewogCQkvKiBUaGUgZG9jcyBkbyBub3QgZXhwbGFpbiBleGFjdGx5IGhvdyB0aGUg Y2FsY3VsYXRpb24gY2FuIGJlCkBAIC0zMzksNiArMzM4LDE1IEBAIHN0YXRpYyB2b2lkIF9faW50 ZWxfdW5jb3JlX2Vhcmx5X3Nhbml0aXplKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAJCWRldl9w cml2LT5lbGxjX3NpemUgPSAxMjg7CiAJCURSTV9JTkZPKCJGb3VuZCAlenVNQiBvZiBlTExDXG4i LCBkZXZfcHJpdi0+ZWxsY19zaXplKTsKIAl9Cit9CisKK3N0YXRpYyB2b2lkIF9faW50ZWxfdW5j b3JlX2Vhcmx5X3Nhbml0aXplKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCisJCQkJCSAgYm9vbCBy ZXN0b3JlX2ZvcmNld2FrZSkKK3sKKwlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYg PSBkZXYtPmRldl9wcml2YXRlOworCisJaWYgKEhBU19GUEdBX0RCR19VTkNMQUlNRUQoZGV2KSkK KwkJX19yYXdfaTkxNV93cml0ZTMyKGRldl9wcml2LCBGUEdBX0RCRywgRlBHQV9EQkdfUk1fTk9D TEFJTSk7CiAKIAkvKiBjbGVhciBvdXQgb2xkIEdUIEZJRk8gZXJyb3JzICovCiAJaWYgKElTX0dF TjYoZGV2KSB8fCBJU19HRU43KGRldikpCkBAIC05ODIsMTQgKzk5MCwxNCBAQCBzdGF0aWMgdm9p ZCBmd19kb21haW5faW5pdChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCiAJc2V0 dXBfdGltZXIoJmQtPnRpbWVyLCBpbnRlbF91bmNvcmVfZndfcmVsZWFzZV90aW1lciwgKHVuc2ln bmVkIGxvbmcpZCk7CiAKIAlkZXZfcHJpdi0+dW5jb3JlLmZ3X2RvbWFpbnMgfD0gKDEgPDwgZG9t YWluX2lkKTsKKworCWZ3X2RvbWFpbl9yZXNldChkKTsKIH0KIAotdm9pZCBpbnRlbF91bmNvcmVf aW5pdChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQorc3RhdGljIHZvaWQgaW50ZWxfdW5jb3JlX2Z3 X2RvbWFpbnNfaW5pdChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogewogCXN0cnVjdCBkcm1faTkx NV9wcml2YXRlICpkZXZfcHJpdiA9IGRldi0+ZGV2X3ByaXZhdGU7CiAKLQlfX2ludGVsX3VuY29y ZV9lYXJseV9zYW5pdGl6ZShkZXYsIGZhbHNlKTsKLQogCWlmIChJU19HRU45KGRldikpIHsKIAkJ ZGV2X3ByaXYtPnVuY29yZS5mdW5jcy5mb3JjZV93YWtlX2dldCA9IGZ3X2RvbWFpbnNfZ2V0Owog CQlkZXZfcHJpdi0+dW5jb3JlLmZ1bmNzLmZvcmNlX3dha2VfcHV0ID0gZndfZG9tYWluc19wdXQ7 CkBAIC0xMDM1LDggKzEwNDMsMTMgQEAgdm9pZCBpbnRlbF91bmNvcmVfaW5pdChzdHJ1Y3QgZHJt X2RldmljZSAqZGV2KQogCQlkZXZfcHJpdi0+dW5jb3JlLmZ1bmNzLmZvcmNlX3dha2VfcHV0ID0K IAkJCWZ3X2RvbWFpbnNfcHV0X3dpdGhfZmlmbzsKIAorCQkvKiBXZSBuZWVkIHRvIGluaXQgZmly c3QgZm9yIEVDT0JVUyBhY2Nlc3MgYW5kIHRoZW4KKwkJICogZGV0ZXJtaW5lIGxhdGVyIGlmIHdl IHdhbnQgdG8gcmVpbml0LCBpbiBjYXNlIG9mIE1UIGFjY2VzcyBpcworCQkgKiBub3Qgd29ya2lu ZworCQkgKi8KIAkJZndfZG9tYWluX2luaXQoZGV2X3ByaXYsIEZXX0RPTUFJTl9JRF9SRU5ERVIs CiAJCQkgICAgICAgRk9SQ0VXQUtFX01ULCBGT1JDRVdBS0VfTVRfQUNLKTsKKwogCQltdXRleF9s b2NrKCZkZXYtPnN0cnVjdF9tdXRleCk7CiAJCWZ3X2RvbWFpbnNfZ2V0X3dpdGhfdGhyZWFkX3N0 YXR1cyhkZXZfcHJpdiwgRk9SQ0VXQUtFX0FMTCk7CiAJCWVjb2J1cyA9IF9fcmF3X2k5MTVfcmVh ZDMyKGRldl9wcml2LCBFQ09CVVMpOwpAQCAtMTA1Nyw2ICsxMDcwLDE1IEBAIHZvaWQgaW50ZWxf dW5jb3JlX2luaXQoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAkJZndfZG9tYWluX2luaXQoZGV2 X3ByaXYsIEZXX0RPTUFJTl9JRF9SRU5ERVIsCiAJCQkgICAgICAgRk9SQ0VXQUtFLCBGT1JDRVdB S0VfQUNLKTsKIAl9Cit9CisKK3ZvaWQgaW50ZWxfdW5jb3JlX2luaXQoc3RydWN0IGRybV9kZXZp Y2UgKmRldikKK3sKKwlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBkZXYtPmRl dl9wcml2YXRlOworCisJaW50ZWxfdW5jb3JlX2VsbGNfZGV0ZWN0KGRldik7CisJaW50ZWxfdW5j b3JlX2Z3X2RvbWFpbnNfaW5pdChkZXYpOworCV9faW50ZWxfdW5jb3JlX2Vhcmx5X3Nhbml0aXpl KGRldiwgZmFsc2UpOwogCiAJc3dpdGNoIChJTlRFTF9JTkZPKGRldiktPmdlbikgewogCWRlZmF1 bHQ6Ci0tIAoxLjkuMQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Au b3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1n ZngK