Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 345604
b: refs/heads/master
c: 422bd00
h: refs/heads/master
v: v3
  • Loading branch information
Rahul Sharma authored and Inki Dae committed Dec 13, 2012
1 parent c52c983 commit 7fef884
Show file tree
Hide file tree
Showing 18 changed files with 144 additions and 898 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 652a187664902399d34f5b3a084fdbb51b2ca12f
refs/heads/master: 422bd00ea640b9aacb6bdd3903b76f69e72fba8d
16 changes: 16 additions & 0 deletions trunk/drivers/gpu/drm/exynos/exynos_drm_drv.c
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,9 @@

#define VBLANK_OFF_DELAY 50000

/* platform device pointer for eynos drm device. */
static struct platform_device *exynos_drm_pdev;

static int exynos_drm_load(struct drm_device *dev, unsigned long flags)
{
struct exynos_drm_private *private;
Expand Down Expand Up @@ -296,6 +299,7 @@ static int exynos_drm_platform_probe(struct platform_device *pdev)
{
DRM_DEBUG_DRIVER("%s\n", __FILE__);

pdev->dev.coherent_dma_mask = DMA_BIT_MASK(32);
exynos_drm_driver.num_ioctls = DRM_ARRAY_SIZE(exynos_ioctls);

return drm_platform_init(&exynos_drm_driver, pdev);
Expand Down Expand Up @@ -357,11 +361,21 @@ static int __init exynos_drm_init(void)

ret = platform_driver_register(&exynos_drm_platform_driver);
if (ret < 0)
goto out_drm;

exynos_drm_pdev = platform_device_register_simple("exynos-drm", -1,
NULL, 0);
if (IS_ERR_OR_NULL(exynos_drm_pdev)) {
ret = PTR_ERR(exynos_drm_pdev);
goto out;
}

return 0;

out:
platform_driver_unregister(&exynos_drm_platform_driver);

out_drm:
#ifdef CONFIG_DRM_EXYNOS_G2D
platform_driver_unregister(&g2d_driver);
out_g2d:
Expand Down Expand Up @@ -392,6 +406,8 @@ static void __exit exynos_drm_exit(void)
{
DRM_DEBUG_DRIVER("%s\n", __FILE__);

platform_device_unregister(exynos_drm_pdev);

platform_driver_unregister(&exynos_drm_platform_driver);

#ifdef CONFIG_DRM_EXYNOS_G2D
Expand Down
Loading

0 comments on commit 7fef884

Please sign in to comment.