From patchwork Fri May 20 13:34:53 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Lothar_Wa=C3=9Fmann?= X-Patchwork-Id: 9129595 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 8836960467 for ; Fri, 20 May 2016 13:53:30 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7BCD827B90 for ; Fri, 20 May 2016 13:53:30 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7073B27BE4; Fri, 20 May 2016 13:53:30 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A778B27BF4 for ; Fri, 20 May 2016 13:53:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932624AbcETNxT (ORCPT ); Fri, 20 May 2016 09:53:19 -0400 Received: from mail.karo-electronics.de ([81.173.242.67]:49528 "EHLO mail.karo-electronics.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933307AbcETNxS (ORCPT ); Fri, 20 May 2016 09:53:18 -0400 From: =?UTF-8?q?Lothar=20Wa=C3=9Fmann?= To: David Airlie , Jean-Christophe Plagniol-Villard , Philipp Zabel , Tomi Valkeinen , dri-devel@lists.freedesktop.org, linux-fbdev@vger.kernel.org, linux-kernel@vger.kernel.org, Russell King - ARM Linux , Sascha Hauer , =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= Cc: =?UTF-8?q?Lothar=20Wa=C3=9Fmann?= Subject: [PATCH 2/3] drm/imx: convey the pixelclk-active and de-active flags from DT to the ipu-di driver Date: Fri, 20 May 2016 15:34:53 +0200 Message-Id: <1463751294-24769-3-git-send-email-LW@KARO-electronics.de> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1463751294-24769-1-git-send-email-LW@KARO-electronics.de> References: <1463751294-24769-1-git-send-email-LW@KARO-electronics.de> MIME-Version: 1.0 Sender: linux-fbdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fbdev@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Currently these flags are lost in the call drm_display_mode_from_videomode() Signed-off-by: Lothar Waßmann --- drivers/gpu/drm/imx/imx-drm-core.c | 12 +++++++---- drivers/gpu/drm/imx/imx-drm.h | 7 ++++--- drivers/gpu/drm/imx/imx-ldb.c | 37 ++++++++++++++++++++++++++-------- drivers/gpu/drm/imx/ipuv3-crtc.c | 7 ++++--- drivers/gpu/drm/imx/parallel-display.c | 31 ++++++++++++++++++++++++---- drivers/gpu/ipu-v3/ipu-di.c | 14 +++++++------ include/video/imx-ipu-v3.h | 5 +---- 7 files changed, 81 insertions(+), 32 deletions(-) diff --git a/drivers/gpu/drm/imx/imx-drm-core.c b/drivers/gpu/drm/imx/imx-drm-core.c index 2453fb1..51735b1 100644 --- a/drivers/gpu/drm/imx/imx-drm-core.c +++ b/drivers/gpu/drm/imx/imx-drm-core.c @@ -96,7 +96,8 @@ static struct imx_drm_crtc *imx_drm_find_crtc(struct drm_crtc *crtc) return NULL; } -int imx_drm_set_bus_format_pins(struct drm_encoder *encoder, u32 bus_format, +int imx_drm_set_bus_format_pins(struct drm_encoder *encoder, + u32 bus_format, u32 bus_flags, int hsync_pin, int vsync_pin) { struct imx_drm_crtc_helper_funcs *helper; @@ -109,14 +110,17 @@ int imx_drm_set_bus_format_pins(struct drm_encoder *encoder, u32 bus_format, helper = &imx_crtc->imx_drm_helper_funcs; if (helper->set_interface_pix_fmt) return helper->set_interface_pix_fmt(encoder->crtc, - bus_format, hsync_pin, vsync_pin); + bus_format, bus_flags, + hsync_pin, vsync_pin); return 0; } EXPORT_SYMBOL_GPL(imx_drm_set_bus_format_pins); -int imx_drm_set_bus_format(struct drm_encoder *encoder, u32 bus_format) +int imx_drm_set_bus_format(struct drm_encoder *encoder, u32 bus_format, + u32 bus_flags) { - return imx_drm_set_bus_format_pins(encoder, bus_format, 2, 3); + return imx_drm_set_bus_format_pins(encoder, bus_format, bus_flags, + 2, 3); } EXPORT_SYMBOL_GPL(imx_drm_set_bus_format); diff --git a/drivers/gpu/drm/imx/imx-drm.h b/drivers/gpu/drm/imx/imx-drm.h index b0241b9..b74baf7 100644 --- a/drivers/gpu/drm/imx/imx-drm.h +++ b/drivers/gpu/drm/imx/imx-drm.h @@ -19,7 +19,8 @@ struct imx_drm_crtc_helper_funcs { int (*enable_vblank)(struct drm_crtc *crtc); void (*disable_vblank)(struct drm_crtc *crtc); int (*set_interface_pix_fmt)(struct drm_crtc *crtc, - u32 bus_format, int hsync_pin, int vsync_pin); + u32 bus_format, u32 bus_flags, + int hsync_pin, int vsync_pin); const struct drm_crtc_helper_funcs *crtc_helper_funcs; const struct drm_crtc_funcs *crtc_funcs; }; @@ -42,9 +43,9 @@ void imx_drm_mode_config_init(struct drm_device *drm); struct drm_gem_cma_object *imx_drm_fb_get_obj(struct drm_framebuffer *fb); int imx_drm_set_bus_format_pins(struct drm_encoder *encoder, - u32 bus_format, int hsync_pin, int vsync_pin); + u32 bus_format, u32 bus_flags, int hsync_pin, int vsync_pin); int imx_drm_set_bus_format(struct drm_encoder *encoder, - u32 bus_format); + u32 bus_format, u32 bus_flags); int imx_drm_encoder_parse_of(struct drm_device *drm, struct drm_encoder *encoder, struct device_node *np); diff --git a/drivers/gpu/drm/imx/imx-ldb.c b/drivers/gpu/drm/imx/imx-ldb.c index b2dc4df..67706eea 100644 --- a/drivers/gpu/drm/imx/imx-ldb.c +++ b/drivers/gpu/drm/imx/imx-ldb.c @@ -27,6 +27,7 @@ #include #include