Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

bcm2708_fb: Explicitly initialise the IOMEM ops #6612

Merged
merged 1 commit into from
Jan 14, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions drivers/video/fbdev/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -65,9 +65,7 @@ config FB_BCM2708
tristate "BCM2708 framebuffer support"
depends on FB && RASPBERRYPI_FIRMWARE
select FB_DEVICE
select FB_CFB_FILLRECT
select FB_CFB_COPYAREA
select FB_CFB_IMAGEBLIT
select FB_IOMEM_HELPERS
help
This framebuffer device driver is for the BCM2708 framebuffer.

Expand Down
18 changes: 4 additions & 14 deletions drivers/video/fbdev/bcm2708_fb.c
Original file line number Diff line number Diff line change
Expand Up @@ -790,12 +790,6 @@ static int bcm2708_compat_ioctl(struct fb_info *info, unsigned int cmd,
}
#endif

static void bcm2708_fb_fillrect(struct fb_info *info,
const struct fb_fillrect *rect)
{
cfb_fillrect(info, rect);
}

/* A helper function for configuring dma control block */
static void set_dma_cb(struct bcm2708_dma_cb *cb,
int burst_size,
Expand Down Expand Up @@ -947,12 +941,6 @@ static void bcm2708_fb_copyarea(struct fb_info *info,
mutex_unlock(&fbdev->dma_mutex);
}

static void bcm2708_fb_imageblit(struct fb_info *info,
const struct fb_image *image)
{
cfb_imageblit(info, image);
}

static irqreturn_t bcm2708_fb_dma_irq(int irq, void *cxt)
{
struct bcm2708_fb_dev *fbdev = cxt;
Expand All @@ -973,18 +961,20 @@ static irqreturn_t bcm2708_fb_dma_irq(int irq, void *cxt)

static struct fb_ops bcm2708_fb_ops = {
.owner = THIS_MODULE,
__FB_DEFAULT_IOMEM_OPS_RDWR,
.fb_check_var = bcm2708_fb_check_var,
.fb_set_par = bcm2708_fb_set_par,
.fb_setcolreg = bcm2708_fb_setcolreg,
.fb_blank = bcm2708_fb_blank,
.fb_fillrect = bcm2708_fb_fillrect,
.fb_fillrect = cfb_fillrect,
.fb_copyarea = bcm2708_fb_copyarea,
.fb_imageblit = bcm2708_fb_imageblit,
.fb_imageblit = cfb_imageblit,
.fb_pan_display = bcm2708_fb_pan_display,
.fb_ioctl = bcm2708_ioctl,
#ifdef CONFIG_COMPAT
.fb_compat_ioctl = bcm2708_compat_ioctl,
#endif
__FB_DEFAULT_IOMEM_OPS_MMAP,
};

static int bcm2708_fb_register(struct bcm2708_fb *fb)
Expand Down
Loading