diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2016-12-06 10:26:30 +0100 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2016-12-06 10:26:48 +0100 |
| commit | 75e75cbd55183ff12459666c0a1d3e71fe1481ab (patch) | |
| tree | a1dc32cc055770736397f9cf9b68f9e176184943 /include/drm | |
| parent | 58309befa82d81f6e9dc36a92d2a339ef2144535 (diff) | |
| parent | 197aa6ed522cc44710687d3b02dd4e4573991416 (diff) | |
| download | op-kernel-dev-75e75cbd55183ff12459666c0a1d3e71fe1481ab.zip op-kernel-dev-75e75cbd55183ff12459666c0a1d3e71fe1481ab.tar.gz | |
Merge remote-tracking branch 'airlied/drm-next' into drm-misc-next
Backmerge v4.9-rc8 to get at
commit e94bd1736f1f60e916a85a80c0b0ebeaae36cce5
Author: Michel Dänzer <michel.daenzer@amd.com>
Date: Wed Nov 30 17:30:01 2016 +0900
drm: Don't call drm_for_each_crtc with a non-KMS driver
so I can apply Michel's follow-up patch.
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Diffstat (limited to 'include/drm')
| -rw-r--r-- | include/drm/drmP.h | 1 | ||||
| -rw-r--r-- | include/drm/drm_drv.h | 3 | ||||
| -rw-r--r-- | include/drm/drm_edid.h | 1 |
3 files changed, 3 insertions, 2 deletions
diff --git a/include/drm/drmP.h b/include/drm/drmP.h index b352a7b..a9cfd33 100644 --- a/include/drm/drmP.h +++ b/include/drm/drmP.h @@ -779,7 +779,6 @@ extern void drm_pci_free(struct drm_device *dev, struct drm_dma_handle * dmah); extern void drm_sysfs_hotplug_event(struct drm_device *dev); - /*@}*/ /* PCI section */ diff --git a/include/drm/drm_drv.h b/include/drm/drm_drv.h index 52bf44e..c4fc495 100644 --- a/include/drm/drm_drv.h +++ b/include/drm/drm_drv.h @@ -429,4 +429,7 @@ void drm_dev_unref(struct drm_device *dev); void drm_put_dev(struct drm_device *dev); void drm_unplug_dev(struct drm_device *dev); +int drm_dev_set_unique(struct drm_device *dev, const char *name); + + #endif diff --git a/include/drm/drm_edid.h b/include/drm/drm_edid.h index c3a7d44..38eabf6 100644 --- a/include/drm/drm_edid.h +++ b/include/drm/drm_edid.h @@ -330,7 +330,6 @@ int drm_edid_to_sad(struct edid *edid, struct cea_sad **sads); int drm_edid_to_speaker_allocation(struct edid *edid, u8 **sadb); int drm_av_sync_delay(struct drm_connector *connector, const struct drm_display_mode *mode); -struct drm_connector *drm_select_eld(struct drm_encoder *encoder); #ifdef CONFIG_DRM_LOAD_EDID_FIRMWARE int drm_load_edid_firmware(struct drm_connector *connector); |
