From patchwork Thu Jun 4 09:02:28 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomi Valkeinen X-Patchwork-Id: 6545581 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id B28F29F326 for ; Thu, 4 Jun 2015 11:06:48 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id AE0D92077E for ; Thu, 4 Jun 2015 11:06:47 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id B584F2068E for ; Thu, 4 Jun 2015 11:06:46 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 81F2B6EB01; Thu, 4 Jun 2015 04:06:36 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from devils.ext.ti.com (devils.ext.ti.com [198.47.26.153]) by gabe.freedesktop.org (Postfix) with ESMTP id 5DFAB6EAD6 for ; Thu, 4 Jun 2015 02:03:54 -0700 (PDT) Received: from dflxv15.itg.ti.com ([128.247.5.124]) by devils.ext.ti.com (8.13.7/8.13.7) with ESMTP id t5493pij011148; Thu, 4 Jun 2015 04:03:51 -0500 Received: from DLEE71.ent.ti.com (dlee71.ent.ti.com [157.170.170.114]) by dflxv15.itg.ti.com (8.14.3/8.13.8) with ESMTP id t5493pQK029491; Thu, 4 Jun 2015 04:03:51 -0500 Received: from dlep33.itg.ti.com (157.170.170.75) by DLEE71.ent.ti.com (157.170.170.114) with Microsoft SMTP Server id 14.3.224.2; Thu, 4 Jun 2015 04:03:51 -0500 Received: from deskari.ti.com (ileax41-snat.itg.ti.com [10.172.224.153]) by dlep33.itg.ti.com (8.14.3/8.13.8) with ESMTP id t5493YwD014785; Thu, 4 Jun 2015 04:03:50 -0500 From: Tomi Valkeinen To: , Laurent Pinchart Subject: [PATCHv2 11/45] drm: omapdrm: Rename CRTC DSS operations with an omap_crtc_dss_ prefix Date: Thu, 4 Jun 2015 12:02:28 +0300 Message-ID: <1433408582-9828-12-git-send-email-tomi.valkeinen@ti.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1433408582-9828-1-git-send-email-tomi.valkeinen@ti.com> References: <1433408582-9828-1-git-send-email-tomi.valkeinen@ti.com> MIME-Version: 1.0 X-Mailman-Approved-At: Thu, 04 Jun 2015 04:06:34 -0700 Cc: Tomi Valkeinen 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: , 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 From: Laurent Pinchart The omap_crtc_enable() and omap_crtc_disable() DSS operations functions will clash with the new CRTC enable and disable helpers. Rename them to omap_crtc_dss_*, as well as the other DSS operations for consistency. Signed-off-by: Laurent Pinchart Signed-off-by: Tomi Valkeinen --- drivers/gpu/drm/omapdrm/omap_crtc.c | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/drivers/gpu/drm/omapdrm/omap_crtc.c b/drivers/gpu/drm/omapdrm/omap_crtc.c index 6840ed5c45a7..94c1bb8448be 100644 --- a/drivers/gpu/drm/omapdrm/omap_crtc.c +++ b/drivers/gpu/drm/omapdrm/omap_crtc.c @@ -131,7 +131,7 @@ enum omap_channel omap_crtc_channel(struct drm_crtc *crtc) static struct omap_crtc *omap_crtcs[8]; /* we can probably ignore these until we support command-mode panels: */ -static int omap_crtc_connect(struct omap_overlay_manager *mgr, +static int omap_crtc_dss_connect(struct omap_overlay_manager *mgr, struct omap_dss_device *dst) { if (mgr->output) @@ -146,14 +146,14 @@ static int omap_crtc_connect(struct omap_overlay_manager *mgr, return 0; } -static void omap_crtc_disconnect(struct omap_overlay_manager *mgr, +static void omap_crtc_dss_disconnect(struct omap_overlay_manager *mgr, struct omap_dss_device *dst) { mgr->output->manager = NULL; mgr->output = NULL; } -static void omap_crtc_start_update(struct omap_overlay_manager *mgr) +static void omap_crtc_dss_start_update(struct omap_overlay_manager *mgr) { } @@ -215,7 +215,7 @@ static void omap_crtc_set_enabled(struct drm_crtc *crtc, bool enable) } -static int omap_crtc_enable(struct omap_overlay_manager *mgr) +static int omap_crtc_dss_enable(struct omap_overlay_manager *mgr) { struct omap_crtc *omap_crtc = omap_crtcs[mgr->id]; @@ -227,14 +227,14 @@ static int omap_crtc_enable(struct omap_overlay_manager *mgr) return 0; } -static void omap_crtc_disable(struct omap_overlay_manager *mgr) +static void omap_crtc_dss_disable(struct omap_overlay_manager *mgr) { struct omap_crtc *omap_crtc = omap_crtcs[mgr->id]; omap_crtc_set_enabled(&omap_crtc->base, false); } -static void omap_crtc_set_timings(struct omap_overlay_manager *mgr, +static void omap_crtc_dss_set_timings(struct omap_overlay_manager *mgr, const struct omap_video_timings *timings) { struct omap_crtc *omap_crtc = omap_crtcs[mgr->id]; @@ -242,7 +242,7 @@ static void omap_crtc_set_timings(struct omap_overlay_manager *mgr, omap_crtc->timings = *timings; } -static void omap_crtc_set_lcd_config(struct omap_overlay_manager *mgr, +static void omap_crtc_dss_set_lcd_config(struct omap_overlay_manager *mgr, const struct dss_lcd_mgr_config *config) { struct omap_crtc *omap_crtc = omap_crtcs[mgr->id]; @@ -250,29 +250,29 @@ static void omap_crtc_set_lcd_config(struct omap_overlay_manager *mgr, dispc_mgr_set_lcd_config(omap_crtc->channel, config); } -static int omap_crtc_register_framedone_handler( +static int omap_crtc_dss_register_framedone( struct omap_overlay_manager *mgr, void (*handler)(void *), void *data) { return 0; } -static void omap_crtc_unregister_framedone_handler( +static void omap_crtc_dss_unregister_framedone( struct omap_overlay_manager *mgr, void (*handler)(void *), void *data) { } static const struct dss_mgr_ops mgr_ops = { - .connect = omap_crtc_connect, - .disconnect = omap_crtc_disconnect, - .start_update = omap_crtc_start_update, - .enable = omap_crtc_enable, - .disable = omap_crtc_disable, - .set_timings = omap_crtc_set_timings, - .set_lcd_config = omap_crtc_set_lcd_config, - .register_framedone_handler = omap_crtc_register_framedone_handler, - .unregister_framedone_handler = omap_crtc_unregister_framedone_handler, + .connect = omap_crtc_dss_connect, + .disconnect = omap_crtc_dss_disconnect, + .start_update = omap_crtc_dss_start_update, + .enable = omap_crtc_dss_enable, + .disable = omap_crtc_dss_disable, + .set_timings = omap_crtc_dss_set_timings, + .set_lcd_config = omap_crtc_dss_set_lcd_config, + .register_framedone_handler = omap_crtc_dss_register_framedone, + .unregister_framedone_handler = omap_crtc_dss_unregister_framedone, }; /* -----------------------------------------------------------------------------