From mboxrd@z Thu Jan 1 00:00:00 1970 From: =?UTF-8?q?Michel=20D=C3=A4nzer?= Subject: [PATCH 1/2] Revert "drm/radeon: remove drm_vblank_get|put from pflip handling" Date: Tue, 17 Jun 2014 19:12:03 +0900 Message-ID: <1402999924-2403-1-git-send-email-michel@daenzer.net> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail.gna.ch (darkcity.gna.ch [195.226.6.51]) by gabe.freedesktop.org (Postfix) with ESMTP id 48E5F6E464 for ; Tue, 17 Jun 2014 03:12:13 -0700 (PDT) Received: from kaveri (125-14-38-183.rev.home.ne.jp [125.14.38.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by darkcity.gna.ch (Postfix) with ESMTPSA id 0F88DC00F5 for ; Tue, 17 Jun 2014 12:11:38 +0200 (CEST) Received: from daenzer by kaveri with local (Exim 4.82_1-5b7a7c0-XX) (envelope-from ) id 1WwqN2-0000dO-UP for dri-devel@lists.freedesktop.org; Tue, 17 Jun 2014 19:12:04 +0900 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: dri-devel@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org RnJvbTogTWljaGVsIETDpG56ZXIgPG1pY2hlbC5kYWVuemVyQGFtZC5jb20+CgpUaGlzIHJldmVy dHMgY29tbWl0IDc1ZjM2ZDg2MTk1N2NiMDViNzg4OWFmMjRjOGNkNGE3ODkzOTgzMDQuCgpkcm1f dmJsYW5rX2dldCgpIGlzIG5lY2Vzc2FyeSB0byBlbnN1cmUgdGhlIERSTSB2YmxhbmsgY291bnRl ciB2YWx1ZSBpcwp1cCB0byBkYXRlIGluIGRybV9zZW5kX3ZibGFua19ldmVudCgpLgoKU2VlbXMg dG8gZml4IHdlc3RvbiBoYW5ncyB3YWl0aW5nIGZvciBwYWdlIGZsaXBzIHRvIGNvbXBsZXRlLgoK U2lnbmVkLW9mZi1ieTogTWljaGVsIETDpG56ZXIgPG1pY2hlbC5kYWVuemVyQGFtZC5jb20+Ci0t LQogZHJpdmVycy9ncHUvZHJtL3JhZGVvbi9yYWRlb25fZGlzcGxheS5jIHwgMTcgKysrKysrKysr KysrKysrKysKIDEgZmlsZSBjaGFuZ2VkLCAxNyBpbnNlcnRpb25zKCspCgpkaWZmIC0tZ2l0IGEv ZHJpdmVycy9ncHUvZHJtL3JhZGVvbi9yYWRlb25fZGlzcGxheS5jIGIvZHJpdmVycy9ncHUvZHJt L3JhZGVvbi9yYWRlb25fZGlzcGxheS5jCmluZGV4IDJhOGI5ZjEuLjk3ZDdhODAgMTAwNjQ0Ci0t LSBhL2RyaXZlcnMvZ3B1L2RybS9yYWRlb24vcmFkZW9uX2Rpc3BsYXkuYworKysgYi9kcml2ZXJz L2dwdS9kcm0vcmFkZW9uL3JhZGVvbl9kaXNwbGF5LmMKQEAgLTM1Nyw2ICszNTcsNyBAQCB2b2lk IHJhZGVvbl9jcnRjX2hhbmRsZV9mbGlwKHN0cnVjdCByYWRlb25fZGV2aWNlICpyZGV2LCBpbnQg Y3J0Y19pZCkKIAogCXNwaW5fdW5sb2NrX2lycXJlc3RvcmUoJnJkZXYtPmRkZXYtPmV2ZW50X2xv Y2ssIGZsYWdzKTsKIAorCWRybV92YmxhbmtfcHV0KHJkZXYtPmRkZXYsIHJhZGVvbl9jcnRjLT5j cnRjX2lkKTsKIAlyYWRlb25fZmVuY2VfdW5yZWYoJndvcmstPmZlbmNlKTsKIAlyYWRlb25faXJx X2ttc19wZmxpcF9pcnFfZ2V0KHJkZXYsIHdvcmstPmNydGNfaWQpOwogCXF1ZXVlX3dvcmsocmFk ZW9uX2NydGMtPmZsaXBfcXVldWUsICZ3b3JrLT51bnBpbl93b3JrKTsKQEAgLTQ1OSw2ICs0NjAs MTIgQEAgc3RhdGljIHZvaWQgcmFkZW9uX2ZsaXBfd29ya19mdW5jKHN0cnVjdCB3b3JrX3N0cnVj dCAqX193b3JrKQogCQliYXNlICY9IH43OwogCX0KIAorCXIgPSBkcm1fdmJsYW5rX2dldChjcnRj LT5kZXYsIHJhZGVvbl9jcnRjLT5jcnRjX2lkKTsKKwlpZiAocikgeworCQlEUk1fRVJST1IoImZh aWxlZCB0byBnZXQgdmJsYW5rIGJlZm9yZSBmbGlwXG4iKTsKKwkJZ290byBwZmxpcF9jbGVhbnVw OworCX0KKwogCS8qIFdlIGJvcnJvdyB0aGUgZXZlbnQgc3BpbiBsb2NrIGZvciBwcm90ZWN0aW5n IGZsaXBfd29yayAqLwogCXNwaW5fbG9ja19pcnFzYXZlKCZjcnRjLT5kZXYtPmV2ZW50X2xvY2ss IGZsYWdzKTsKIApAQCAtNDczLDYgKzQ4MCwxNiBAQCBzdGF0aWMgdm9pZCByYWRlb25fZmxpcF93 b3JrX2Z1bmMoc3RydWN0IHdvcmtfc3RydWN0ICpfX3dvcmspCiAKIAlyZXR1cm47CiAKK3BmbGlw X2NsZWFudXA6CisJaWYgKHVubGlrZWx5KHJhZGVvbl9ib19yZXNlcnZlKHdvcmstPm5ld19yYm8s IGZhbHNlKSAhPSAwKSkgeworCQlEUk1fRVJST1IoImZhaWxlZCB0byByZXNlcnZlIG5ldyByYm8g aW4gZXJyb3IgcGF0aFxuIik7CisJCWdvdG8gY2xlYW51cDsKKwl9CisJaWYgKHVubGlrZWx5KHJh ZGVvbl9ib191bnBpbih3b3JrLT5uZXdfcmJvKSAhPSAwKSkgeworCQlEUk1fRVJST1IoImZhaWxl ZCB0byB1bnBpbiBuZXcgcmJvIGluIGVycm9yIHBhdGhcbiIpOworCX0KKwlyYWRlb25fYm9fdW5y ZXNlcnZlKHdvcmstPm5ld19yYm8pOworCiBjbGVhbnVwOgogCWRybV9nZW1fb2JqZWN0X3VucmVm ZXJlbmNlX3VubG9ja2VkKCZ3b3JrLT5vbGRfcmJvLT5nZW1fYmFzZSk7CiAJcmFkZW9uX2ZlbmNl X3VucmVmKCZ3b3JrLT5mZW5jZSk7Ci0tIAoyLjAuMAoKX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX18KZHJpLWRldmVsIG1haWxpbmcgbGlzdApkcmktZGV2ZWxA bGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1h bi9saXN0aW5mby9kcmktZGV2ZWwK