Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cdc3d09f authored by Daniel Vetter's avatar Daniel Vetter
Browse files

drm: Move all decl for drm_edid.c to drm_edid.h 



Some were still left in drm_crtc.h. Also include drm_edid.h in the
rst files.

Reviewed-by: default avatarSean Paul <seanpaul@chromium.org>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20160831160913.12991-4-daniel.vetter@ffwll.ch
parent 199e4e96

Documentation/gpu/drm-kms-helpers.rst

+3 −0
Original line number Diff line number Diff line
@@ -208,6 +208,9 @@ Output Probing Helper Functions Reference 
EDID Helper Functions Reference

===============================



.. kernel-doc:: include/drm/drm_edid.h

   :internal:



.. kernel-doc:: drivers/gpu/drm/drm_edid.c

   :export:

include/drm/drm_crtc.h

+1 −29
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ 
#include <drm/drm_encoder.h>

#include <drm/drm_property.h>

#include <drm/drm_bridge.h>

#include <drm/drm_edid.h>



struct drm_device;

struct drm_mode_set;
@@ -2004,33 +2005,4 @@ assert_drm_connector_list_read_locked(struct drm_mode_config *mode_config) 
		!drm_modeset_is_locked(&mode_config->connection_mutex));

}



/* drm_edid.c */

bool drm_probe_ddc(struct i2c_adapter *adapter);

struct edid *drm_get_edid(struct drm_connector *connector,

			  struct i2c_adapter *adapter);

struct edid *drm_get_edid_switcheroo(struct drm_connector *connector,

				     struct i2c_adapter *adapter);

struct edid *drm_edid_duplicate(const struct edid *edid);

int drm_add_edid_modes(struct drm_connector *connector, struct edid *edid);



u8 drm_match_cea_mode(const struct drm_display_mode *to_match);

enum hdmi_picture_aspect drm_get_cea_aspect_ratio(const u8 video_code);

bool drm_detect_hdmi_monitor(struct edid *edid);

bool drm_detect_monitor_audio(struct edid *edid);

bool drm_rgb_quant_range_selectable(struct edid *edid);

int drm_add_modes_noedid(struct drm_connector *connector,

			 int hdisplay, int vdisplay);

void drm_set_preferred_mode(struct drm_connector *connector,

			    int hpref, int vpref);



int drm_edid_header_is_valid(const u8 *raw_edid);

bool drm_edid_block_valid(u8 *raw_edid, int block, bool print_bad_edid,

			  bool *edid_corrupt);

bool drm_edid_is_valid(struct edid *edid);

void drm_edid_get_monitor_name(struct edid *edid, char *name,

			       int buflen);

struct drm_display_mode *drm_mode_find_dmt(struct drm_device *dev,

					   int hsize, int vsize, int fresh,

					   bool rb);



#endif /* __DRM_CRTC_H__ */

include/drm/drm_edid.h

+30 −0
Original line number Diff line number Diff line
@@ -25,6 +25,9 @@ 


#include <linux/types.h>



struct drm_device;

struct i2c_adapter;



#define EDID_LENGTH 128

#define DDC_ADDR 0x50

#define DDC_ADDR2 0x52 /* E-DDC 1.2 - where DisplayID can hide */
@@ -423,9 +426,36 @@ static inline u8 drm_eld_get_conn_type(const uint8_t *eld) 
	return eld[DRM_ELD_SAD_COUNT_CONN_TYPE] & DRM_ELD_CONN_TYPE_MASK;

}



bool drm_probe_ddc(struct i2c_adapter *adapter);

struct edid *drm_do_get_edid(struct drm_connector *connector,

	int (*get_edid_block)(void *data, u8 *buf, unsigned int block,

			      size_t len),

	void *data);

struct edid *drm_get_edid(struct drm_connector *connector,

			  struct i2c_adapter *adapter);

struct edid *drm_get_edid_switcheroo(struct drm_connector *connector,

				     struct i2c_adapter *adapter);

struct edid *drm_edid_duplicate(const struct edid *edid);

int drm_add_edid_modes(struct drm_connector *connector, struct edid *edid);



u8 drm_match_cea_mode(const struct drm_display_mode *to_match);

enum hdmi_picture_aspect drm_get_cea_aspect_ratio(const u8 video_code);

bool drm_detect_hdmi_monitor(struct edid *edid);

bool drm_detect_monitor_audio(struct edid *edid);

bool drm_rgb_quant_range_selectable(struct edid *edid);

int drm_add_modes_noedid(struct drm_connector *connector,

			 int hdisplay, int vdisplay);

void drm_set_preferred_mode(struct drm_connector *connector,

			    int hpref, int vpref);



int drm_edid_header_is_valid(const u8 *raw_edid);

bool drm_edid_block_valid(u8 *raw_edid, int block, bool print_bad_edid,

			  bool *edid_corrupt);

bool drm_edid_is_valid(struct edid *edid);

void drm_edid_get_monitor_name(struct edid *edid, char *name,

			       int buflen);

struct drm_display_mode *drm_mode_find_dmt(struct drm_device *dev,

					   int hsize, int vsize, int fresh,

					   bool rb);



#endif /* __DRM_EDID_H__ */