From patchwork Sat Feb 14 00:26:46 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Lespiau, Damien" X-Patchwork-Id: 5828181 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id B1D019F37F for ; Sat, 14 Feb 2015 00:26:53 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id BF335201EF for ; Sat, 14 Feb 2015 00:26:52 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id A155C201ED for ; Sat, 14 Feb 2015 00:26:51 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id AC60B6E00E; Fri, 13 Feb 2015 16:26:49 -0800 (PST) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTP id AE4BE6E00E for ; Fri, 13 Feb 2015 16:26:48 -0800 (PST) Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by orsmga102.jf.intel.com with ESMTP; 13 Feb 2015 16:22:54 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.09,574,1418112000"; d="scan'208";a="677777763" Received: from dfava-mobl3.ger.corp.intel.com (HELO strange.ger.corp.intel.com) ([10.252.2.216]) by fmsmga002.fm.intel.com with ESMTP; 13 Feb 2015 16:26:46 -0800 From: Damien Lespiau To: intel-gfx@lists.freedesktop.org Date: Sat, 14 Feb 2015 00:26:46 +0000 Message-Id: <1423873606-15888-1-git-send-email-damien.lespiau@intel.com> X-Mailer: git-send-email 1.8.3.1 Subject: [Intel-gfx] [PATCH] drm/i915/skl: Fix plane index in the colorkey vfuncs 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-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP While the SKL versions of update_plane() and disable_plane() have been fixed before hitting upstream, the colorkey vfuncs have been left behind and so register writes for sprite 0 were landing on plane 0 (primary plane) instead of plane 1. Signed-off-by: Damien Lespiau Tested-By: PRC QA PRTS (Patch Regression Test System Contact: shuang.he@intel.com) --- drivers/gpu/drm/i915/intel_sprite.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_sprite.c b/drivers/gpu/drm/i915/intel_sprite.c index f2d408d..9bd5e28 100644 --- a/drivers/gpu/drm/i915/intel_sprite.c +++ b/drivers/gpu/drm/i915/intel_sprite.c @@ -308,7 +308,7 @@ skl_update_colorkey(struct drm_plane *drm_plane, struct drm_i915_private *dev_priv = dev->dev_private; struct intel_plane *intel_plane = to_intel_plane(drm_plane); const int pipe = intel_plane->pipe; - const int plane = intel_plane->plane; + const int plane = intel_plane->plane + 1; u32 plane_ctl; I915_WRITE(PLANE_KEYVAL(pipe, plane), key->min_value); @@ -336,7 +336,7 @@ skl_get_colorkey(struct drm_plane *drm_plane, struct drm_i915_private *dev_priv = dev->dev_private; struct intel_plane *intel_plane = to_intel_plane(drm_plane); const int pipe = intel_plane->pipe; - const int plane = intel_plane->plane; + const int plane = intel_plane->plane + 1; u32 plane_ctl; key->min_value = I915_READ(PLANE_KEYVAL(pipe, plane));