From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5EFA9C43387 for ; Fri, 11 Jan 2019 05:38:27 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 39D1920675 for ; Fri, 11 Jan 2019 05:38:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730294AbfAKFiE (ORCPT ); Fri, 11 Jan 2019 00:38:04 -0500 Received: from mx1.redhat.com ([209.132.183.28]:48824 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725769AbfAKFh6 (ORCPT ); Fri, 11 Jan 2019 00:37:58 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 22A9F92A57; Fri, 11 Jan 2019 05:37:58 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-116-203.ams2.redhat.com [10.36.116.203]) by smtp.corp.redhat.com (Postfix) with ESMTP id BA888600C3; Fri, 11 Jan 2019 05:37:57 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 8D6399AD9; Fri, 11 Jan 2019 06:37:53 +0100 (CET) From: Gerd Hoffmann To: dri-devel@lists.freedesktop.org, David Airlie Cc: andr2000@gmail.com, noralf@tronnes.org, Gerd Hoffmann , David Airlie , virtualization@lists.linux-foundation.org (open list:DRM DRIVER FOR BOCHS VIRTUAL GPU), linux-kernel@vger.kernel.org (open list) Subject: [PATCH v4 07/16] drm/bochs: atomic: use atomic page_flip helper Date: Fri, 11 Jan 2019 06:37:43 +0100 Message-Id: <20190111053752.4004-8-kraxel@redhat.com> In-Reply-To: <20190111053752.4004-1-kraxel@redhat.com> References: <20190111053752.4004-1-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Fri, 11 Jan 2019 05:37:58 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Conversion to atomic modesetting, step five. Use atomic page_flip helper for crtc. Signed-off-by: Gerd Hoffmann Reviewed-by: Oleksandr Andrushchenko Acked-by: Daniel Vetter --- drivers/gpu/drm/bochs/bochs_kms.c | 23 +---------------------- 1 file changed, 1 insertion(+), 22 deletions(-) diff --git a/drivers/gpu/drm/bochs/bochs_kms.c b/drivers/gpu/drm/bochs/bochs_kms.c index 646f897cb2..67c3674609 100644 --- a/drivers/gpu/drm/bochs/bochs_kms.c +++ b/drivers/gpu/drm/bochs/bochs_kms.c @@ -104,27 +104,6 @@ static void bochs_crtc_commit(struct drm_crtc *crtc) { } -static int bochs_crtc_page_flip(struct drm_crtc *crtc, - struct drm_framebuffer *fb, - struct drm_pending_vblank_event *event, - uint32_t page_flip_flags, - struct drm_modeset_acquire_ctx *ctx) -{ - struct bochs_device *bochs = - container_of(crtc, struct bochs_device, crtc); - struct drm_framebuffer *old_fb = crtc->primary->fb; - unsigned long irqflags; - - drm_atomic_set_fb_for_plane(crtc->primary->state, fb); - bochs_crtc_mode_set_base(crtc, 0, 0, old_fb); - if (event) { - spin_lock_irqsave(&bochs->dev->event_lock, irqflags); - drm_crtc_send_vblank_event(crtc, event); - spin_unlock_irqrestore(&bochs->dev->event_lock, irqflags); - } - return 0; -} - static void bochs_crtc_atomic_enable(struct drm_crtc *crtc, struct drm_crtc_state *old_crtc_state) { @@ -152,7 +131,7 @@ static void bochs_crtc_atomic_flush(struct drm_crtc *crtc, static const struct drm_crtc_funcs bochs_crtc_funcs = { .set_config = drm_atomic_helper_set_config, .destroy = drm_crtc_cleanup, - .page_flip = bochs_crtc_page_flip, + .page_flip = drm_atomic_helper_page_flip, .reset = drm_atomic_helper_crtc_reset, .atomic_duplicate_state = drm_atomic_helper_crtc_duplicate_state, .atomic_destroy_state = drm_atomic_helper_crtc_destroy_state, -- 2.9.3 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Gerd Hoffmann Subject: [PATCH v4 07/16] drm/bochs: atomic: use atomic page_flip helper Date: Fri, 11 Jan 2019 06:37:43 +0100 Message-ID: <20190111053752.4004-8-kraxel@redhat.com> References: <20190111053752.4004-1-kraxel@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by gabe.freedesktop.org (Postfix) with ESMTPS id 8AF9D6F551 for ; Fri, 11 Jan 2019 05:37:58 +0000 (UTC) In-Reply-To: <20190111053752.4004-1-kraxel@redhat.com> 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, David Airlie Cc: andr2000@gmail.com, open list , "open list:DRM DRIVER FOR BOCHS VIRTUAL GPU" , David Airlie , Gerd Hoffmann List-Id: dri-devel@lists.freedesktop.org Q29udmVyc2lvbiB0byBhdG9taWMgbW9kZXNldHRpbmcsIHN0ZXAgZml2ZS4KVXNlIGF0b21pYyBw YWdlX2ZsaXAgaGVscGVyIGZvciBjcnRjLgoKU2lnbmVkLW9mZi1ieTogR2VyZCBIb2ZmbWFubiA8 a3JheGVsQHJlZGhhdC5jb20+ClJldmlld2VkLWJ5OiBPbGVrc2FuZHIgQW5kcnVzaGNoZW5rbyA8 b2xla3NhbmRyX2FuZHJ1c2hjaGVua29AZXBhbS5jb20+CkFja2VkLWJ5OiBEYW5pZWwgVmV0dGVy IDxkYW5pZWwudmV0dGVyQGZmd2xsLmNoPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9ib2Nocy9ib2No c19rbXMuYyB8IDIzICstLS0tLS0tLS0tLS0tLS0tLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgMSBp bnNlcnRpb24oKyksIDIyIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2Ry bS9ib2Nocy9ib2Noc19rbXMuYyBiL2RyaXZlcnMvZ3B1L2RybS9ib2Nocy9ib2Noc19rbXMuYwpp bmRleCA2NDZmODk3Y2IyLi42N2MzNjc0NjA5IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0v Ym9jaHMvYm9jaHNfa21zLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2JvY2hzL2JvY2hzX2ttcy5j CkBAIC0xMDQsMjcgKzEwNCw2IEBAIHN0YXRpYyB2b2lkIGJvY2hzX2NydGNfY29tbWl0KHN0cnVj dCBkcm1fY3J0YyAqY3J0YykKIHsKIH0KIAotc3RhdGljIGludCBib2Noc19jcnRjX3BhZ2VfZmxp cChzdHJ1Y3QgZHJtX2NydGMgKmNydGMsCi0JCQkJc3RydWN0IGRybV9mcmFtZWJ1ZmZlciAqZmIs Ci0JCQkJc3RydWN0IGRybV9wZW5kaW5nX3ZibGFua19ldmVudCAqZXZlbnQsCi0JCQkJdWludDMy X3QgcGFnZV9mbGlwX2ZsYWdzLAotCQkJCXN0cnVjdCBkcm1fbW9kZXNldF9hY3F1aXJlX2N0eCAq Y3R4KQotewotCXN0cnVjdCBib2Noc19kZXZpY2UgKmJvY2hzID0KLQkJY29udGFpbmVyX29mKGNy dGMsIHN0cnVjdCBib2Noc19kZXZpY2UsIGNydGMpOwotCXN0cnVjdCBkcm1fZnJhbWVidWZmZXIg Km9sZF9mYiA9IGNydGMtPnByaW1hcnktPmZiOwotCXVuc2lnbmVkIGxvbmcgaXJxZmxhZ3M7Ci0K LQlkcm1fYXRvbWljX3NldF9mYl9mb3JfcGxhbmUoY3J0Yy0+cHJpbWFyeS0+c3RhdGUsIGZiKTsK LQlib2Noc19jcnRjX21vZGVfc2V0X2Jhc2UoY3J0YywgMCwgMCwgb2xkX2ZiKTsKLQlpZiAoZXZl bnQpIHsKLQkJc3Bpbl9sb2NrX2lycXNhdmUoJmJvY2hzLT5kZXYtPmV2ZW50X2xvY2ssIGlycWZs YWdzKTsKLQkJZHJtX2NydGNfc2VuZF92YmxhbmtfZXZlbnQoY3J0YywgZXZlbnQpOwotCQlzcGlu X3VubG9ja19pcnFyZXN0b3JlKCZib2Nocy0+ZGV2LT5ldmVudF9sb2NrLCBpcnFmbGFncyk7Ci0J fQotCXJldHVybiAwOwotfQotCiBzdGF0aWMgdm9pZCBib2Noc19jcnRjX2F0b21pY19lbmFibGUo c3RydWN0IGRybV9jcnRjICpjcnRjLAogCQkJCSAgICAgc3RydWN0IGRybV9jcnRjX3N0YXRlICpv bGRfY3J0Y19zdGF0ZSkKIHsKQEAgLTE1Miw3ICsxMzEsNyBAQCBzdGF0aWMgdm9pZCBib2Noc19j cnRjX2F0b21pY19mbHVzaChzdHJ1Y3QgZHJtX2NydGMgKmNydGMsCiBzdGF0aWMgY29uc3Qgc3Ry dWN0IGRybV9jcnRjX2Z1bmNzIGJvY2hzX2NydGNfZnVuY3MgPSB7CiAJLnNldF9jb25maWcgPSBk cm1fYXRvbWljX2hlbHBlcl9zZXRfY29uZmlnLAogCS5kZXN0cm95ID0gZHJtX2NydGNfY2xlYW51 cCwKLQkucGFnZV9mbGlwID0gYm9jaHNfY3J0Y19wYWdlX2ZsaXAsCisJLnBhZ2VfZmxpcCA9IGRy bV9hdG9taWNfaGVscGVyX3BhZ2VfZmxpcCwKIAkucmVzZXQgPSBkcm1fYXRvbWljX2hlbHBlcl9j cnRjX3Jlc2V0LAogCS5hdG9taWNfZHVwbGljYXRlX3N0YXRlID0gZHJtX2F0b21pY19oZWxwZXJf Y3J0Y19kdXBsaWNhdGVfc3RhdGUsCiAJLmF0b21pY19kZXN0cm95X3N0YXRlID0gZHJtX2F0b21p Y19oZWxwZXJfY3J0Y19kZXN0cm95X3N0YXRlLAotLSAKMi45LjMKCl9fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmRyaS1kZXZlbCBtYWlsaW5nIGxpc3QKZHJp LWRldmVsQGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9y Zy9tYWlsbWFuL2xpc3RpbmZvL2RyaS1kZXZlbAo=