From patchwork Thu Dec 20 11:26:08 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juha-Pekka Heikkila X-Patchwork-Id: 10738761 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 0B41014E5 for ; Thu, 20 Dec 2018 11:26:58 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id F00A326419 for ; Thu, 20 Dec 2018 11:26:57 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E0E82287A6; Thu, 20 Dec 2018 11:26:57 +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=-5.2 required=2.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id E2B7F26419 for ; Thu, 20 Dec 2018 11:26:56 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 6606E6F304; Thu, 20 Dec 2018 11:26:56 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-pg1-x542.google.com (mail-pg1-x542.google.com [IPv6:2607:f8b0:4864:20::542]) by gabe.freedesktop.org (Postfix) with ESMTPS id 0E9226F304 for ; Thu, 20 Dec 2018 11:26:54 +0000 (UTC) Received: by mail-pg1-x542.google.com with SMTP id c25so754649pgb.4 for ; Thu, 20 Dec 2018 03:26:54 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=f7Lyg4NnqJ9GnLHzSiZ5X2QnovOYmGwpO4fWEjGLOgY=; b=ODgI5UaLwGyvFvgre2XvlJjzseeBXQCwSlvV8FwA1PqqFBGPdJYSA6vKiOjIaUlxKe KWWYeuO1jRhnZaigcSIDWn3LV3O9J6X057/cyxUs+yb6nt9Fu994w5/Z6/QpzB5dwHS0 7eysS0adGr6Q8I88EJxgec1ZXC7/UHwhgGebgR7xHBwqnZxahTEOijyMUqNnGewOv0fK oV3kNJUpc+FD9iWvAYOMZr4+NkA6WjVVmu1XKXz3USdI2LdGA64LjpFaDmVkimFhrn8t IhH2Z6gILlp61EzXSsPS9xPlz9C2DEUPheORdcpH6ZQtXB2q3JApocuWH3ghsImhrK76 M6/A== X-Gm-Message-State: AA+aEWaZjoplrawKN08lhwlq95yQ9yEQnTEzfSTY3m+ZtmiZlCNsZSYG yigahVUzpZ1HqyieLHUj+t4Nidecit0= X-Google-Smtp-Source: AFSGD/VyQ089vvJyGr8/8zy5g4ziuuDL5mK6o1QoK2y66N8v06/v9uaoQq5yY55T9LozNW2wepRKLw== X-Received: by 2002:a63:ee4c:: with SMTP id n12mr22033739pgk.21.1545305212925; Thu, 20 Dec 2018 03:26:52 -0800 (PST) Received: from jheikkil-mobl.fi.intel.com ([192.55.54.40]) by smtp.gmail.com with ESMTPSA id m3sm34952754pff.173.2018.12.20.03.26.50 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 20 Dec 2018 03:26:52 -0800 (PST) From: Juha-Pekka Heikkila To: intel-gfx@lists.freedesktop.org Date: Thu, 20 Dec 2018 13:26:08 +0200 Message-Id: <1545305168-6047-1-git-send-email-juhapekka.heikkila@gmail.com> X-Mailer: git-send-email 2.7.4 Subject: [Intel-gfx] [PATCH] drm/i915: Fix ILK-IVB primary plane enable delays X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.23 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 Primary and sprite plane enable on ILK-IVB may take two frames to complete Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=103925 Signed-off-by: Juha-Pekka Heikkila --- drivers/gpu/drm/i915/intel_display.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 3b70948..b46ab48 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -10813,8 +10813,11 @@ int intel_plane_atomic_calc_changes(const struct intel_crtc_state *old_crtc_stat * Despite the w/a only being listed for IVB we assume that * the ILK/SNB note has similar ramifications, hence we apply * the w/a on all three platforms. + * + * With experimental results seems this is needed also for primary + * plane, not only sprite plane. */ - if (plane->id == PLANE_SPRITE0 && + if (plane->id != PLANE_CURSOR && (IS_GEN_RANGE(dev_priv, 5, 6) || IS_IVYBRIDGE(dev_priv)) && (turn_on || (!needs_scaling(old_plane_state) &&