From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Vetter Subject: [PATCH] drm/i915: Fix modeset state confusion in the load detect code Date: Tue, 3 Mar 2015 17:31:21 +0100 Message-ID: <1425400281-1555-1-git-send-email-daniel.vetter@ffwll.ch> References: <1425289456.24292.93.camel@x220> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-we0-f182.google.com (mail-we0-f182.google.com [74.125.82.182]) by gabe.freedesktop.org (Postfix) with ESMTP id 509C16E5AE for ; Tue, 3 Mar 2015 08:31:32 -0800 (PST) Received: by wevl61 with SMTP id l61so41008632wev.2 for ; Tue, 03 Mar 2015 08:31:31 -0800 (PST) In-Reply-To: <1425289456.24292.93.camel@x220> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Intel Graphics Development Cc: Paul Bolle , Daniel Vetter , DRI Development , Daniel Vetter , Linus Torvalds List-Id: dri-devel@lists.freedesktop.org VGhpcyBpcyBhIHRyaWNreSBzdG9yeSBvZiB0aGUgbmV3IGF0b21pYyBzdGF0ZSBoYW5kbGluZyBh bmQgdGhlIGxlZ2FjeQpjb2RlIGZpZ2h0aW5nIG92ZXIgZWFjaCBhbm90aGVyLiBUaGUgYnVnIGF0 IGhhbmQgaXMgYW4gdW5kZXJydW4gb2YgdGhlCmZyYW1lYnVmZmVyIHJlZmVyZW5jZSB3aXRoIHN1 YnNlcXVlbnQgaGlsYXJpdHkgY2F1c2VkIGJ5IHRoZSBsb2FkCmRldGVjdCBjb2RlLiBXaGljaCBp cyBwZWN1bGlhciBzaW5jZSB0aGUgdGhlIGV4YWN0IHNhbWUgY29kZSB3b3JrcwpmaW5lIGFzIHRo ZSBpbXBsZW1lbnRhdGlvbiBvZiB0aGUgbGVnYWN5IHNldGNydGMgaW9jdGwuCgpMZXQncyBsb29r IGF0IHRoZSBpbmdyZWRpZW50czoKCi0gQ3VycmVudGx5IG91ciBjb2RlIGlzIGEgY3JhenkgbWl4 IG9mIGxlZ2FjeSBtb2Rlc2V0IGludGVyZmFjZXMgdG8KICBzZXQgdGhlIHBhcmFtZXRlcnMgYW5k IGhhbGYtYmFrZWQgYXRvbWljIHN0YXRlIHRyYWNraW5nIHVuZGVybmVhdGguCiAgV2hpbGUgdGhp cyB0cmFuc2l0aW9uIGlzIGdvaW5nIHdlJ3JlIHVzaW5nIHRoZSB0cmFuc2l0aW9uYWwgcGxhbmUK ICBoZWxwZXJzIHRvIHVwZGF0ZSB0aGUgYXRvbWljIHNpZGUgKGRybV9wbGFuZV9oZWxwZXJfZGlz YWJsZS91cGRhdGUKICBhbmQgZnJpZW5kcyksIGkuZS4gcGxhbmUtPnN0YXRlLT5mYi4gU2luY2Ug dGhlIHN0YXRlIHN0cnVjdHVyZSBvd25zCiAgdGhlIGZiIHRob3NlIGZ1bmN0aW9ucyB0YWtlIGNh cmUgb2YgdGhhdCB0aGVtc2VsdmVzLgoKICBUaGUgbGVnYWN5IHN0YXRlIChzcGVjaWZpY2FsbHkg Y3J0Yy0+cHJpbWFyeS0+ZmIpIGlzIHN0aWxsIG1hbmFnZWQKICBieSB0aGUgb2xkIGNvZGUgKGFu ZCBtb3N0bHkgYnkgdGhlIGRybSBjb3JlKSwgd2l0aCB0aGUgZmIgcmVmZXJlbmNlCiAgY291bnRp bmcgZG9uZSBieSBjYWxsZXJzIChjb3JlIGRybSBmb3IgdGhlIGlvY3RsIG9yIHRoZSBpOTE1IGxv YWQKICBkZXRlY3QgY29kZSkuIFRoZSByZWxldmFudCBjb21taXQgaXMKCiAgY29tbWl0IGVhMmM2 N2JiNGFmZmE4NDA4MGM2MTY5MjBmMzg5OWYxMjM3ODZlNTYKICBBdXRob3I6IE1hdHQgUm9wZXIg PG1hdHRoZXcuZC5yb3BlckBpbnRlbC5jb20+CiAgRGF0ZTogICBUdWUgRGVjIDIzIDEwOjQxOjUy IDIwMTQgLTA4MDAKCiAgICAgIGRybS9pOTE1OiBNb3ZlIHRvIGF0b21pYyBwbGFuZSBoZWxwZXJz ICh2OSkKCi0gZHJtX3BsYW5lX2hlbHBlcl9kaXNhYmxlIGhhcyBzcGVjaWFsIGNvZGUgdG8gaGFu ZGxlIG11bHRpcGxlIGNhbGxzCiAgaW4gYSByb3cgLSBpdCBjaGVja3MgcGxhbmUtPmNydGMgPT0g TlVMTCBhbmQgYmFpbHMgb3V0LiBUaGlzIGlzIHRvCiAgbWF0Y2ggdGhlIHByb3BlciBhdG9taWMg aW1wbGVtZW50YXRpb24gd2hpY2ggbmVlZHMgdGhlIGNydGMgdG8gZ2V0CiAgYXQgdGhlIGltcGxp ZWQgbG9ja2luZyBjb250ZXh0IGF0b21pYyB1cGRhdGVzIGFsd2F5cyBuZWVkLiBTZWUKCiAgY29t bWl0IGFjZjI0YTM5NWM1YTkyOTAxODliMDgwMzgzNTY0NDM3MTAxZDQxMWMKICBBdXRob3I6IERh bmllbCBWZXR0ZXIgPGRhbmllbC52ZXR0ZXJAZmZ3bGwuY2g+CiAgRGF0ZTogICBUdWUgSnVsIDI5 IDE1OjMzOjA1IDIwMTQgKzAyMDAKCiAgICAgIGRybS9wbGFuZS1oZWxwZXI6IHRyYW5zaXRpb25h bCBhdG9taWMgcGxhbmUgaGVscGVycwoKLSBUaGUgdW5pdmVyc2FsIHBsYW5lIGNvZGUgc3BsaXQg b3V0IHRoZSBpbXBsaWNpdCBwcmltYXJ5IHBsYW5lIGZyb20KICB0aGUgQ1JUQyBpbnRvIGl0J3Mg b3duIGZ1bGwtYmxvd24gZHJtX3BsYW5lIG9iamVjdC4gQXMgcGFydCBvZiB0aGF0CiAgdGhlIHNl dGNydGMgaW9jdGwgKHdoaWNoIHVwZGF0ZWQgYm90aCB0aGUgY3J0YyBtb2RlIGFuZCBwcmltYXJ5 CiAgcGxhbmUpIGxlYXJuZWQgdG8gc2V0IGNydGMtPnByaW1hcnktPmNydGMgb24gbW9kZXNldCB0 byBtYWtlIHN1cmUKICB0aGUgcGxhbmUtPmNydGMgYXNzaWdubWVudHMgc3RhdGF0ZSB1cCB0byBk YXRlIGluCgogIGNvbW1pdCBlMTMxNjFhZjgwYzE4NWVjZDhkYzQ2NDFkMGY1ZGY1OGY5ZTNlMGFm CiAgQXV0aG9yOiBNYXR0IFJvcGVyIDxtYXR0aGV3LmQucm9wZXJAaW50ZWwuY29tPgogIERhdGU6 ICAgVHVlIEFwciAxIDE1OjIyOjM4IDIwMTQgLTA3MDAKCiAgICAgIGRybTogQWRkIGRybV9jcnRj X2luaXRfd2l0aF9wbGFuZXMoKSAodjIpCgogIFVuZm9ydHVuYXRlbHkgd2UndmUgZm9yZ290dGVu IHRvIHVwZGF0ZSB0aGUgbG9hZCBkZXRlY3QgY29kZS4gV2hpY2gKICB3YXNuJ3QgYSBwcm9ibGVt IHNpbmNlIHRoZSBsb2FkIGRldGVjdCBtb2Rlc2V0IGlzIHRlbXBvcmFyeSBhbmQKICBhbHdheXMg dW5kb25lIGJlZm9yZSB3ZSBkcm9wIHRoZSBsb2Nrcy4KCi0gRmluYWxseSB0aGVyZSBpcyBhIG9y Z2FuaWNhbGx5IGdyb3duIGhpc3RvcnkgKGkuZS4gZG9uJ3QgYXNrKSBhcm91bmQKICB3aG8gc2V0 cyB0aGUgbGVnYWN5IHBsYW5lLT5mYiBmb3IgdGhlIHZhcmlvdXMgZHJpdmVyIGVudHJ5IHBvaW50 cy4KICBPcmlnaW5hbGx5IHVwZGF0aW5nIHRoYXQgd2FzIHRoZSBkcml2ZXJzIGR1dHksIGJ1dCBm b3IgYWxtb3N0IGFsbAogIHBsYWNlcyB3ZSd2ZSBtb3ZlZCB0aGF0IChwbHVzIHVwZGF0aW5nIHRo ZSByZWZjb3VudHMpIGludG8gdGhlIGNvcmUuCiAgQWdhaW4gdGhlIGV4Y2VwdGlvbiBpcyB0aGUg bG9hZCBkZXRlY3QgY29kZS4KClRha2luZyBhbGwgdG9nZXRoZXIgdGhlIGZvbGxvd2luZyBoYXBw ZW5zOgotIFRoZSBsb2FkIGRldGVjdCBjb2RlIGRvZXNuJ3Qgc2V0IGNydGMtPnByaW1hcnktPmNy dGMuIFRoaXMgaXMgb25seQogIHJlYWxseSBhbiBpc3N1ZSBvbiBjcnRjcyBuZXZlciBiZWZvcmUg dXNlZCBvciB3aGVuIHVzZXJzcGFjZQogIGV4cGxpY2l0bHkgZGlzYWJsZWQgdGhlIHByaW1hcnkg cGxhbmUuCgotIFRoZSBwbGFuZSBoZWxwZXIgZ2x1ZSBjb2RlIHNob3J0LWNpcmN1aXRzIGJlY2F1 c2Ugb2YgdGhhdCBhbmQgbGVhdmVzCiAgYSBub24tTlVMTCBmYiBiZWhpbmQgaW4gcGxhbmUtPnN0 YXRlLT5mYiBhbmQgcGxhbmUtPmZiLiBUaGUgc3RhdGUKICBmYiBpc24ndCBhIHJlYWwgcHJvYmxl bSAoaXQncyBwcm9wZXJseSByZWZjb3VudGVkIG9uIGl0cyBvd24pLCBpdCdzCiAganVzdCB0aGUg Y2FuYXJ5LgoKLSBMb2FkIGRldGVjdCBjb2RlIGRyb3BzIHRoZSByZWZlcmVuY2UgZm9yIHRoYXQg ZmIsIGJ1dCBkb2Vzbid0IHNldAogIHBsYW5lLT5mYiA9IE5VTEwuIFRoaXMgaXMgb2sgc2luY2Ug aXQncyBzdGlsbCBsaXZpbmcgaW4gdGhhdCBvbGQKICB3b3JsZCB3aGVyZSBkcml2ZXJzIGhhZCB0 byBjbGVhciB0aGUgcG9pbnRlciBidXQgdGhlIGNvcmUvY2FsbGVycwogIGhhbmRsZWQgdGhlIHJl ZmNvdW50aW5nLgoKLSBPbiB0aGUgbmV4dCBtb2Rlc2V0IHRoZSBkcm0gY29yZSBub3RpY2VzIHBs YW5lLT5mYiBhbmQgdGFrZXMgY2FyZSBvZgogIHJlZmNvdW50aW5nIGl0IHByb3Blcmx5IGJ5IGRv aW5nIGFub3RoZXIgdW5yZWYuIFRoaXMgZHJvcHMgdGhlCiAgcmVmY291bnQgdG8gemVybywgbGVh dmluZyBzdGF0ZS0+cGxhbmUgbm93IHBvaW50aW5nIGF0IGZyZWVkIG1lbW9yeS4KCi0gaW50ZWxf cGxhbmVfZHVwbGljYXRlX3N0YXRlIHN0aWxsIGFzc3VtZSBpdCBvd25zIGEgcmVmZXJlbmNlIHRv IHRoYXQKICB2ZXJ5IHN0YXRlLT5mYiBhbmQgYmFkIHRoaW5ncyBzdGFydCB0byBoYXBwZW4uCgpG aXggdGhpcyBhbGwgYnkgYXBwbHlpbmcgdGhlIHNhbWUgZHVjdC10YXBlIGFzIGZvciB0aGUgbGVn YWN5IHNldGNydGMKaW9jdGwgY29kZSBhbmQgc2V0IGNydGMtPnByaW1hcnktPmNydGMgcHJvcGVy bHkuCgpDYzogTWF0dCBSb3BlciA8bWF0dGhldy5kLnJvcGVyQGludGVsLmNvbT4KQ2M6IExpbnVz IFRvcnZhbGRzIDx0b3J2YWxkc0BsaW51eC1mb3VuZGF0aW9uLm9yZz4KQ2M6IFBhdWwgQm9sbGUg PHBlYm9sbGVAdGlzY2FsaS5ubD4KQ2M6IFJvYiBDbGFyayA8cm9iZGNsYXJrQGdtYWlsLmNvbT4K Q2M6IFBhdWxvIFphbm9uaSA8cHJ6YW5vbmlAZ21haWwuY29tPgpDYzogU2VhbiBQYXVsIDxzZWFu cGF1bEBjaHJvbWl1bS5vcmc+CkNjOiBNYXR0IFJvcGVyIDxtYXR0aGV3LmQucm9wZXJAaW50ZWwu Y29tPgpSZXBvcnRlZC1ieTogTGludXMgVG9ydmFsZHMgPHRvcnZhbGRzQGxpbnV4LWZvdW5kYXRp b24ub3JnPgpSZXBvcnRlZC1ieTogUGF1bCBCb2xsZSA8cGVib2xsZUB0aXNjYWxpLm5sPgpTaWdu ZWQtb2ZmLWJ5OiBEYW5pZWwgVmV0dGVyIDxkYW5pZWwudmV0dGVyQGludGVsLmNvbT4KLS0tCiBk cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgfCAxICsKIDEgZmlsZSBjaGFuZ2Vk LCAxIGluc2VydGlvbigrKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs X2Rpc3BsYXkuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwppbmRleCBj YzMzMDVlMzBjMWIuLmQxMTZjYWY5OGE3MiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfZGlzcGxheS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3Bs YXkuYwpAQCAtODg1OSw2ICs4ODU5LDcgQEAgcmV0cnk6CiAJCQlvbGQtPnJlbGVhc2VfZmItPmZ1 bmNzLT5kZXN0cm95KG9sZC0+cmVsZWFzZV9mYik7CiAJCWdvdG8gZmFpbDsKIAl9CisJY3J0Yy0+ cHJpbWFyeS0+Y3J0YyA9IGNydGM7CiAKIAkvKiBsZXQgdGhlIGNvbm5lY3RvciBnZXQgdGhyb3Vn aCBvbmUgZnVsbCBjeWNsZSBiZWZvcmUgdGVzdGluZyAqLwogCWludGVsX3dhaXRfZm9yX3ZibGFu ayhkZXYsIGludGVsX2NydGMtPnBpcGUpOwotLSAKMi4xLjQKCl9fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fCmRyaS1kZXZlbCBtYWlsaW5nIGxpc3QKZHJpLWRl dmVsQGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21h aWxtYW4vbGlzdGluZm8vZHJpLWRldmVsCg==