Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux

[cascardo/linux.git] / drivers / gpu / drm / tegra / dc.c

diff --git a/drivers/gpu/drm/tegra/dc.c b/drivers/gpu/drm/tegra/dc.c
index 2086400..de94707 100644 (file)
--- a/drivers/gpu/drm/tegra/dc.c
+++ b/drivers/gpu/drm/tegra/dc.c
@@ -12,8 +12,7 @@
 #include <linux/module.h>
 #include <linux/of.h>
 #include <linux/platform_device.h>
-
-#include <mach/clk.h>
+#include <linux/clk/tegra.h>
 
 #include "drm.h"
 #include "dc.h"
@@ -500,7 +499,7 @@ int tegra_dc_setup_window(struct tegra_dc *dc, unsigned int index,
                tegra_dc_writel(dc, 0x0000, DC_WIN_CSC_KVB);
 
                value |= CSC_ENABLE;
-       } else if (bpp < 24) {
+       } else if (window->bits_per_pixel < 24) {
                value |= COLOR_EXPAND;
        }
 
@@ -1127,11 +1126,9 @@ static int tegra_dc_probe(struct platform_device *pdev)
                return -ENXIO;
        }
 
-       dc->regs = devm_request_and_ioremap(&pdev->dev, regs);
-       if (!dc->regs) {
-               dev_err(&pdev->dev, "failed to remap registers\n");
-               return -ENXIO;
-       }
+       dc->regs = devm_ioremap_resource(&pdev->dev, regs);
+       if (IS_ERR(dc->regs))
+               return PTR_ERR(dc->regs);
 
        dc->irq = platform_get_irq(pdev, 0);
        if (dc->irq < 0) {