Merge tag 'drm-misc-next-2018-06-21' of git://anongit.freedesktop.org/drm/drm-misc into drm-next
drm-misc-next for 4.19: UAPI Changes: - Add writeback connector (Brian Starkey/Liviu Dudau) - Add "content type" property to HDMI connectors (Stanislav Lisovskiy) Cross-subsystem Changes: - some devicetree Docs update - fix compile breakage on ION due to the dma-buf cleanups (Christian König) Core Changes: - Reject over-sized allocation requests early (Chris Wilson) - gem-fb-helper: Always do implicit sync (Daniel Vetter) - dma-buf cleanups (Christian König) Driver Changes: - Fixes for the otm8009a panel driver (Philippe Cornu) - Add Innolux TV123WAM panel driver support (Sandeep Panda) - Move GEM BO to drm_framebuffer in few drivers (Daniel Stone) - i915 pinning improvements (Chris Wilson) - Stop consulting plane->fb/crtc in a few drivers (Ville Syrjälä) Signed-off-by: Dave Airlie <airlied@redhat.com> Link: https://patchwork.freedesktop.org/patch/msgid/20180621105428.GA20795@juma
This commit is contained in:
@@ -82,9 +82,11 @@ config DRM_PARADE_PS8622
|
||||
|
||||
config DRM_SIL_SII8620
|
||||
tristate "Silicon Image SII8620 HDMI/MHL bridge"
|
||||
depends on OF && RC_CORE
|
||||
depends on OF
|
||||
select DRM_KMS_HELPER
|
||||
imply EXTCON
|
||||
select INPUT
|
||||
select RC_CORE
|
||||
help
|
||||
Silicon Image SII8620 HDMI/MHL bridge chip driver.
|
||||
|
||||
|
@@ -1337,7 +1337,7 @@ static const struct mipi_dsi_host_ops cdns_dsi_ops = {
|
||||
.transfer = cdns_dsi_transfer,
|
||||
};
|
||||
|
||||
static int cdns_dsi_resume(struct device *dev)
|
||||
static int __maybe_unused cdns_dsi_resume(struct device *dev)
|
||||
{
|
||||
struct cdns_dsi *dsi = dev_get_drvdata(dev);
|
||||
|
||||
@@ -1350,7 +1350,7 @@ static int cdns_dsi_resume(struct device *dev)
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int cdns_dsi_suspend(struct device *dev)
|
||||
static int __maybe_unused cdns_dsi_suspend(struct device *dev)
|
||||
{
|
||||
struct cdns_dsi *dsi = dev_get_drvdata(dev);
|
||||
|
||||
|
Reference in New Issue
Block a user