From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ville Syrjala Subject: [RFC][PATCH 02/11] drm/i915: Fill display_info.{width, height}_mm from .get_modes() Date: Tue, 27 Feb 2018 14:56:51 +0200 Message-ID: <20180227125700.6527-3-ville.syrjala@linux.intel.com> References: <20180227125700.6527-1-ville.syrjala@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20180227125700.6527-1-ville.syrjala@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: dri-devel@lists.freedesktop.org Cc: Daniel Vetter , intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org RnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KCmRp c3BsYXlfaW5mby53aWR0aF9tbSBhbmQgZGlzcGxheV9pbmZvLmhlaWdodF9tbSBhcmUgZHluYW1p YyBtZXRhZGF0YQp0aGF0IGVpdGhlciBnZXRzIHBhcnNlZCBmcm9tIHRoZSBFRElEIG9yIGZpbGxl ZCBieSB0aGUgZHJpdmVyIGJ5IHNvbWUKb3RoZXIgbWVhbnMuIEVpdGhlciB3YXkgd2Ugc2hvdWxk IHVwZGF0ZSBpdCBpbiB0aGUgc2FtZSBwbGFjZSwgaWUuCnRoZSAuZmlsbF9tb2RlcygpLy5nZXRf bW9kZXMoKSBob29rcy4KCkNjOiBLZWl0aCBQYWNrYXJkIDxrZWl0aHBAa2VpdGhwLmNvbT4KQ2M6 IERhbmllbCBWZXR0ZXIgPGRhbmllbC52ZXR0ZXJAZmZ3bGwuY2g+ClNpZ25lZC1vZmYtYnk6IFZp bGxlIFN5cmrDpGzDpCA8dmlsbGUuc3lyamFsYUBsaW51eC5pbnRlbC5jb20+Ci0tLQogZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfZHAuYyAgIHwgMTUgKysrKysrKy0tLS0tLS0tCiBkcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9kc2kuYyAgfCAxMyArKysrKysrLS0tLS0tCiBkcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF9sdmRzLmMgfCAgOSArKysrKystLS0KIDMgZmlsZXMgY2hhbmdlZCwg MjAgaW5zZXJ0aW9ucygrKSwgMTcgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfZHAuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2RwLmMK aW5kZXggODAxYTIxYjE2MDA0Li5lZGZjYWQyNzY1MDYgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX2RwLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHAu YwpAQCAtNDk2Niw2ICs0OTY2LDcgQEAgaW50ZWxfZHBfZm9yY2Uoc3RydWN0IGRybV9jb25uZWN0 b3IgKmNvbm5lY3RvcikKIHN0YXRpYyBpbnQgaW50ZWxfZHBfZ2V0X21vZGVzKHN0cnVjdCBkcm1f Y29ubmVjdG9yICpjb25uZWN0b3IpCiB7CiAJc3RydWN0IGludGVsX2Nvbm5lY3RvciAqaW50ZWxf Y29ubmVjdG9yID0gdG9faW50ZWxfY29ubmVjdG9yKGNvbm5lY3Rvcik7CisJY29uc3Qgc3RydWN0 IGRybV9kaXNwbGF5X21vZGUgKmZpeGVkX21vZGUgPSBpbnRlbF9jb25uZWN0b3ItPnBhbmVsLmZp eGVkX21vZGU7CiAJc3RydWN0IGVkaWQgKmVkaWQ7CiAKIAllZGlkID0gaW50ZWxfY29ubmVjdG9y LT5kZXRlY3RfZWRpZDsKQEAgLTQ5NzYsMTIgKzQ5NzcsMTMgQEAgc3RhdGljIGludCBpbnRlbF9k cF9nZXRfbW9kZXMoc3RydWN0IGRybV9jb25uZWN0b3IgKmNvbm5lY3RvcikKIAl9CiAKIAkvKiBp ZiBlRFAgaGFzIG5vIEVESUQsIGZhbGwgYmFjayB0byBmaXhlZCBtb2RlICovCi0JaWYgKGludGVs X2RwX2lzX2VkcChpbnRlbF9hdHRhY2hlZF9kcChjb25uZWN0b3IpKSAmJgotCSAgICBpbnRlbF9j b25uZWN0b3ItPnBhbmVsLmZpeGVkX21vZGUpIHsKKwlpZiAoaW50ZWxfZHBfaXNfZWRwKGludGVs X2F0dGFjaGVkX2RwKGNvbm5lY3RvcikpICYmIGZpeGVkX21vZGUpIHsKIAkJc3RydWN0IGRybV9k aXNwbGF5X21vZGUgKm1vZGU7CiAKLQkJbW9kZSA9IGRybV9tb2RlX2R1cGxpY2F0ZShjb25uZWN0 b3ItPmRldiwKLQkJCQkJICBpbnRlbF9jb25uZWN0b3ItPnBhbmVsLmZpeGVkX21vZGUpOworCQlj b25uZWN0b3ItPmRpc3BsYXlfaW5mby53aWR0aF9tbSA9IGZpeGVkX21vZGUtPndpZHRoX21tOwor CQljb25uZWN0b3ItPmRpc3BsYXlfaW5mby5oZWlnaHRfbW0gPSBmaXhlZF9tb2RlLT5oZWlnaHRf bW07CisKKwkJbW9kZSA9IGRybV9tb2RlX2R1cGxpY2F0ZShjb25uZWN0b3ItPmRldiwgZml4ZWRf bW9kZSk7CiAJCWlmIChtb2RlKSB7CiAJCQlkcm1fbW9kZV9wcm9iZWRfYWRkKGNvbm5lY3Rvciwg bW9kZSk7CiAJCQlyZXR1cm4gMTsKQEAgLTYyNTEsMTEgKzYyNTMsOCBAQCBzdGF0aWMgYm9vbCBp bnRlbF9lZHBfaW5pdF9jb25uZWN0b3Ioc3RydWN0IGludGVsX2RwICppbnRlbF9kcCwKIAlpZiAo IWZpeGVkX21vZGUgJiYgZGV2X3ByaXYtPnZidC5sZnBfbHZkc192YnRfbW9kZSkgewogCQlmaXhl ZF9tb2RlID0gZHJtX21vZGVfZHVwbGljYXRlKGRldiwKIAkJCQkJZGV2X3ByaXYtPnZidC5sZnBf bHZkc192YnRfbW9kZSk7Ci0JCWlmIChmaXhlZF9tb2RlKSB7CisJCWlmIChmaXhlZF9tb2RlKQog CQkJZml4ZWRfbW9kZS0+dHlwZSB8PSBEUk1fTU9ERV9UWVBFX1BSRUZFUlJFRDsKLQkJCWNvbm5l Y3Rvci0+ZGlzcGxheV9pbmZvLndpZHRoX21tID0gZml4ZWRfbW9kZS0+d2lkdGhfbW07Ci0JCQlj b25uZWN0b3ItPmRpc3BsYXlfaW5mby5oZWlnaHRfbW0gPSBmaXhlZF9tb2RlLT5oZWlnaHRfbW07 Ci0JCX0KIAl9CiAJbXV0ZXhfdW5sb2NrKCZkZXYtPm1vZGVfY29uZmlnLm11dGV4KTsKIApkaWZm IC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHNpLmMgYi9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF9kc2kuYwppbmRleCA1MWExZDY4NjhiMWUuLmM4Y2YzZDVjNzc4MyAxMDA2 NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHNpLmMKKysrIGIvZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfZHNpLmMKQEAgLTE1OTksMTcgKzE1OTksMjEgQEAgc3RhdGljIHZv aWQgaW50ZWxfZHNpX3VucHJlcGFyZShzdHJ1Y3QgaW50ZWxfZW5jb2RlciAqZW5jb2RlcikKIHN0 YXRpYyBpbnQgaW50ZWxfZHNpX2dldF9tb2RlcyhzdHJ1Y3QgZHJtX2Nvbm5lY3RvciAqY29ubmVj dG9yKQogewogCXN0cnVjdCBpbnRlbF9jb25uZWN0b3IgKmludGVsX2Nvbm5lY3RvciA9IHRvX2lu dGVsX2Nvbm5lY3Rvcihjb25uZWN0b3IpOworCWNvbnN0IHN0cnVjdCBkcm1fZGlzcGxheV9tb2Rl ICpmaXhlZF9tb2RlID0KKwkJaW50ZWxfY29ubmVjdG9yLT5wYW5lbC5maXhlZF9tb2RlOwogCXN0 cnVjdCBkcm1fZGlzcGxheV9tb2RlICptb2RlOwogCiAJRFJNX0RFQlVHX0tNUygiXG4iKTsKIAot CWlmICghaW50ZWxfY29ubmVjdG9yLT5wYW5lbC5maXhlZF9tb2RlKSB7CisJaWYgKCFmaXhlZF9t b2RlKSB7CiAJCURSTV9ERUJVR19LTVMoIm5vIGZpeGVkIG1vZGVcbiIpOwogCQlyZXR1cm4gMDsK IAl9CiAKLQltb2RlID0gZHJtX21vZGVfZHVwbGljYXRlKGNvbm5lY3Rvci0+ZGV2LAotCQkJCSAg aW50ZWxfY29ubmVjdG9yLT5wYW5lbC5maXhlZF9tb2RlKTsKKwljb25uZWN0b3ItPmRpc3BsYXlf aW5mby53aWR0aF9tbSA9IGZpeGVkX21vZGUtPndpZHRoX21tOworCWNvbm5lY3Rvci0+ZGlzcGxh eV9pbmZvLmhlaWdodF9tbSA9IGZpeGVkX21vZGUtPmhlaWdodF9tbTsKKworCW1vZGUgPSBkcm1f bW9kZV9kdXBsaWNhdGUoY29ubmVjdG9yLT5kZXYsIGZpeGVkX21vZGUpOwogCWlmICghbW9kZSkg ewogCQlEUk1fREVCVUdfS01TKCJkcm1fbW9kZV9kdXBsaWNhdGUgZmFpbGVkXG4iKTsKIAkJcmV0 dXJuIDA7CkBAIC0xODQzLDkgKzE4NDcsNiBAQCB2b2lkIGludGVsX2RzaV9pbml0KHN0cnVjdCBk cm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIAkJZ290byBlcnI7CiAJfQogCi0JY29ubmVjdG9y LT5kaXNwbGF5X2luZm8ud2lkdGhfbW0gPSBmaXhlZF9tb2RlLT53aWR0aF9tbTsKLQljb25uZWN0 b3ItPmRpc3BsYXlfaW5mby5oZWlnaHRfbW0gPSBmaXhlZF9tb2RlLT5oZWlnaHRfbW07Ci0KIAlp bnRlbF9wYW5lbF9pbml0KCZpbnRlbF9jb25uZWN0b3ItPnBhbmVsLCBmaXhlZF9tb2RlLCBOVUxM LCBOVUxMKTsKIAlpbnRlbF9wYW5lbF9zZXR1cF9iYWNrbGlnaHQoY29ubmVjdG9yLCBJTlZBTElE X1BJUEUpOwogCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9sdmRzLmMg Yi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9sdmRzLmMKaW5kZXggZDM1ZDJkNTBmNTk1Li5j ZGFlNDkzNGI4ODUgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2x2ZHMu YworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9sdmRzLmMKQEAgLTQ3Nyw2ICs0Nzcs OCBAQCBpbnRlbF9sdmRzX2RldGVjdChzdHJ1Y3QgZHJtX2Nvbm5lY3RvciAqY29ubmVjdG9yLCBi b29sIGZvcmNlKQogc3RhdGljIGludCBpbnRlbF9sdmRzX2dldF9tb2RlcyhzdHJ1Y3QgZHJtX2Nv bm5lY3RvciAqY29ubmVjdG9yKQogewogCXN0cnVjdCBpbnRlbF9sdmRzX2Nvbm5lY3RvciAqbHZk c19jb25uZWN0b3IgPSB0b19sdmRzX2Nvbm5lY3Rvcihjb25uZWN0b3IpOworCWNvbnN0IHN0cnVj dCBkcm1fZGlzcGxheV9tb2RlICpmaXhlZF9tb2RlID0KKwkJbHZkc19jb25uZWN0b3ItPmJhc2Uu cGFuZWwuZml4ZWRfbW9kZTsKIAlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gY29ubmVjdG9yLT5k ZXY7CiAJc3RydWN0IGRybV9kaXNwbGF5X21vZGUgKm1vZGU7CiAKQEAgLTQ4NCw3ICs0ODYsMTAg QEAgc3RhdGljIGludCBpbnRlbF9sdmRzX2dldF9tb2RlcyhzdHJ1Y3QgZHJtX2Nvbm5lY3RvciAq Y29ubmVjdG9yKQogCWlmICghSVNfRVJSX09SX05VTEwobHZkc19jb25uZWN0b3ItPmJhc2UuZWRp ZCkpCiAJCXJldHVybiBkcm1fYWRkX2VkaWRfbW9kZXMoY29ubmVjdG9yLCBsdmRzX2Nvbm5lY3Rv ci0+YmFzZS5lZGlkKTsKIAotCW1vZGUgPSBkcm1fbW9kZV9kdXBsaWNhdGUoZGV2LCBsdmRzX2Nv bm5lY3Rvci0+YmFzZS5wYW5lbC5maXhlZF9tb2RlKTsKKwljb25uZWN0b3ItPmRpc3BsYXlfaW5m by53aWR0aF9tbSA9IGZpeGVkX21vZGUtPndpZHRoX21tOworCWNvbm5lY3Rvci0+ZGlzcGxheV9p bmZvLmhlaWdodF9tbSA9IGZpeGVkX21vZGUtPmhlaWdodF9tbTsKKworCW1vZGUgPSBkcm1fbW9k ZV9kdXBsaWNhdGUoZGV2LCBmaXhlZF9tb2RlKTsKIAlpZiAobW9kZSA9PSBOVUxMKQogCQlyZXR1 cm4gMDsKIApAQCAtMTExNCw4ICsxMTE5LDYgQEAgdm9pZCBpbnRlbF9sdmRzX2luaXQoc3RydWN0 IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogCQlmaXhlZF9tb2RlID0gZHJtX21vZGVfZHVw bGljYXRlKGRldiwgZGV2X3ByaXYtPnZidC5sZnBfbHZkc192YnRfbW9kZSk7CiAJCWlmIChmaXhl ZF9tb2RlKSB7CiAJCQlmaXhlZF9tb2RlLT50eXBlIHw9IERSTV9NT0RFX1RZUEVfUFJFRkVSUkVE OwotCQkJY29ubmVjdG9yLT5kaXNwbGF5X2luZm8ud2lkdGhfbW0gPSBmaXhlZF9tb2RlLT53aWR0 aF9tbTsKLQkJCWNvbm5lY3Rvci0+ZGlzcGxheV9pbmZvLmhlaWdodF9tbSA9IGZpeGVkX21vZGUt PmhlaWdodF9tbTsKIAkJCWdvdG8gb3V0OwogCQl9CiAJfQotLSAKMi4xMy42CgpfX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBs aXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVz a3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK