From mboxrd@z Thu Jan 1 00:00:00 1970 From: Maarten Lankhorst Subject: [PATCH] drm/i915: Fix broken mst get_hw_state. Date: Thu, 27 Aug 2015 13:13:31 +0200 Message-ID: <55DEF0DB.7060103@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by gabe.freedesktop.org (Postfix) with ESMTP id 868396E55D for ; Thu, 27 Aug 2015 04:13:50 -0700 (PDT) List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Intel Graphics Development List-Id: intel-gfx@lists.freedesktop.org Y29ubmVjdG9yLT5lbmNvZGVyIGlzIGluaXRpYWxpemVkIGFzIE5VTEwuIEZpeCB0aGlzIGJ5IHNl dHRpbmcgaXQgaW4KZHVyaW5nIHByZSBlbmFibGUuIE1TVCBjb25uZWN0b3JzIGFyZSBub3QgcmVh ZCBvdXQgZHVyaW5nIGluaXRpYWwgaHcKcmVhZG91dCwgYW5kIGhhdmUgbm8gZml4ZWQgZW5jb2Rl ciBtYXBwaW5ncy4gU28gaXQncyBoYXJtbGVzcyB0bwpyZXR1cm4gZmFsc2Ugd2hlbiB0aGUgY29u bmVjdG9yIGhhcyBuZXZlciBiZWVuIGFzc2lnbmVkIHRvIGFuIGVuY29kZXIuCiAgIApTaWduZWQt b2ZmLWJ5OiBNYWFydGVuIExhbmtob3JzdCA8bWFhcnRlbi5sYW5raG9yc3RAbGludXguaW50ZWwu Y29tPgotLS0KZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXku YyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwppbmRleCA3MzgxNzhhMGFj OTYuLmUzOTIyZDk3M2RiMCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf ZGlzcGxheS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwpAQCAt NjI4Myw3ICs2MjgzLDcgQEAgc3RhdGljIHZvaWQgaW50ZWxfY29ubmVjdG9yX2NoZWNrX3N0YXRl KHN0cnVjdCBpbnRlbF9jb25uZWN0b3IgKmNvbm5lY3RvcikKIAkJICAgICAgY29ubmVjdG9yLT5i YXNlLm5hbWUpOwogCiAJaWYgKGNvbm5lY3Rvci0+Z2V0X2h3X3N0YXRlKGNvbm5lY3RvcikpIHsK LQkJc3RydWN0IGRybV9lbmNvZGVyICplbmNvZGVyID0gJmNvbm5lY3Rvci0+ZW5jb2Rlci0+YmFz ZTsKKwkJc3RydWN0IGludGVsX2VuY29kZXIgKmVuY29kZXIgPSBjb25uZWN0b3ItPmVuY29kZXI7 CiAJCXN0cnVjdCBkcm1fY29ubmVjdG9yX3N0YXRlICpjb25uX3N0YXRlID0gY29ubmVjdG9yLT5i YXNlLnN0YXRlOwogCiAJCUk5MTVfU1RBVEVfV0FSTighY3J0YywKQEAgLTYyOTUsMTMgKzYyOTUs MTMgQEAgc3RhdGljIHZvaWQgaW50ZWxfY29ubmVjdG9yX2NoZWNrX3N0YXRlKHN0cnVjdCBpbnRl bF9jb25uZWN0b3IgKmNvbm5lY3RvcikKIAkJSTkxNV9TVEFURV9XQVJOKCFjcnRjLT5zdGF0ZS0+ YWN0aXZlLAogCQkgICAgICAiY29ubmVjdG9yIGlzIGFjdGl2ZSwgYnV0IGF0dGFjaGVkIGNydGMg aXNuJ3RcbiIpOwogCi0JCWlmICghZW5jb2RlcikKKwkJaWYgKCFlbmNvZGVyIHx8IGVuY29kZXIt PnR5cGUgPT0gSU5URUxfT1VUUFVUX0RQX01TVCkKIAkJCXJldHVybjsKIAotCQlJOTE1X1NUQVRF X1dBUk4oY29ubl9zdGF0ZS0+YmVzdF9lbmNvZGVyICE9IGVuY29kZXIsCisJCUk5MTVfU1RBVEVf V0FSTihjb25uX3N0YXRlLT5iZXN0X2VuY29kZXIgIT0gJmVuY29kZXItPmJhc2UsCiAJCQkiYXRv bWljIGVuY29kZXIgZG9lc24ndCBtYXRjaCBhdHRhY2hlZCBlbmNvZGVyXG4iKTsKIAotCQlJOTE1 X1NUQVRFX1dBUk4oY29ubl9zdGF0ZS0+Y3J0YyAhPSBlbmNvZGVyLT5jcnRjLAorCQlJOTE1X1NU QVRFX1dBUk4oY29ubl9zdGF0ZS0+Y3J0YyAhPSBlbmNvZGVyLT5iYXNlLmNydGMsCiAJCQkiYXR0 YWNoZWQgZW5jb2RlciBjcnRjIGRpZmZlcnMgZnJvbSBjb25uZWN0b3IgY3J0Y1xuIik7CiAJfSBl bHNlIHsKIAkJSTkxNV9TVEFURV9XQVJOKGNydGMgJiYgY3J0Yy0+c3RhdGUtPmFjdGl2ZSwKZGlm ZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2RwX21zdC5jIGIvZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfZHBfbXN0LmMKaW5kZXggZWJmMjA1NDYyNjMxLi5kNjA2NzIxYjE3 ODggMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2RwX21zdC5jCisrKyBi L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2RwX21zdC5jCkBAIC0xNTksNiArMTU5LDExIEBA IHN0YXRpYyB2b2lkIGludGVsX21zdF9wcmVfZW5hYmxlX2RwKHN0cnVjdCBpbnRlbF9lbmNvZGVy ICplbmNvZGVyKQogCQlyZXR1cm47CiAJfQogCisJLyogTVNUIGVuY29kZXJzIGFyZSBib3VuZCB0 byBhIGNydGMsIG5vdCB0byBhIGNvbm5lY3RvciwKKwkgKiBmb3JjZSB0aGUgbWFwcGluZyBoZXJl IGZvciBnZXRfaHdfc3RhdGUuCisJICovCisJZm91bmQtPmVuY29kZXIgPSBlbmNvZGVyOworCiAJ RFJNX0RFQlVHX0tNUygiJWRcbiIsIGludGVsX2RwLT5hY3RpdmVfbXN0X2xpbmtzKTsKIAlpbnRl bF9tc3QtPnBvcnQgPSBmb3VuZC0+cG9ydDsKIApAQCAtMzkyLDcgKzM5Nyw3IEBAIHN0YXRpYyBj b25zdCBzdHJ1Y3QgZHJtX2VuY29kZXJfZnVuY3MgaW50ZWxfZHBfbXN0X2VuY19mdW5jcyA9IHsK IAogc3RhdGljIGJvb2wgaW50ZWxfZHBfbXN0X2dldF9od19zdGF0ZShzdHJ1Y3QgaW50ZWxfY29u bmVjdG9yICpjb25uZWN0b3IpCiB7Ci0JaWYgKGNvbm5lY3Rvci0+ZW5jb2RlcikgeworCWlmIChj b25uZWN0b3ItPmVuY29kZXIgJiYgY29ubmVjdG9yLT5iYXNlLnN0YXRlLT5jcnRjKSB7CiAJCWVu dW0gcGlwZSBwaXBlOwogCQlpZiAoIWNvbm5lY3Rvci0+ZW5jb2Rlci0+Z2V0X2h3X3N0YXRlKGNv bm5lY3Rvci0+ZW5jb2RlciwgJnBpcGUpKQogCQkJcmV0dXJuIGZhbHNlOwoKX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlz dApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3Rv cC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK