Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9e38a661 authored by Dave Airlie's avatar Dave Airlie
Browse files

staging/gma500: fixup staging code to build following core changes. 



This just fixes up the staging code to keep building.

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent 01f2c773

drivers/staging/gma500/accel_2d.c

+1 −1
Original line number Diff line number Diff line
@@ -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:

drivers/staging/gma500/cdv_intel_display.c

+2 −2
Original line number Diff line number Diff line
@@ -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;

drivers/staging/gma500/framebuffer.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

drivers/staging/gma500/mdfld_intel_display.c

+2 −2
Original line number Diff line number Diff line
@@ -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;

drivers/staging/gma500/mrst_crtc.c

+2 −2
Original line number Diff line number Diff line
@@ -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;