From patchwork Thu Jan 29 21:18:40 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alban Browaeys X-Patchwork-Id: 5745171 Return-Path: X-Original-To: patchwork-linux-samsung-soc@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 DCD8ABF440 for ; Thu, 29 Jan 2015 21:19:23 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 0A01320222 for ; Thu, 29 Jan 2015 21:19:23 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 317722012D for ; Thu, 29 Jan 2015 21:19:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755704AbbA2VTV (ORCPT ); Thu, 29 Jan 2015 16:19:21 -0500 Received: from mail-wi0-f173.google.com ([209.85.212.173]:50478 "EHLO mail-wi0-f173.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754927AbbA2VTU (ORCPT ); Thu, 29 Jan 2015 16:19:20 -0500 Received: by mail-wi0-f173.google.com with SMTP id r20so32517415wiv.0; Thu, 29 Jan 2015 13:19:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=dTc/KoCcWjI3pDq1si0QRqJTJmWkcn6pR3RxA9phhiU=; b=lvKTQ4d9MYd5CgkClhoU3YWjWA8ajUNswsILpp+uP665Y55b0fYR3n3uAEqDt6LW9h JGohTXKFRrYL4l3FD0vPRMU8yQ3flkVyUGu7NA27Y6utGMyGxqGHQCdwgQX0SNM8iBFx fS/SjDGJgYR/ZMuAeaD9lNrsj645BAAPFy9ZI2COlll9W45Z9yKdqArs7i0lBc6nOus0 mDHJB2RaSE1ftPLjKQdIF1AtBQGmohaguQrfDok3zUBU65apwhxeIsjYXl3h0J0A8ahK KdvWzGlJcp62b67o0EZS2OFGm59Wm3qu1eOl2GQDzlTVZDDNWLvmGWgA3V1rv7WdpRnr bPKw== X-Received: by 10.194.57.199 with SMTP id k7mr5381015wjq.1.1422566359269; Thu, 29 Jan 2015 13:19:19 -0800 (PST) Received: from odroid.prahal.homelinux.net (ARouen-655-1-5-160.w82-126.abo.wanadoo.fr. [82.126.112.160]) by mx.google.com with ESMTPSA id x18sm4051035wia.12.2015.01.29.13.19.18 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 29 Jan 2015 13:19:18 -0800 (PST) From: Alban Browaeys X-Google-Original-From: Alban Browaeys To: Gustavo Padovan , Inki Dae , Joonyoung Shim , Seung-Woo Kim , Kyungmin Park Cc: linux-samsung-soc@vger.kernel.org, linux-next@vger.kernel.org, Alban Browaeys Subject: [PATCH] exynos/drm: fix no hdmi output Date: Thu, 29 Jan 2015 22:18:40 +0100 Message-Id: <1422566320-6126-1-git-send-email-prahal@yahoo.com> X-Mailer: git-send-email 2.1.4 Sender: linux-samsung-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-samsung-soc@vger.kernel.org X-Spam-Status: No, score=-5.2 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FORGED_MSGID_YAHOO, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID, 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 The hdmi outputs black screen only even though under the hood Xorg and framebuffer console are fine : devices found and initialized, but not a pixel out. Commit 93bca243ec96 ("drm/exynos: remove struct exynos_drm_manager") changed the call order of mixer_initialize with regards to exynos_drm_crtc_create. This changes breaks hdmi out on Odroid U2 (linux-next with added Marek Szyprowski v4 hdmi patchset from linux-samsung-soc ML). Restore the previous call ordering get hdmi to ouput proper pixels: ie call mixer_initialize first then exynos_drm_crtc_create. Fixes: 93bca243ec96 ("drm/exynos: remove struct exynos_drm_manager") Signed-off-by: Alban Browaeys Acked-by: Joonyoung Shim Reviewed-by: Gustavo Padovan --- drivers/gpu/drm/exynos/exynos_mixer.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/exynos/exynos_mixer.c b/drivers/gpu/drm/exynos/exynos_mixer.c index d8fd8e1..188f90f 100644 --- a/drivers/gpu/drm/exynos/exynos_mixer.c +++ b/drivers/gpu/drm/exynos/exynos_mixer.c @@ -1258,18 +1258,19 @@ static int mixer_bind(struct device *dev, struct device *manager, void *data) struct drm_device *drm_dev = data; int ret; + ret = mixer_initialize(ctx, drm_dev); + if (ret) + return ret; + ctx->crtc = exynos_drm_crtc_create(drm_dev, ctx->pipe, EXYNOS_DISPLAY_TYPE_HDMI, &mixer_crtc_ops, ctx); if (IS_ERR(ctx->crtc)) { + mixer_ctx_remove(ctx); ret = PTR_ERR(ctx->crtc); goto free_ctx; } - ret = mixer_initialize(ctx, drm_dev); - if (ret) - goto free_ctx; - return 0; free_ctx: