From patchwork Wed Jun 1 22:06:51 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 9148531 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 70F8D60467 for ; Wed, 1 Jun 2016 22:08:27 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 63E352040D for ; Wed, 1 Jun 2016 22:08:27 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 58A9C265F9; Wed, 1 Jun 2016 22:08:27 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1F3402040D for ; Wed, 1 Jun 2016 22:08:27 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id C7AB66EAAF; Wed, 1 Jun 2016 22:07:52 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-wm0-x241.google.com (mail-wm0-x241.google.com [IPv6:2a00:1450:400c:c09::241]) by gabe.freedesktop.org (Postfix) with ESMTPS id 484436EAAC for ; Wed, 1 Jun 2016 22:07:48 +0000 (UTC) Received: by mail-wm0-x241.google.com with SMTP id a136so10669448wme.0 for ; Wed, 01 Jun 2016 15:07:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=4XL2ZlVgtCuF/ZAQt8DMiLusAdbhB0iVHQaTi9z4SvQ=; b=UNlCQFp8DX3gMFtwXOTyvLfGCWVC2k9vBhwWfSYpwBNIrXBvDKvOOu31iL/us0/Gtz ttZcICJ8eok+dn3HXTq2L1cP/plLe9z7Hqi2krBF4KWagD9nrcq0zM/Kk82XFkq1labX pGsHMGU/rOCNJ8qZA+g4oszowiYDj4DxrtwNw= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=4XL2ZlVgtCuF/ZAQt8DMiLusAdbhB0iVHQaTi9z4SvQ=; b=M6kKbSiw+16ZeHJqXThHDj8EGw3RBMRM1UpgJN/+aodPQ0FwVlsyO2rX1K0cyBkugJ rEvEj4cGGa/iLQYAxL60BJNurPfYo+7R4XmBE/Zz3DDLp88BHpN9gZ81ydu1oBs9Yewu fUU+EfrzT6Ob28s5LolFhDaGNYj0GIJ2tIIm3g3yFABODHNBlU2krN/YVBJnU2lcQ2TW i8qyDqHJEGrQzkYkqHRfwcgyWc/FzlxKjaWE0CuBapsO55yKxP83ELcXZlKx+0zDVYHi +CN6GYqf5RqldF++BCarLpRAYt4UerFvqF8IKT7ylKUEpvP1xFe271W5Y0OqELhQvWoL KYww== X-Gm-Message-State: ALyK8tL5AK32NumFHnTCWi2xzC3nAOGAm8vpi9h26uiRr2qSZDhXakKTvW4jzbN2bKjVlw== X-Received: by 10.28.7.69 with SMTP id 66mr5842245wmh.87.1464818866123; Wed, 01 Jun 2016 15:07:46 -0700 (PDT) Received: from phenom.ffwll.local ([2a02:168:56b5:0:ac27:b86c:7764:9429]) by smtp.gmail.com with ESMTPSA id lf7sm1571508wjb.23.2016.06.01.15.07.45 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 01 Jun 2016 15:07:45 -0700 (PDT) From: Daniel Vetter To: DRI Development Date: Thu, 2 Jun 2016 00:06:51 +0200 Message-Id: <1464818821-5736-29-git-send-email-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.8.1 In-Reply-To: <1464818821-5736-1-git-send-email-daniel.vetter@ffwll.ch> References: <1464818821-5736-1-git-send-email-daniel.vetter@ffwll.ch> Cc: Daniel Vetter , Intel Graphics Development Subject: [Intel-gfx] [PATCH 28/38] drm/i915: Use atomic commits for legacy page_flips X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Virus-Scanned: ClamAV using ClamSMTP Note that I didn't start garbage collecting all the legacy flip code yet, to make it easier to revert this. But there will be _lots_ of code that can be removed once this is tested on all platforms. FIXME: obj->frontbuffer_bits gets out of whack when pipelining commits too hard. Signed-off-by: Daniel Vetter --- drivers/gpu/drm/i915/intel_display.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 75aa6d90eb13..14fd10ec1bbf 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -11642,6 +11642,7 @@ void intel_check_page_flip(struct drm_i915_private *dev_priv, int pipe) spin_unlock(&dev->event_lock); } +__attribute__((unused)) static int intel_crtc_page_flip(struct drm_crtc *crtc, struct drm_framebuffer *fb, struct drm_pending_vblank_event *event, @@ -13975,7 +13976,7 @@ static const struct drm_crtc_funcs intel_crtc_funcs = { .set_config = drm_atomic_helper_set_config, .set_property = drm_atomic_helper_crtc_set_property, .destroy = intel_crtc_destroy, - .page_flip = intel_crtc_page_flip, + .page_flip = drm_atomic_helper_page_flip, .atomic_duplicate_state = intel_crtc_duplicate_state, .atomic_destroy_state = intel_crtc_destroy_state, };