From patchwork Wed Aug 15 20:18:02 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Clark X-Patchwork-Id: 10766 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 4070A23E41 for ; Wed, 15 Aug 2012 20:18:44 +0000 (UTC) Received: from mail-gg0-f180.google.com (mail-gg0-f180.google.com [209.85.161.180]) by fiordland.canonical.com (Postfix) with ESMTP id 10D21A188ED for ; Wed, 15 Aug 2012 20:18:43 +0000 (UTC) Received: by mail-gg0-f180.google.com with SMTP id i2so2381742ggm.11 for ; Wed, 15 Aug 2012 13:18:43 -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 :in-reply-to:references:x-gm-message-state; bh=8koI+uPMuZcuODB2zvg87RUlU+0cd1qQgJke4fMoQ1Y=; b=RQ4yg/ozl5TGn5/a2+DEFZ+sKSBlt5ERUuHPtkIi+ljNA1SVLU3VaTHBKW1F/bXxIX usEBt8vbG9GXWiro4ZGdAHpY+HZWy/JM+YIonnPcn9PP695o2uvTq5TKCq1WouhnwZUo JFeqi3uipFdUx9yycHBBIK4BHwc8HCj6UN96+ExDxiwAlxMFS0vxHhtoQi6w2aJzfZfN c4uUxpAoLqyX90zzXKY7YpwDvUIStpRO98Cfec7UyY+XaOAfkimSs7ew/z4+EZmNdx5Q WXO8SCkQDeYV2cAyynCO56bIRcoWBx5IhIAtmyXKiNkSSklmf1kuZ0kA/V8d8Lxo+aWx R0Vw== Received: by 10.50.6.229 with SMTP id e5mr20346412iga.9.1345061923689; Wed, 15 Aug 2012 13:18:43 -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.50.184.200 with SMTP id ew8csp92432igc; Wed, 15 Aug 2012 13:18:43 -0700 (PDT) Received: by 10.182.212.36 with SMTP id nh4mr24981941obc.37.1345061923315; Wed, 15 Aug 2012 13:18:43 -0700 (PDT) Received: from mail-ob0-f178.google.com (mail-ob0-f178.google.com [209.85.214.178]) by mx.google.com with ESMTPS id k6si2585155obd.49.2012.08.15.13.18.43 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 15 Aug 2012 13:18:43 -0700 (PDT) Received-SPF: pass (google.com: domain of robdclark@gmail.com designates 209.85.214.178 as permitted sender) client-ip=209.85.214.178; Authentication-Results: mx.google.com; spf=pass (google.com: domain of robdclark@gmail.com designates 209.85.214.178 as permitted sender) smtp.mail=robdclark@gmail.com; dkim=pass header.i=@gmail.com Received: by mail-ob0-f178.google.com with SMTP id wd20so3199585obb.37 for ; Wed, 15 Aug 2012 13:18:43 -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:in-reply-to :references; bh=8koI+uPMuZcuODB2zvg87RUlU+0cd1qQgJke4fMoQ1Y=; b=D2iO9Vnro54vbNmD7B3IB9twh9x8vkyjel28E1yNDlezFI5esAtxXOSO9YMqd4ufVn k/5xqqIA7t4VuUtPTVhOlqfgKG28yYl9g66x12YVi5qGSA5YYhyx6xEs0ZDG0Ye18Itg yXXbufl+U4Mr5fsaY6UaEbkLgwEBU9i7jmbYedwz8jseWhQsT6YIC/ojYWcIohe7JZ// EPpSRhG+t4rsHzXAEb0R4pqg7gdcMwAwgsGb8fIZl4Au48nliAhv+yUm1nOVU2w8c6YF 3xnIrijxP+bxQoSIzQQ++enm9nfJbA3sstDrReWvLyyhOXpiwCa0dP3uUcqSry51SEgJ bIcw== Received: by 10.182.212.70 with SMTP id ni6mr24996390obc.44.1345061923145; Wed, 15 Aug 2012 13:18:43 -0700 (PDT) Received: from localhost (ppp-70-129-134-248.dsl.rcsntx.swbell.net. [70.129.134.248]) by mx.google.com with ESMTPS id u5sm2217964obk.2.2012.08.15.13.18.42 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 15 Aug 2012 13:18:42 -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 , Andre Renaud , Rob Clark Subject: [PATCH 2/2] Expose the OMAP Z-Order property through DRM Date: Wed, 15 Aug 2012 15:18:02 -0500 Message-Id: <1345061882-9743-3-git-send-email-rob.clark@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1345061882-9743-1-git-send-email-rob.clark@linaro.org> References: <1345061882-9743-1-git-send-email-rob.clark@linaro.org> X-Gm-Message-State: ALoCoQkHNTsgwA/yVYKPrSKGsgzESI5+O+L5UPYz2GiEu6zqSvg3ebjjB+pTExziPg9CEq3eFFUs From: Andre Renaud Added support for zorder changes through DRM plane properties Signed-off-by: Andre Renaud Signed-off-by: Rob Clark --- drivers/staging/omapdrm/omap_drv.h | 1 + drivers/staging/omapdrm/omap_plane.c | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+) diff --git a/drivers/staging/omapdrm/omap_drv.h b/drivers/staging/omapdrm/omap_drv.h index b103d28..9dc72d1 100644 --- a/drivers/staging/omapdrm/omap_drv.h +++ b/drivers/staging/omapdrm/omap_drv.h @@ -62,6 +62,7 @@ struct omap_drm_private { /* properties: */ struct drm_property *rotation_prop; + struct drm_property *zorder_prop; }; /* this should probably be in drm-core to standardize amongst drivers */ diff --git a/drivers/staging/omapdrm/omap_plane.c b/drivers/staging/omapdrm/omap_plane.c index 6931d06..4bde639 100644 --- a/drivers/staging/omapdrm/omap_plane.c +++ b/drivers/staging/omapdrm/omap_plane.c @@ -433,6 +433,15 @@ void omap_plane_install_properties(struct drm_plane *plane, priv->rotation_prop = prop; } drm_object_attach_property(obj, prop, 0); + + prop = priv->zorder_prop; + if (!prop) { + prop = drm_property_create_range(dev, 0, "zorder", 0, 3); + if (prop == NULL) + return; + priv->zorder_prop = prop; + } + drm_object_attach_property(obj, prop, 0); } int omap_plane_set_property(struct drm_plane *plane, @@ -452,6 +461,16 @@ int omap_plane_set_property(struct drm_plane *plane, ret = omap_plane_dpms(plane, DRM_MODE_DPMS_ON); else ret = 0; + } else if (property == priv->zorder_prop) { + struct omap_overlay *ovl = omap_plane->ovl; + + DBG("%s: zorder: %d", ovl->name, (uint32_t)val); + omap_plane->info.zorder = val; + + if (ovl->is_enabled(ovl)) + ret = omap_plane_dpms(plane, DRM_MODE_DPMS_ON); + else + ret = 0; } return ret;