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

Commit 19fd7441 authored by Jean-Christophe PLAGNIOL-VILLARD's avatar Jean-Christophe PLAGNIOL-VILLARD
Browse files

Merge tag 'fbdev-3.11-2' of git://gitorious.org/linux-omap-dss2/linux into fbdev/for-next 

Various fbdev changes for 3.11

* xilinxfb updates
* Small cleanups and fixes to multiple drivers
parents b75bf98b 464d8a54

drivers/video/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -2188,7 +2188,7 @@ config FB_PS3_DEFAULT_SIZE_M 


config FB_XILINX

	tristate "Xilinx frame buffer support"

	depends on FB && (XILINX_VIRTEX || MICROBLAZE)

	depends on FB && (XILINX_VIRTEX || MICROBLAZE || ARCH_ZYNQ)

	select FB_CFB_FILLRECT

	select FB_CFB_COPYAREA

	select FB_CFB_IMAGEBLIT

drivers/video/aty/aty128fb.c

+1 −1
Original line number Diff line number Diff line
@@ -2016,7 +2016,7 @@ static int aty128_init(struct pci_dev *pdev, const struct pci_device_id *ent) 


	aty128_init_engine(par);



	par->pm_reg = pci_find_capability(pdev, PCI_CAP_ID_PM);

	par->pm_reg = pdev->pm_cap;

	par->pdev = pdev;

	par->asleep = 0;

	par->lock_blank = 0;

drivers/video/aty/atyfb_base.c

+5 −4
Original line number Diff line number Diff line
@@ -58,6 +58,7 @@ 
#include <linux/slab.h>

#include <linux/vmalloc.h>

#include <linux/delay.h>

#include <linux/compiler.h>

#include <linux/console.h>

#include <linux/fb.h>

#include <linux/init.h>
@@ -434,8 +435,8 @@ static int correct_chipset(struct atyfb_par *par) 
	const char *name;

	int i;



	for (i = ARRAY_SIZE(aty_chips) - 1; i >= 0; i--)

		if (par->pci_id == aty_chips[i].pci_id)

	for (i = ARRAY_SIZE(aty_chips); i > 0; i--)

		if (par->pci_id == aty_chips[i - 1].pci_id)

			break;



	if (i < 0)
@@ -531,8 +532,8 @@ static int correct_chipset(struct atyfb_par *par) 
	return 0;

}



static char ram_dram[] = "DRAM";

static char ram_resv[] = "RESV";

static char ram_dram[] __maybe_unused = "DRAM";

static char ram_resv[] __maybe_unused = "RESV";

#ifdef CONFIG_FB_ATY_GX

static char ram_vram[] = "VRAM";

#endif /* CONFIG_FB_ATY_GX */

drivers/video/aty/radeon_pm.c

+1 −1
Original line number Diff line number Diff line
@@ -2805,7 +2805,7 @@ static void radeonfb_early_resume(void *data) 
void radeonfb_pm_init(struct radeonfb_info *rinfo, int dynclk, int ignore_devlist, int force_sleep)

{

	/* Find PM registers in config space if any*/

	rinfo->pm_reg = pci_find_capability(rinfo->pdev, PCI_CAP_ID_PM);

	rinfo->pm_reg = rinfo->pdev->pm_cap;



	/* Enable/Disable dynamic clocks: TODO add sysfs access */

	if (rinfo->family == CHIP_FAMILY_RS480)

drivers/video/au1100fb.c

+0 −1
Original line number Diff line number Diff line
@@ -579,7 +579,6 @@ static int au1100fb_drv_probe(struct platform_device *dev) 
	if (fbdev->info.cmap.len != 0) {

		fb_dealloc_cmap(&fbdev->info.cmap);

	}

	platform_set_drvdata(dev, NULL);



	return -ENODEV;

}