From patchwork Tue Aug 21 05:58:28 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: archit taneja X-Patchwork-Id: 1352281 Return-Path: X-Original-To: patchwork-linux-omap@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 7CBCDE0002 for ; Tue, 21 Aug 2012 06:01:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753435Ab2HUGBm (ORCPT ); Tue, 21 Aug 2012 02:01:42 -0400 Received: from devils.ext.ti.com ([198.47.26.153]:34862 "EHLO devils.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753302Ab2HUGBi (ORCPT ); Tue, 21 Aug 2012 02:01:38 -0400 Received: from dlelxv30.itg.ti.com ([172.17.2.17]) by devils.ext.ti.com (8.13.7/8.13.7) with ESMTP id q7L61bL2017462; Tue, 21 Aug 2012 01:01:37 -0500 Received: from DLEE74.ent.ti.com (dlee74.ent.ti.com [157.170.170.8]) by dlelxv30.itg.ti.com (8.13.8/8.13.8) with ESMTP id q7L61bcP018442; Tue, 21 Aug 2012 01:01:37 -0500 Received: from dlelxv24.itg.ti.com (172.17.1.199) by DLEE74.ent.ti.com (157.170.170.8) with Microsoft SMTP Server id 14.1.323.3; Tue, 21 Aug 2012 01:01:36 -0500 Received: from legion.dal.design.ti.com (legion.dal.design.ti.com [128.247.22.53]) by dlelxv24.itg.ti.com (8.13.8/8.13.8) with ESMTP id q7L61b5X006208; Tue, 21 Aug 2012 01:01:37 -0500 Received: from localhost (a0393947pc.apr.dhcp.ti.com [172.24.137.248]) by legion.dal.design.ti.com (8.11.7p1+Sun/8.11.7) with ESMTP id q7L61Zr04328; Tue, 21 Aug 2012 01:01:35 -0500 (CDT) From: Archit Taneja To: CC: , , , , Archit Taneja Subject: [PATCH 21/23] OMAPDSS: MANAGER: Get device via output Date: Tue, 21 Aug 2012 11:28:28 +0530 Message-ID: <1345528711-27801-22-git-send-email-archit@ti.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1345528711-27801-1-git-send-email-archit@ti.com> References: <1345528711-27801-1-git-send-email-archit@ti.com> MIME-Version: 1.0 Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org A manager is not connected to a device directly any more. It first connects to an output, and then to the display. Update the manager's get_device op to return the device via the connected output. Signed-off-by: Archit Taneja --- drivers/video/omap2/dss/manager.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/video/omap2/dss/manager.c b/drivers/video/omap2/dss/manager.c index d808ce2..d14ffc5 100644 --- a/drivers/video/omap2/dss/manager.c +++ b/drivers/video/omap2/dss/manager.c @@ -509,7 +509,7 @@ static struct kobj_type manager_ktype = { static inline struct omap_dss_device *dss_mgr_get_device(struct omap_overlay_manager *mgr) { - return mgr->device; + return mgr->output ? mgr->output->device : NULL; } static int dss_mgr_wait_for_vsync(struct omap_overlay_manager *mgr)