From mboxrd@z Thu Jan 1 00:00:00 1970 From: John.C.Harrison@Intel.com Subject: [PATCH v4 33/38] drm/i915: GPU priority bumping to prevent starvation Date: Mon, 11 Jan 2016 18:43:02 +0000 Message-ID: <1452537788-32136-34-git-send-email-John.C.Harrison@Intel.com> References: <1448278774-31376-1-git-send-email-John.C.Harrison@Intel.com> <1452537788-32136-1-git-send-email-John.C.Harrison@Intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTP id 5C3E36E519 for ; Mon, 11 Jan 2016 10:43:43 -0800 (PST) In-Reply-To: <1452537788-32136-1-git-send-email-John.C.Harrison@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 RnJvbTogSm9obiBIYXJyaXNvbiA8Sm9obi5DLkhhcnJpc29uQEludGVsLmNvbT4KCklmIGEgaGln aCBwcmlvcml0eSB0YXNrIHdhcyB0byBjb250aW51b3VzbHkgc3VibWl0IGJhdGNoIGJ1ZmZlcnMg dG8KdGhlIGRyaXZlciwgaXQgY291bGQgc3RhcnZlIG91dCBhbnkgbG93ZXIgcHJpb3JpdHkgdGFz ayBmcm9tIGdldHRpbmcKYW55IEdQVSB0aW1lIGF0IGFsbC4gVG8gcHJldmVudCB0aGlzLCB0aGUg cHJpb3JpdHkgb2YgYSBxdWV1ZWQgYmF0Y2gKYnVmZmVyIGlzIGJ1bXBlZCBlYWNoIHRpbWUgaXQg ZG9lcyBub3QgZ2V0IHN1Ym1pdHRlZCB0byB0aGUgaGFyZHdhcmUuCgp2MjogVXBkYXRlZCBmb3Ig c2lnbmVkIHByaW9yaXR5IHZhbHVlcy4KCkZvcjogVklaLTE1ODcKU2lnbmVkLW9mZi1ieTogSm9o biBIYXJyaXNvbiA8Sm9obi5DLkhhcnJpc29uQEludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9k cm0vaTkxNS9pOTE1X2RlYnVnZnMuYyAgIHwgMjggKysrKysrKysrKysrKysrKysrKysrKysrKysr KwogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9zY2hlZHVsZXIuYyB8IDE0ICsrKysrKysrKysr KysrCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3NjaGVkdWxlci5oIHwgIDEgKwogMyBmaWxl cyBjaGFuZ2VkLCA0MyBpbnNlcnRpb25zKCspCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJt L2k5MTUvaTkxNV9kZWJ1Z2ZzLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2RlYnVnZnMu YwppbmRleCA3M2QwZjk3Li4xYzRjNmZlIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pOTE1X2RlYnVnZnMuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2RlYnVnZnMu YwpAQCAtMTE3OCw2ICsxMTc4LDMzIEBAIERFRklORV9TSU1QTEVfQVRUUklCVVRFKGk5MTVfc2No ZWR1bGVyX3ByaW9yaXR5X21heF9mb3BzLAogCQkJIiVsbGRcbiIpOwogCiBzdGF0aWMgaW50Citp OTE1X3NjaGVkdWxlcl9wcmlvcml0eV9idW1wX2dldCh2b2lkICpkYXRhLCB1NjQgKnZhbCkKK3sK KwlzdHJ1Y3QgZHJtX2RldmljZSAgICAgICAqZGV2ICAgICAgID0gZGF0YTsKKwlzdHJ1Y3QgZHJt X2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgID0gZGV2LT5kZXZfcHJpdmF0ZTsKKwlzdHJ1Y3QgaTkx NV9zY2hlZHVsZXIgICAqc2NoZWR1bGVyID0gZGV2X3ByaXYtPnNjaGVkdWxlcjsKKworCSp2YWwg PSAodTY0KSBzY2hlZHVsZXItPnByaW9yaXR5X2xldmVsX2J1bXA7CisJcmV0dXJuIDA7Cit9CisK K3N0YXRpYyBpbnQKK2k5MTVfc2NoZWR1bGVyX3ByaW9yaXR5X2J1bXBfc2V0KHZvaWQgKmRhdGEs IHU2NCB2YWwpCit7CisJc3RydWN0IGRybV9kZXZpY2UgICAgICAgKmRldiAgICAgICA9IGRhdGE7 CisJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ICA9IGRldi0+ZGV2X3ByaXZhdGU7 CisJc3RydWN0IGk5MTVfc2NoZWR1bGVyICAgKnNjaGVkdWxlciA9IGRldl9wcml2LT5zY2hlZHVs ZXI7CisKKwlzY2hlZHVsZXItPnByaW9yaXR5X2xldmVsX2J1bXAgPSAodTMyKSB2YWw7CisJcmV0 dXJuIDA7Cit9CisKK0RFRklORV9TSU1QTEVfQVRUUklCVVRFKGk5MTVfc2NoZWR1bGVyX3ByaW9y aXR5X2J1bXBfZm9wcywKKwkJCWk5MTVfc2NoZWR1bGVyX3ByaW9yaXR5X2J1bXBfZ2V0LAorCQkJ aTkxNV9zY2hlZHVsZXJfcHJpb3JpdHlfYnVtcF9zZXQsCisJCQkiJWxsZFxuIik7CisKK3N0YXRp YyBpbnQKIGk5MTVfc2NoZWR1bGVyX3ByaW9yaXR5X3ByZWVtcHRfZ2V0KHZvaWQgKmRhdGEsIHU2 NCAqdmFsKQogewogCXN0cnVjdCBkcm1fZGV2aWNlICAgICAgICpkZXYgICAgICAgPSBkYXRhOwpA QCAtNTY2Nyw2ICs1Njk0LDcgQEAgc3RhdGljIGNvbnN0IHN0cnVjdCBpOTE1X2RlYnVnZnNfZmls ZXMgewogCXsiaTkxNV9uZXh0X3NlcW5vIiwgJmk5MTVfbmV4dF9zZXFub19mb3BzfSwKIAl7Imk5 MTVfc2NoZWR1bGVyX3ByaW9yaXR5X21pbiIsICZpOTE1X3NjaGVkdWxlcl9wcmlvcml0eV9taW5f Zm9wc30sCiAJeyJpOTE1X3NjaGVkdWxlcl9wcmlvcml0eV9tYXgiLCAmaTkxNV9zY2hlZHVsZXJf cHJpb3JpdHlfbWF4X2ZvcHN9LAorCXsiaTkxNV9zY2hlZHVsZXJfcHJpb3JpdHlfYnVtcCIsICZp OTE1X3NjaGVkdWxlcl9wcmlvcml0eV9idW1wX2ZvcHN9LAogCXsiaTkxNV9zY2hlZHVsZXJfcHJp b3JpdHlfcHJlZW1wdCIsICZpOTE1X3NjaGVkdWxlcl9wcmlvcml0eV9wcmVlbXB0X2ZvcHN9LAog CXsiaTkxNV9zY2hlZHVsZXJfbWluX2ZseWluZyIsICZpOTE1X3NjaGVkdWxlcl9taW5fZmx5aW5n X2ZvcHN9LAogCXsiaTkxNV9zY2hlZHVsZXJfZmlsZV9xdWV1ZV9tYXgiLCAmaTkxNV9zY2hlZHVs ZXJfZmlsZV9xdWV1ZV9tYXhfZm9wc30sCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pOTE1X3NjaGVkdWxlci5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9zY2hlZHVsZXIu YwppbmRleCBkMTk1OTBjLi4zZWRmODU2IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pOTE1X3NjaGVkdWxlci5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfc2NoZWR1 bGVyLmMKQEAgLTE5MSw2ICsxOTEsNyBAQCBpbnQgaTkxNV9zY2hlZHVsZXJfaW5pdChzdHJ1Y3Qg ZHJtX2RldmljZSAqZGV2KQogCS8qIERlZmF1bHQgdHVuaW5nIHZhbHVlczogKi8KIAlzY2hlZHVs ZXItPnByaW9yaXR5X2xldmVsX21pbiAgICAgPSAtMTAyMzsKIAlzY2hlZHVsZXItPnByaW9yaXR5 X2xldmVsX21heCAgICAgPSAxMDIzOworCXNjaGVkdWxlci0+cHJpb3JpdHlfbGV2ZWxfYnVtcCAg ICA9IDUwOwogCXNjaGVkdWxlci0+cHJpb3JpdHlfbGV2ZWxfcHJlZW1wdCA9IDkwMDsKIAlzY2hl ZHVsZXItPm1pbl9mbHlpbmcgICAgICAgICAgICAgPSAyOwogCXNjaGVkdWxlci0+ZmlsZV9xdWV1 ZV9tYXggICAgICAgICA9IDY0OwpAQCAtMTM1Miw2ICsxMzUzLDE5IEBAIHN0YXRpYyBpbnQgaTkx NV9zY2hlZHVsZXJfc3VibWl0KHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcsIGJvb2wgd2Fz X2xvY2tlZCkKIAkJcmV0ID0gaTkxNV9zY2hlZHVsZXJfcG9wX2Zyb21fcXVldWVfbG9ja2VkKHJp bmcsICZub2RlLCAmZmxhZ3MpOwogCX0gd2hpbGUgKHJldCA9PSAwKTsKIAorCS8qCisJICogQnVt cCB0aGUgcHJpb3JpdHkgb2YgZXZlcnl0aGluZyB0aGF0IHdhcyBub3Qgc3VibWl0dGVkIHRvIHBy ZXZlbnQKKwkgKiBzdGFydmF0aW9uIG9mIGxvdyBwcmlvcml0eSB0YXNrcyBieSBhIHNwYW1taW5n IGhpZ2ggcHJpb3JpdHkgdGFzay4KKwkgKi8KKwlpOTE1X3NjaGVkdWxlcl9wcmlvcml0eV9idW1w X2NsZWFyKHNjaGVkdWxlcik7CisJbGlzdF9mb3JfZWFjaF9lbnRyeShub2RlLCAmc2NoZWR1bGVy LT5ub2RlX3F1ZXVlW3JpbmctPmlkXSwgbGluaykgeworCQlpZiAoIUk5MTVfU1FTX0lTX1FVRVVF RChub2RlKSkKKwkJCWNvbnRpbnVlOworCisJCWk5MTVfc2NoZWR1bGVyX3ByaW9yaXR5X2J1bXAo c2NoZWR1bGVyLCBub2RlLAorCQkJCQkgICAgIHNjaGVkdWxlci0+cHJpb3JpdHlfbGV2ZWxfYnVt cCk7CisJfQorCiAJc3Bpbl91bmxvY2tfaXJxcmVzdG9yZSgmc2NoZWR1bGVyLT5sb2NrLCBmbGFn cyk7CiAKIAlpZiAoIXdhc19sb2NrZWQpCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pOTE1X3NjaGVkdWxlci5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9zY2hlZHVsZXIu aAppbmRleCA3M2JmMzIxLi5kN2FhNTQyIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pOTE1X3NjaGVkdWxlci5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfc2NoZWR1 bGVyLmgKQEAgLTEwNCw2ICsxMDQsNyBAQCBzdHJ1Y3QgaTkxNV9zY2hlZHVsZXIgewogCS8qIFR1 bmluZyBwYXJhbWV0ZXJzOiAqLwogCWludDMyX3QgICAgICAgICAgICAgcHJpb3JpdHlfbGV2ZWxf bWluOwogCWludDMyX3QgICAgICAgICAgICAgcHJpb3JpdHlfbGV2ZWxfbWF4OworCWludDMyX3Qg ICAgICAgICAgICAgcHJpb3JpdHlfbGV2ZWxfYnVtcDsKIAlpbnQzMl90ICAgICAgICAgICAgIHBy aW9yaXR5X2xldmVsX3ByZWVtcHQ7CiAJdWludDMyX3QgICAgICAgICAgICBtaW5fZmx5aW5nOwog CXVpbnQzMl90ICAgICAgICAgICAgZmlsZV9xdWV1ZV9tYXg7Ci0tIAoxLjkuMQoKX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcg bGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVz a3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK