From patchwork Tue Sep 19 19:44:07 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juha-Pekka Heikkila X-Patchwork-Id: 9960049 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 9D3D06056A for ; Tue, 19 Sep 2017 19:45:17 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8EEC928EB0 for ; Tue, 19 Sep 2017 19:45:17 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 83CD128EC4; Tue, 19 Sep 2017 19:45:17 +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_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, 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]) (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 ECFE828EE5 for ; Tue, 19 Sep 2017 19:45:15 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 557756E643; Tue, 19 Sep 2017 19:44:27 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-lf0-x241.google.com (mail-lf0-x241.google.com [IPv6:2a00:1450:4010:c07::241]) by gabe.freedesktop.org (Postfix) with ESMTPS id B768E6E602 for ; Tue, 19 Sep 2017 19:44:20 +0000 (UTC) Received: by mail-lf0-x241.google.com with SMTP id m199so308416lfe.5 for ; Tue, 19 Sep 2017 12:44:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=jUlibxji+wME7SCsEjduVTTjcCMs3gi35TQlLm2o+sk=; b=YhEAvt1VvE0WDE8LHMEKQQt0sFJXeZ6pLfMKy0R5EpVxgbdkIHViYgqakEaJjOTYFU snBecAreeCiArtFZJCz6Cv6go1/lDn/wrK2E1N5bz9cukxe446EOjvi1MPhkT1JmdVYi CMINwO4kmaTzvEjVs4FMo7Hl1Z0AMjQM8vLYgYbZBjf5vpz8QMAjUH1yiupkftt+Jmzw 8TXSxwXNQkN8QRfvTHpeZHlf/H6ci+lli046n12XlEuZN837tDLjLmHMPvWgzi7Fj0Nq yl9GKbAuB6oV/OPKTLUxoAF35qKo62b7E8vCOIEBq0kWpgTNijHV2xY3eZeSsr/zBYBj PAiA== 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:in-reply-to :references; bh=jUlibxji+wME7SCsEjduVTTjcCMs3gi35TQlLm2o+sk=; b=btcsnPUKTU69canLOS5kQ1jgM9DwzrXNhlyHZMmTdswM53p1s50thjLOA1b3A6AhEO /+lt34usDXWLaCQkTMblsLpt9nr6sxOLwny4QiVAYQI+5ETM4b6bPzj/KUfEvrPdAJZm wmAXST6/UMvJZyQJt0yOe5VKPZTL8mjm1gync3WPDdyA7qPzJYBYHUFf0ElxLSw91qBa E9zAcpDGds2uMFiGj04flqaeof7wQpSsHwuDWXFID/IQrBENX+BaMgWFy1KHouWFKaBH SM7KplReiwJ0u6GeiRRmSJorodukAzUy3ysM5/MwrhnZhrgaZ2yORt5jYstytbz5ZEdc 16Sg== X-Gm-Message-State: AHPjjUiQ/DfAf38+FBuVsDY2DwQAp8wJC9VR4svrneb1iFpSHHFUFFhd hVo2Wu8Ab9zAS4faCtf18CemY8zR X-Google-Smtp-Source: AOwi7QB1HuZ6CqFwhEMvOaQBoEzVueEqzytw+WaX54dR9elbrghtX6IExHDWmxOmdVEvG5D8avJAyA== X-Received: by 10.25.149.199 with SMTP id x190mr995888lfd.209.1505850258727; Tue, 19 Sep 2017 12:44:18 -0700 (PDT) Received: from localhost.localdomain (mobile-access-5d6aa2-75.dhcp.inet.fi. [93.106.162.75]) by smtp.gmail.com with ESMTPSA id g83sm22657lji.65.2017.09.19.12.44.17 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 19 Sep 2017 12:44:18 -0700 (PDT) From: Juha-Pekka Heikkila To: intel-gfx@lists.freedesktop.org Date: Tue, 19 Sep 2017 22:44:07 +0300 Message-Id: <1505850249-23527-4-git-send-email-juhapekka.heikkila@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1505850249-23527-1-git-send-email-juhapekka.heikkila@gmail.com> References: <1505850249-23527-1-git-send-email-juhapekka.heikkila@gmail.com> Subject: [Intel-gfx] [PATCH 3/5] drm/i915: Unify skylake plane disable 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 Don't handle skylake primary plane separately as it is similar plane as the others. Signed-off-by: Juha-Pekka Heikkila --- drivers/gpu/drm/i915/intel_display.c | 21 ++------------------- drivers/gpu/drm/i915/intel_drv.h | 1 + drivers/gpu/drm/i915/intel_sprite.c | 2 +- 3 files changed, 4 insertions(+), 20 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index f8ee434..48d5975 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -3554,23 +3554,6 @@ u32 skl_plane_ctl(const struct intel_crtc_state *crtc_state, return plane_ctl; } -static void skylake_disable_primary_plane(struct intel_plane *primary, - struct intel_crtc *crtc) -{ - struct drm_i915_private *dev_priv = to_i915(primary->base.dev); - enum plane_id plane_id = primary->id; - enum pipe pipe = primary->pipe; - unsigned long irqflags; - - spin_lock_irqsave(&dev_priv->uncore.lock, irqflags); - - I915_WRITE_FW(PLANE_CTL(pipe, plane_id), 0); - I915_WRITE_FW(PLANE_SURF(pipe, plane_id), 0); - POSTING_READ_FW(PLANE_SURF(pipe, plane_id)); - - spin_unlock_irqrestore(&dev_priv->uncore.lock, irqflags); -} - static int __intel_display_resume(struct drm_device *dev, struct drm_atomic_state *state, @@ -13155,7 +13138,7 @@ intel_primary_plane_create(struct drm_i915_private *dev_priv, enum pipe pipe) modifiers = skl_format_modifiers_ccs; primary->update_plane = skl_update_plane; - primary->disable_plane = skylake_disable_primary_plane; + primary->disable_plane = skl_disable_plane; } else if (INTEL_GEN(dev_priv) >= 9) { intel_primary_formats = skl_primary_formats; num_formats = ARRAY_SIZE(skl_primary_formats); @@ -13165,7 +13148,7 @@ intel_primary_plane_create(struct drm_i915_private *dev_priv, enum pipe pipe) modifiers = skl_format_modifiers_noccs; primary->update_plane = skl_update_plane; - primary->disable_plane = skylake_disable_primary_plane; + primary->disable_plane = skl_disable_plane; } else if (INTEL_GEN(dev_priv) >= 4) { intel_primary_formats = i965_primary_formats; num_formats = ARRAY_SIZE(i965_primary_formats); diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h index 7b225d0..56fb493 100644 --- a/drivers/gpu/drm/i915/intel_drv.h +++ b/drivers/gpu/drm/i915/intel_drv.h @@ -1920,6 +1920,7 @@ void intel_pipe_update_end(struct intel_crtc_state *new_crtc_state); void skl_update_plane(struct intel_plane *plane, const struct intel_crtc_state *crtc_state, const struct intel_plane_state *plane_state); +void skl_disable_plane(struct intel_plane *plane, struct intel_crtc *crtc); /* intel_tv.c */ void intel_tv_init(struct drm_i915_private *dev_priv); diff --git a/drivers/gpu/drm/i915/intel_sprite.c b/drivers/gpu/drm/i915/intel_sprite.c index 2ec4108..22598c2 100644 --- a/drivers/gpu/drm/i915/intel_sprite.c +++ b/drivers/gpu/drm/i915/intel_sprite.c @@ -305,7 +305,7 @@ skl_update_plane(struct intel_plane *plane, spin_unlock_irqrestore(&dev_priv->uncore.lock, irqflags); } -static void +void skl_disable_plane(struct intel_plane *plane, struct intel_crtc *crtc) { struct drm_i915_private *dev_priv = to_i915(plane->base.dev);