From patchwork Thu Nov 22 19:00:28 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Egbert Eich X-Patchwork-Id: 1786451 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 1CA84DF24C for ; Thu, 22 Nov 2012 19:27:52 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 03AD9E65A8 for ; Thu, 22 Nov 2012 11:27:52 -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.186]) by gabe.freedesktop.org (Postfix) with ESMTP id CF844E5EC2 for ; Thu, 22 Nov 2012 11:27:32 -0800 (PST) Received: from debian (p5DCF0728.dip0.t-ipconnect.de [93.207.7.40]) by mrelayeu.kundenserver.de (node=mrbap1) with ESMTP (Nemesis) id 0MbaQ1-1TsJyI1WBZ-00JA8a; Thu, 22 Nov 2012 20:27:31 +0100 Received: from sles11.fritz.box (sles11.fritz.box [192.168.178.22]) by debian (Postfix) with ESMTP id 724A83F35E; Thu, 22 Nov 2012 20:27:29 +0100 (CET) From: Egbert Eich To: dri-devel@lists.freedesktop.org Subject: [PATCH v4] DRM/KMS/EDID: Move EDID related Functions to drm_edid.h (v2) Date: Thu, 22 Nov 2012 14:00:28 -0500 Message-Id: <1353610828-29048-1-git-send-email-eich@suse.com> X-Mailer: git-send-email 1.7.7 In-Reply-To: <1353356598-10634-1-git-send-email-eich@suse.de> References: <1353356598-10634-1-git-send-email-eich@suse.de> X-Provags-ID: V02:K0:Qe9QlMqDdcdKP38lkkHp4XcjZNr6cdjSg2yhu55ER6Q ywaPdNZS8bCZ3XQY5uGQ679ClBbO+5ucLQg1vpuwy69h9p+xjh Yfn6tx3z1ELw7JPO7NPN1uo7/i4h9QmLCeEULV0Ab8f37awr04 vOIDGPvsUGcDrR96IoiAOkvDMT+H//3SlBMpyFdFnIYSLX4jjs jEnz8T6h/ZlFhMOIDiny8hNOAoCqJNsIhmR6zj/PIV8t/GwsZt GXJGo8V3Ha9eCfa6Xm+t1IJxItVroXf5ZBskdQNevtniJTXyBF dPwIKYTRKJjAAiw2z7k471L45XUE+O/GtCwIhKNRXcz0Lxxa2S ozqrP45jHLNYDC+QEksE= Cc: Egbert Eich , tiwai@suse.com 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 v2: Adjusted to apply cleanly. Signed-off-by: Egbert Eich --- include/drm/drm_crtc.h | 8 -------- include/drm/drm_edid.h | 9 +++++++++ 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/include/drm/drm_crtc.h b/include/drm/drm_crtc.h index 7a3ccbf..7eed9bd 100644 --- a/include/drm/drm_crtc.h +++ b/include/drm/drm_crtc.h @@ -878,9 +878,6 @@ extern char *drm_get_tv_subconnector_name(int val); extern char *drm_get_tv_select_name(int val); extern void drm_fb_release(struct drm_file *file_priv); extern int drm_mode_group_init_legacy_group(struct drm_device *dev, struct drm_mode_group *group); -extern bool drm_probe_ddc(struct i2c_adapter *adapter); -extern struct edid *drm_get_edid(struct drm_connector *connector, - struct i2c_adapter *adapter); extern int drm_add_edid_modes(struct drm_connector *connector, struct edid *edid); extern void drm_mode_probed_add(struct drm_connector *connector, struct drm_display_mode *mode); extern void drm_mode_remove(struct drm_connector *connector, struct drm_display_mode *mode); @@ -1036,9 +1033,6 @@ extern int drm_mode_gamma_get_ioctl(struct drm_device *dev, void *data, struct drm_file *file_priv); 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 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, void *data, struct drm_file *file_priv); extern struct drm_display_mode *drm_cvt_mode(struct drm_device *dev, @@ -1054,8 +1048,6 @@ extern struct drm_display_mode *drm_gtf_mode_complex(struct drm_device *dev, extern int drm_add_modes_noedid(struct drm_connector *connector, int hdisplay, int vdisplay); -extern int drm_edid_header_is_valid(const u8 *raw_edid); -extern unsigned drm_edid_is_valid(struct edid *edid, unsigned last_error_flags); struct drm_display_mode *drm_mode_find_dmt(struct drm_device *dev, int hsize, int vsize, int fresh, bool rb); diff --git a/include/drm/drm_edid.h b/include/drm/drm_edid.h index 6bcaee5..2c0d39a 100644 --- a/include/drm/drm_edid.h +++ b/include/drm/drm_edid.h @@ -268,4 +268,13 @@ int drm_validate_edid_blob(struct drm_connector *connector, u8 **blockp, int len void drm_cache_edid(struct drm_connector *connector, struct edid *edid); unsigned drm_edid_block_check_error(u8 *raw_edid, int block, unsigned last_error_flags); +extern bool drm_probe_ddc(struct i2c_adapter *adapter); +extern struct edid *drm_get_edid(struct drm_connector *connector, + struct i2c_adapter *adapter); +extern u8 *drm_find_cea_extension(struct edid *edid); +extern bool drm_detect_hdmi_monitor(struct edid *edid); +extern bool drm_detect_monitor_audio(struct edid *edid); +extern int drm_edid_header_is_valid(const u8 *raw_edid); +extern unsigned drm_edid_is_valid(struct edid *edid, unsigned last_error_flags); + #endif /* __DRM_EDID_H__ */