diff options
author | Dong Aisheng <aisheng.dong@nxp.com> | 2019-12-02 18:01:02 +0800 |
---|---|---|
committer | Dong Aisheng <aisheng.dong@nxp.com> | 2019-12-02 18:01:02 +0800 |
commit | 270a1ad2a9f21a3dfe6d2a20c8a236b425af5901 (patch) | |
tree | ffb0180b00b10e320f232de0325d6655cbd37b9a /include/drm | |
parent | 09b639e3e560a58b4fda3adf0a65041917ab5977 (diff) | |
parent | c779d1746c680323ecf790015cbab9781a542f0b (diff) |
Merge remote-tracking branch 'origin/display/drm' into display/next
* origin/display/drm: (8 commits)
drm/fourcc: add a 10bits fully packed variant of NV12
drm/fourcc: add modifier for vivante compressed tiled layout
MLK-17368-1 drm: add fourcc codes for Verisilicon tiled formats
MLK-16290 drm: Add drm_of_component_probe_with_match() helper
MLK-15110-1 drm/fourcc: Add Amphion tiled layout format modifier
...
Diffstat (limited to 'include/drm')
-rw-r--r-- | include/drm/drm_of.h | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/include/drm/drm_of.h b/include/drm/drm_of.h index ead34ab5ca4e..9dcbbf6f6c51 100644 --- a/include/drm/drm_of.h +++ b/include/drm/drm_of.h @@ -7,6 +7,7 @@ #include <drm/drm_bridge.h> #endif +struct component_match; struct component_master_ops; struct component_match; struct device; @@ -25,6 +26,10 @@ void drm_of_component_match_add(struct device *master, struct component_match **matchptr, int (*compare)(struct device *, void *), struct device_node *node); +extern int drm_of_component_probe_with_match(struct device *dev, + struct component_match *match, + int (*compare_of)(struct device *, void *), + const struct component_master_ops *m_ops); int drm_of_component_probe(struct device *dev, int (*compare_of)(struct device *, void *), const struct component_master_ops *m_ops); @@ -56,6 +61,14 @@ drm_of_component_match_add(struct device *master, { } +static int drm_of_component_probe_with_match(struct device *dev, + struct component_match *match, + int (*compare_of)(struct device *, void *), + const struct component_master_ops *m_ops) +{ + return -EINVAL; +} + static inline int drm_of_component_probe(struct device *dev, int (*compare_of)(struct device *, void *), |