From patchwork Fri Jun 27 10:16:37 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomi Valkeinen X-Patchwork-Id: 4434531 Return-Path: X-Original-To: patchwork-linux-omap@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id EA383BEEAA for ; Fri, 27 Jun 2014 10:16:48 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 4BD8E20381 for ; Fri, 27 Jun 2014 10:16:48 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3431B20170 for ; Fri, 27 Jun 2014 10:16:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753131AbaF0KQo (ORCPT ); Fri, 27 Jun 2014 06:16:44 -0400 Received: from arroyo.ext.ti.com ([192.94.94.40]:51870 "EHLO arroyo.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752895AbaF0KQn (ORCPT ); Fri, 27 Jun 2014 06:16:43 -0400 Received: from dflxv15.itg.ti.com ([128.247.5.124]) by arroyo.ext.ti.com (8.13.7/8.13.7) with ESMTP id s5RAGhuD003431; Fri, 27 Jun 2014 05:16:43 -0500 Received: from DFLE73.ent.ti.com (dfle73.ent.ti.com [128.247.5.110]) by dflxv15.itg.ti.com (8.14.3/8.13.8) with ESMTP id s5RAGhiB004297; Fri, 27 Jun 2014 05:16:43 -0500 Received: from dflp32.itg.ti.com (10.64.6.15) by DFLE73.ent.ti.com (128.247.5.110) with Microsoft SMTP Server id 14.3.174.1; Fri, 27 Jun 2014 05:16:42 -0500 Received: from [192.168.2.6] (ileax41-snat.itg.ti.com [10.172.224.153]) by dflp32.itg.ti.com (8.14.3/8.13.8) with ESMTP id s5RAGfGQ014019; Fri, 27 Jun 2014 05:16:42 -0500 Message-ID: <53AD4485.3070506@ti.com> Date: Fri, 27 Jun 2014 13:16:37 +0300 From: Tomi Valkeinen User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:24.0) Gecko/20100101 Thunderbird/24.6.0 MIME-Version: 1.0 To: Jyri Sarha , , , Archit Taneja Subject: Re: [PATCH 14/15] OMAPDSS: HDMI: remove the unused code References: <1403604240-16738-1-git-send-email-tomi.valkeinen@ti.com> <1403604240-16738-15-git-send-email-tomi.valkeinen@ti.com> <53AC6EDD.6040300@ti.com> In-Reply-To: <53AC6EDD.6040300@ti.com> X-Enigmail-Version: 1.6 Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, T_TVD_MIME_EPI, 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 On 26/06/14 22:05, Jyri Sarha wrote: > On 06/24/2014 01:03 PM, Tomi Valkeinen wrote: >> We no longer need the horrible driver internal videmode tables, which >> were used to decide if a given videomode is a HDMI or DVI mode. So >> remove all related code. >> >> Signed-off-by: Tomi Valkeinen >> --- >> drivers/video/fbdev/omap2/dss/hdmi.h | 11 - >> drivers/video/fbdev/omap2/dss/hdmi_common.c | 316 >> ---------------------------- >> 2 files changed, 327 deletions(-) >> >> diff --git a/drivers/video/fbdev/omap2/dss/hdmi.h >> b/drivers/video/fbdev/omap2/dss/hdmi.h >> index e3956defc1c3..262771b9b76b 100644 >> --- a/drivers/video/fbdev/omap2/dss/hdmi.h >> +++ b/drivers/video/fbdev/omap2/dss/hdmi.h > ... >> @@ -192,7 +187,6 @@ struct hdmi_video_format { >> >> struct hdmi_config { >> struct omap_video_timings timings; >> - struct hdmi_cm cm; >> struct hdmi_avi_infoframe infoframe; >> enum hdmi_core_hdmi_dvi hdmi_dvi_mode; >> }; > > The HDMI audio finctionality is broken already now, but removing > hdmi_config.cm will cause compilation failure if HDMI audio is enabled. Ah, true. > I'll mail a patch set to fix OMAP4+ HDMI audio shortly. The set should > be applied on top of these patches and it fixes (obviously) the > compilation issue too. I'll rather fix my series. It's not good to introduce compilation errors. So I'll just add the following in my patches: } @@ -529,7 +529,7 @@ static bool hdmi_audio_supported(struct omap_dss_device *dssdev) mutex_lock(&hdmi.lock); - r = hdmi_mode_has_audio(hdmi.cfg.cm.mode); + r = hdmi_mode_has_audio(hdmi.cfg.hdmi_dvi_mode); mutex_unlock(&hdmi.lock); return r; @@ -543,7 +543,7 @@ static int hdmi_audio_config(struct omap_dss_device *dssdev, mutex_lock(&hdmi.lock); - if (!hdmi_mode_has_audio(hdmi.cfg.cm.mode)) { + if (!hdmi_mode_has_audio(hdmi.cfg.hdmi_dvi_mode)) { r = -EPERM; goto err; } diff --git a/drivers/video/fbdev/omap2/dss/hdmi4.c b/drivers/video/fbdev/omap2/dss/hdmi4.c index 342ddb47811a..6a8550cf43e5 100644 --- a/drivers/video/fbdev/omap2/dss/hdmi4.c +++ b/drivers/video/fbdev/omap2/dss/hdmi4.c @@ -491,7 +491,7 @@ static int hdmi_audio_enable(struct omap_dss_device *dssdev) mutex_lock(&hdmi.lock); - if (!hdmi_mode_has_audio(hdmi.cfg.cm.mode)) { + if (!hdmi_mode_has_audio(hdmi.cfg.hdmi_dvi_mode)) { r = -EPERM; goto err;