Merge tag 'drm-misc-next-2017-03-12' of git://anongit.freedesktop.org/git/drm-misc into drm-next
More drm-misc stuff for 4.12: - drm_platform removal from Laurent - more dw-hdmi bridge driver updates (Laurent, Kieran, Neil) - more header cleanup and documentation - more drm_debugs_remove_files removal (Noralf) - minor qxl updates (Gerd) - edp crc support in helper + analogix_dp (Tomeu) for more igt testing! - old/new iterator roll-out (Maarten) - new bridge drivers: lvds (Laurent), megachips-something (Peter Senna) * tag 'drm-misc-next-2017-03-12' of git://anongit.freedesktop.org/git/drm-misc: (51 commits) drm: bridge: dw-hdmi: Move the driver to a separate directory. drm: bridge: dw-hdmi: Switch to regmap for register access drm: bridge: dw-hdmi: Remove device type from platform data drm: bridge: dw-hdmi: Add support for custom PHY configuration drm: bridge: dw-hdmi: Create PHY operations drm: bridge: dw-hdmi: Fix the PHY power up sequence drm: bridge: dw-hdmi: Fix the PHY power down sequence drm: bridge: dw-hdmi: Enable CSC even for DVI drm: bridge: dw-hdmi: Move CSC configuration out of PHY code drm: bridge: dw-hdmi: Remove unused functions drm: Extract drm_file.h drm: Remove DRM_MINOR_CNT drm: rename drm_fops.c to drm_file.c drm/doc: document fallback behaviour for atomic events drm: Remove drmP.h include from drm_kms_helper_common.c drm: Extract drm_pci.h drm: Move drm_lock_data out of drmP.h drm: Extract drm_prime.h drm/doc: Add todo about connector_list_iter drm/qxl: Remove qxl_debugfs_remove_files() ...
This commit is contained in:
@@ -789,7 +789,10 @@ struct drm_dp_aux_msg {
|
||||
* @name: user-visible name of this AUX channel and the I2C-over-AUX adapter
|
||||
* @ddc: I2C adapter that can be used for I2C-over-AUX communication
|
||||
* @dev: pointer to struct device that is the parent for this AUX channel
|
||||
* @crtc: backpointer to the crtc that is currently using this AUX channel
|
||||
* @hw_mutex: internal mutex used for locking transfers
|
||||
* @crc_work: worker that captures CRCs for each frame
|
||||
* @crc_count: counter of captured frame CRCs
|
||||
* @transfer: transfers a message representing a single AUX transaction
|
||||
*
|
||||
* The .dev field should be set to a pointer to the device that implements
|
||||
@@ -825,7 +828,10 @@ struct drm_dp_aux {
|
||||
const char *name;
|
||||
struct i2c_adapter ddc;
|
||||
struct device *dev;
|
||||
struct drm_crtc *crtc;
|
||||
struct mutex hw_mutex;
|
||||
struct work_struct crc_work;
|
||||
u8 crc_count;
|
||||
ssize_t (*transfer)(struct drm_dp_aux *aux,
|
||||
struct drm_dp_aux_msg *msg);
|
||||
/**
|
||||
@@ -904,4 +910,7 @@ void drm_dp_aux_init(struct drm_dp_aux *aux);
|
||||
int drm_dp_aux_register(struct drm_dp_aux *aux);
|
||||
void drm_dp_aux_unregister(struct drm_dp_aux *aux);
|
||||
|
||||
int drm_dp_start_crc(struct drm_dp_aux *aux, struct drm_crtc *crtc);
|
||||
int drm_dp_stop_crc(struct drm_dp_aux *aux);
|
||||
|
||||
#endif /* _DRM_DP_HELPER_H_ */
|
||||
|
||||
Reference in New Issue
Block a user