From: Matt Roper Subject: [PATCH 4/4] drm/i915/skl+: Use scaling amount for plane data rate calculation (v3) Date: Mon, 16 May 2016 15:52:01 -0700 Message-ID: <1463439121-28974-5-git-send-email-matthew.d.roper@intel.com> References: <1463439121-28974-1-git-send-email-matthew.d.roper@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by gabe.freedesktop.org (Postfix) with ESMTP id 65A706E5C1 for ; Mon, 16 May 2016 22:53:28 +0000 (UTC) In-Reply-To: <1463439121-28974-1-git-send-email-matthew.d.roper@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 RnJvbTogIkt1bWFyLCBNYWhlc2giIDxtYWhlc2gxLmt1bWFyQGludGVsLmNvbT4KCmlmIGRvd25z Y2FsaW5nIGlzIGVuYWJsZWQgcGxhbmUgZGF0YSByYXRlIGluY3JlYXNlcyBhY2NvcmRpbmcgdG8g c2NhbGluZwphbW91bnQuIHRha2Ugc2NhbGluZyBhbW91bnQgdW5kZXIgY29uc2lkZXJhdGlvbiB3 aGlsZSBjYWxjdWxhdGluZyBwbGFuZQpkYXRhIHJhdGUKCnYyOiBBZGRyZXNzIE1hdHQncyBjb21t ZW50cywgd2hlcmUgZGF0YSByYXRlIHdhcyBvdmVycmlkZGVuIGJlY2F1c2Ugb2YKbWlzc2luZyBl bHNlLgoKdjMgKGJ5IE1hdHQpOgogLSBBZGQgYnJhY2VzIHRvICdlbHNlJyBicmFuY2ggdG8gbWF0 Y2gga2VybmVsIGNvZGluZyBzdHlsZQogLSBBZGp1c3QgZmluYWwgY2FsY3VsYXRpb24gbm93IHRo YXQgc2tsX3BsYW5lX2Rvd25zY2FsZV9hbW91bnQoKQogICByZXR1cm5zIDE2LjE2IGZpeGVkIHBv aW50IHZhbHVlIGluc3RlYWQgb2YgYSBkZWNpbWFsIGZpeGVkIHBvaW50CgpDYzogbWF0dGhldy5k LnJvcGVyQGludGVsLmNvbQpTaWduZWQtb2ZmLWJ5OiBLdW1hciwgTWFoZXNoIDxtYWhlc2gxLmt1 bWFyQGludGVsLmNvbT4KU2lnbmVkLW9mZi1ieTogTWF0dCBSb3BlciA8bWF0dGhldy5kLnJvcGVy QGludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jIHwgMTMgKysr KysrKysrLS0tLQogMSBmaWxlIGNoYW5nZWQsIDkgaW5zZXJ0aW9ucygrKSwgNCBkZWxldGlvbnMo LSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jIGIvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYwppbmRleCA1YmQ4ODViLi40ZDAwODhjIDEwMDY0NAot LS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jCisrKyBiL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX3BtLmMKQEAgLTI5OTMsNiArMjk5Myw3IEBAIHNrbF9wbGFuZV9yZWxhdGl2 ZV9kYXRhX3JhdGUoY29uc3Qgc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNzdGF0ZSwKIHsKIAlz dHJ1Y3QgaW50ZWxfcGxhbmVfc3RhdGUgKmludGVsX3BzdGF0ZSA9IHRvX2ludGVsX3BsYW5lX3N0 YXRlKHBzdGF0ZSk7CiAJc3RydWN0IGRybV9mcmFtZWJ1ZmZlciAqZmIgPSBwc3RhdGUtPmZiOwor CXVpbnQzMl90IGRvd25fc2NhbGVfYW1vdW50LCBkYXRhX3JhdGU7CiAJdWludDMyX3Qgd2lkdGgg PSAwLCBoZWlnaHQgPSAwOwogCXVuc2lnbmVkIGZvcm1hdCA9IGZiID8gZmItPnBpeGVsX2Zvcm1h dCA6IERSTV9GT1JNQVRfWFJHQjg4ODg7CiAKQEAgLTMwMTIsMTUgKzMwMTMsMTkgQEAgc2tsX3Bs YW5lX3JlbGF0aXZlX2RhdGFfcmF0ZShjb25zdCBzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3N0 YXRlLAogCS8qIGZvciBwbGFuYXIgZm9ybWF0ICovCiAJaWYgKGZvcm1hdCA9PSBEUk1fRk9STUFU X05WMTIpIHsKIAkJaWYgKHkpICAvKiB5LXBsYW5lIGRhdGEgcmF0ZSAqLwotCQkJcmV0dXJuIHdp ZHRoICogaGVpZ2h0ICoKKwkJCWRhdGFfcmF0ZSA9IHdpZHRoICogaGVpZ2h0ICoKIAkJCQlkcm1f Zm9ybWF0X3BsYW5lX2NwcChmb3JtYXQsIDApOwogCQllbHNlICAgIC8qIHV2LXBsYW5lIGRhdGEg cmF0ZSAqLwotCQkJcmV0dXJuICh3aWR0aCAvIDIpICogKGhlaWdodCAvIDIpICoKKwkJCWRhdGFf cmF0ZSA9ICh3aWR0aCAvIDIpICogKGhlaWdodCAvIDIpICoKIAkJCQlkcm1fZm9ybWF0X3BsYW5l X2NwcChmb3JtYXQsIDEpOworCX0gZWxzZSB7CisJCS8qIGZvciBwYWNrZWQgZm9ybWF0cyAqLwor CQlkYXRhX3JhdGUgPSB3aWR0aCAqIGhlaWdodCAqIGRybV9mb3JtYXRfcGxhbmVfY3BwKGZvcm1h dCwgMCk7CiAJfQogCi0JLyogZm9yIHBhY2tlZCBmb3JtYXRzICovCi0JcmV0dXJuIHdpZHRoICog aGVpZ2h0ICogZHJtX2Zvcm1hdF9wbGFuZV9jcHAoZm9ybWF0LCAwKTsKKwlkb3duX3NjYWxlX2Ft b3VudCA9IHNrbF9wbGFuZV9kb3duc2NhbGVfYW1vdW50KGludGVsX3BzdGF0ZSk7CisKKwlyZXR1 cm4gZGF0YV9yYXRlICogZG93bl9zY2FsZV9hbW91bnQgPj4gMTY7CiB9CiAKIC8qCi0tIAoyLjEu NAoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwt Z2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8v bGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==