From patchwork Mon Mar 12 02:11:20 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Clark X-Patchwork-Id: 7216 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 25C6323E14 for ; Mon, 12 Mar 2012 02:11:14 +0000 (UTC) Received: from mail-iy0-f180.google.com (mail-iy0-f180.google.com [209.85.210.180]) by fiordland.canonical.com (Postfix) with ESMTP id D168EA1825A for ; Mon, 12 Mar 2012 02:11:13 +0000 (UTC) Received: by iage36 with SMTP id e36so7948962iag.11 for ; Sun, 11 Mar 2012 19:11:13 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-forwarded-to:x-forwarded-for:delivered-to:received-spf :dkim-signature:sender:from:to:cc:subject:date:message-id:x-mailer :x-gm-message-state; bh=J99Hv3GN9zUjJzlaXQVD1Y2KNjqaGMVIMR+Ka2JG6/s=; b=i4PBGC8LKdlLBOqREHfNZRDVQWyrguW9IilH+2RunLzsJPME0Xw7MImU19qUAwW1c5 oveAk1+T3L720OojEji3H5BunPscYptgBlLfwATCe2OsMgq19fyZvmJvegBlV/HUyRxC 639tN+aO82JJ4Yl0iVnlZ/+N7pIrk0iTHCCCPBkVLXnDSTjYFgSJHazUKU0YPgHhKcAW ZJOzGY7vTYB37havi7E0I/qT0i/QfDaw4gXy5Au+jeyjT7WVBMKS4YjggpB87IpTv9H1 ugNeeFzkT3xUyft6UDJRPfALaZUN8HdoijsUM7soYXTdAkGS/FOcJ0pQMB7utVeMzUYg tW5w== Received: by 10.50.104.199 with SMTP id gg7mr14965356igb.50.1331518273260; Sun, 11 Mar 2012 19:11:13 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.231.53.18 with SMTP id k18csp31435ibg; Sun, 11 Mar 2012 19:11:12 -0700 (PDT) Received: by 10.50.89.233 with SMTP id br9mr16342881igb.48.1331518272817; Sun, 11 Mar 2012 19:11:12 -0700 (PDT) Received: from mail-iy0-f178.google.com (mail-iy0-f178.google.com [209.85.210.178]) by mx.google.com with ESMTPS id iw3si11099709igc.70.2012.03.11.19.11.12 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 11 Mar 2012 19:11:12 -0700 (PDT) Received-SPF: pass (google.com: domain of robdclark@gmail.com designates 209.85.210.178 as permitted sender) client-ip=209.85.210.178; Authentication-Results: mx.google.com; spf=pass (google.com: domain of robdclark@gmail.com designates 209.85.210.178 as permitted sender) smtp.mail=robdclark@gmail.com; dkim=pass header.i=@gmail.com Received: by iakl21 with SMTP id l21so7757744iak.37 for ; Sun, 11 Mar 2012 19:11:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:x-mailer; bh=J99Hv3GN9zUjJzlaXQVD1Y2KNjqaGMVIMR+Ka2JG6/s=; b=wV127riwjB7D5UnwgsgSP6OImgOS3TEsqwhvJHIRSlCv/QeDgXeEHhdHpWCECIhCBS cQBOfFlu23MJ6SwPIDfvTapc7ohw2dLGGlCqEiktnix60PoEAcWvtzDh4MiThZbahJJK +VmBYKGoflVvUvh7FY1jUICW8z2Y9MJez4XMx5jCrLT48cX65Je3NXt4uchk962ehxns 95kMVVN5KZxEnd0uGjETIrzFSbsyA5b4ZERs0bKQ/mFdvsnDAvKhY22GIDDn1RqAp2wd OaynkLZK/PG2t69jybUqfQuw6+PVY72y3RxwW2cIjGm3sNR1o31P5nTZSlMNDiTJrXGY S5LQ== Received: by 10.182.109.106 with SMTP id hr10mr6179911obb.27.1331518272445; Sun, 11 Mar 2012 19:11:12 -0700 (PDT) Received: from localhost (ppp-70-129-134-19.dsl.rcsntx.swbell.net. [70.129.134.19]) by mx.google.com with ESMTPS id 1sm17988433obo.2.2012.03.11.19.11.10 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 11 Mar 2012 19:11:11 -0700 (PDT) Sender: Rob Clark From: Rob Clark To: dri-devel@lists.freedesktop.org, linux-omap@vger.kernel.org Cc: patches@linaro.org, Greg KH , Tomi Valkeinen , Andy Gross , Rob Clark Subject: [PATCH 1/3] staging: drm/omap: avoid multiple planes having same z-order Date: Sun, 11 Mar 2012 21:11:20 -0500 Message-Id: <1331518282-6870-1-git-send-email-rob.clark@linaro.org> X-Mailer: git-send-email 1.7.5.4 X-Gm-Message-State: ALoCoQluCdTv5mSwLOp3ECnly5+7/5X0jOZ2pQSNBJCoWpzy19irT1bEDHiLWJ2Ltt+zkl055LJS From: Rob Clark Multiple video pipes on same output with same z-order is an undefined behavior. Set a unique z-order value based on overlay number/id. Signed-off-by: Rob Clark --- drivers/staging/omapdrm/omap_plane.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/drivers/staging/omapdrm/omap_plane.c b/drivers/staging/omapdrm/omap_plane.c index 55ddc58..9b3bfa0 100644 --- a/drivers/staging/omapdrm/omap_plane.c +++ b/drivers/staging/omapdrm/omap_plane.c @@ -439,7 +439,7 @@ struct drm_plane *omap_plane_init(struct drm_device *dev, if (priv) omap_plane->info.zorder = 0; else - omap_plane->info.zorder = 1; + omap_plane->info.zorder = ovl->id; update_manager(plane);