From mboxrd@z Thu Jan 1 00:00:00 1970 From: Maarten Lankhorst Subject: [PATCH 31/42] drm/i915: Remove use of crtc->config in intel_sdvo.c Date: Mon, 11 May 2015 16:25:07 +0200 Message-ID: <1431354318-11995-32-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 263E66E3F4 for ; Mon, 11 May 2015 07:25:45 -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 U2lnbmVkLW9mZi1ieTogTWFhcnRlbiBMYW5raG9yc3QgPG1hYXJ0ZW4ubGFua2hvcnN0QGxpbnV4 LmludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9zZHZvLmMgfCAxOSAr KysrKysrKysrKy0tLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgMTEgaW5zZXJ0aW9ucygrKSwgOCBk ZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9zZHZv LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9zZHZvLmMKaW5kZXggNmE2ODA5OGY4YjA4 Li45M2IzMWQ2NmExYWIgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Nk dm8uYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9zZHZvLmMKQEAgLTk5NSw3ICs5 OTUsOCBAQCBzdGF0aWMgYm9vbCBpbnRlbF9zZHZvX3NldF9hdmlfaW5mb2ZyYW1lKHN0cnVjdCBp bnRlbF9zZHZvICppbnRlbF9zZHZvLAogewogCXVpbnQ4X3Qgc2R2b19kYXRhW0hETUlfSU5GT0ZS QU1FX1NJWkUoQVZJKV07CiAJc3RydWN0IGRybV9jcnRjICpjcnRjID0gaW50ZWxfc2R2by0+YmFz ZS5iYXNlLmNydGM7Ci0Jc3RydWN0IGludGVsX2NydGMgKmludGVsX2NydGMgPSB0b19pbnRlbF9j cnRjKGNydGMpOworCXN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpwaXBlX2NvbmZpZyA9CisJCXRv X2ludGVsX2NydGNfc3RhdGUoY3J0Yy0+c3RhdGUpOwogCXVuaW9uIGhkbWlfaW5mb2ZyYW1lIGZy YW1lOwogCWludCByZXQ7CiAJc3NpemVfdCBsZW47CkBAIC0xMDA4LDcgKzEwMDksNyBAQCBzdGF0 aWMgYm9vbCBpbnRlbF9zZHZvX3NldF9hdmlfaW5mb2ZyYW1lKHN0cnVjdCBpbnRlbF9zZHZvICpp bnRlbF9zZHZvLAogCX0KIAogCWlmIChpbnRlbF9zZHZvLT5yZ2JfcXVhbnRfcmFuZ2Vfc2VsZWN0 YWJsZSkgewotCQlpZiAoaW50ZWxfY3J0Yy0+Y29uZmlnLT5saW1pdGVkX2NvbG9yX3JhbmdlKQor CQlpZiAocGlwZV9jb25maWctPmxpbWl0ZWRfY29sb3JfcmFuZ2UpCiAJCQlmcmFtZS5hdmkucXVh bnRpemF0aW9uX3JhbmdlID0KIAkJCQlIRE1JX1FVQU5USVpBVElPTl9SQU5HRV9MSU1JVEVEOwog CQllbHNlCkBAIC0xMTgxLDkgKzExODIsMTEgQEAgc3RhdGljIHZvaWQgaW50ZWxfc2R2b19wcmVf ZW5hYmxlKHN0cnVjdCBpbnRlbF9lbmNvZGVyICppbnRlbF9lbmNvZGVyKQogCXN0cnVjdCBkcm1f ZGV2aWNlICpkZXYgPSBpbnRlbF9lbmNvZGVyLT5iYXNlLmRldjsKIAlzdHJ1Y3QgZHJtX2k5MTVf cHJpdmF0ZSAqZGV2X3ByaXYgPSBkZXYtPmRldl9wcml2YXRlOwogCXN0cnVjdCBpbnRlbF9jcnRj ICpjcnRjID0gdG9faW50ZWxfY3J0YyhpbnRlbF9lbmNvZGVyLT5iYXNlLmNydGMpOworCXN0cnVj dCBpbnRlbF9jcnRjX3N0YXRlICpwaXBlX2NvbmZpZyA9CisJCXRvX2ludGVsX2NydGNfc3RhdGUo Y3J0Yy0+YmFzZS5zdGF0ZSk7CiAJc3RydWN0IGRybV9kaXNwbGF5X21vZGUgKmFkanVzdGVkX21v ZGUgPQotCQkmY3J0Yy0+Y29uZmlnLT5iYXNlLmFkanVzdGVkX21vZGU7Ci0Jc3RydWN0IGRybV9k aXNwbGF5X21vZGUgKm1vZGUgPSAmY3J0Yy0+Y29uZmlnLT5iYXNlLm1vZGU7CisJCSZwaXBlX2Nv bmZpZy0+YmFzZS5hZGp1c3RlZF9tb2RlOworCXN0cnVjdCBkcm1fZGlzcGxheV9tb2RlICptb2Rl ID0gJnBpcGVfY29uZmlnLT5iYXNlLm1vZGU7CiAJc3RydWN0IGludGVsX3Nkdm8gKmludGVsX3Nk dm8gPSB0b19zZHZvKGludGVsX2VuY29kZXIpOwogCXUzMiBzZHZveDsKIAlzdHJ1Y3QgaW50ZWxf c2R2b19pbl9vdXRfbWFwIGluX291dDsKQEAgLTEyMjUsNyArMTIyOCw3IEBAIHN0YXRpYyB2b2lk IGludGVsX3Nkdm9fcHJlX2VuYWJsZShzdHJ1Y3QgaW50ZWxfZW5jb2RlciAqaW50ZWxfZW5jb2Rl cikKIAlpZiAoIWludGVsX3Nkdm9fc2V0X3RhcmdldF9pbnB1dChpbnRlbF9zZHZvKSkKIAkJcmV0 dXJuOwogCi0JaWYgKGNydGMtPmNvbmZpZy0+aGFzX2hkbWlfc2luaykgeworCWlmIChwaXBlX2Nv bmZpZy0+aGFzX2hkbWlfc2luaykgewogCQlpbnRlbF9zZHZvX3NldF9lbmNvZGUoaW50ZWxfc2R2 bywgU0RWT19FTkNPREVfSERNSSk7CiAJCWludGVsX3Nkdm9fc2V0X2NvbG9yaW1ldHJ5KGludGVs X3Nkdm8sCiAJCQkJCSAgIFNEVk9fQ09MT1JJTUVUUllfUkdCMjU2KTsKQEAgLTEyNDUsNyArMTI0 OCw3IEBAIHN0YXRpYyB2b2lkIGludGVsX3Nkdm9fcHJlX2VuYWJsZShzdHJ1Y3QgaW50ZWxfZW5j b2RlciAqaW50ZWxfZW5jb2RlcikKIAkJRFJNX0lORk8oIlNldHRpbmcgaW5wdXQgdGltaW5ncyBv biAlcyBmYWlsZWRcbiIsCiAJCQkgU0RWT19OQU1FKGludGVsX3Nkdm8pKTsKIAotCXN3aXRjaCAo Y3J0Yy0+Y29uZmlnLT5waXhlbF9tdWx0aXBsaWVyKSB7CisJc3dpdGNoIChwaXBlX2NvbmZpZy0+ cGl4ZWxfbXVsdGlwbGllcikgewogCWRlZmF1bHQ6CiAJCVdBUk4oMSwgInVua25vd24gcGl4ZWwg bXVsdGlwbGllciBzcGVjaWZpZWRcbiIpOwogCWNhc2UgMTogcmF0ZSA9IFNEVk9fQ0xPQ0tfUkFU RV9NVUxUXzFYOyBicmVhazsKQEAgLTEyNjAsNyArMTI2Myw3IEBAIHN0YXRpYyB2b2lkIGludGVs X3Nkdm9fcHJlX2VuYWJsZShzdHJ1Y3QgaW50ZWxfZW5jb2RlciAqaW50ZWxfZW5jb2RlcikKIAkJ LyogVGhlIHJlYWwgbW9kZSBwb2xhcml0eSBpcyBzZXQgYnkgdGhlIFNEVk8gY29tbWFuZHMsIHVz aW5nCiAJCSAqIHN0cnVjdCBpbnRlbF9zZHZvX2R0ZC4gKi8KIAkJc2R2b3ggPSBTRFZPX1ZTWU5D X0FDVElWRV9ISUdIIHwgU0RWT19IU1lOQ19BQ1RJVkVfSElHSDsKLQkJaWYgKCFIQVNfUENIX1NQ TElUKGRldikgJiYgY3J0Yy0+Y29uZmlnLT5saW1pdGVkX2NvbG9yX3JhbmdlKQorCQlpZiAoIUhB U19QQ0hfU1BMSVQoZGV2KSAmJiBwaXBlX2NvbmZpZy0+bGltaXRlZF9jb2xvcl9yYW5nZSkKIAkJ CXNkdm94IHw9IEhETUlfQ09MT1JfUkFOR0VfMTZfMjM1OwogCQlpZiAoSU5URUxfSU5GTyhkZXYp LT5nZW4gPCA1KQogCQkJc2R2b3ggfD0gU0RWT19CT1JERVJfRU5BQkxFOwpAQCAtMTI5MCw3ICsx MjkzLDcgQEAgc3RhdGljIHZvaWQgaW50ZWxfc2R2b19wcmVfZW5hYmxlKHN0cnVjdCBpbnRlbF9l bmNvZGVyICppbnRlbF9lbmNvZGVyKQogCX0gZWxzZSBpZiAoSVNfSTk0NUcoZGV2KSB8fCBJU19J OTQ1R00oZGV2KSB8fCBJU19HMzMoZGV2KSkgewogCQkvKiBkb25lIGluIGNydGNfbW9kZV9zZXQg YXMgaXQgbGl2ZXMgaW5zaWRlIHRoZSBkcGxsIHJlZ2lzdGVyICovCiAJfSBlbHNlIHsKLQkJc2R2 b3ggfD0gKGNydGMtPmNvbmZpZy0+cGl4ZWxfbXVsdGlwbGllciAtIDEpCisJCXNkdm94IHw9IChw aXBlX2NvbmZpZy0+cGl4ZWxfbXVsdGlwbGllciAtIDEpCiAJCQk8PCBTRFZPX1BPUlRfTVVMVElQ TFlfU0hJRlQ7CiAJfQogCi0tIAoyLjEuMAoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMu ZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0 aW5mby9pbnRlbC1nZngK