diff options
| author | Dave Airlie <airlied@redhat.com> | 2016-12-13 05:05:12 +0300 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2016-12-13 05:05:12 +0300 |
| commit | 2601a15d5d9b7f262e94b88784b1e1cf28ec020d (patch) | |
| tree | 52a5434ad72100759552f18c706dc44598fa6dbc /drivers/gpu/drm/vc4/vc4_drv.c | |
| parent | 25dfd7cfefeea5bddd48da5763ecbe686579c922 (diff) | |
| parent | c167df443b4a8d97d25a8e69bd9f490a1e3fe646 (diff) | |
| download | linux-2601a15d5d9b7f262e94b88784b1e1cf28ec020d.tar.xz | |
Merge tag 'drm-vc4-next-2016-12-09' of https://github.com/anholt/linux into drm-next
This pull request brings in VEC (TV-out) support for vc4, along with a
pageflipping race fix.
* tag 'drm-vc4-next-2016-12-09' of https://github.com/anholt/linux:
drm/vc4: Don't use drm_put_dev
drm/vc4: Document VEC DT binding
drm/vc4: Add support for the VEC (Video Encoder) IP
drm: Add TV connector states to drm_connector_state
drm: Turn DRM_MODE_SUBCONNECTOR_xx definitions into an enum
drm/vc4: Fix ->clock_select setting for the VEC encoder
drm/vc4: Fix race between page flip completion event and clean-up
Diffstat (limited to 'drivers/gpu/drm/vc4/vc4_drv.c')
| -rw-r--r-- | drivers/gpu/drm/vc4/vc4_drv.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/gpu/drm/vc4/vc4_drv.c b/drivers/gpu/drm/vc4/vc4_drv.c index 1dab9e5b3689..ac09ca7ff430 100644 --- a/drivers/gpu/drm/vc4/vc4_drv.c +++ b/drivers/gpu/drm/vc4/vc4_drv.c @@ -277,12 +277,14 @@ static void vc4_drm_unbind(struct device *dev) struct drm_device *drm = platform_get_drvdata(pdev); struct vc4_dev *vc4 = to_vc4_dev(drm); + drm_dev_unregister(drm); + if (vc4->fbdev) drm_fbdev_cma_fini(vc4->fbdev); drm_mode_config_cleanup(drm); - drm_put_dev(drm); + drm_dev_unref(drm); } static const struct component_master_ops vc4_drm_ops = { @@ -292,6 +294,7 @@ static const struct component_master_ops vc4_drm_ops = { static struct platform_driver *const component_drivers[] = { &vc4_hdmi_driver, + &vc4_vec_driver, &vc4_dpi_driver, &vc4_hvs_driver, &vc4_crtc_driver, |