From patchwork Thu Feb 5 07:11:36 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joonyoung Shim X-Patchwork-Id: 5782181 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 31B46BF440 for ; Thu, 5 Feb 2015 07:11:37 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id A6763202E5 for ; Thu, 5 Feb 2015 07:11:35 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 8C2A920279 for ; Thu, 5 Feb 2015 07:11:34 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 8C9AD6E1EF; Wed, 4 Feb 2015 23:11:33 -0800 (PST) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mailout1.samsung.com (mailout1.samsung.com [203.254.224.24]) by gabe.freedesktop.org (Postfix) with ESMTP id CD40E6E1ED for ; Wed, 4 Feb 2015 23:11:32 -0800 (PST) Received: from epcpsbgr5.samsung.com (u145.gpu120.samsung.co.kr [203.254.230.145]) by mailout1.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0NJA000GAEN7Z660@mailout1.samsung.com> for dri-devel@lists.freedesktop.org; Thu, 05 Feb 2015 16:11:31 +0900 (KST) Received: from epcpsbgm1.samsung.com ( [172.20.52.114]) by epcpsbgr5.samsung.com (EPCPMTA) with SMTP id B3.C2.19034.3A713D45; Thu, 05 Feb 2015 16:11:31 +0900 (KST) X-AuditID: cbfee691-f79b86d000004a5a-07-54d317a32003 Received: from epmmp2 ( [203.254.227.17]) by epcpsbgm1.samsung.com (EPCPMTA) with SMTP id C6.98.20081.3A713D45; Thu, 05 Feb 2015 16:11:31 +0900 (KST) Received: from localhost.localdomain ([10.252.81.123]) by mmp2.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0NJA002ZZEN6UM90@mmp2.samsung.com>; Thu, 05 Feb 2015 16:11:31 +0900 (KST) From: Joonyoung Shim To: dri-devel@lists.freedesktop.org Subject: [PATCH 2/4] drm/exynos: remove mode property of exynos crtc Date: Thu, 05 Feb 2015 16:11:36 +0900 Message-id: <1423120298-28619-2-git-send-email-jy0922.shim@samsung.com> X-Mailer: git-send-email 1.9.1 In-reply-to: <1423120298-28619-1-git-send-email-jy0922.shim@samsung.com> References: <1423120298-28619-1-git-send-email-jy0922.shim@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrELMWRmVeSWpSXmKPExsWyRsSkSHex+OUQg7lNqhb/t01ktrjy9T2b xafVrewWk+5PYLF4ce8ii8WMyS/ZHNg8/j6/zuKx99sCFo/73ceZPPq2rGIMYInisklJzcks Sy3St0vgyniwsJu5oEWxovfFc5YGxn7pLkZODgkBE4l/v6azQNhiEhfurWfrYuTiEBJYyiix 5fNv9i5GDrCiOYfiIOLTGSX2n2hkhXDamCQO3tnEBNLNJqAncWfbcTBbREBZ4u/EVYwgNrNA rcS9+e/BbGEBF4mfr/+D2SwCqhKtR3+C2bwC7hKd09tZIa6Qkzh5bDKYzSngIfHnIUSvEFDN kp/zmUEWSwh0s0tsb13BDjFIQOLb5EMsEJfKSmw6wAwxR1Li4IobLBMYhRcwMqxiFE0tSC4o TkovMtUrTswtLs1L10vOz93ECAzq0/+eTdzBeP+A9SFGAQ5GJR5ei32XQoRYE8uKK3MPMZoC bZjILCWanA+MnbySeENjMyMLUxNTYyNzSzMlcV4d6Z/BQgLpiSWp2ampBalF8UWlOanFhxiZ ODilGhiPlQoaXZPkDP7Zze50PvnMU8ZLEy6E/avM3fxN5eO1q5effj0UbzB/6l/t9qcTO/JM 3q8pd9h+/7V6JrOBR9ECs6NXTBZvnnDoGavfx3sOrwsbTXWrih+uTFXju6nMIH2o1yEwguVi f4ZASf75M/7/LQXT3crfL5sYZZez9Eiy9f5t7ZmGmxOUWIozEg21mIuKEwGG2wyWZQIAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprDIsWRmVeSWpSXmKPExsVy+t9jQd3F4pdDDD60yVr83zaR2eLK1/ds Fp9Wt7JbTLo/gcXixb2LLBYzJr9kc2Dz+Pv8OovH3m8LWDzudx9n8ujbsooxgCWqgdEmIzUx JbVIITUvOT8lMy/dVsk7ON453tTMwFDX0NLCXEkhLzE31VbJxSdA1y0zB2i9kkJZYk4pUCgg sbhYSd8O04TQEDddC5jGCF3fkCC4HiMDNJCwhjHjwcJu5oIWxYreF89ZGhj7pbsYOTgkBEwk 5hyK62LkBDLFJC7cW8/WxcjFISQwnVFi/4lGVginjUni4J1NTCBVbAJ6Ene2HQezRQSUJf5O XMUIYjML1Ercm/8ezBYWcJH4+fo/mM0ioCrRevQnmM0r4C7ROb2dFWKbnMTJY5PBbE4BD4k/ DyF6hYBqlvyczzyBkXcBI8MqRtHUguSC4qT0XEO94sTc4tK8dL3k/NxNjOCYeSa1g3Flg8Uh RgEORiUeXst9l0KEWBPLiitzDzFKcDArifBqclwOEeJNSaysSi3Kjy8qzUktPsRoCnTVRGYp 0eR8YDznlcQbGpuYGVkamRtaGBmbK4nzKtm3hQgJpCeWpGanphakFsH0MXFwSjUwis3p3yCt HB9g7xWn2vnm8PJvzj+Z4ySyuC9kfy/rm7H16on6NO7tZ34r77R64TM9YMWE1ydu/E1/tPLU sy3Fq7Uyr1w6969sm1b3kqlTa5+4rPg7ceYhwZPyq6axPFK5dpQ/fslkPkWPRM0l09b3NWRb H0//eYk962/VpbyTXi6hK5ZIJ+umdimxFGckGmoxFxUnAgARQMWVrwIAAA== DLP-Filter: Pass X-MTR: 20000000000000000@CPGS X-CFilter-Loop: Reflected Cc: gustavo.padovan@collabora.co.uk, sw0312.kim@samsung.com X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" 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 This was added by commit 3b8d1cf818c2 ("drm/exynos: add property for crtc mode"). Currently we can control a plane used for crtc using primary plane by universal plane feature. Stop to use non-standard property to control primary plane. Signed-off-by: Joonyoung Shim --- drivers/gpu/drm/exynos/exynos_drm_crtc.c | 60 -------------------------------- drivers/gpu/drm/exynos/exynos_drm_drv.h | 8 ----- 2 files changed, 68 deletions(-) diff --git a/drivers/gpu/drm/exynos/exynos_drm_crtc.c b/drivers/gpu/drm/exynos/exynos_drm_crtc.c index fff2e55..48ccab7 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_crtc.c +++ b/drivers/gpu/drm/exynos/exynos_drm_crtc.c @@ -232,70 +232,12 @@ static void exynos_drm_crtc_destroy(struct drm_crtc *crtc) kfree(exynos_crtc); } -static int exynos_drm_crtc_set_property(struct drm_crtc *crtc, - struct drm_property *property, - uint64_t val) -{ - struct drm_device *dev = crtc->dev; - struct exynos_drm_private *dev_priv = dev->dev_private; - struct exynos_drm_crtc *exynos_crtc = to_exynos_crtc(crtc); - - if (property == dev_priv->crtc_mode_property) { - enum exynos_crtc_mode mode = val; - - if (mode == exynos_crtc->mode) - return 0; - - exynos_crtc->mode = mode; - - switch (mode) { - case CRTC_MODE_NORMAL: - exynos_drm_crtc_commit(crtc); - break; - case CRTC_MODE_BLANK: - exynos_plane_dpms(crtc->primary, DRM_MODE_DPMS_OFF); - break; - default: - break; - } - - return 0; - } - - return -EINVAL; -} - static struct drm_crtc_funcs exynos_crtc_funcs = { .set_config = drm_crtc_helper_set_config, .page_flip = exynos_drm_crtc_page_flip, .destroy = exynos_drm_crtc_destroy, - .set_property = exynos_drm_crtc_set_property, -}; - -static const struct drm_prop_enum_list mode_names[] = { - { CRTC_MODE_NORMAL, "normal" }, - { CRTC_MODE_BLANK, "blank" }, }; -static void exynos_drm_crtc_attach_mode_property(struct drm_crtc *crtc) -{ - struct drm_device *dev = crtc->dev; - struct exynos_drm_private *dev_priv = dev->dev_private; - struct drm_property *prop; - - prop = dev_priv->crtc_mode_property; - if (!prop) { - prop = drm_property_create_enum(dev, 0, "mode", mode_names, - ARRAY_SIZE(mode_names)); - if (!prop) - return; - - dev_priv->crtc_mode_property = prop; - } - - drm_object_attach_property(&crtc->base, prop, 0); -} - struct exynos_drm_crtc *exynos_drm_crtc_create(struct drm_device *drm_dev, int pipe, enum exynos_drm_output_type type, @@ -338,8 +280,6 @@ struct exynos_drm_crtc *exynos_drm_crtc_create(struct drm_device *drm_dev, drm_crtc_helper_add(crtc, &exynos_crtc_helper_funcs); - exynos_drm_crtc_attach_mode_property(crtc); - return exynos_crtc; err_crtc: diff --git a/drivers/gpu/drm/exynos/exynos_drm_drv.h b/drivers/gpu/drm/exynos/exynos_drm_drv.h index d490b49..1aceafc 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_drv.h +++ b/drivers/gpu/drm/exynos/exynos_drm_drv.h @@ -197,11 +197,6 @@ struct exynos_drm_crtc_ops { void (*te_handler)(struct exynos_drm_crtc *crtc); }; -enum exynos_crtc_mode { - CRTC_MODE_NORMAL, /* normal mode */ - CRTC_MODE_BLANK, /* The private plane of crtc is blank */ -}; - /* * Exynos specific crtc structure. * @@ -215,7 +210,6 @@ enum exynos_crtc_mode { * we can refer to the crtc to current hardware interrupt occurred through * this pipe value. * @dpms: store the crtc dpms value - * @mode: store the crtc mode value * @ops: pointer to callbacks for exynos drm specific functionality * @ctx: A pointer to the crtc's implementation specific context */ @@ -224,7 +218,6 @@ struct exynos_drm_crtc { enum exynos_drm_output_type type; unsigned int pipe; unsigned int dpms; - enum exynos_crtc_mode mode; wait_queue_head_t pending_flip_queue; atomic_t pending_flip; struct exynos_drm_crtc_ops *ops; @@ -265,7 +258,6 @@ struct exynos_drm_private { */ struct drm_crtc *crtc[MAX_CRTC]; struct drm_property *plane_zpos_property; - struct drm_property *crtc_mode_property; unsigned long da_start; unsigned long da_space_size;