From: Sasha Levin Subject: [PATCH AUTOSEL 5.1 033/141] drm/vkms: Forward timer right after drm_crtc_handle_vblank Date: Fri, 19 Jul 2019 00:00:58 -0400 Message-ID: <20190719040246.15945-33-sashal@kernel.org> References: <20190719040246.15945-1-sashal@kernel.org> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by gabe.freedesktop.org (Postfix) with ESMTPS id EA7926E50D for ; Fri, 19 Jul 2019 04:03:54 +0000 (UTC) In-Reply-To: <20190719040246.15945-1-sashal@kernel.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Sasha Levin , Rodrigo Siqueira , Daniel Vetter , dri-devel@lists.freedesktop.org, Shayenne Moura , Daniel Vetter List-Id: dri-devel@lists.freedesktop.org RnJvbTogRGFuaWVsIFZldHRlciA8ZGFuaWVsLnZldHRlckBmZndsbC5jaD4KClsgVXBzdHJlYW0g Y29tbWl0IDczNTU5NjVkYTIyYjhkOWViYWM4YmNlNGI3NzYzOTlmYjBiYjlkMzIgXQoKSW4KCmNv bW1pdCBkZWYzNWU3YzU5MjYxNmJjMDliZTMyOGRlODc5NWU1ZTYyNGEzY2Y4CkF1dGhvcjogU2hh eWVubmUgTW91cmEgPHNoYXllbm5lbHV6bW91cmFAZ21haWwuY29tPgpEYXRlOiAgIFdlZCBKYW4g MzAgMTQ6MDY6MzYgMjAxOSAtMDIwMAoKICAgIGRybS92a21zOiBCdWdmaXggZXh0cmEgdmJsYW5r IGZyYW1lCgp3ZSBmaXhlZCB0aGUgdmJsYW5rIGNvdW50ZXIgdG8gZ2l2ZSBhY2N1cmF0ZSByZXN1 bHRzIG91dHNpZGUgb2YKZHJtX2NydGNfaGFuZGxlX3ZibGFuaywgd2hpY2ggZml4ZWQgYnVncyBh cm91bmQgdmJsYW5rIHRpbWVzdGFtcHMKYmVpbmcgb2ZmLWJ5LW9uZSBhbmQgY2F1c2luZyB0aGUg dmJsYW5rIGNvdW50ZXIgdG8ganVtcCB3aGVuIGl0CnNob3VsZG4ndC4KClRoZSB0cm91YmxlIGlz IHRoYXQgdGhpcyBjb21wbGV0ZWx5IGJyb2tlIGNyYyBnZW5lcmF0aW9uLiBTaGF5ZW5uZSBhbmQK Um9kcmlnbyB0cmFja2VkIHRoaXMgZG93biB0byB0aGUgdmJsYW5rIHRpbWVzdGFtcCBnb2luZyBi YWNrd2FyZHMgaW4KdGltZSBzb21laG93LiBXaGljaCB0aGVuIHJlc3VsdGVkIGluIGFuIHVuZGVy ZmxvdyBpbiBkcm1fdmJsYW5rLmMKY29kZSwgd2hpY2ggcmVzdWx0ZWQgaW4gYWxsIGtpbmRzIG9m IHRoaW5ncyBicmVha2luZyByZWFsbHkgYmFkbHkuCgpUaGUgcmVhc29uIGZvciB0aGlzIGlzIHRo YXQgb25jZSB3ZSd2ZSBjYWxsZWQgZHJtX2NydGNfaGFuZGxlX3ZibGFuawphbmQgdGhlIGhydGlt ZXIgaXNuJ3QgZm9yd2FyZGVkIHlldCwgd2UncmUgcmV0dXJuaW5nIGEgdmJsYW5rCnRpbWVzdGFt cCBpbiB0aGUgcGFzdC4gVGhpcyByYWNlIGlzIHJlYWxseSBoYXJkIHRvIGhpdCBzaW5jZSBpdCdz CnNtYWxsLCBleGNlcHQgd2hlbiB5b3UgZW5hYmxlIGNyYyBnZW5lcmF0aW9uOiBJbiB0aGF0IGNh c2UgdGhlcmUncyBhCmNhbGwgdG8gZHJtX2NydGNfYWNjdXJhdGVfdmJsYW5rIHJpZ2h0IGluLWJl dHdlbiwgc28gd2UncmUgZ3VhcmFudGVlZAp0byBoaXQgdGhlIGJ1Zy4KClRoZSBmaXggaXMgdG8g cm9sbCB0aGUgaHJ0aW1lciBmb3J3YXJkIF9iZWZvcmVfIHdlIGRvIHRoZSB2YmxhbmsKcHJvY2Vz c2luZyAod2hpY2ggaGFzIGEgc2lkZS1lZmZlY3Qgb2YgaW5jcmVtZW50aW5nIHRoZSB2YmxhbmsK Y291bnRlciksIGFuZCB3ZSBhbHdheXMgc3VidHJhY3Qgb25lIGZyYW1lIGZyb20gdGhlIGhydGlt ZXIgLSBzaW5jZQpub3cgaXQncyBhbHdheXMgb25lIGZyYW1lIGluIHRoZSBmdXR1cmUuCgpUbyBt YWtlIHN1cmUgd2UgZG9uJ3QgaGl0IHRoaXMgYWdhaW4gYWxzbyBhZGQgYSBXQVJOX09OIGNoZWNr aW5nIGZvcgp3aGV0aGVyIG91ciB0aW1lc3RhbXAgaXMgc29tZWhvdyBtb3ZpbmcgaW50byB0aGUg cGFzdCwgd2hpY2ggaXMgbmV2ZXIKc2hvdWxkLgoKVGhpcyBhbHNvIGFsaWducyBtb3JlIHdpdGgg aG93IHJlYWwgaHcgd29ya3M6CjEuIGZpcnN0IGFsbCByZWdpc3RlcnMgYXJlIHVwZGF0ZWQgd2l0 aCB0aGUgbmV3IHRpbWVzdGFtcC92YmxhbmsKY291bnRlciB2YWx1ZXMuCjIuIHRoZW4gYW4gaW50 ZXJydXB0IGlzIGdlbmVyYXRlZAozLiBrZXJuZWwgaW50ZXJydXB0IGhhbmRsZXIgZXZlbnR1YWxs eSBmaXJlcy4KClNvIGRvaW5nIHRoaXMgYWxpZ25zIHZrbXMgY2xvc2VyIHdpdGggd2hhdCBkcm1f dmJsYW5rLmMgZXhwZWN0cy4KRG9jdW1lbnQgdGhpcyBhbHNvIGluIGEgY29tbWVudC4KCkNjOiBT aGF5ZW5uZSBNb3VyYSA8c2hheWVubmVsdXptb3VyYUBnbWFpbC5jb20+CkNjOiBSb2RyaWdvIFNp cXVlaXJhIDxyb2RyaWdvc2lxdWVpcmFtZWxvQGdtYWlsLmNvbT4KU2lnbmVkLW9mZi1ieTogRGFu aWVsIFZldHRlciA8ZGFuaWVsLnZldHRlckBpbnRlbC5jb20+ClRlc3RlZC1ieTogUm9kcmlnbyBT aXF1ZWlyYSA8cm9kcmlnb3NpcXVlaXJhbWVsb0BnbWFpbC5jb20+ClJldmlld2VkLWJ5OiBSb2Ry aWdvIFNpcXVlaXJhIDxyb2RyaWdvc2lxdWVpcmFtZWxvQGdtYWlsLmNvbT4KU2lnbmVkLW9mZi1i eTogUm9kcmlnbyBTaXF1ZWlyYSA8cm9kcmlnb3NpcXVlaXJhbWVsb0BnbWFpbC5jb20+Ckxpbms6 IGh0dHBzOi8vcGF0Y2h3b3JrLmZyZWVkZXNrdG9wLm9yZy9wYXRjaC9tc2dpZC8yMDE5MDYwNjA4 NDQwNC4xMjAxNC0xLWRhbmllbC52ZXR0ZXJAZmZ3bGwuY2gKU2lnbmVkLW9mZi1ieTogU2FzaGEg TGV2aW4gPHNhc2hhbEBrZXJuZWwub3JnPgotLS0KIGRyaXZlcnMvZ3B1L2RybS92a21zL3ZrbXNf Y3J0Yy5jIHwgMjIgKysrKysrKysrKysrKysrKy0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDE2IGlu c2VydGlvbnMoKyksIDYgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJt L3ZrbXMvdmttc19jcnRjLmMgYi9kcml2ZXJzL2dwdS9kcm0vdmttcy92a21zX2NydGMuYwppbmRl eCA4YTlhZWIwYTllYTguLjA5NDdhOWY3NWM3OSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJt L3ZrbXMvdmttc19jcnRjLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL3ZrbXMvdmttc19jcnRjLmMK QEAgLTE1LDYgKzE1LDEwIEBAIHN0YXRpYyBlbnVtIGhydGltZXJfcmVzdGFydCB2a21zX3ZibGFu a19zaW11bGF0ZShzdHJ1Y3QgaHJ0aW1lciAqdGltZXIpCiAKIAlzcGluX2xvY2soJm91dHB1dC0+ bG9jayk7CiAKKwlyZXRfb3ZlcnJ1biA9IGhydGltZXJfZm9yd2FyZF9ub3coJm91dHB1dC0+dmJs YW5rX2hydGltZXIsCisJCQkJCSAgb3V0cHV0LT5wZXJpb2RfbnMpOworCVdBUk5fT04ocmV0X292 ZXJydW4gIT0gMSk7CisKIAlyZXQgPSBkcm1fY3J0Y19oYW5kbGVfdmJsYW5rKGNydGMpOwogCWlm ICghcmV0KQogCQlEUk1fRVJST1IoInZrbXMgZmFpbHVyZSBvbiBoYW5kbGluZyB2YmxhbmsiKTsK QEAgLTM1LDEwICszOSw2IEBAIHN0YXRpYyBlbnVtIGhydGltZXJfcmVzdGFydCB2a21zX3ZibGFu a19zaW11bGF0ZShzdHJ1Y3QgaHJ0aW1lciAqdGltZXIpCiAJCQlEUk1fV0FSTigiZmFpbGVkIHRv IHF1ZXVlIHZrbXNfY3JjX3dvcmtfaGFuZGxlIik7CiAJfQogCi0JcmV0X292ZXJydW4gPSBocnRp bWVyX2ZvcndhcmRfbm93KCZvdXRwdXQtPnZibGFua19ocnRpbWVyLAotCQkJCQkgIG91dHB1dC0+ cGVyaW9kX25zKTsKLQlXQVJOX09OKHJldF9vdmVycnVuICE9IDEpOwotCiAJc3Bpbl91bmxvY2so Jm91dHB1dC0+bG9jayk7CiAKIAlyZXR1cm4gSFJUSU1FUl9SRVNUQVJUOwpAQCAtNzQsMTEgKzc0 LDIxIEBAIGJvb2wgdmttc19nZXRfdmJsYW5rX3RpbWVzdGFtcChzdHJ1Y3QgZHJtX2RldmljZSAq ZGV2LCB1bnNpZ25lZCBpbnQgcGlwZSwKIHsKIAlzdHJ1Y3Qgdmttc19kZXZpY2UgKnZrbXNkZXYg PSBkcm1fZGV2aWNlX3RvX3ZrbXNfZGV2aWNlKGRldik7CiAJc3RydWN0IHZrbXNfb3V0cHV0ICpv dXRwdXQgPSAmdmttc2Rldi0+b3V0cHV0OworCXN0cnVjdCBkcm1fdmJsYW5rX2NydGMgKnZibGFu ayA9ICZkZXYtPnZibGFua1twaXBlXTsKIAogCSp2YmxhbmtfdGltZSA9IG91dHB1dC0+dmJsYW5r X2hydGltZXIubm9kZS5leHBpcmVzOwogCi0JaWYgKCFpbl92YmxhbmtfaXJxKQotCQkqdmJsYW5r X3RpbWUgLT0gb3V0cHV0LT5wZXJpb2RfbnM7CisJaWYgKFdBUk5fT04oKnZibGFua190aW1lID09 IHZibGFuay0+dGltZSkpCisJCXJldHVybiB0cnVlOworCisJLyoKKwkgKiBUbyBwcmV2ZW50IHJh Y2VzIHdlIHJvbGwgdGhlIGhydGltZXIgZm9yd2FyZCBiZWZvcmUgd2UgZG8gYW55CisJICogaW50 ZXJydXB0IHByb2Nlc3NpbmcgLSB0aGlzIGlzIGhvdyByZWFsIGh3IHdvcmtzICh0aGUgaW50ZXJy dXB0IGlzCisJICogb25seSBnZW5lcmF0ZWQgYWZ0ZXIgYWxsIHRoZSB2YmxhbmsgcmVnaXN0ZXJz IGFyZSB1cGRhdGVkKSBhbmQgd2hhdAorCSAqIHRoZSB2YmxhbmsgY29yZSBleHBlY3RzLiBUaGVy ZWZvcmUgd2UgbmVlZCB0byBhbHdheXMgY29ycmVjdCB0aGUKKwkgKiB0aW1lc3RhbXBlIGJ5IG9u ZSBmcmFtZS4KKwkgKi8KKwkqdmJsYW5rX3RpbWUgLT0gb3V0cHV0LT5wZXJpb2RfbnM7CiAKIAly ZXR1cm4gdHJ1ZTsKIH0KLS0gCjIuMjAuMQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX18KZHJpLWRldmVsIG1haWxpbmcgbGlzdApkcmktZGV2ZWxAbGlzdHMu ZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlz dGluZm8vZHJpLWRldmVs