From patchwork Tue Aug 29 09:48:04 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: 9927023 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 CBB2060383 for ; Tue, 29 Aug 2017 09:48:29 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BC5A8288B2 for ; Tue, 29 Aug 2017 09:48:29 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B16E6288B5; Tue, 29 Aug 2017 09:48:29 +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 6A0E7288B2 for ; Tue, 29 Aug 2017 09:48:29 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 714136E387; Tue, 29 Aug 2017 09:48:28 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-pg0-x241.google.com (mail-pg0-x241.google.com [IPv6:2607:f8b0:400e:c05::241]) by gabe.freedesktop.org (Postfix) with ESMTPS id 037CB6E383 for ; Tue, 29 Aug 2017 09:48:26 +0000 (UTC) Received: by mail-pg0-x241.google.com with SMTP id t193so2359188pgc.4 for ; Tue, 29 Aug 2017 02:48:26 -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=hkQy8O8eSho23l/brTnM3WEQSktbdK3GQRhv+9JlT2I=; b=dOOoumV3CLLNrl63G41sSaBGYQEBl/PQi9zPmGwCc+s3fZxlOP8kVzwFKByQSO4hlo w7AtKEJweQQFkzq3Y71zWrbAqVKo/XUkXAoSVlWYrPalFnQaSa7k1HToj+PwEiOxiczg 32eLikt5KT0ic8Y8zyDJK+Gc/7NEs+gjqIEMF3zDPRSN7fHT6CMCHkUyov/yAGLF0c14 INSh9K+h4//QtYpHRDXSplWeSvn8MnLgx/xexlkF2hYxQeITDwHgU87zem2acGmblgOr K9SIUgZSWWvuRzlZV565VojmgTAsCYIzprTaDIC9CjA3HV5uLJWKQrtkzwAVgS/dP9Su NPXg== 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=hkQy8O8eSho23l/brTnM3WEQSktbdK3GQRhv+9JlT2I=; b=FyYXTXPZM7vownphPyVTjJpSVMqv6FQXN0QiYnXFVYeNmGsRkRsYNtJikki9AFkKiL Fj0v/dipP6/p2LM/6DzPzzj2+dV3gbznL78Fd3GOY6GlTUYmZMUUBA04hyIkgKiTW0hF 0AOXTyut8Vlhxf+cbaXKox5VnTWUsBYBuWtHmgvGX8NSmRz+NskP8HsquIAz0iI2DQpo tAhGjj9i4/UYGnbuFfpjQiGfKY7spTERBWU/APuIjzAm855JxbW+hfHbeorwPi5uOjXv 0k/v+oSPrvIbxkGny3XGUWh8rGUPEiBRkbXMW3x+VWH6Ql2ZOu/keSFLHvtuB8EOF/FG 8h8w== X-Gm-Message-State: AHYfb5huaiDy5nEoOEaFTM9RuB5vtRmC4Bkw1zi0VdX3blUuAqQSQ+Tf iozNv7euVXuwEmYw X-Received: by 10.98.60.75 with SMTP id j72mr3513770pfa.108.1504000106205; Tue, 29 Aug 2017 02:48:26 -0700 (PDT) Received: from jheikkil-mobl.fi.intel.com ([192.55.54.42]) by smtp.gmail.com with ESMTPSA id w15sm5342177pgo.63.2017.08.29.02.48.24 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 29 Aug 2017 02:48:25 -0700 (PDT) From: Juha-Pekka Heikkila To: intel-gfx@lists.freedesktop.org Date: Tue, 29 Aug 2017 12:48:04 +0300 Message-Id: <1504000084-25457-4-git-send-email-juhapekka.heikkila@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1504000084-25457-1-git-send-email-juhapekka.heikkila@gmail.com> References: <1504000084-25457-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 9082a2c..93a37e6 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -3534,23 +3534,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, @@ -13189,7 +13172,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); @@ -13199,7 +13182,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 1efd612..18752b7 100644 --- a/drivers/gpu/drm/i915/intel_drv.h +++ b/drivers/gpu/drm/i915/intel_drv.h @@ -1890,6 +1890,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);