From patchwork Wed Oct 9 23:49:44 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Sheu X-Patchwork-Id: 3013301 Return-Path: X-Original-To: patchwork-linux-media@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 33D529F245 for ; Wed, 9 Oct 2013 23:58:44 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 575BF202B8 for ; Wed, 9 Oct 2013 23:58:43 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7AB5F202A7 for ; Wed, 9 Oct 2013 23:58:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757064Ab3JIX6j (ORCPT ); Wed, 9 Oct 2013 19:58:39 -0400 Received: from mail-oa0-f73.google.com ([209.85.219.73]:54233 "EHLO mail-oa0-f73.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756941Ab3JIX6i (ORCPT ); Wed, 9 Oct 2013 19:58:38 -0400 Received: by mail-oa0-f73.google.com with SMTP id n10so348655oag.2 for ; Wed, 09 Oct 2013 16:58:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=atnKAWq60nHtceVYAFdAY6MAxGgKPY13ESuLx47T0tQ=; b=WyAECGT259wgQrv8jdWrHwjmBQ1LKwzJZZ+FtdqqUwliNsnWQxeJ5UEN5PF1DdsyyI OAyPOuPYTBsIM8l6/O48w2HnvugHoz/4MNl2KDBFOXG84F/YD/UjkNQLedzKJfEVPHiL MMry1eZ2oEhqM9c/yw34oRMdilLAIFXA5gd6t61Ri2HKbTgJRKLnfAZbrC/l2UAuRIW1 LeHRxRF82URlD+LnmaNGSCW8wztb8YQbIrAdYuUPIRdr8cty7+NaYkCZpzNRDz37Wde5 y6JPJwzA6IwG6eWvnnJh8j0Kr7CxI7ovkmbf24wA+ORpH5JpX4NXpZiG/qqghnTv8zq8 hoVg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=atnKAWq60nHtceVYAFdAY6MAxGgKPY13ESuLx47T0tQ=; b=bZnqKwBMp/P0rOIiHdWD7rkjK14pbAwz09yR9rW2ffqOtVdbIKeyDlzVMUM1wqnTez gK5DuZbSh7vI3aIkWtRsQQiGf0kr2MfvP05yvmoyPdviaqG9bp0fwtLQoP1KBVsDQuSC WckkUWJ9DLaJYwGULj2cdBAchecoTAzP7s+ijUvn94xTVeVrJditeMckajvsaUzm9XJU RFwvX30pH37w1odbeVMIXR+C/U2YQxzBU7hKZ41HeablnJYJB/g+8igfPLiMWLAl2AB4 SYDtdjRX9zjJcxEok2Z1h91kP6sC0r90H0pLHzY7CgiuS2J7KEsq5RQJiusQ3t7pI/Ub K5pQ== X-Gm-Message-State: ALoCoQks5S+D58bToIfwUTsKmE6bRYl1vMj/LHuKV9/NtKxFSirNvQiBcVz/7LTiWGjck/deA6HRFK+M1i5YRYiMkyGkCAEM1Vgl9arn9BBz8jjaiL6H2Au33KBMi6T2Q79TcbSwf+JfJ3z/DTnEv9RY3HhSlX0A4XSZj0+bKO45Wqh9X33SULFKDYLK8Bhg5irH2QfkXalA6wX/JKyAiXoYIcmbp+RzYg== X-Received: by 10.182.108.166 with SMTP id hl6mr2717716obb.1.1381362636266; Wed, 09 Oct 2013 16:50:36 -0700 (PDT) Received: from corp2gmr1-1.hot.corp.google.com (corp2gmr1-1.hot.corp.google.com [172.24.189.92]) by gmr-mx.google.com with ESMTPS id a42si2383482yhj.6.1969.12.31.16.00.00 (version=TLSv1.1 cipher=AES128-SHA bits=128/128); Wed, 09 Oct 2013 16:50:36 -0700 (PDT) Received: from shortskirt.mtv.corp.google.com (shortskirt.mtv.corp.google.com [172.22.70.255]) by corp2gmr1-1.hot.corp.google.com (Postfix) with ESMTP id 1E7C231C1CD; Wed, 9 Oct 2013 16:50:36 -0700 (PDT) Received: by shortskirt.mtv.corp.google.com (Postfix, from userid 157237) id D01D5C09C4; Wed, 9 Oct 2013 16:50:35 -0700 (PDT) From: John Sheu To: linux-media@vger.kernel.org Cc: John Sheu , m.chehab@samsung.com, k.debski@samsung.com, pawel@osciak.com Subject: [PATCH 1/6] [media] s5p-mfc: fix DISPLAY_DELAY Date: Wed, 9 Oct 2013 16:49:44 -0700 Message-Id: <1381362589-32237-2-git-send-email-sheu@google.com> X-Mailer: git-send-email 1.8.4 In-Reply-To: <1381362589-32237-1-git-send-email-sheu@google.com> References: <1381362589-32237-1-git-send-email-sheu@google.com> Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Spam-Status: No, score=-7.0 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham 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 V4L2_CID_MPEG_MFC51_VIDEO_DECODER_H264_DISPLAY_DELAY_ENABLE is being ignored, and the display delay is always being applied. Fix this. Signed-off-by: John Sheu --- drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c b/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c index 461358c..5bf6efd 100644 --- a/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c +++ b/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c @@ -1271,11 +1271,8 @@ static int s5p_mfc_init_decode_v6(struct s5p_mfc_ctx *ctx) /* FMO_ASO_CTRL - 0: Enable, 1: Disable */ reg |= (fmo_aso_ctrl << S5P_FIMV_D_OPT_FMO_ASO_CTRL_MASK_V6); - /* When user sets desplay_delay to 0, - * It works as "display_delay enable" and delay set to 0. - * If user wants display_delay disable, It should be - * set to negative value. */ - if (ctx->display_delay >= 0) { + /* Setup display delay, only if enabled. */ + if (ctx->display_delay_enable) { reg |= (0x1 << S5P_FIMV_D_OPT_DDELAY_EN_SHIFT_V6); WRITEL(ctx->display_delay, S5P_FIMV_D_DISPLAY_DELAY_V6); }