From patchwork Mon Jan 14 14:30:28 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thierry Reding X-Patchwork-Id: 1972331 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by patchwork2.kernel.org (Postfix) with ESMTP id 2230CDF23A for ; Mon, 14 Jan 2013 14:38:43 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 0E109E61ED for ; Mon, 14 Jan 2013 06:38:43 -0800 (PST) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from moutng.kundenserver.de (moutng.kundenserver.de [212.227.126.171]) by gabe.freedesktop.org (Postfix) with ESMTP id 31EDDE61B2 for ; Mon, 14 Jan 2013 06:30:45 -0800 (PST) Received: from mailbox.adnet.avionic-design.de (mailbox.avionic-design.de [109.75.18.3]) by mrelayeu.kundenserver.de (node=mrbap3) with ESMTP (Nemesis) id 0Lu4L0-1SuqVt2CJi-010uUh; Mon, 14 Jan 2013 15:30:40 +0100 Received: from localhost (localhost [127.0.0.1]) by mailbox.adnet.avionic-design.de (Postfix) with ESMTP id AD4672A2814C; Mon, 14 Jan 2013 15:30:38 +0100 (CET) X-Virus-Scanned: amavisd-new at avionic-design.de Received: from mailbox.adnet.avionic-design.de ([127.0.0.1]) by localhost (mailbox.avionic-design.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id EyL57XASikAi; Mon, 14 Jan 2013 15:30:36 +0100 (CET) Received: from mailman.adnet.avionic-design.de (mailman.adnet.avionic-design.de [172.20.31.172]) by mailbox.adnet.avionic-design.de (Postfix) with ESMTP id 651532A2816D; Mon, 14 Jan 2013 15:30:29 +0100 (CET) Received: from localhost (avionic-0098.adnet.avionic-design.de [172.20.31.233]) by mailman.adnet.avionic-design.de (Postfix) with ESMTP id C07D71007FF; Mon, 14 Jan 2013 15:30:25 +0100 (CET) From: Thierry Reding To: dri-devel@lists.freedesktop.org Subject: [PATCH v3 9/9] drm: Remove duplicate drm_mode_cea_vic() Date: Mon, 14 Jan 2013 15:30:28 +0100 Message-Id: <1358173828-31674-10-git-send-email-thierry.reding@avionic-design.de> X-Mailer: git-send-email 1.8.1 In-Reply-To: <1358173828-31674-1-git-send-email-thierry.reding@avionic-design.de> References: <1358173828-31674-1-git-send-email-thierry.reding@avionic-design.de> X-Provags-ID: V02:K0:H2CWxgORNKzhx29kyTfo5VIMMj8tgoZjHOoE6dAl2w4 SpftLQK2kcWAlWtO/Der79Fz9rArsb83cOg1E5rABXQfUj2Ivy Xs4JrLxiUwrleR14OHx20edSWZdzAgwW5gbbF0KrhHQEH39w3r xsF6Z3KzR6Fue3o9xQZctTPTzPyO2CdXKPCSLsmLUqsFtxPXEF Sqp9ddNjgiOro366Vc2YbfShQ+R0HjfiAyJZ6I5CX8oKH6wffi yQk8I67GBhJLU5AFmG6QA/ZZBOgXKPDMfgfeScqiZu5827c0Cx 0e4xNSzdz95zSV9tqEy0Y+xboqHYi0VhGia+JJHeKclXJqRdPO mHe8zg+PyrvslOXYv80lIQt94kQY0wdoWnFPoH3tlATm6JPB4B qWxBsUrEwH643X/ZUxYqs1he/3ZzWGQJ5mqBeP6ue6j2HPgncp ehMMz Cc: Paulo Zanoni X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: dri-devel-bounces+patchwork-dri-devel=patchwork.kernel.org@lists.freedesktop.org Errors-To: dri-devel-bounces+patchwork-dri-devel=patchwork.kernel.org@lists.freedesktop.org The same function had already been merged with a different name. Remove the duplicate one but reuse some of its kerneldoc fragments for the existing implementation. Signed-off-by: Thierry Reding --- drivers/gpu/drm/drm_edid.c | 30 +++++++----------------------- include/drm/drm_crtc.h | 3 +-- 2 files changed, 8 insertions(+), 25 deletions(-) diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c index 1cfafc0..0acd6f3 100644 --- a/drivers/gpu/drm/drm_edid.c +++ b/drivers/gpu/drm/drm_edid.c @@ -1514,11 +1514,14 @@ u8 *drm_find_cea_extension(struct edid *edid) } EXPORT_SYMBOL(drm_find_cea_extension); -/* - * Looks for a CEA mode matching given drm_display_mode. - * Returns its CEA Video ID code, or 0 if not found. +/** + * drm_match_cea_mode - look for a CEA mode matching given mode + * @mode: display mode + * + * Returns the CEA Video ID (VIC) of the mode or 0 if it isn't a CEA-861 + * mode. */ -u8 drm_match_cea_mode(struct drm_display_mode *to_match) +u8 drm_match_cea_mode(const struct drm_display_mode *to_match) { struct drm_display_mode *cea_mode; u8 mode; @@ -2082,25 +2085,6 @@ int drm_add_modes_noedid(struct drm_connector *connector, EXPORT_SYMBOL(drm_add_modes_noedid); /** - * drm_mode_cea_vic - return the CEA-861 VIC of a given mode - * @mode: mode - * - * RETURNS: - * The VIC number, 0 in case it's not a CEA-861 mode. - */ -uint8_t drm_mode_cea_vic(const struct drm_display_mode *mode) -{ - uint8_t i; - - for (i = 0; i < drm_num_cea_modes; i++) - if (drm_mode_equal(mode, &edid_cea_modes[i])) - return i + 1; - - return 0; -} -EXPORT_SYMBOL(drm_mode_cea_vic); - -/** * drm_hdmi_avi_infoframe_from_display_mode() - fill an HDMI AVI infoframe with * data from a DRM display mode * @frame: HDMI AVI infoframe diff --git a/include/drm/drm_crtc.h b/include/drm/drm_crtc.h index dd62ca0..d0f3927 100644 --- a/include/drm/drm_crtc.h +++ b/include/drm/drm_crtc.h @@ -1031,7 +1031,7 @@ extern int drm_mode_gamma_get_ioctl(struct drm_device *dev, extern int drm_mode_gamma_set_ioctl(struct drm_device *dev, void *data, struct drm_file *file_priv); extern u8 *drm_find_cea_extension(struct edid *edid); -extern u8 drm_match_cea_mode(struct drm_display_mode *to_match); +extern u8 drm_match_cea_mode(const struct drm_display_mode *to_match); extern bool drm_detect_hdmi_monitor(struct edid *edid); extern bool drm_detect_monitor_audio(struct edid *edid); extern int drm_mode_page_flip_ioctl(struct drm_device *dev, @@ -1048,7 +1048,6 @@ extern struct drm_display_mode *drm_gtf_mode_complex(struct drm_device *dev, int GTF_2C, int GTF_K, int GTF_2J); extern int drm_add_modes_noedid(struct drm_connector *connector, int hdisplay, int vdisplay); -extern uint8_t drm_mode_cea_vic(const struct drm_display_mode *mode); extern int drm_edid_header_is_valid(const u8 *raw_edid); extern bool drm_edid_block_valid(u8 *raw_edid, int block, bool print_bad_edid);