From mboxrd@z Thu Jan 1 00:00:00 1970 From: Damien Lespiau Subject: [PATCH 09/22] drm: Make drm_match_cea_mode() return the underlying 2D VIC for 3d modes Date: Wed, 25 Sep 2013 16:45:27 +0100 Message-ID: <1380123940-14340-10-git-send-email-damien.lespiau@intel.com> References: <1380123940-14340-1-git-send-email-damien.lespiau@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <1380123940-14340-1-git-send-email-damien.lespiau@intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-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: dri-devel@lists.freedesktop.org Cc: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org V2hlbiBzY2FubmluZyBvdXQgYSBzdGVyZW8gbW9kZSwgdGhlIEFWSSBpbmZvZnJhbWUgdmljIGZp ZWxkIGhhcyB0byBiZQp0aGUgdW5kZXJseW5nIDJEIFZJQy4gQmVmb3JlIHRoYXQgY29tbWl0LCB3 ZSB3ZXJlbid0IG1hdGNoaW5nIHRoZSBDRUEKbW9kZSBiZWNhdXNlIG9mIHRoZSBleHRyYSBzdGVy ZW8gZmxhZyBhbmQgdGhlbiB3ZXJlIHNldHRpbmcgdGhlIFZJQwpmaWVsZCBpbiB0aGUgQVZJIGlu Zm9mcmFtZSB0byAwLgoKUmV2aWV3ZWQtYnk6IFZpbGxlIFN5cmrDpGzDpCA8dmlsbGUuc3lyamFs YUBsaW51eC5pbnRlbC5jb20+ClNpZ25lZC1vZmYtYnk6IERhbWllbiBMZXNwaWF1IDxkYW1pZW4u bGVzcGlhdUBpbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2RybV9lZGlkLmMgIHwgIDQg KystLQogZHJpdmVycy9ncHUvZHJtL2RybV9tb2Rlcy5jIHwgMTggKysrKysrKysrKysrLS0tLS0t CiBpbmNsdWRlL2RybS9kcm1fY3J0Yy5oICAgICAgfCAgMiArLQogMyBmaWxlcyBjaGFuZ2VkLCAx NSBpbnNlcnRpb25zKCspLCA5IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1 L2RybS9kcm1fZWRpZC5jIGIvZHJpdmVycy9ncHUvZHJtL2RybV9lZGlkLmMKaW5kZXggMGJhZTc2 ZC4uNDhmMTc0NiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2RybV9lZGlkLmMKKysrIGIv ZHJpdmVycy9ncHUvZHJtL2RybV9lZGlkLmMKQEAgLTI0MDQsNyArMjQwNCw3IEBAIHU4IGRybV9t YXRjaF9jZWFfbW9kZShjb25zdCBzdHJ1Y3QgZHJtX2Rpc3BsYXlfbW9kZSAqdG9fbWF0Y2gpCiAK IAkJaWYgKChLSFoyUElDT1ModG9fbWF0Y2gtPmNsb2NrKSA9PSBLSFoyUElDT1MoY2xvY2sxKSB8 fAogCQkgICAgIEtIWjJQSUNPUyh0b19tYXRjaC0+Y2xvY2spID09IEtIWjJQSUNPUyhjbG9jazIp KSAmJgotCQkgICAgZHJtX21vZGVfZXF1YWxfbm9fY2xvY2tzKHRvX21hdGNoLCBjZWFfbW9kZSkp CisJCSAgICBkcm1fbW9kZV9lcXVhbF9ub19jbG9ja3Nfbm9fc3RlcmVvKHRvX21hdGNoLCBjZWFf bW9kZSkpCiAJCQlyZXR1cm4gbW9kZSArIDE7CiAJfQogCXJldHVybiAwOwpAQCAtMjQ1Myw3ICsy NDUzLDcgQEAgc3RhdGljIHU4IGRybV9tYXRjaF9oZG1pX21vZGUoY29uc3Qgc3RydWN0IGRybV9k aXNwbGF5X21vZGUgKnRvX21hdGNoKQogCiAJCWlmICgoS0haMlBJQ09TKHRvX21hdGNoLT5jbG9j aykgPT0gS0haMlBJQ09TKGNsb2NrMSkgfHwKIAkJICAgICBLSFoyUElDT1ModG9fbWF0Y2gtPmNs b2NrKSA9PSBLSFoyUElDT1MoY2xvY2syKSkgJiYKLQkJICAgIGRybV9tb2RlX2VxdWFsX25vX2Ns b2Nrcyh0b19tYXRjaCwgaGRtaV9tb2RlKSkKKwkJICAgIGRybV9tb2RlX2VxdWFsX25vX2Nsb2Nr c19ub19zdGVyZW8odG9fbWF0Y2gsIGhkbWlfbW9kZSkpCiAJCQlyZXR1cm4gbW9kZSArIDE7CiAJ fQogCXJldHVybiAwOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2RybV9tb2Rlcy5jIGIv ZHJpdmVycy9ncHUvZHJtL2RybV9tb2Rlcy5jCmluZGV4IGZjMmFkYjYuLmMyY2IyYzggMTAwNjQ0 Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9kcm1fbW9kZXMuYworKysgYi9kcml2ZXJzL2dwdS9kcm0v ZHJtX21vZGVzLmMKQEAgLTgzMCwxMiArODMwLDE2IEBAIGJvb2wgZHJtX21vZGVfZXF1YWwoY29u c3Qgc3RydWN0IGRybV9kaXNwbGF5X21vZGUgKm1vZGUxLCBjb25zdCBzdHJ1Y3QgZHJtX2Rpc3Bs CiAJfSBlbHNlIGlmIChtb2RlMS0+Y2xvY2sgIT0gbW9kZTItPmNsb2NrKQogCQlyZXR1cm4gZmFs c2U7CiAKLQlyZXR1cm4gZHJtX21vZGVfZXF1YWxfbm9fY2xvY2tzKG1vZGUxLCBtb2RlMik7CisJ aWYgKChtb2RlMS0+ZmxhZ3MgJiBEUk1fTU9ERV9GTEFHXzNEX01BU0spICE9CisJICAgIChtb2Rl Mi0+ZmxhZ3MgJiBEUk1fTU9ERV9GTEFHXzNEX01BU0spKQorCQlyZXR1cm4gZmFsc2U7CisKKwly ZXR1cm4gZHJtX21vZGVfZXF1YWxfbm9fY2xvY2tzX25vX3N0ZXJlbyhtb2RlMSwgbW9kZTIpOwog fQogRVhQT1JUX1NZTUJPTChkcm1fbW9kZV9lcXVhbCk7CiAKIC8qKgotICogZHJtX21vZGVfZXF1 YWxfbm9fY2xvY2tzIC0gdGVzdCBtb2RlcyBmb3IgZXF1YWxpdHkKKyAqIGRybV9tb2RlX2VxdWFs X25vX2Nsb2Nrc19ub19zdGVyZW8gLSB0ZXN0IG1vZGVzIGZvciBlcXVhbGl0eQogICogQG1vZGUx OiBmaXJzdCBtb2RlCiAgKiBAbW9kZTI6IHNlY29uZCBtb2RlCiAgKgpAQCAtODQzLDEyICs4NDcs MTMgQEAgRVhQT1JUX1NZTUJPTChkcm1fbW9kZV9lcXVhbCk7CiAgKiBOb25lLgogICoKICAqIENo ZWNrIHRvIHNlZSBpZiBAbW9kZTEgYW5kIEBtb2RlMiBhcmUgZXF1aXZhbGVudCwgYnV0Ci0gKiBk b24ndCBjaGVjayB0aGUgcGl4ZWwgY2xvY2tzLgorICogZG9uJ3QgY2hlY2sgdGhlIHBpeGVsIGNs b2NrcyBub3IgdGhlIHN0ZXJlbyBsYXlvdXQuCiAgKgogICogUkVUVVJOUzoKICAqIFRydWUgaWYg dGhlIG1vZGVzIGFyZSBlcXVhbCwgZmFsc2Ugb3RoZXJ3aXNlLgogICovCi1ib29sIGRybV9tb2Rl X2VxdWFsX25vX2Nsb2Nrcyhjb25zdCBzdHJ1Y3QgZHJtX2Rpc3BsYXlfbW9kZSAqbW9kZTEsIGNv bnN0IHN0cnVjdCBkcm1fZGlzcGxheV9tb2RlICptb2RlMikKK2Jvb2wgZHJtX21vZGVfZXF1YWxf bm9fY2xvY2tzX25vX3N0ZXJlbyhjb25zdCBzdHJ1Y3QgZHJtX2Rpc3BsYXlfbW9kZSAqbW9kZTEs CisJCQkJCWNvbnN0IHN0cnVjdCBkcm1fZGlzcGxheV9tb2RlICptb2RlMikKIHsKIAlpZiAobW9k ZTEtPmhkaXNwbGF5ID09IG1vZGUyLT5oZGlzcGxheSAmJgogCSAgICBtb2RlMS0+aHN5bmNfc3Rh cnQgPT0gbW9kZTItPmhzeW5jX3N0YXJ0ICYmCkBAIC04NjAsMTIgKzg2NSwxMyBAQCBib29sIGRy bV9tb2RlX2VxdWFsX25vX2Nsb2Nrcyhjb25zdCBzdHJ1Y3QgZHJtX2Rpc3BsYXlfbW9kZSAqbW9k ZTEsIGNvbnN0IHN0cnVjdAogCSAgICBtb2RlMS0+dnN5bmNfZW5kID09IG1vZGUyLT52c3luY19l bmQgJiYKIAkgICAgbW9kZTEtPnZ0b3RhbCA9PSBtb2RlMi0+dnRvdGFsICYmCiAJICAgIG1vZGUx LT52c2NhbiA9PSBtb2RlMi0+dnNjYW4gJiYKLQkgICAgbW9kZTEtPmZsYWdzID09IG1vZGUyLT5m bGFncykKKwkgICAgKG1vZGUxLT5mbGFncyAmIH5EUk1fTU9ERV9GTEFHXzNEX01BU0spID09CisJ ICAgICAobW9kZTItPmZsYWdzICYgfkRSTV9NT0RFX0ZMQUdfM0RfTUFTSykpCiAJCXJldHVybiB0 cnVlOwogCiAJcmV0dXJuIGZhbHNlOwogfQotRVhQT1JUX1NZTUJPTChkcm1fbW9kZV9lcXVhbF9u b19jbG9ja3MpOworRVhQT1JUX1NZTUJPTChkcm1fbW9kZV9lcXVhbF9ub19jbG9ja3Nfbm9fc3Rl cmVvKTsKIAogLyoqCiAgKiBkcm1fbW9kZV92YWxpZGF0ZV9zaXplIC0gbWFrZSBzdXJlIG1vZGVz IGFkaGVyZSB0byBzaXplIGNvbnN0cmFpbnRzCmRpZmYgLS1naXQgYS9pbmNsdWRlL2RybS9kcm1f Y3J0Yy5oIGIvaW5jbHVkZS9kcm0vZHJtX2NydGMuaAppbmRleCA4MjVkNmZhLi42YjdmOWM3IDEw MDY0NAotLS0gYS9pbmNsdWRlL2RybS9kcm1fY3J0Yy5oCisrKyBiL2luY2x1ZGUvZHJtL2RybV9j cnRjLmgKQEAgLTk4OSw3ICs5ODksNyBAQCBleHRlcm4gdm9pZCBkcm1fbW9kZV9jb25maWdfcmVz ZXQoc3RydWN0IGRybV9kZXZpY2UgKmRldik7CiBleHRlcm4gdm9pZCBkcm1fbW9kZV9jb25maWdf Y2xlYW51cChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KTsKIGV4dGVybiB2b2lkIGRybV9tb2RlX3Nl dF9uYW1lKHN0cnVjdCBkcm1fZGlzcGxheV9tb2RlICptb2RlKTsKIGV4dGVybiBib29sIGRybV9t b2RlX2VxdWFsKGNvbnN0IHN0cnVjdCBkcm1fZGlzcGxheV9tb2RlICptb2RlMSwgY29uc3Qgc3Ry dWN0IGRybV9kaXNwbGF5X21vZGUgKm1vZGUyKTsKLWV4dGVybiBib29sIGRybV9tb2RlX2VxdWFs X25vX2Nsb2Nrcyhjb25zdCBzdHJ1Y3QgZHJtX2Rpc3BsYXlfbW9kZSAqbW9kZTEsIGNvbnN0IHN0 cnVjdCBkcm1fZGlzcGxheV9tb2RlICptb2RlMik7CitleHRlcm4gYm9vbCBkcm1fbW9kZV9lcXVh bF9ub19jbG9ja3Nfbm9fc3RlcmVvKGNvbnN0IHN0cnVjdCBkcm1fZGlzcGxheV9tb2RlICptb2Rl MSwgY29uc3Qgc3RydWN0IGRybV9kaXNwbGF5X21vZGUgKm1vZGUyKTsKIGV4dGVybiBpbnQgZHJt X21vZGVfd2lkdGgoY29uc3Qgc3RydWN0IGRybV9kaXNwbGF5X21vZGUgKm1vZGUpOwogZXh0ZXJu IGludCBkcm1fbW9kZV9oZWlnaHQoY29uc3Qgc3RydWN0IGRybV9kaXNwbGF5X21vZGUgKm1vZGUp OwogCi0tIAoxLjguMy4xCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3Rv cC5vcmcKaHR0cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVs LWdmeAo=