aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristopher Harvey <charvey@matrox.com>2013-02-20 09:34:22 -0500
committerDave Airlie <airlied@redhat.com>2013-04-29 19:57:02 -0400
commitf1998fe2d89be370707bfbd213365689cacf9206 (patch)
tree818ce69577272d28734cb709d1a24910f4b4e025
parent67d411ddb9def691572cd5ad0ee2991510d860d2 (diff)
drm/mgag200: Pass driver specific mga_device in driver functions
Signed-off-by: Christopher Harvey <charvey@matrox.com> Signed-off-by: Dave Airlie <airlied@redhat.com>
-rw-r--r--drivers/gpu/drm/mgag200/mgag200_mode.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/gpu/drm/mgag200/mgag200_mode.c b/drivers/gpu/drm/mgag200/mgag200_mode.c
index fe22bb780e1d..7337013a4a0e 100644
--- a/drivers/gpu/drm/mgag200/mgag200_mode.c
+++ b/drivers/gpu/drm/mgag200/mgag200_mode.c
@@ -1261,9 +1261,8 @@ static const struct drm_crtc_helper_funcs mga_helper_funcs = {
1261}; 1261};
1262 1262
1263/* CRTC setup */ 1263/* CRTC setup */
1264static void mga_crtc_init(struct drm_device *dev) 1264static void mga_crtc_init(struct mga_device *mdev)
1265{ 1265{
1266 struct mga_device *mdev = dev->dev_private;
1267 struct mga_crtc *mga_crtc; 1266 struct mga_crtc *mga_crtc;
1268 int i; 1267 int i;
1269 1268
@@ -1274,7 +1273,7 @@ static void mga_crtc_init(struct drm_device *dev)
1274 if (mga_crtc == NULL) 1273 if (mga_crtc == NULL)
1275 return; 1274 return;
1276 1275
1277 drm_crtc_init(dev, &mga_crtc->base, &mga_crtc_funcs); 1276 drm_crtc_init(mdev->dev, &mga_crtc->base, &mga_crtc_funcs);
1278 1277
1279 drm_mode_crtc_set_gamma_size(&mga_crtc->base, MGAG200_LUT_SIZE); 1278 drm_mode_crtc_set_gamma_size(&mga_crtc->base, MGAG200_LUT_SIZE);
1280 mdev->mode_info.crtc = mga_crtc; 1279 mdev->mode_info.crtc = mga_crtc;
@@ -1529,7 +1528,7 @@ int mgag200_modeset_init(struct mga_device *mdev)
1529 1528
1530 mdev->dev->mode_config.fb_base = mdev->mc.vram_base; 1529 mdev->dev->mode_config.fb_base = mdev->mc.vram_base;
1531 1530
1532 mga_crtc_init(mdev->dev); 1531 mga_crtc_init(mdev);
1533 1532
1534 encoder = mga_encoder_init(mdev->dev); 1533 encoder = mga_encoder_init(mdev->dev);
1535 if (!encoder) { 1534 if (!encoder) {