diff options
author | Dave Airlie <airlied@redhat.com> | 2016-07-14 21:01:37 -0400 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2016-07-14 21:01:37 -0400 |
commit | 6c181c82106e12dced317e93a7a396cbb8c64f75 (patch) | |
tree | 95f81eaf5fa9e5539411f5d9690b31c7c0c20044 /drivers/gpu/drm/sti | |
parent | 1640142b3d900cd7e5bc593d130a84f9187d9819 (diff) | |
parent | 01d3434a565ada5ca084c68ec1e087ada5a7b157 (diff) |
Merge tag 'topic/drm-misc-2016-07-14' of git://anongit.freedesktop.org/drm-intel into drm-next
I recovered dri-devel backlog from my vacation, more misc stuff:
- of_put_node fixes from Peter Chen (not all yet)
- more patches from Gustavo to use kms-native drm_crtc_vblank_* funcs
- docs sphinxification from Lukas Wunner
- bunch of fixes all over from Dan Carpenter
- more follow up work from Chris register/unregister rework in various
places
- vgem dma-buf export (for writing testcases)
- small things all over from tons of different people
* tag 'topic/drm-misc-2016-07-14' of git://anongit.freedesktop.org/drm-intel: (52 commits)
drm: Don't overwrite user ioctl arg unless requested
dma-buf/sync_file: improve Kconfig description for Sync Files
MAINTAINERS: add entry for the Sync File Framework
drm: Resurrect atomic rmfb code
drm/vgem: Use PAGE_KERNEL in place of x86-specific PAGE_KERNEL_IO
qxl: silence uninitialized variable warning
qxl: check for kmap failures
vga_switcheroo: Sphinxify docs
drm: Restore double clflush on the last partial cacheline
gpu: drm: rockchip_drm_drv: add missing of_node_put after calling of_parse_phandle
gpu: drm: sti_vtg: add missing of_node_put after calling of_parse_phandle
gpu: drm: sti_hqvdp: add missing of_node_put after calling of_parse_phandle
gpu: drm: sti_vdo: add missing of_node_put after calling of_parse_phandle
gpu: drm: sti_compositor: add missing of_node_put after calling of_parse_phandle
drm/tilcdc: use drm_crtc_handle_vblank()
drm/rcar-du: use drm_crtc_handle_vblank()
drm/nouveau: use drm_crtc_handle_vblank()
drm/atmel: use drm_crtc_handle_vblank()
drm/armada: use drm_crtc_handle_vblank()
drm: make drm_vblank_count_and_time() static
...
Diffstat (limited to 'drivers/gpu/drm/sti')
-rw-r--r-- | drivers/gpu/drm/sti/sti_compositor.c | 2 | ||||
-rw-r--r-- | drivers/gpu/drm/sti/sti_dvo.c | 1 | ||||
-rw-r--r-- | drivers/gpu/drm/sti/sti_hqvdp.c | 1 | ||||
-rw-r--r-- | drivers/gpu/drm/sti/sti_vtg.c | 1 |
4 files changed, 5 insertions, 0 deletions
diff --git a/drivers/gpu/drm/sti/sti_compositor.c b/drivers/gpu/drm/sti/sti_compositor.c index 794148ff0e57..bd74732ea09b 100644 --- a/drivers/gpu/drm/sti/sti_compositor.c +++ b/drivers/gpu/drm/sti/sti_compositor.c | |||
@@ -267,10 +267,12 @@ static int sti_compositor_probe(struct platform_device *pdev) | |||
267 | vtg_np = of_parse_phandle(pdev->dev.of_node, "st,vtg", 0); | 267 | vtg_np = of_parse_phandle(pdev->dev.of_node, "st,vtg", 0); |
268 | if (vtg_np) | 268 | if (vtg_np) |
269 | compo->vtg_main = of_vtg_find(vtg_np); | 269 | compo->vtg_main = of_vtg_find(vtg_np); |
270 | of_node_put(vtg_np); | ||
270 | 271 | ||
271 | vtg_np = of_parse_phandle(pdev->dev.of_node, "st,vtg", 1); | 272 | vtg_np = of_parse_phandle(pdev->dev.of_node, "st,vtg", 1); |
272 | if (vtg_np) | 273 | if (vtg_np) |
273 | compo->vtg_aux = of_vtg_find(vtg_np); | 274 | compo->vtg_aux = of_vtg_find(vtg_np); |
275 | of_node_put(vtg_np); | ||
274 | 276 | ||
275 | platform_set_drvdata(pdev, compo); | 277 | platform_set_drvdata(pdev, compo); |
276 | 278 | ||
diff --git a/drivers/gpu/drm/sti/sti_dvo.c b/drivers/gpu/drm/sti/sti_dvo.c index ec3108074350..00881eb4536e 100644 --- a/drivers/gpu/drm/sti/sti_dvo.c +++ b/drivers/gpu/drm/sti/sti_dvo.c | |||
@@ -580,6 +580,7 @@ static int sti_dvo_probe(struct platform_device *pdev) | |||
580 | dvo->panel_node = of_parse_phandle(np, "sti,panel", 0); | 580 | dvo->panel_node = of_parse_phandle(np, "sti,panel", 0); |
581 | if (!dvo->panel_node) | 581 | if (!dvo->panel_node) |
582 | DRM_ERROR("No panel associated to the dvo output\n"); | 582 | DRM_ERROR("No panel associated to the dvo output\n"); |
583 | of_node_put(dvo->panel_node); | ||
583 | 584 | ||
584 | platform_set_drvdata(pdev, dvo); | 585 | platform_set_drvdata(pdev, dvo); |
585 | 586 | ||
diff --git a/drivers/gpu/drm/sti/sti_hqvdp.c b/drivers/gpu/drm/sti/sti_hqvdp.c index 33d2f42550cc..b03232247966 100644 --- a/drivers/gpu/drm/sti/sti_hqvdp.c +++ b/drivers/gpu/drm/sti/sti_hqvdp.c | |||
@@ -1363,6 +1363,7 @@ static int sti_hqvdp_probe(struct platform_device *pdev) | |||
1363 | vtg_np = of_parse_phandle(pdev->dev.of_node, "st,vtg", 0); | 1363 | vtg_np = of_parse_phandle(pdev->dev.of_node, "st,vtg", 0); |
1364 | if (vtg_np) | 1364 | if (vtg_np) |
1365 | hqvdp->vtg = of_vtg_find(vtg_np); | 1365 | hqvdp->vtg = of_vtg_find(vtg_np); |
1366 | of_node_put(vtg_np); | ||
1366 | 1367 | ||
1367 | platform_set_drvdata(pdev, hqvdp); | 1368 | platform_set_drvdata(pdev, hqvdp); |
1368 | 1369 | ||
diff --git a/drivers/gpu/drm/sti/sti_vtg.c b/drivers/gpu/drm/sti/sti_vtg.c index 957ce712ea44..0bdc385eec17 100644 --- a/drivers/gpu/drm/sti/sti_vtg.c +++ b/drivers/gpu/drm/sti/sti_vtg.c | |||
@@ -432,6 +432,7 @@ static int vtg_probe(struct platform_device *pdev) | |||
432 | np = of_parse_phandle(pdev->dev.of_node, "st,slave", 0); | 432 | np = of_parse_phandle(pdev->dev.of_node, "st,slave", 0); |
433 | if (np) { | 433 | if (np) { |
434 | vtg->slave = of_vtg_find(np); | 434 | vtg->slave = of_vtg_find(np); |
435 | of_node_put(np); | ||
435 | 436 | ||
436 | if (!vtg->slave) | 437 | if (!vtg->slave) |
437 | return -EPROBE_DEFER; | 438 | return -EPROBE_DEFER; |