From mboxrd@z Thu Jan 1 00:00:00 1970 From: Maarten Lankhorst Subject: [PATCH 16/42] drm/i915: Remove usage of crtc->config from i915_debugfs.c Date: Mon, 11 May 2015 16:24:52 +0200 Message-ID: <1431354318-11995-17-git-send-email-maarten.lankhorst@linux.intel.com> References: <1431354318-11995-1-git-send-email-maarten.lankhorst@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mblankhorst.nl (mblankhorst.nl [141.105.120.124]) by gabe.freedesktop.org (Postfix) with ESMTP id D3ED16E3F2 for ; Mon, 11 May 2015 07:25:44 -0700 (PDT) In-Reply-To: <1431354318-11995-1-git-send-email-maarten.lankhorst@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 Cc: Ander Conselvan de Oliveira List-Id: intel-gfx@lists.freedesktop.org QW5vdGhlciBhYnVzZXIgZ29uZS4KClNpZ25lZC1vZmYtYnk6IE1hYXJ0ZW4gTGFua2hvcnN0IDxt YWFydGVuLmxhbmtob3JzdEBsaW51eC5pbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5 MTUvaTkxNV9kZWJ1Z2ZzLmMgfCA0MiArKysrKysrKysrKysrKysrKysrKysrKystLS0tLS0tLS0t LS0tCiAxIGZpbGUgY2hhbmdlZCwgMjcgaW5zZXJ0aW9ucygrKSwgMTUgZGVsZXRpb25zKC0pCgpk aWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kZWJ1Z2ZzLmMgYi9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pOTE1X2RlYnVnZnMuYwppbmRleCBhY2Q0ZDJjNzYxM2EuLjU0MzlmZjlm N2U2YiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kZWJ1Z2ZzLmMKKysr IGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kZWJ1Z2ZzLmMKQEAgLTI3NTUsMTMgKzI3NTUs MTYgQEAgc3RhdGljIGludCBpOTE1X2Rpc3BsYXlfaW5mbyhzdHJ1Y3Qgc2VxX2ZpbGUgKm0sIHZv aWQgKnVudXNlZCkKIAlzZXFfcHJpbnRmKG0sICItLS0tLS0tLS1cbiIpOwogCWZvcl9lYWNoX2lu dGVsX2NydGMoZGV2LCBjcnRjKSB7CiAJCWJvb2wgYWN0aXZlOworCQlzdHJ1Y3QgaW50ZWxfY3J0 Y19zdGF0ZSAqcGlwZV9jb25maWc7CiAJCWludCB4LCB5OwogCisJCXBpcGVfY29uZmlnID0gdG9f aW50ZWxfY3J0Y19zdGF0ZShjcnRjLT5iYXNlLnN0YXRlKTsKKwogCQlzZXFfcHJpbnRmKG0sICJD UlRDICVkOiBwaXBlOiAlYywgYWN0aXZlPSVzIChzaXplPSVkeCVkKVxuIiwKIAkJCSAgIGNydGMt PmJhc2UuYmFzZS5pZCwgcGlwZV9uYW1lKGNydGMtPnBpcGUpLAotCQkJICAgeWVzbm8oY3J0Yy0+ YWN0aXZlKSwgY3J0Yy0+Y29uZmlnLT5waXBlX3NyY193LAotCQkJICAgY3J0Yy0+Y29uZmlnLT5w aXBlX3NyY19oKTsKLQkJaWYgKGNydGMtPmFjdGl2ZSkgeworCQkJICAgeWVzbm8ocGlwZV9jb25m aWctPmJhc2UuYWN0aXZlKSwKKwkJCSAgIHBpcGVfY29uZmlnLT5waXBlX3NyY193LCBwaXBlX2Nv bmZpZy0+cGlwZV9zcmNfaCk7CisJCWlmIChwaXBlX2NvbmZpZy0+YmFzZS5hY3RpdmUpIHsKIAkJ CWludGVsX2NydGNfaW5mbyhtLCBjcnRjKTsKIAogCQkJYWN0aXZlID0gY3Vyc29yX3Bvc2l0aW9u KGRldiwgY3J0Yy0+cGlwZSwgJngsICZ5KTsKQEAgLTMwMDIsNyArMzAwNSw3IEBAIHN0YXRpYyB2 b2lkIGRycnNfc3RhdHVzX3Blcl9jcnRjKHN0cnVjdCBzZXFfZmlsZSAqbSwKIAogCXNlcV9wdXRz KG0sICJcblxuIik7CiAKLQlpZiAoaW50ZWxfY3J0Yy0+Y29uZmlnLT5oYXNfZHJycykgeworCWlm ICh0b19pbnRlbF9jcnRjX3N0YXRlKGludGVsX2NydGMtPmJhc2Uuc3RhdGUpLT5oYXNfZHJycykg ewogCQlzdHJ1Y3QgaW50ZWxfcGFuZWwgKnBhbmVsOwogCiAJCW11dGV4X2xvY2soJmRycnMtPm11 dGV4KTsKQEAgLTMwNTQsNyArMzA1Nyw3IEBAIHN0YXRpYyBpbnQgaTkxNV9kcnJzX3N0YXR1cyhz dHJ1Y3Qgc2VxX2ZpbGUgKm0sIHZvaWQgKnVudXNlZCkKIAlmb3JfZWFjaF9pbnRlbF9jcnRjKGRl diwgaW50ZWxfY3J0YykgewogCQlkcm1fbW9kZXNldF9sb2NrKCZpbnRlbF9jcnRjLT5iYXNlLm11 dGV4LCBOVUxMKTsKIAotCQlpZiAoaW50ZWxfY3J0Yy0+YWN0aXZlKSB7CisJCWlmIChpbnRlbF9j cnRjLT5iYXNlLnN0YXRlLT5hY3RpdmUpIHsKIAkJCWFjdGl2ZV9jcnRjX2NudCsrOwogCQkJc2Vx X3ByaW50ZihtLCAiXG5DUlRDICVkOiAgIiwgYWN0aXZlX2NydGNfY250KTsKIApAQCAtMzU5Niwy MiArMzU5OSwyNyBAQCBzdGF0aWMgdm9pZCBoc3dfdHJhbnNfZWRwX3BpcGVfQV9jcmNfd2Eoc3Ry dWN0IGRybV9kZXZpY2UgKmRldikKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYg PSBkZXYtPmRldl9wcml2YXRlOwogCXN0cnVjdCBpbnRlbF9jcnRjICpjcnRjID0KIAkJdG9faW50 ZWxfY3J0YyhkZXZfcHJpdi0+cGlwZV90b19jcnRjX21hcHBpbmdbUElQRV9BXSk7CisJc3RydWN0 IGludGVsX2NydGNfc3RhdGUgKnBpcGVfY29uZmlnOwogCiAJZHJtX21vZGVzZXRfbG9ja19hbGwo ZGV2KTsKKwlwaXBlX2NvbmZpZyA9IHRvX2ludGVsX2NydGNfc3RhdGUoY3J0Yy0+YmFzZS5zdGF0 ZSk7CisKIAkvKgogCSAqIElmIHdlIHVzZSB0aGUgZURQIHRyYW5zY29kZXIgd2UgbmVlZCB0byBt YWtlIHN1cmUgdGhhdCB3ZSBkb24ndAogCSAqIGJ5cGFzcyB0aGUgcGZpdCwgc2luY2Ugb3RoZXJ3 aXNlIHRoZSBwaXBlIENSQyBzb3VyY2Ugd29uJ3Qgd29yay4gT25seQogCSAqIHJlbGV2YW50IG9u IGhzdyB3aXRoIHBpcGUgQSB3aGVuIHVzaW5nIHRoZSBhbHdheXMtb24gcG93ZXIgd2VsbAogCSAq IHJvdXRpbmcuCiAJICovCi0JaWYgKGNydGMtPmNvbmZpZy0+Y3B1X3RyYW5zY29kZXIgPT0gVFJB TlNDT0RFUl9FRFAgJiYKLQkgICAgIWNydGMtPmNvbmZpZy0+cGNoX3BmaXQuZW5hYmxlZCkgewot CQlib29sIGFjdGl2ZSA9IGNydGMtPmFjdGl2ZTsKKwlpZiAocGlwZV9jb25maWctPmNwdV90cmFu c2NvZGVyID09IFRSQU5TQ09ERVJfRURQICYmCisJICAgICFwaXBlX2NvbmZpZy0+cGNoX3BmaXQu ZW5hYmxlZCkgeworCQlib29sIGFjdGl2ZSA9IHBpcGVfY29uZmlnLT5iYXNlLmFjdGl2ZTsKIAot CQlpZiAoYWN0aXZlKQorCQlpZiAoYWN0aXZlKSB7CiAJCQlpbnRlbF9jcnRjX2NvbnRyb2woJmNy dGMtPmJhc2UsIGZhbHNlKTsKKwkJCXBpcGVfY29uZmlnID0gdG9faW50ZWxfY3J0Y19zdGF0ZShj cnRjLT5iYXNlLnN0YXRlKTsKKwkJfQogCi0JCWNydGMtPmNvbmZpZy0+cGNoX3BmaXQuZm9yY2Vf dGhydSA9IHRydWU7CisJCXBpcGVfY29uZmlnLT5wY2hfcGZpdC5mb3JjZV90aHJ1ID0gdHJ1ZTsK IAogCQlpbnRlbF9kaXNwbGF5X3Bvd2VyX2dldChkZXZfcHJpdiwKIAkJCQkJUE9XRVJfRE9NQUlO X1BJUEVfUEFORUxfRklUVEVSKFBJUEVfQSkpOwpAQCAtMzYyNyw2ICszNjM1LDcgQEAgc3RhdGlj IHZvaWQgaHN3X3VuZG9fdHJhbnNfZWRwX3BpcGVfQV9jcmNfd2Eoc3RydWN0IGRybV9kZXZpY2Ug KmRldikKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBkZXYtPmRldl9wcml2 YXRlOwogCXN0cnVjdCBpbnRlbF9jcnRjICpjcnRjID0KIAkJdG9faW50ZWxfY3J0YyhkZXZfcHJp di0+cGlwZV90b19jcnRjX21hcHBpbmdbUElQRV9BXSk7CisJc3RydWN0IGludGVsX2NydGNfc3Rh dGUgKnBpcGVfY29uZmlnOwogCiAJZHJtX21vZGVzZXRfbG9ja19hbGwoZGV2KTsKIAkvKgpAQCAt MzYzNSwxMyArMzY0NCwxNiBAQCBzdGF0aWMgdm9pZCBoc3dfdW5kb190cmFuc19lZHBfcGlwZV9B X2NyY193YShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCSAqIHJlbGV2YW50IG9uIGhzdyB3aXRo IHBpcGUgQSB3aGVuIHVzaW5nIHRoZSBhbHdheXMtb24gcG93ZXIgd2VsbAogCSAqIHJvdXRpbmcu CiAJICovCi0JaWYgKGNydGMtPmNvbmZpZy0+cGNoX3BmaXQuZm9yY2VfdGhydSkgewotCQlib29s IGFjdGl2ZSA9IGNydGMtPmFjdGl2ZTsKKwlwaXBlX2NvbmZpZyA9IHRvX2ludGVsX2NydGNfc3Rh dGUoY3J0Yy0+YmFzZS5zdGF0ZSk7CisJaWYgKHBpcGVfY29uZmlnLT5wY2hfcGZpdC5mb3JjZV90 aHJ1KSB7CisJCWJvb2wgYWN0aXZlID0gcGlwZV9jb25maWctPmJhc2UuYWN0aXZlOwogCi0JCWlm IChhY3RpdmUpCisJCWlmIChhY3RpdmUpIHsKIAkJCWludGVsX2NydGNfY29udHJvbCgmY3J0Yy0+ YmFzZSwgZmFsc2UpOworCQkJcGlwZV9jb25maWcgPSB0b19pbnRlbF9jcnRjX3N0YXRlKGNydGMt PmJhc2Uuc3RhdGUpOworCQl9CiAKLQkJY3J0Yy0+Y29uZmlnLT5wY2hfcGZpdC5mb3JjZV90aHJ1 ID0gZmFsc2U7CisJCXBpcGVfY29uZmlnLT5wY2hfcGZpdC5mb3JjZV90aHJ1ID0gZmFsc2U7CiAK IAkJaW50ZWxfZGlzcGxheV9wb3dlcl9wdXQoZGV2X3ByaXYsCiAJCQkJCVBPV0VSX0RPTUFJTl9Q SVBFX1BBTkVMX0ZJVFRFUihQSVBFX0EpKTsKQEAgLTM3NjMsNyArMzc3NSw3IEBAIHN0YXRpYyBp bnQgcGlwZV9jcmNfc2V0X3NvdXJjZShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCBlbnVtIHBpcGUg cGlwZSwKIAkJCQkgcGlwZV9uYW1lKHBpcGUpKTsKIAogCQlkcm1fbW9kZXNldF9sb2NrKCZjcnRj LT5iYXNlLm11dGV4LCBOVUxMKTsKLQkJaWYgKGNydGMtPmFjdGl2ZSkKKwkJaWYgKGNydGMtPmJh c2Uuc3RhdGUtPmFjdGl2ZSkKIAkJCWludGVsX3dhaXRfZm9yX3ZibGFuayhkZXYsIHBpcGUpOwog CQlkcm1fbW9kZXNldF91bmxvY2soJmNydGMtPmJhc2UubXV0ZXgpOwogCi0tIAoyLjEuMAoKX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1h aWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5m cmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK