From mboxrd@z Thu Jan  1 00:00:00 1970
From: Jesse Barnes <jbarnes@virtuousgeek.org>
Subject: [PATCH 3/4] drm/i915: use current mode if the size
	matches the preferred mode
Date: Fri, 14 Mar 2014 14:37:10 -0700
Message-ID: <1394833031-4055-3-git-send-email-jbarnes@virtuousgeek.org>
References: <1394833031-4055-1-git-send-email-jbarnes@virtuousgeek.org>
Mime-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64
Return-path: <intel-gfx-bounces@lists.freedesktop.org>
Received: from gproxy3-pub.mail.unifiedlayer.com
 (gproxy3-pub.mail.unifiedlayer.com [69.89.30.42])
 by gabe.freedesktop.org (Postfix) with SMTP id 59E7E89078
 for <intel-gfx@lists.freedesktop.org>; Sat, 15 Mar 2014 06:37:19 -0700 (PDT)
In-Reply-To: <1394833031-4055-1-git-send-email-jbarnes@virtuousgeek.org>
List-Unsubscribe: <http://lists.freedesktop.org/mailman/options/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=unsubscribe>
List-Archive: <http://lists.freedesktop.org/archives/intel-gfx>
List-Post: <mailto:intel-gfx@lists.freedesktop.org>
List-Help: <mailto:intel-gfx-request@lists.freedesktop.org?subject=help>
List-Subscribe: <http://lists.freedesktop.org/mailman/listinfo/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=subscribe>
Errors-To: intel-gfx-bounces@lists.freedesktop.org
Sender: "Intel-gfx" <intel-gfx-bounces@lists.freedesktop.org>
To: intel-gfx@lists.freedesktop.org
Cc: dri-devel@lists.freedesktop.org
List-Id: intel-gfx@lists.freedesktop.org

RnJvbTogS3Jpc3RpYW4gSMO4Z3NiZXJnIDxob2Vnc2JlcmdAZ21haWwuY29tPgoKVGhlIEJJT1Mg
bWF5IHNldCBhIG5hdGl2ZSBtb2RlIHRoYXQgZG9lc24ndCBxdWl0ZSBtYXRjaCB0aGUgcHJlZmVy
cmVkCm1vZGUgdGltaW5ncy4gIEl0IHNob3VsZCBiZSBvayB0byB1c2UgaG93ZXZlciBpZiBpdCB1
c2VzIHRoZSBzYW1lIHNpemUsCnNvIHRyeSB0byBhdm9pZCBhIG1vZGUgc2V0IGluIHRoYXQgY2Fz
ZS4KClNpZ25lZC1vZmYtYnk6IEtyaXN0aWFuIEjDuGdzYmVyZyA8aG9lZ3NiZXJnQGdtYWlsLmNv
bT4KU2lnbmVkLW9mZi1ieTogSmVzc2UgQmFybmVzIDxqYmFybmVzQHZpcnR1b3VzZ2Vlay5vcmc+
Ci0tLQogZHJpdmVycy9ncHUvZHJtL2RybV9tb2Rlcy5jICAgICAgICB8ICAgIDggKysrKysrKysK
IGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2ZiZGV2LmMgfCAgIDM3ICsrKysrKysrKysrKysr
KysrKy0tLS0tLS0tLS0tLS0tLS0tLQogaW5jbHVkZS9kcm0vZHJtX2NydGMuaCAgICAgICAgICAg
ICB8ICAgIDIgKysKIDMgZmlsZXMgY2hhbmdlZCwgMjggaW5zZXJ0aW9ucygrKSwgMTkgZGVsZXRp
b25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2RybV9tb2Rlcy5jIGIvZHJpdmVy
cy9ncHUvZHJtL2RybV9tb2Rlcy5jCmluZGV4IGIwNzMzMTUuLjdkMmRkYTQgMTAwNjQ0Ci0tLSBh
L2RyaXZlcnMvZ3B1L2RybS9kcm1fbW9kZXMuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vZHJtX21v
ZGVzLmMKQEAgLTg5NCw2ICs4OTQsMTQgQEAgYm9vbCBkcm1fbW9kZV9lcXVhbF9ub19jbG9ja3Nf
bm9fc3RlcmVvKGNvbnN0IHN0cnVjdCBkcm1fZGlzcGxheV9tb2RlICptb2RlMSwKIH0KIEVYUE9S
VF9TWU1CT0woZHJtX21vZGVfZXF1YWxfbm9fY2xvY2tzX25vX3N0ZXJlbyk7CiAKK2Jvb2wgZHJt
X21vZGVfc2FtZV9zaXplKGNvbnN0IHN0cnVjdCBkcm1fZGlzcGxheV9tb2RlICptb2RlMSwKKwkJ
CWNvbnN0IHN0cnVjdCBkcm1fZGlzcGxheV9tb2RlICptb2RlMikKK3sKKwlyZXR1cm4gbW9kZTEt
PnZkaXNwbGF5ID09IG1vZGUyLT52ZGlzcGxheSAmJgorCQltb2RlMS0+aGRpc3BsYXkgPT0gbW9k
ZTItPmhkaXNwbGF5OworfQorRVhQT1JUX1NZTUJPTChkcm1fbW9kZV9zYW1lX3NpemUpOworCiAv
KioKICAqIGRybV9tb2RlX3ZhbGlkYXRlX3NpemUgLSBtYWtlIHN1cmUgbW9kZXMgYWRoZXJlIHRv
IHNpemUgY29uc3RyYWludHMKICAqIEBkZXY6IERSTSBkZXZpY2UKZGlmZiAtLWdpdCBhL2RyaXZl
cnMvZ3B1L2RybS9pOTE1L2ludGVsX2ZiZGV2LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl
bF9mYmRldi5jCmluZGV4IGQ2ZDc4YzguLmY4MWUzZGIgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1
L2RybS9pOTE1L2ludGVsX2ZiZGV2LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf
ZmJkZXYuYwpAQCAtMzY5LDMxICszNjksMzAgQEAgc3RhdGljIGJvb2wgaW50ZWxfZmJfaW5pdGlh
bF9jb25maWcoc3RydWN0IGRybV9mYl9oZWxwZXIgKmZiX2hlbHBlciwKIAkJLyogZ28gZm9yIGNv
bW1hbmQgbGluZSBtb2RlIGZpcnN0ICovCiAJCW1vZGVzW2ldID0gZHJtX3BpY2tfY21kbGluZV9t
b2RlKGZiX2Nvbm4sIHdpZHRoLCBoZWlnaHQpOwogCi0JCS8qIHRyeSBmb3IgcHJlZmVycmVkIG5l
eHQgKi8KKwkJLyogdHJ5IGZvciBwcmVmZXJyZWQgbmV4dCBvciBtYXRjaCBjdXJyZW50ICovCiAJ
CWlmICghbW9kZXNbaV0pIHsKKwkJCXN0cnVjdCBkcm1fZGlzcGxheV9tb2RlICpwcmVmZXJyZWQ7
CisKIAkJCURSTV9ERUJVR19LTVMoImxvb2tpbmcgZm9yIHByZWZlcnJlZCBtb2RlIG9uIGNvbm5l
Y3RvciAlZFxuIiwKIAkJCQkgICAgICBmYl9jb25uLT5jb25uZWN0b3ItPmJhc2UuaWQpOwotCQkJ
bW9kZXNbaV0gPSBkcm1faGFzX3ByZWZlcnJlZF9tb2RlKGZiX2Nvbm4sIHdpZHRoLAotCQkJCQkJ
CSAgaGVpZ2h0KTsKLQkJfQotCi0JCS8qIGxhc3QgcmVzb3J0OiB1c2UgY3VycmVudCBtb2RlICov
Ci0JCWlmICghbW9kZXNbaV0pIHsKLQkJCS8qCi0JCQkgKiBJTVBPUlRBTlQ6IFdlIHdhbnQgdG8g
dXNlIHRoZSBhZGp1c3RlZCBtb2RlIChpLmUuCi0JCQkgKiBhZnRlciB0aGUgcGFuZWwgZml0dGVy
IHVwc2NhbGluZykgYXMgdGhlIGluaXRpYWwKLQkJCSAqIGNvbmZpZywgbm90IHRoZSBpbnB1dCBt
b2RlLCB3aGljaCBpcyB3aGF0IGNydGMtPm1vZGUKLQkJCSAqIHVzdWFsbHkgY29udGFpbnMuIEJ1
dCBzaW5jZSBvdXIgY3VycmVudCBmYXN0Ym9vdAotCQkJICogY29kZSBwdXRzIGEgbW9kZSBkZXJp
dmVkIGZyb20gdGhlIHBvc3QtcGZpdCB0aW1pbmdzCi0JCQkgKiBpbnRvIGNydGMtPm1vZGUgdGhp
cyB3b3JrcyBvdXQgY29ycmVjdGx5LiBXZSBkb24ndAotCQkJICogdXNlIGh3bW9kZSBhbnl3aGVy
ZSByaWdodCBub3csIHNvIHVzZSBpdCBmb3IgdGhpcwotCQkJICogc2luY2UgdGhlIGZiIGhlbHBl
ciBsYXllciB3YW50cyBhIHBvaW50ZXIgdG8KLQkJCSAqIHNvbWV0aGluZyB3ZSBvd24uCi0JCQkg
Ki8KKwkJCXByZWZlcnJlZCA9IGRybV9oYXNfcHJlZmVycmVkX21vZGUoZmJfY29ubiwgd2lkdGgs
CisJCQkJCQkJICAgaGVpZ2h0KTsKIAkJCWludGVsX21vZGVfZnJvbV9waXBlX2NvbmZpZygmZW5j
b2Rlci0+Y3J0Yy0+aHdtb2RlLAogCQkJCQkJICAgICZ0b19pbnRlbF9jcnRjKGVuY29kZXItPmNy
dGMpLT5jb25maWcpOwotCQkJbW9kZXNbaV0gPSAmZW5jb2Rlci0+Y3J0Yy0+aHdtb2RlOworIAkJ
CW1vZGVzW2ldID0gJmVuY29kZXItPmNydGMtPmh3bW9kZTsKKworCQkJaWYgKHByZWZlcnJlZCAm
JgorCQkJICAgICFkcm1fbW9kZV9zYW1lX3NpemUocHJlZmVycmVkLCBtb2Rlc1tpXSkpIHsKKwkJ
CQlEUk1fREVCVUdfS01TKCJ1c2luZyBwcmVmZXJyZWQgbW9kZSAlcyAiCisJCQkJCSAgICAgICJp
bnN0ZWFkIG9mIGN1cnJlbnQgbW9kZSAlcyAiCisJCQkJCSAgICAgICJvbiBjb25uZWN0b3IgJWRc
biIsCisJCQkJCSAgICAgIHByZWZlcnJlZC0+bmFtZSwKKwkJCQkJICAgICAgbW9kZXNbaV0tPm5h
bWUsCisJCQkJCSAgICAgIGZiX2Nvbm4tPmNvbm5lY3Rvci0+YmFzZS5pZCk7CisJCQkJbW9kZXNb
aV0gPSBwcmVmZXJyZWQ7CisJCQl9CiAJCX0KKwogCQljcnRjc1tpXSA9IG5ld19jcnRjOwogCiAJ
CURSTV9ERUJVR19LTVMoImNvbm5lY3RvciAlcyBvbiBjcnRjICVkOiAlc1xuIiwKZGlmZiAtLWdp
dCBhL2luY2x1ZGUvZHJtL2RybV9jcnRjLmggYi9pbmNsdWRlL2RybS9kcm1fY3J0Yy5oCmluZGV4
IGY3NjQ2NTQuLmQ1ZWJlM2IgMTAwNjQ0Ci0tLSBhL2luY2x1ZGUvZHJtL2RybV9jcnRjLmgKKysr
IGIvaW5jbHVkZS9kcm0vZHJtX2NydGMuaApAQCAtMTAyMCw2ICsxMDIwLDggQEAgZXh0ZXJuIGJv
b2wgZHJtX21vZGVfZXF1YWwoY29uc3Qgc3RydWN0IGRybV9kaXNwbGF5X21vZGUgKm1vZGUxLCBj
b25zdCBzdHJ1Y3QgZHIKIGV4dGVybiBib29sIGRybV9tb2RlX2VxdWFsX25vX2Nsb2Nrc19ub19z
dGVyZW8oY29uc3Qgc3RydWN0IGRybV9kaXNwbGF5X21vZGUgKm1vZGUxLCBjb25zdCBzdHJ1Y3Qg
ZHJtX2Rpc3BsYXlfbW9kZSAqbW9kZTIpOwogZXh0ZXJuIGludCBkcm1fbW9kZV93aWR0aChjb25z
dCBzdHJ1Y3QgZHJtX2Rpc3BsYXlfbW9kZSAqbW9kZSk7CiBleHRlcm4gaW50IGRybV9tb2RlX2hl
aWdodChjb25zdCBzdHJ1Y3QgZHJtX2Rpc3BsYXlfbW9kZSAqbW9kZSk7CitleHRlcm4gYm9vbCBk
cm1fbW9kZV9zYW1lX3NpemUoY29uc3Qgc3RydWN0IGRybV9kaXNwbGF5X21vZGUgKm1vZGUxLAor
CQkJICAgICAgIGNvbnN0IHN0cnVjdCBkcm1fZGlzcGxheV9tb2RlICptb2RlMik7CiAKIC8qIGZv
ciB1cyBieSBmYiBtb2R1bGUgKi8KIGV4dGVybiBzdHJ1Y3QgZHJtX2Rpc3BsYXlfbW9kZSAqZHJt
X21vZGVfY3JlYXRlKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpOwotLSAKMS43LjkuNQoKX19fX19f
X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxp
bmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVl
ZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK