diff options
| author | Dave Airlie <airlied@redhat.com> | 2017-10-17 02:45:05 +0200 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2017-10-17 02:53:43 +0200 |
| commit | bd21a37d41c3b3088aeae59f54fd82de0ddb6fdd (patch) | |
| tree | 985dc5b65d2adb36a3671e78a174b3aaac4b6f50 /include/drm/drm_connector.h | |
| parent | drm/amd/display: drop unused dm_delay_in_microseconds (diff) | |
| parent | Merge tag 'drm-misc-next-2017-10-16' of git://anongit.freedesktop.org/drm/drm... (diff) | |
| download | linux-bd21a37d41c3b3088aeae59f54fd82de0ddb6fdd.tar.xz linux-bd21a37d41c3b3088aeae59f54fd82de0ddb6fdd.zip | |
Merge remote-tracking branch 'pfdo/drm-next' into drm-next
Pull in drm-next for the object find API changes.
Fix the one place the API crashes.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'include/drm/drm_connector.h')
| -rw-r--r-- | include/drm/drm_connector.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/drm/drm_connector.h b/include/drm/drm_connector.h index b34904dc8b9b..b4285c40e1e4 100644 --- a/include/drm/drm_connector.h +++ b/include/drm/drm_connector.h @@ -939,10 +939,11 @@ static inline unsigned drm_connector_index(struct drm_connector *connector) * add takes a reference to it. */ static inline struct drm_connector *drm_connector_lookup(struct drm_device *dev, + struct drm_file *file_priv, uint32_t id) { struct drm_mode_object *mo; - mo = drm_mode_object_find(dev, id, DRM_MODE_OBJECT_CONNECTOR); + mo = drm_mode_object_find(dev, file_priv, id, DRM_MODE_OBJECT_CONNECTOR); return mo ? obj_to_connector(mo) : NULL; } |