From patchwork Mon Sep 11 12:28:57 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: 9947295 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 C87BF602C9 for ; Mon, 11 Sep 2017 12:29:17 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AB7A828BE4 for ; Mon, 11 Sep 2017 12:29:17 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9F78C28BDC; Mon, 11 Sep 2017 12:29: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 51DED28BDC for ; Mon, 11 Sep 2017 12:29:17 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id F136C6E3A3; Mon, 11 Sep 2017 12:29:16 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-wm0-x244.google.com (mail-wm0-x244.google.com [IPv6:2a00:1450:400c:c09::244]) by gabe.freedesktop.org (Postfix) with ESMTPS id 6E3C66E3A3 for ; Mon, 11 Sep 2017 12:29:15 +0000 (UTC) Received: by mail-wm0-x244.google.com with SMTP id x17so6738765wmd.5 for ; Mon, 11 Sep 2017 05:29:15 -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=OzKIKGiLOxILWsMXfmlmY9ERMOCukeuFRoagOwtrU/E=; b=gQ7GZdj+m/JBkXv83CYW4U66Ad1ZRhpNZ1/z4HU9jSatpmeai7Ccxta+yHI+GA+DEu us/VCRRw6HIARFXjTqrINQxjR2WLj75XjQ+lfLyl8zAos4jglNqfpedT906CteZyKVSI ftQdIpcVy10ZLov6gvTiumeOo3iF+eY+PYDVwSbXEROt+WkH8i+fqXxRB+MLMCEHVOVE 43Kf0IUmsfye2ISgTty6VDTbj/tFTXBTHfalK8c6TmTDJb5Oy5e2RuvaE3HdQ8eHWILp H02jBHKXLrb/nfMddNCQjgr9TZ385jkXhn7hlZQ8O5g7TXANEBofiLb63uIP4N5oGFRq putA== 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=OzKIKGiLOxILWsMXfmlmY9ERMOCukeuFRoagOwtrU/E=; b=sW1nEHfvYmISky+brTktBYSxKEp8iTRLG7DGeupNUxX65iaZu+90ISFWPgYyPdnFE4 s096m5HaonnLtXABPzF1t2AvNHRGjKA7TZMPTPCeXaAV1qOfwigFj2ce9dwZAIwtreze CAo3MpMBAIee9llzpDqezLeSvxptqzYvhtGniaAaV+eSR6sKPZsULDkTXhi6OqaEdIQS roJcGvRdYNTvAYNOc/jy8B0udCKyu2EVPeH3OCqVxOO+G8J6il+kPJnNkmvdAut534Uw O44sEFxUNkH2OLgsPF7msGtncENd5BfmbRN1/bAaV2yu/+FMi1C6sz6pVMrx2JlGpvlV vqsg== X-Gm-Message-State: AHPjjUgipp65FvahvMZ3+RgD9tAIh1TYiutUMkWtTyiyvyjgi1WeqJ+d Q4Q9jL4eCsFZoddP X-Google-Smtp-Source: ADKCNb5q5HFp6QHhLYQKVoFcBcy+uplN524N0hG7EzN8s7PN8cSMX9kHHC9ng75srRQMjKPnremUVg== X-Received: by 10.80.139.145 with SMTP id m17mr9389675edm.304.1505132953446; Mon, 11 Sep 2017 05:29:13 -0700 (PDT) Received: from jheikkil-MOBL1.fi.intel.com ([2001:998:22:0:90d4:903f:9739:d412]) by smtp.gmail.com with ESMTPSA id t49sm1425111edd.62.2017.09.11.05.29.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 11 Sep 2017 05:29:12 -0700 (PDT) From: Juha-Pekka Heikkila To: intel-gfx@lists.freedesktop.org Date: Mon, 11 Sep 2017 15:28:57 +0300 Message-Id: <1505132937-27327-4-git-send-email-juhapekka.heikkila@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1505132937-27327-1-git-send-email-juhapekka.heikkila@gmail.com> References: <1505132937-27327-1-git-send-email-juhapekka.heikkila@gmail.com> Subject: [Intel-gfx] [PATCH 3/3] 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 ac4073a..17fe6f2 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -3530,23 +3530,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, @@ -13185,7 +13168,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); @@ -13195,7 +13178,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 d932613..cb44a51 100644 --- a/drivers/gpu/drm/i915/intel_drv.h +++ b/drivers/gpu/drm/i915/intel_drv.h @@ -1884,6 +1884,7 @@ void intel_pipe_update_end(struct intel_crtc *crtc); 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 ef16519..bc6bae6 100644 --- a/drivers/gpu/drm/i915/intel_sprite.c +++ b/drivers/gpu/drm/i915/intel_sprite.c @@ -306,7 +306,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);