Commit 4e07155d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'fbdev-for-6.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/linux-fbdev 

Pull fbdev updates from Helge Deller:

 - omapfb: Remove unused code (Dr. David Alan Gilbert)

 - sh7760fb: Fix memory leak in error path of sh7760fb_alloc_mem() (Zhen
   Lei)

* tag 'fbdev-for-6.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/linux-fbdev:
  fbdev: omapfb: Remove some deadcode
  fbdev: sh7760fb: Fix a possible memory leak in sh7760fb_alloc_mem()
parents 3e51108c 8d749313

drivers/video/fbdev/omap2/omapfb/dss/dispc.c

+0 −27
Original line number Diff line number Diff line
@@ -1230,17 +1230,6 @@ void dispc_ovl_set_fifo_threshold(enum omap_plane plane, u32 low, u32 high) 
		dispc_write_reg(DISPC_OVL_PRELOAD(plane), min(high, 0xfffu));

}



void dispc_enable_fifomerge(bool enable)

{

	if (!dss_has_feature(FEAT_FIFO_MERGE)) {

		WARN_ON(enable);

		return;

	}



	DSSDBG("FIFO merge %s\n", enable ? "enabled" : "disabled");

	REG_FLD_MOD(DISPC_CONFIG, enable ? 1 : 0, 14, 14);

}



void dispc_ovl_compute_fifo_thresholds(enum omap_plane plane,

		u32 *fifo_low, u32 *fifo_high, bool use_fifomerge,

		bool manual_update)
@@ -3656,22 +3645,6 @@ void dispc_mgr_set_clock_div(enum omap_channel channel, 
	dispc_mgr_set_lcd_divisor(channel, cinfo->lck_div, cinfo->pck_div);

}



int dispc_mgr_get_clock_div(enum omap_channel channel,

		struct dispc_clock_info *cinfo)

{

	unsigned long fck;



	fck = dispc_fclk_rate();



	cinfo->lck_div = REG_GET(DISPC_DIVISORo(channel), 23, 16);

	cinfo->pck_div = REG_GET(DISPC_DIVISORo(channel), 7, 0);



	cinfo->lck = fck / cinfo->lck_div;

	cinfo->pck = cinfo->lck / cinfo->pck_div;



	return 0;

}



u32 dispc_read_irqstatus(void)

{

	return dispc_read_reg(DISPC_IRQSTATUS);

drivers/video/fbdev/omap2/omapfb/dss/dss.h

+0 −3
Original line number Diff line number Diff line
@@ -366,7 +366,6 @@ void dispc_disable_sidle(void); 


void dispc_lcd_enable_signal(bool enable);

void dispc_pck_free_enable(bool enable);

void dispc_enable_fifomerge(bool enable);

void dispc_enable_gamma_table(bool enable);



typedef bool (*dispc_div_calc_func)(int lckd, int pckd, unsigned long lck,
@@ -388,8 +387,6 @@ void dispc_ovl_compute_fifo_thresholds(enum omap_plane plane, 


void dispc_mgr_set_clock_div(enum omap_channel channel,

		const struct dispc_clock_info *cinfo);

int dispc_mgr_get_clock_div(enum omap_channel channel,

		struct dispc_clock_info *cinfo);

void dispc_set_tv_pclk(unsigned long pclk);



u32 dispc_read_irqstatus(void);

drivers/video/fbdev/sh7760fb.c

+1 −2
Original line number Diff line number Diff line
@@ -409,12 +409,11 @@ static int sh7760fb_alloc_mem(struct fb_info *info) 
		vram = PAGE_SIZE;



	fbmem = dma_alloc_coherent(info->device, vram, &par->fbdma, GFP_KERNEL);



	if (!fbmem)

		return -ENOMEM;



	if ((par->fbdma & SH7760FB_DMA_MASK) != SH7760FB_DMA_MASK) {

		sh7760fb_free_mem(info);

		dma_free_coherent(info->device, vram, fbmem, par->fbdma);

		dev_err(info->device, "kernel gave me memory at 0x%08lx, which is"

			"unusable for the LCDC\n", (unsigned long)par->fbdma);

		return -ENOMEM;