diff options
| author | Dennis Wenzel <b21659@freescale.com> | 2010-09-29 10:42:06 -0500 |
|---|---|---|
| committer | Dennis Wenzel <b21659@freescale.com> | 2010-09-29 13:05:36 -0500 |
| commit | 09b371942aac57ce46f0f54b90435e5981ee7911 (patch) | |
| tree | 783eb9b40de436d0a43f0db9b8c7bc36088de3e8 /drivers/mxc | |
| parent | 666f48f823ed8a716a1d3863d3b93d910dbd67d1 (diff) | |
ENGR00132066-2: X-accel hangs on startup using 2.6.35 kernel
Changed libz160 to only use AMD CSI and no longer have FSL CSI option.
Update warning messages when gpu2d driver loaded.
Acked-by: Rob Herring <r.herring@freescale.com>
Signed-off-by: Dennis Wenzel <b21659@freescale.com>
Diffstat (limited to 'drivers/mxc')
| -rw-r--r-- | drivers/mxc/amd-gpu/platform/hal/linux/gsl_kmod.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/mxc/amd-gpu/platform/hal/linux/gsl_kmod.c b/drivers/mxc/amd-gpu/platform/hal/linux/gsl_kmod.c index bef8684ad131..b83706f9c36c 100644 --- a/drivers/mxc/amd-gpu/platform/hal/linux/gsl_kmod.c +++ b/drivers/mxc/amd-gpu/platform/hal/linux/gsl_kmod.c @@ -815,9 +815,10 @@ static int gpu_probe(struct platform_device *pdev) if (gpu_2d_irq > 0) { if (request_irq(gpu_2d_irq, z160_irq_handler, 0, "g12", NULL) < 0) { - printk(KERN_ERR "2D Acceleration Enabled, OpenVG Disabled!\n"); + printk(KERN_ERR "DO NOT use uio_pdrv_genirq kernel module for X acceleration!\n"); gpu_2d_irq = 0; } + printk(KERN_ERR "Do NOT run OpenVG apps while also running imx-drv X device driver!\n"); } if (kgsl_driver_init() != GSL_SUCCESS) { |