diff --git a/drivers/video/fbdev/bcm2708_fb.c b/drivers/video/fbdev/bcm2708_fb.c index 135260ccf24038..4732cb18d792f9 100644 --- a/drivers/video/fbdev/bcm2708_fb.c +++ b/drivers/video/fbdev/bcm2708_fb.c @@ -657,8 +657,6 @@ static long vc_mem_copy(struct bcm2708_fb *fb, struct fb_dmacopy *ioparam) long rc = 0; size_t offset; -return -EFAULT; - /* restrict this to root user */ if (!uid_eq(current_euid(), GLOBAL_ROOT_UID)) { rc = -EFAULT; @@ -1111,7 +1109,6 @@ static int bcm2708_fb_probe(struct platform_device *dev) dev_info(&dev->dev, "FB found %d display(s)\n", num_displays); -#if 0 /* Set up the DMA information. Note we have just one set of DMA * parameters to work with all the FB's so requires synchronising when * being used @@ -1144,7 +1141,7 @@ static int bcm2708_fb_probe(struct platform_device *dev) "Failed to request DMA irq\n"); goto free_dma_chan; } -#endif + rpi_firmware_property(fbdev->fw, RPI_FIRMWARE_GET_VC_MEMORY, &gpu_mem, sizeof(gpu_mem));