diff options
| author | Russell King | 2014-04-22 16:24:03 +0200 |
|---|---|---|
| committer | Russell King | 2014-07-03 17:24:48 +0200 |
| commit | 42e62ba7a484e12a77b9e330a29bbf7c99d3e60e (patch) | |
| tree | d3a9dbd2ed7cd157d365ee214d87ca1e08f06749 /drivers/gpu/drm/armada/armada_drv.c | |
| parent | drm/armada: move variant initialisation to CRTC init (diff) | |
| download | kernel-qcow2-linux-42e62ba7a484e12a77b9e330a29bbf7c99d3e60e.tar.gz kernel-qcow2-linux-42e62ba7a484e12a77b9e330a29bbf7c99d3e60e.tar.xz kernel-qcow2-linux-42e62ba7a484e12a77b9e330a29bbf7c99d3e60e.zip | |
drm/armada: make variant a CRTC thing
Move the variant pointer into the armada_crtc structure, and update for
the resulting changes.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'drivers/gpu/drm/armada/armada_drv.c')
| -rw-r--r-- | drivers/gpu/drm/armada/armada_drv.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/gpu/drm/armada/armada_drv.c b/drivers/gpu/drm/armada/armada_drv.c index 4939a86a2afc..3995be3c686b 100644 --- a/drivers/gpu/drm/armada/armada_drv.c +++ b/drivers/gpu/drm/armada/armada_drv.c @@ -85,6 +85,7 @@ void armada_drm_queue_unref_work(struct drm_device *dev, static int armada_drm_load(struct drm_device *dev, unsigned long flags) { const struct platform_device_id *id; + const struct armada_variant *variant; struct armada_private *priv; struct resource *res[ARRAY_SIZE(priv->dcrtc)]; struct resource *mem = NULL; @@ -128,7 +129,7 @@ static int armada_drm_load(struct drm_device *dev, unsigned long flags) if (!id) return -ENXIO; - priv->variant = (struct armada_variant *)id->driver_data; + variant = (const struct armada_variant *)id->driver_data; INIT_WORK(&priv->fb_unref_work, armada_drm_unref_work); INIT_KFIFO(priv->fb_unref); @@ -160,7 +161,7 @@ static int armada_drm_load(struct drm_device *dev, unsigned long flags) if (irq < 0) goto err_kms; - ret = armada_drm_crtc_create(dev, res[n], irq); + ret = armada_drm_crtc_create(dev, res[n], irq, variant); if (ret) goto err_kms; } |