From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ville Syrjala Subject: [PATCH 3/3] drm/i915: Clean up the baseline bpp computation Date: Wed, 7 Nov 2018 23:35:22 +0200 Message-ID: <20181107213522.17590-3-ville.syrjala@linux.intel.com> References: <20181107213522.17590-1-ville.syrjala@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by gabe.freedesktop.org (Postfix) with ESMTPS id 1CAA66E50F for ; Wed, 7 Nov 2018 21:35:32 +0000 (UTC) In-Reply-To: <20181107213522.17590-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: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org RnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KClBh c3Mgb24gdGhlIGVycm5vIGFsbCB0aGUgd2F5IGZyb20gY29ubmVjdGVkX3NpbmtfbWF4X2JwcCgp LAphbmQgbWFrZSB0aGUgYmFzZV9icHAgaGFuZGxpbmcgaW4gaW50ZWxfbW9kZXNldF9waXBlX2Nv bmZpZygpCmEgYml0IGxlc3MgdWdseS4gV2UnbGwgYWxzbyByZW5hbWUgY29ubmVjdGVkX3Npbmtf bWF4X2JwcCgpCnRvIG5vdCBnaXZlIHRoZSBpbXByZXNzaW9uIHRoYXQgaXQgcmV0dXJuIHRoZSBi cHAgdmFsdWUsCmFuZCB3ZSdsbCBwaW1wIHVwIHRoZSBkZWJ1ZyBtZXNzYWdlIHdpdGhpbiB0byBp bmNsdWRlIHRoZQpjb25uZWN0b3IgbmFtZS9pZC4KClNpZ25lZC1vZmYtYnk6IFZpbGxlIFN5cmrD pGzDpCA8dmlsbGUuc3lyamFsYUBsaW51eC5pbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfZGlzcGxheS5jIHwgNDIgKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0tLQog MSBmaWxlIGNoYW5nZWQsIDI0IGluc2VydGlvbnMoKyksIDE4IGRlbGV0aW9ucygtKQoKZGlmZiAt LWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYyBiL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwppbmRleCAyYWYxNDI4NjBiNzMuLjM1MzRiYzBkNGZh OCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCisrKyBi L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwpAQCAtMTA5MjksMTEgKzEwOTI5 LDEyIEBAIHN0YXRpYyB2b2lkIGludGVsX21vZGVzZXRfdXBkYXRlX2Nvbm5lY3Rvcl9hdG9taWNf c3RhdGUoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIH0KIAogc3RhdGljIGludAotY29ubmVjdGVk X3NpbmtfbWF4X2JwcChjb25zdCBzdHJ1Y3QgZHJtX2Nvbm5lY3Rvcl9zdGF0ZSAqY29ubl9zdGF0 ZSwKLQkJICAgICAgIHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpwaXBlX2NvbmZpZykKK2NvbXB1 dGVfc2lua19waXBlX2JwcChjb25zdCBzdHJ1Y3QgZHJtX2Nvbm5lY3Rvcl9zdGF0ZSAqY29ubl9z dGF0ZSwKKwkJICAgICAgc3RydWN0IGludGVsX2NydGNfc3RhdGUgKnBpcGVfY29uZmlnKQogewor CXN0cnVjdCBkcm1fY29ubmVjdG9yICpjb25uZWN0b3IgPSBjb25uX3N0YXRlLT5jb25uZWN0b3I7 CisJY29uc3Qgc3RydWN0IGRybV9kaXNwbGF5X2luZm8gKmluZm8gPSAmY29ubmVjdG9yLT5kaXNw bGF5X2luZm87CiAJaW50IGJwcDsKLQlzdHJ1Y3QgZHJtX2Rpc3BsYXlfaW5mbyAqaW5mbyA9ICZj b25uX3N0YXRlLT5jb25uZWN0b3ItPmRpc3BsYXlfaW5mbzsKIAogCXN3aXRjaCAoY29ubl9zdGF0 ZS0+bWF4X2JwYykgewogCWNhc2UgNiAuLi4gNzoKQEAgLTEwOTUzLDEyICsxMDk1NCwxNSBAQCBj b25uZWN0ZWRfc2lua19tYXhfYnBwKGNvbnN0IHN0cnVjdCBkcm1fY29ubmVjdG9yX3N0YXRlICpj b25uX3N0YXRlLAogCX0KIAogCWlmIChicHAgPCBwaXBlX2NvbmZpZy0+cGlwZV9icHApIHsKLQkJ RFJNX0RFQlVHX0tNUygiTGltaXRpbmcgZGlzcGxheSBicHAgdG8gJWQgaW5zdGVhZCBvZiBFZGlk IGJwcCAiCi0JCQkgICAgICAiJWQsIHJlcXVlc3RlZCBicHAgJWQsIG1heCBwbGF0Zm9ybSBicHAg JWRcbiIsIGJwcCwKLQkJCSAgICAgIDMgKiBpbmZvLT5icGMsIDMgKiBjb25uX3N0YXRlLT5tYXhf cmVxdWVzdGVkX2JwYywKKwkJRFJNX0RFQlVHX0tNUygiW0NPTk5FQ1RPUjolZDolc10gTGltaXRp bmcgZGlzcGxheSBicHAgdG8gJWQgaW5zdGVhZCBvZiAiCisJCQkgICAgICAiRURJRCBicHAgJWQs IHJlcXVlc3RlZCBicHAgJWQsIG1heCBwbGF0Zm9ybSBicHAgJWRcbiIsCisJCQkgICAgICBjb25u ZWN0b3ItPmJhc2UuaWQsIGNvbm5lY3Rvci0+bmFtZSwKKwkJCSAgICAgIGJwcCwgMyAqIGluZm8t PmJwYywgMyAqIGNvbm5fc3RhdGUtPm1heF9yZXF1ZXN0ZWRfYnBjLAogCQkJICAgICAgcGlwZV9j b25maWctPnBpcGVfYnBwKTsKKwogCQlwaXBlX2NvbmZpZy0+cGlwZV9icHAgPSBicHA7CiAJfQor CiAJcmV0dXJuIDA7CiB9CiAKQEAgLTEwOTY3LDcgKzEwOTcxLDcgQEAgY29tcHV0ZV9iYXNlbGlu ZV9waXBlX2JwcChzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YywKIAkJCSAgc3RydWN0IGludGVsX2Ny dGNfc3RhdGUgKnBpcGVfY29uZmlnKQogewogCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZf cHJpdiA9IHRvX2k5MTUoY3J0Yy0+YmFzZS5kZXYpOwotCXN0cnVjdCBkcm1fYXRvbWljX3N0YXRl ICpzdGF0ZTsKKwlzdHJ1Y3QgZHJtX2F0b21pY19zdGF0ZSAqc3RhdGUgPSBwaXBlX2NvbmZpZy0+ YmFzZS5zdGF0ZTsKIAlzdHJ1Y3QgZHJtX2Nvbm5lY3RvciAqY29ubmVjdG9yOwogCXN0cnVjdCBk cm1fY29ubmVjdG9yX3N0YXRlICpjb25uZWN0b3Jfc3RhdGU7CiAJaW50IGJwcCwgaTsKQEAgLTEw OTgwLDIxICsxMDk4NCwyMSBAQCBjb21wdXRlX2Jhc2VsaW5lX3BpcGVfYnBwKHN0cnVjdCBpbnRl bF9jcnRjICpjcnRjLAogCWVsc2UKIAkJYnBwID0gOCozOwogCi0KIAlwaXBlX2NvbmZpZy0+cGlw ZV9icHAgPSBicHA7CiAKLQlzdGF0ZSA9IHBpcGVfY29uZmlnLT5iYXNlLnN0YXRlOwotCi0JLyog Q2xhbXAgZGlzcGxheSBicHAgdG8gRURJRCB2YWx1ZSAqLworCS8qIENsYW1wIGRpc3BsYXkgYnBw IHRvIGNvbm5lY3RvciBtYXggYnBwICovCiAJZm9yX2VhY2hfbmV3X2Nvbm5lY3Rvcl9pbl9zdGF0 ZShzdGF0ZSwgY29ubmVjdG9yLCBjb25uZWN0b3Jfc3RhdGUsIGkpIHsKKwkJaW50IHJldDsKKwog CQlpZiAoY29ubmVjdG9yX3N0YXRlLT5jcnRjICE9ICZjcnRjLT5iYXNlKQogCQkJY29udGludWU7 CiAKLQkJaWYgKGNvbm5lY3RlZF9zaW5rX21heF9icHAoY29ubmVjdG9yX3N0YXRlLCBwaXBlX2Nv bmZpZykgPCAwKQotCQkJcmV0dXJuIC1FSU5WQUw7CisJCXJldCA9IGNvbXB1dGVfc2lua19waXBl X2JwcChjb25uZWN0b3Jfc3RhdGUsIHBpcGVfY29uZmlnKTsKKwkJaWYgKHJldCkKKwkJCXJldHVy biByZXQ7CiAJfQogCi0JcmV0dXJuIGJwcDsKKwlyZXR1cm4gMDsKIH0KIAogc3RhdGljIHZvaWQg aW50ZWxfZHVtcF9jcnRjX3RpbWluZ3MoY29uc3Qgc3RydWN0IGRybV9kaXNwbGF5X21vZGUgKm1v ZGUpCkBAIC0xMTMxOSwxMCArMTEzMjMsMTIgQEAgaW50ZWxfbW9kZXNldF9waXBlX2NvbmZpZyhz dHJ1Y3QgZHJtX2NydGMgKmNydGMsCiAJICAgICAgKERSTV9NT0RFX0ZMQUdfUFZTWU5DIHwgRFJN X01PREVfRkxBR19OVlNZTkMpKSkKIAkJcGlwZV9jb25maWctPmJhc2UuYWRqdXN0ZWRfbW9kZS5m bGFncyB8PSBEUk1fTU9ERV9GTEFHX05WU1lOQzsKIAotCWJhc2VfYnBwID0gY29tcHV0ZV9iYXNl bGluZV9waXBlX2JwcCh0b19pbnRlbF9jcnRjKGNydGMpLAotCQkJCQkgICAgIHBpcGVfY29uZmln KTsKLQlpZiAoYmFzZV9icHAgPCAwKQotCQlyZXR1cm4gLUVJTlZBTDsKKwlyZXQgPSBjb21wdXRl X2Jhc2VsaW5lX3BpcGVfYnBwKHRvX2ludGVsX2NydGMoY3J0YyksCisJCQkJCXBpcGVfY29uZmln KTsKKwlpZiAocmV0KQorCQlyZXR1cm4gcmV0OworCisJYmFzZV9icHAgPSBwaXBlX2NvbmZpZy0+ cGlwZV9icHA7CiAKIAkvKgogCSAqIERldGVybWluZSB0aGUgcmVhbCBwaXBlIGRpbWVuc2lvbnMu IE5vdGUgdGhhdCBzdGVyZW8gbW9kZXMgY2FuCi0tIAoyLjE4LjEKCl9fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50 ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9y Zy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=