diff options
| -rw-r--r-- | drivers/gpu/drm/omapdrm/dss/dispc.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/gpu/drm/omapdrm/dss/dispc.c b/drivers/gpu/drm/omapdrm/dss/dispc.c index b8fdb63e5bb3..7f3ac6b13b56 100644 --- a/drivers/gpu/drm/omapdrm/dss/dispc.c +++ b/drivers/gpu/drm/omapdrm/dss/dispc.c | |||
| @@ -2348,7 +2348,7 @@ static int dispc_ovl_calc_scaling_24xx(struct dispc_device *dispc, | |||
| 2348 | } | 2348 | } |
| 2349 | 2349 | ||
| 2350 | if (in_width > maxsinglelinewidth) { | 2350 | if (in_width > maxsinglelinewidth) { |
| 2351 | DSSERR("Cannot scale max input width exceeded"); | 2351 | DSSERR("Cannot scale max input width exceeded\n"); |
| 2352 | return -EINVAL; | 2352 | return -EINVAL; |
| 2353 | } | 2353 | } |
| 2354 | return 0; | 2354 | return 0; |
| @@ -2430,13 +2430,13 @@ again: | |||
| 2430 | } | 2430 | } |
| 2431 | 2431 | ||
| 2432 | if (in_width > (maxsinglelinewidth * 2)) { | 2432 | if (in_width > (maxsinglelinewidth * 2)) { |
| 2433 | DSSERR("Cannot setup scaling"); | 2433 | DSSERR("Cannot setup scaling\n"); |
| 2434 | DSSERR("width exceeds maximum width possible"); | 2434 | DSSERR("width exceeds maximum width possible\n"); |
| 2435 | return -EINVAL; | 2435 | return -EINVAL; |
| 2436 | } | 2436 | } |
| 2437 | 2437 | ||
| 2438 | if (in_width > maxsinglelinewidth && *five_taps) { | 2438 | if (in_width > maxsinglelinewidth && *five_taps) { |
| 2439 | DSSERR("cannot setup scaling with five taps"); | 2439 | DSSERR("cannot setup scaling with five taps\n"); |
| 2440 | return -EINVAL; | 2440 | return -EINVAL; |
| 2441 | } | 2441 | } |
| 2442 | return 0; | 2442 | return 0; |
| @@ -2478,7 +2478,7 @@ static int dispc_ovl_calc_scaling_44xx(struct dispc_device *dispc, | |||
| 2478 | in_width > maxsinglelinewidth && ++*decim_x); | 2478 | in_width > maxsinglelinewidth && ++*decim_x); |
| 2479 | 2479 | ||
| 2480 | if (in_width > maxsinglelinewidth) { | 2480 | if (in_width > maxsinglelinewidth) { |
| 2481 | DSSERR("Cannot scale width exceeds max line width"); | 2481 | DSSERR("Cannot scale width exceeds max line width\n"); |
| 2482 | return -EINVAL; | 2482 | return -EINVAL; |
| 2483 | } | 2483 | } |
| 2484 | 2484 | ||
| @@ -2496,7 +2496,7 @@ static int dispc_ovl_calc_scaling_44xx(struct dispc_device *dispc, | |||
| 2496 | * bandwidth. Despite what theory says this appears to | 2496 | * bandwidth. Despite what theory says this appears to |
| 2497 | * be true also for 16-bit color formats. | 2497 | * be true also for 16-bit color formats. |
| 2498 | */ | 2498 | */ |
| 2499 | DSSERR("Not enough bandwidth, too much downscaling (x-decimation factor %d > 4)", *decim_x); | 2499 | DSSERR("Not enough bandwidth, too much downscaling (x-decimation factor %d > 4)\n", *decim_x); |
| 2500 | 2500 | ||
| 2501 | return -EINVAL; | 2501 | return -EINVAL; |
| 2502 | } | 2502 | } |
| @@ -4639,7 +4639,7 @@ static int dispc_errata_i734_wa_init(struct dispc_device *dispc) | |||
| 4639 | i734_buf.size, &i734_buf.paddr, | 4639 | i734_buf.size, &i734_buf.paddr, |
| 4640 | GFP_KERNEL); | 4640 | GFP_KERNEL); |
| 4641 | if (!i734_buf.vaddr) { | 4641 | if (!i734_buf.vaddr) { |
| 4642 | dev_err(&dispc->pdev->dev, "%s: dma_alloc_writecombine failed", | 4642 | dev_err(&dispc->pdev->dev, "%s: dma_alloc_writecombine failed\n", |
| 4643 | __func__); | 4643 | __func__); |
| 4644 | return -ENOMEM; | 4644 | return -ENOMEM; |
| 4645 | } | 4645 | } |
