aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorInki Dae <inki.dae@samsung.com>2011-10-14 00:29:48 -0400
committerDave Airlie <airlied@redhat.com>2011-10-18 05:01:18 -0400
commit41c243464f2420744f1c14da77e230440c1c31b4 (patch)
tree0ea9dbd73079515dd846d2c5d500367f44a83ace
parent8e9cc6a13ac0c6a5a1fef5ca2bda0925832516f3 (diff)
drm/exynos: added device object as argument of subdrv_probe().
sub drivers should refer to its own device object to access its own context. Signed-off-by: Inki Dae <inki.dae@samsung.com> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com> Signed-off-by: Dave Airlie <airlied@redhat.com>
-rw-r--r--drivers/gpu/drm/exynos/exynos_drm_core.c2
-rw-r--r--drivers/gpu/drm/exynos/exynos_drm_drv.h2
-rw-r--r--drivers/gpu/drm/exynos/exynos_drm_fimd.c2
3 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/exynos/exynos_drm_core.c b/drivers/gpu/drm/exynos/exynos_drm_core.c
index edb0ee13cffc..661a03571d0c 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_core.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_core.c
@@ -55,7 +55,7 @@ static int exynos_drm_subdrv_probe(struct drm_device *dev,
55 * 55 *
56 * P.S. note that this driver is considered for modularization. 56 * P.S. note that this driver is considered for modularization.
57 */ 57 */
58 ret = subdrv->probe(dev); 58 ret = subdrv->probe(dev, subdrv->manager.dev);
59 if (ret) 59 if (ret)
60 return ret; 60 return ret;
61 } 61 }
diff --git a/drivers/gpu/drm/exynos/exynos_drm_drv.h b/drivers/gpu/drm/exynos/exynos_drm_drv.h
index 4ea137158de3..002f2925106a 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_drv.h
+++ b/drivers/gpu/drm/exynos/exynos_drm_drv.h
@@ -219,7 +219,7 @@ struct exynos_drm_subdrv {
219 struct list_head list; 219 struct list_head list;
220 struct drm_device *drm_dev; 220 struct drm_device *drm_dev;
221 221
222 int (*probe)(struct drm_device *dev); 222 int (*probe)(struct drm_device *drm_dev, struct device *dev);
223 void (*remove)(struct drm_device *dev); 223 void (*remove)(struct drm_device *dev);
224 224
225 struct exynos_drm_manager manager; 225 struct exynos_drm_manager manager;
diff --git a/drivers/gpu/drm/exynos/exynos_drm_fimd.c b/drivers/gpu/drm/exynos/exynos_drm_fimd.c
index 9d1138e4fb4e..b0afa8493230 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_fimd.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_fimd.c
@@ -538,7 +538,7 @@ static irqreturn_t fimd_irq_handler(int irq, void *dev_id)
538 return IRQ_HANDLED; 538 return IRQ_HANDLED;
539} 539}
540 540
541static int fimd_subdrv_probe(struct drm_device *drm_dev) 541static int fimd_subdrv_probe(struct drm_device *drm_dev, struct device *dev)
542{ 542{
543 struct drm_driver *drm_driver = drm_dev->driver; 543 struct drm_driver *drm_driver = drm_dev->driver;
544 544