video: tegra: adf: fix build errors
Michael I. Gold [Sat, 8 Nov 2014 00:43:39 +0000 (16:43 -0800)]
Fix internal function calls to match current prototypes.

bug 1459374

Change-Id: Ie2e36d11fcbde6129940b29d40cf389334cb80a7
Signed-off-by: Michael I. Gold <gold@nvidia.com>
Reviewed-on: http://git-master/r/598910
Reviewed-by: Jon Mayo <jmayo@nvidia.com>
Tested-by: Jon Mayo <jmayo@nvidia.com>

drivers/video/tegra/dc/dc.c
drivers/video/tegra/tegra_adf.c

index c8fcc32..eb9cb33 100644 (file)
@@ -4061,7 +4061,7 @@ static int tegra_dc_probe(struct platform_device *ndev)
                if (IS_ERR(dc->adf)) {
                        tegra_dc_io_start(dc);
                        dc->fb = tegra_fb_register(ndev, dc, dc->pdata->fb,
-                               fb_mem, NULL);
+                               fb_mem);
                        tegra_dc_io_end(dc);
                        if (IS_ERR_OR_NULL(dc->fb)) {
                                dc->fb = NULL;
index 3630b68..205ed68 100644 (file)
@@ -728,7 +728,7 @@ static void tegra_adf_dev_post(struct adf_device *dev, struct adf_post *cfg,
 
        if (!skip_flip) {
                tegra_dc_update_windows(wins, nr_win,
-                       data->dirty_rect_valid ? data->dirty_rect : NULL);
+                       data->dirty_rect_valid ? data->dirty_rect : NULL, true);
                /* TODO: implement swapinterval here */
                tegra_dc_sync_windows(wins, nr_win);
                tegra_dc_program_bandwidth(adf_info->dc, true);
@@ -969,6 +969,7 @@ static const char *tegra_adf_intf_type_str(struct adf_interface *intf)
        }
 }
 
+#if IS_ENABLED(CONFIG_ADF_TEGRA_FBDEV)
 static int tegra_adf_dpms_to_fb_blank(u8 dpms_state)
 {
        switch (dpms_state) {
@@ -984,6 +985,7 @@ static int tegra_adf_dpms_to_fb_blank(u8 dpms_state)
                BUG();
        }
 }
+#endif
 
 static int tegra_adf_intf_blank(struct adf_interface *intf, u8 state)
 {