staging/gma500: fixup staging code to build following core changes.
authorDave Airlie <airlied@redhat.com>
Tue, 20 Dec 2011 10:22:18 +0000 (10:22 +0000)
committerDave Airlie <airlied@redhat.com>
Tue, 20 Dec 2011 10:22:18 +0000 (10:22 +0000)
This just fixes up the staging code to keep building.

Signed-off-by: Dave Airlie <airlied@redhat.com>
drivers/staging/gma500/accel_2d.c
drivers/staging/gma500/cdv_intel_display.c
drivers/staging/gma500/framebuffer.c
drivers/staging/gma500/mdfld_intel_display.c
drivers/staging/gma500/mrst_crtc.c
drivers/staging/gma500/power.c
drivers/staging/gma500/psb_intel_display.c

index 114b99a1ce1914d8e5b906d7e070986350e974ae..b8f78ebbb145f0957663549a4713675d1a7be18f 100644 (file)
@@ -253,7 +253,7 @@ static void psbfb_copyarea_accel(struct fb_info *info,
                return;
 
        offset = psbfb->gtt->offset;
-       stride = fb->pitch;
+       stride = fb->pitches[0];
 
        switch (fb->depth) {
        case 8:
index 7b97c600eff0c49885b742f14b9f11cf80bdbefd..c63a32776a9ec09436fd632b92eed8ba4ace4b5c 100644 (file)
@@ -507,9 +507,9 @@ int cdv_intel_pipe_set_base(struct drm_crtc *crtc,
        if (ret < 0)
                goto psb_intel_pipe_set_base_exit;
        start = psbfb->gtt->offset;
-       offset = y * crtc->fb->pitch + x * (crtc->fb->bits_per_pixel / 8);
+       offset = y * crtc->fb->pitches[0] + x * (crtc->fb->bits_per_pixel / 8);
 
-       REG_WRITE(dspstride, crtc->fb->pitch);
+       REG_WRITE(dspstride, crtc->fb->pitches[0]);
 
        dspcntr = REG_READ(dspcntr_reg);
        dspcntr &= ~DISPPLANE_PIXFORMAT_MASK;
index 7aee4d2cd1d481fe73d7fa759fceed6802035caf..b00761cba1448a4f78360c625349a08ed6e36c46 100644 (file)
@@ -511,7 +511,7 @@ static int psbfb_create(struct psb_fbdev *fbdev,
                info->apertures->ranges[0].size = dev_priv->gtt.stolen_size;
        }
 
-       drm_fb_helper_fill_fix(info, fb->pitch, fb->depth);
+       drm_fb_helper_fill_fix(info, fb->pitches[0], fb->depth);
        drm_fb_helper_fill_var(info, &fbdev->psb_fb_helper,
                                sizes->fb_width, sizes->fb_height);
 
index 8eb827ecc3d35da5ce37bbfbb261f0bb9a98e021..0b37b7b6b02afadb29bfe629635d9fea87f21626 100644 (file)
@@ -390,9 +390,9 @@ int mdfld__intel_pipe_set_base(struct drm_crtc *crtc, int x, int y, struct drm_f
                goto psb_intel_pipe_set_base_exit;
 
        start = psbfb->gtt->offset;
-       offset = y * crtc->fb->pitch + x * (crtc->fb->bits_per_pixel / 8);
+       offset = y * crtc->fb->pitches[0] + x * (crtc->fb->bits_per_pixel / 8);
 
-       REG_WRITE(dspstride, crtc->fb->pitch);
+       REG_WRITE(dspstride, crtc->fb->pitches[0]);
        dspcntr = REG_READ(dspcntr_reg);
        dspcntr &= ~DISPPLANE_PIXFORMAT_MASK;
 
index c9311a573c2838ecc947c58286a6c7fb366f3e79..980837e37d80e23cd27c3f9190978053f499acf8 100644 (file)
@@ -543,9 +543,9 @@ int mrst_pipe_set_base(struct drm_crtc *crtc,
                return 0;
 
        start = psbfb->gtt->offset;
-       offset = y * crtc->fb->pitch + x * (crtc->fb->bits_per_pixel / 8);
+       offset = y * crtc->fb->pitches[0] + x * (crtc->fb->bits_per_pixel / 8);
 
-       REG_WRITE(dspstride, crtc->fb->pitch);
+       REG_WRITE(dspstride, crtc->fb->pitches[0]);
 
        dspcntr = REG_READ(dspcntr_reg);
        dspcntr &= ~DISPPLANE_PIXFORMAT_MASK;
index 436fe9733b168381ae264d2980ed60d747bdceae..408257038335acdba819715a1e97a3b27e50be60 100644 (file)
@@ -266,7 +266,7 @@ bool gma_power_begin(struct drm_device *dev, bool force_on)
        ret = gma_resume_pci(dev->pdev);
        if (ret == 0) {
                /* FIXME: we want to defer this for Medfield/Oaktrail */
-               gma_resume_display(dev);
+               gma_resume_display(dev->pdev);
                psb_irq_preinstall(dev);
                psb_irq_postinstall(dev);
                pm_runtime_get(&dev->pdev->dev);
index caa9d86f26d82f0db7d665b8e9bcb6fdf30bb176..85659613ae624e38d58e303c6fa5a36a80fcda25 100644 (file)
@@ -367,9 +367,9 @@ int psb_intel_pipe_set_base(struct drm_crtc *crtc,
                goto psb_intel_pipe_set_base_exit;
        start = psbfb->gtt->offset;
 
-       offset = y * crtc->fb->pitch + x * (crtc->fb->bits_per_pixel / 8);
+       offset = y * crtc->fb->pitches[0] + x * (crtc->fb->bits_per_pixel / 8);
 
-       REG_WRITE(dspstride, crtc->fb->pitch);
+       REG_WRITE(dspstride, crtc->fb->pitches[0]);
 
        dspcntr = REG_READ(dspcntr_reg);
        dspcntr &= ~DISPPLANE_PIXFORMAT_MASK;