From patchwork Tue Jun 21 17:34:34 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Egbert Eich X-Patchwork-Id: 9191167 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 CDF896075E for ; Tue, 21 Jun 2016 17:40:22 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C238A1FF60 for ; Tue, 21 Jun 2016 17:40:22 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B721E28111; Tue, 21 Jun 2016 17:40:22 +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.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED 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 58C811FF60 for ; Tue, 21 Jun 2016 17:40:22 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 76B276E2B9; Tue, 21 Jun 2016 17:40:21 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mout.kundenserver.de (mout.kundenserver.de [212.227.17.13]) by gabe.freedesktop.org (Postfix) with ESMTPS id 4A9FD6E2B9; Tue, 21 Jun 2016 17:40:19 +0000 (UTC) Received: from debian ([84.150.101.88]) by mrelayeu.kundenserver.de (mreue102) with ESMTPSA (Nemesis) id 0Lo0Ge-1bqv7316lc-00g47X; Tue, 21 Jun 2016 19:34:41 +0200 Received: from sles12.fritz.box (sles12.fritz.box [192.168.178.37]) by debian (Postfix) with ESMTP id 99366E12AE; Tue, 21 Jun 2016 19:34:39 +0200 (CEST) From: Egbert Eich To: intel-gfx@lists.freedesktop.org Date: Tue, 21 Jun 2016 19:34:34 +0200 Message-Id: <1466530474-11587-1-git-send-email-eich@freedesktop.org> X-Mailer: git-send-email 2.7.0 X-Provags-ID: V03:K0:G0qsPFL9lofxTFwNMKgyfOl84Bh8gHuz5rx69PjK3oOx0MWkBJ0 pqYzZH39WdPnRuH5iF2/97co/ali2P0tGcLlUwObqZKa9JqW8q2utHdMYaJ6WEUlU6YEgwZ qiUuIy74c2nmq86KyrOyFLCuXdOEwnMq0Sfa4Pcji1rXrEaaREC8v3v8bxEPn8QBzuh0RKc +hTmThW0MsGDIjc4380Lw== X-UI-Out-Filterresults: notjunk:1; V01:K0:3ZKKRG8ZNiQ=:oUN4OGGIPn0IzepKaCxcwL B8rFyy2yvk2MowMpushkJpulfJVGDFWoT8F8/kS47dA5nQ9tk/VFFlTib053erv6FlmBfdEo6 CXazHGy32gABHiSz1JlUmUK37ZKxswN7rtrmVanTJkd2+qxzBKgD5VCyu0F3WZ86gBu8wSGbP ZI22k8WEeqBIduPFJ8GQrO5fc8PUZKhHg6wdcqvoK8+cwHsXuioh7Ykf2lnO2LTxfM+KXhhhr oYBnj9tiZa1CzpnUmHcCOiNUmHrbF5wCJkykwWSD+rwFBymqcCzDnzvVz1DG/IjMUPHbWEcRP RtH9ViiR/6k8vPuMGwi391eRELaWpwDx3lHQ+0h9UFjXxG155FAnTDt0w/zbasqgs12umnxvg WGBrBppGcQ6AnRs+tpWILgfqFAHZS7oNhUgFYuybePomnyfo43cYWo0bTSGx2orqJvZUNnWag LqjIKxwiJqbCyeYs9sr9eQkOExlWc0m61wNUV48Eyl37rsoLVLpN9UgQL5hYG4JgD6CCPq2rT a/jDrZcm5M16cZ2FORGbvfPis4M+ku5tfnh/CIp9MHhOOHJ7dqD85xTyCnX1qLy2qq+d3KJ0O nRPlGM0RhOz13Q+9gJ4IA9XkXmbo4OpcG1aPEGvNjHGNFf+PHTQ/7dXDmJoIjyFcFoAtX3ZKD GdMonvrwIlLIPY5KVAFBASvPxARqVbaAy7ecea5oTDwrxEouhB2SoRhG7D6KUEbgB+WE= Subject: [Intel-gfx] [PATCH driver/intel] sna/cursor: Make sure hw cursors are disabled before disabling secondary planes 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 When the hw cursors are not disabled before the cursor planes get disabled we may lose the cursor later on. Thus make sure the cursors are disabled before the cursor planes are. Signed-off-by: Egbert Eich --- src/sna/sna_display.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/sna/sna_display.c b/src/sna/sna_display.c index d790975..412c192 100644 --- a/src/sna/sna_display.c +++ b/src/sna/sna_display.c @@ -8081,6 +8081,9 @@ void sna_mode_check(struct sna *sna) if (sna->mode.hidden) return; + /* make sure the hw cursors are disabled before disabling + the secondary planes which include the cursor plane */ + sna_hide_cursors(sna->scrn); disabled = sna_mode_disable_secondary_planes(sna); /* Validate CRTC attachments and force consistency upon the kernel */