diff options
| author | Terje Bergstrom <tbergstrom@nvidia.com> | 2013-03-22 16:34:07 +0200 |
|---|---|---|
| committer | Thierry Reding <thierry.reding@avionic-design.de> | 2013-04-22 12:39:59 +0200 |
| commit | 692e6d7be8099225f04b2d97299bc03479a5fcdb (patch) | |
| tree | 13e5a72eeaca72c0b73a668f5f683df6e01619d0 /drivers/gpu/host1x/drm/dc.c | |
| parent | c89c0ea63fcd045bdc17076fd078676e1da0c41a (diff) | |
gpu: host1x: Remove second host1x driver
Remove second host1x driver, and bind tegra-drm to the new host1x
driver. The logic to parse device tree and track clients is moved
to drm.c.
Signed-off-by: Arto Merilainen <amerilainen@nvidia.com>
Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com>
Reviewed-by: Thierry Reding <thierry.reding@avionic-design.de>
Tested-by: Thierry Reding <thierry.reding@avionic-design.de>
Tested-by: Erik Faye-Lund <kusmabite@gmail.com>
Signed-off-by: Thierry Reding <thierry.reding@avionic-design.de>
Diffstat (limited to 'drivers/gpu/host1x/drm/dc.c')
| -rw-r--r-- | drivers/gpu/host1x/drm/dc.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/gpu/host1x/drm/dc.c b/drivers/gpu/host1x/drm/dc.c index d1f66099826..29a79b66f36 100644 --- a/drivers/gpu/host1x/drm/dc.c +++ b/drivers/gpu/host1x/drm/dc.c @@ -16,6 +16,7 @@ #include "drm.h" #include "dc.h" +#include "host1x_client.h" struct tegra_plane { struct drm_plane base; @@ -1097,7 +1098,7 @@ static const struct host1x_client_ops dc_client_ops = { static int tegra_dc_probe(struct platform_device *pdev) { - struct host1x_drm *host1x = dev_get_drvdata(pdev->dev.parent); + struct host1x_drm *host1x = host1x_get_drm_data(pdev->dev.parent); struct resource *regs; struct tegra_dc *dc; int err; @@ -1160,7 +1161,7 @@ static int tegra_dc_probe(struct platform_device *pdev) static int tegra_dc_remove(struct platform_device *pdev) { - struct host1x_drm *host1x = dev_get_drvdata(pdev->dev.parent); + struct host1x_drm *host1x = host1x_get_drm_data(pdev->dev.parent); struct tegra_dc *dc = platform_get_drvdata(pdev); int err; |