From patchwork Mon Sep 24 11:07:46 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Inki Dae X-Patchwork-Id: 1497361 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by patchwork2.kernel.org (Postfix) with ESMTP id 8A836DF280 for ; Mon, 24 Sep 2012 11:08:01 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 51E029F751 for ; Mon, 24 Sep 2012 04:08:01 -0700 (PDT) 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 627FF9E9F0 for ; Mon, 24 Sep 2012 04:07:49 -0700 (PDT) Received: from epcpsbgm1.samsung.com (epcpsbgm1 [203.254.230.26]) by mailout1.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0MAU00LYPPKL5J40@mailout1.samsung.com> for dri-devel@lists.freedesktop.org; Mon, 24 Sep 2012 20:07:47 +0900 (KST) X-AuditID: cbfee61a-b7f726d000000ec7-8b-50603f03f5da Received: from epmmp1.local.host ( [203.254.227.16]) by epcpsbgm1.samsung.com (EPCPMTA) with SMTP id 0A.94.03783.30F30605; Mon, 24 Sep 2012 20:07:47 +0900 (KST) Received: from daeinki-desktop.10.32.193.11 ([10.90.51.53]) by mmp1.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0MAU00HSPPKZ1770@mmp1.samsung.com> for dri-devel@lists.freedesktop.org; Mon, 24 Sep 2012 20:07:47 +0900 (KST) From: Inki Dae To: airlied@linux.ie, dri-devel@lists.freedesktop.org Subject: [PATCH] drm/exynos: fix display power call issue. Date: Mon, 24 Sep 2012 20:07:46 +0900 Message-id: <1348484866-6487-1-git-send-email-inki.dae@samsung.com> X-Mailer: git-send-email 1.7.4.1 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrOJMWRmVeSWpSXmKPExsVy+t9jAV1m+4QAg89HNCyufH3P5sDocb/7 OFMAYxSXTUpqTmZZapG+XQJXxqdXcQUfeCu2vU5oYGzg6WLk5JAQMJHYvO8WM4QtJnHh3nq2 LkYuDiGBRYwS2/8vYANJCAmsZ5J4M40RxGYTUJWYuOI+WFxEwFSiY9JSFhCbWaBQYmHPUzBb WMBK4t+DD0A1HBwsQPXP78mBhHkFnCU+dS9kg9ilILHg3lu2CYzcCxgZVjGKphYkFxQnpeca 6hUn5haX5qXrJefnbmIEe++Z1A7GlQ0WhxgFOBiVeHg5z8cHCLEmlhVX5h5ilOBgVhLhnWiY ECDEm5JYWZValB9fVJqTWnyIUZqDRUmcV/hTYICQQHpiSWp2ampBahFMlomDU6qBsVnx2uc/ Bzycj7qWvMuojTdIj0/q5rp883eI4e8Nq+53paw8JRGVZ8vodu/GH3vxX4zm3+RWWv24opB7 6svHrE93ZL7cXiwZdj/76/xHq/fwxSROf9nd+lPzxvdDGjXLc1Y/dJgw87NAUtCRteVm4ftT 5eMbU85VX1TgnX3fUnuuN6/JSf8KViWW4oxEQy3mouJEADXD/+/aAQAA Cc: kyungmin.park@samsung.com X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: dri-devel-bounces+patchwork-dri-devel=patchwork.kernel.org@lists.freedesktop.org Errors-To: dri-devel-bounces+patchwork-dri-devel=patchwork.kernel.org@lists.freedesktop.org this patch fixes the issue that display power callback isn't called. with DRM_IOCTL_MODE_RMFB request, encoder->connector becomes NULL so display_ops->power_on() wouldn't be called so this patch makes exynos_drm_best_encoder function to be used to get a valid encoder of each connector. Signed-off-by: Inki Dae Signed-off-by: Kyungmin Park --- drivers/gpu/drm/exynos/exynos_drm_connector.h | 2 ++ drivers/gpu/drm/exynos/exynos_drm_encoder.c | 2 +- 2 files changed, 3 insertions(+), 1 deletions(-) diff --git a/drivers/gpu/drm/exynos/exynos_drm_connector.h b/drivers/gpu/drm/exynos/exynos_drm_connector.h index 40a55c2..22f6cc4 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_connector.h +++ b/drivers/gpu/drm/exynos/exynos_drm_connector.h @@ -31,6 +31,8 @@ struct drm_connector *exynos_drm_connector_create(struct drm_device *dev, struct drm_encoder *encoder); +struct drm_encoder *exynos_drm_best_encoder(struct drm_connector *connector); + void exynos_drm_display_power(struct drm_connector *connector, int mode); #endif diff --git a/drivers/gpu/drm/exynos/exynos_drm_encoder.c b/drivers/gpu/drm/exynos/exynos_drm_encoder.c index b8bbff0..60add3b 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_encoder.c +++ b/drivers/gpu/drm/exynos/exynos_drm_encoder.c @@ -57,7 +57,7 @@ static void exynos_drm_connector_power(struct drm_encoder *encoder, int mode) struct drm_connector *connector; list_for_each_entry(connector, &dev->mode_config.connector_list, head) { - if (connector->encoder == encoder) { + if (exynos_drm_best_encoder(connector) == encoder) { DRM_DEBUG_KMS("connector[%d] dpms[%d]\n", connector->base.id, mode);