diff options
| author | Dave Airlie <airlied@redhat.com> | 2017-04-07 05:34:46 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2017-04-07 05:34:46 +1000 |
| commit | 0e961332147851d16038d52323fc50e23dcbdfa3 (patch) | |
| tree | 0f18a54d4f2a983ff61fb40541aee6e0aa0a4b37 /drivers/gpu/drm/imx/imx-drm.h | |
| parent | 3eda2f5983f63c61e686efce21a8e624074c934e (diff) | |
| parent | 3d1df96ad46856ce850be5ac112eab919cbe1cab (diff) | |
| download | linux-0e961332147851d16038d52323fc50e23dcbdfa3.tar.gz linux-0e961332147851d16038d52323fc50e23dcbdfa3.tar.xz | |
Merge tag 'imx-drm-next-2017-04-04' of git://git.pengutronix.de/git/pza/linux into drm-next
imx-drm module/dependency changes
- The PRE/PRG drivers added an unwanted DRM dependency to the ipu-v3 driver.
Remove the dependency by conditionally disabling PRE/PRG support depending
on CONFIG_DRM.
- Merge the imx-ipuv3-crtc module into the imxdrm module. There is no reason
anymore for a separation between core drm driver and crtc/plane drivers,
especially since commit eb8c88808c83 ("drm/imx: add deferred plane
disabling"), which added a dependency on imx-ipuv3-crtc to the imxdrm
module.
* tag 'imx-drm-next-2017-04-04' of git://git.pengutronix.de/git/pza/linux:
drm/imx: merge imx-drm-core and ipuv3-crtc in one module
gpu: ipu-v3: don't depend on DRM being enabled
Diffstat (limited to 'drivers/gpu/drm/imx/imx-drm.h')
| -rw-r--r-- | drivers/gpu/drm/imx/imx-drm.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/imx/imx-drm.h b/drivers/gpu/drm/imx/imx-drm.h index 295434b199db..f6dd64be9cd5 100644 --- a/drivers/gpu/drm/imx/imx-drm.h +++ b/drivers/gpu/drm/imx/imx-drm.h @@ -29,6 +29,8 @@ int imx_drm_init_drm(struct platform_device *pdev, int preferred_bpp); int imx_drm_exit_drm(void); +extern struct platform_driver ipu_drm_driver; + void imx_drm_mode_config_init(struct drm_device *drm); struct drm_gem_cma_object *imx_drm_fb_get_obj(struct drm_framebuffer *fb); |