xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'drm/next/platform' of git://linuxtv.org/pinchartl/media into drm-misc-next

Browse Source 
Merge Laurent's drm_platform removal code. Only conflict is with the
drm_pci.h extraction, which allows me to fix up the misplayed
drm_platform_init fumble that 0day and Stephen Rothwell reported.

Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
This commit is contained in:
Daniel Vetter
2017-03-11 11:46:03 +01:00
parent 35dc8aabc8 76adb460fd
commit a45216547e
22 changed files with 237 additions and 337 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/drm/drm_pci.h
View File

@@ -72,7 +72,4 @@ static inline int drm_pci_set_busid(struct drm_device *dev,
extern int drm_pcie_get_speed_cap_mask(struct drm_device *dev, u32 *speed_mask);
extern int drm_pcie_get_max_link_width(struct drm_device *dev, u32 *mlw);
/* platform section */
extern int drm_platform_init(struct drm_driver *driver, struct platform_device *platform_device);
#endif /* _DRM_PCI_H_ */