video: bcm2708_fb: Fixups based on review comments

Signed-off-by: Dave Stevenson <[email protected]>

Author: 6by9

drivers/video/fbdev/bcm2708_fb.c

@@ -288,10 +288,9 @@ static int bcm2708_fb_set_par(struct fb_info *info)
 			.xoffset = info->var.xoffset,
 			.yoffset = info->var.yoffset,
 		.tag5 = { RPI_FIRMWARE_FRAMEBUFFER_ALLOCATE, 8, 0 },
-			.base = 0,
-			.screen_size = 0,
+			/* base and screen_size will be initialised later */
 		.tag6 = { RPI_FIRMWARE_FRAMEBUFFER_SET_PITCH, 4, 0 },
-			.pitch = 0,
+			/* pitch will be initialised later */
 	};
 	int ret, image_size;
 
@@ -316,7 +315,7 @@ static int bcm2708_fb_set_par(struct fb_info *info)
 		}
 
 		fb->cpuaddr = dma_alloc_coherent(info->device, image_size,
-						 &fb->dma_addr, GFP_ATOMIC);
+						 &fb->dma_addr, GFP_KERNEL);
 
 		if (!fb->cpuaddr) {
 			fb->dma_addr = 0;
@@ -354,29 +353,14 @@ static int bcm2708_fb_set_par(struct fb_info *info)
 	}
 
 	if (ret) {
-		/* Old scheme */
-		const struct fb_alloc_tags fbinfo_old = {
-			.tag1 = { RPI_FIRMWARE_FRAMEBUFFER_SET_PHYSICAL_WIDTH_HEIGHT,
-				  8, 0, },
-				.xres = info->var.xres,
-				.yres = info->var.yres,
-			.tag2 = { RPI_FIRMWARE_FRAMEBUFFER_SET_VIRTUAL_WIDTH_HEIGHT,
-				  8, 0, },
-				.xres_virtual = info->var.xres_virtual,
-				.yres_virtual = info->var.yres_virtual,
-			.tag3 = { RPI_FIRMWARE_FRAMEBUFFER_SET_DEPTH, 4, 0 },
-				.bpp = info->var.bits_per_pixel,
-			.tag4 = { RPI_FIRMWARE_FRAMEBUFFER_SET_VIRTUAL_OFFSET,
-				  8, 0 },
-				.xoffset = info->var.xoffset,
-				.yoffset = info->var.yoffset,
-			.tag5 = { RPI_FIRMWARE_FRAMEBUFFER_ALLOCATE, 8, 0 },
-				.base = 0,
-				.screen_size = 0,
-			.tag6 = { RPI_FIRMWARE_FRAMEBUFFER_GET_PITCH, 4, 0 },
-				.pitch = 0,
-		};
-		fbinfo = fbinfo_old;
+		/* Old scheme:
+		 * - FRAMEBUFFER_ALLOCATE passes 0 for base and screen_size.
+		 * - GET_PITCH instead of SET_PITCH.
+		 */
+		fbinfo.base = 0;
+		fbinfo.screen_size = 0;
+		fbinfo.tag6.tag = RPI_FIRMWARE_FRAMEBUFFER_GET_PITCH;
+		fbinfo.pitch = 0;
 
 		ret = rpi_firmware_property_list(fb->fw, &fbinfo,
 						 sizeof(fbinfo));