diff mbox

[media] OMAP_VOUT: Fix build break caused by update_mode removal in DSS2

Message ID 1312528761-18241-1-git-send-email-archit@ti.com (mailing list archive)
State New, archived
Headers show

Commit Message

archit taneja Aug. 5, 2011, 7:19 a.m. UTC
The DSS2 driver does not support the configuration of the update_mode of a
panel anymore. Remove the setting of update_mode done in omap_vout_probe().
Ignore configuration of TE since omap_vout driver doesn't support manual update
displays anyway.

Signed-off-by: Archit Taneja <archit@ti.com>
---
 drivers/media/video/omap/omap_vout.c |   13 -------------
 1 files changed, 0 insertions(+), 13 deletions(-)

Comments

Koen Kooi Aug. 5, 2011, 6:08 p.m. UTC | #1
Op 5 aug 2011, om 09:19 heeft Archit Taneja het volgende geschreven:

> The DSS2 driver does not support the configuration of the  
> update_mode of a
> panel anymore. Remove the setting of update_mode done in  
> omap_vout_probe().
> Ignore configuration of TE since omap_vout driver doesn't support  
> manual update
> displays anyway.
>
> Signed-off-by: Archit Taneja <archit@ti.com>

Tested-by: Koen Kooi <koen@dominion.thruhere.net>

> ---
> drivers/media/video/omap/omap_vout.c |   13 -------------
> 1 files changed, 0 insertions(+), 13 deletions(-)
>
> diff --git a/drivers/media/video/omap/omap_vout.c b/drivers/media/ 
> video/omap/omap_vout.c
> index b5ef362..b3a5ecd 100644
> --- a/drivers/media/video/omap/omap_vout.c
> +++ b/drivers/media/video/omap/omap_vout.c
> @@ -2194,19 +2194,6 @@ static int __init omap_vout_probe(struct  
> platform_device *pdev)
> 					"'%s' Display already enabled\n",
> 					def_display->name);
> 			}
> -			/* set the update mode */
> -			if (def_display->caps &
> -					OMAP_DSS_DISPLAY_CAP_MANUAL_UPDATE) {
> -				if (dssdrv->enable_te)
> -					dssdrv->enable_te(def_display, 0);
> -				if (dssdrv->set_update_mode)
> -					dssdrv->set_update_mode(def_display,
> -							OMAP_DSS_UPDATE_MANUAL);
> -			} else {
> -				if (dssdrv->set_update_mode)
> -					dssdrv->set_update_mode(def_display,
> -							OMAP_DSS_UPDATE_AUTO);
> -			}
> 		}
> 	}
>
> -- 
> 1.7.1
>

--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Vaibhav Hiremath Aug. 11, 2011, 12:05 p.m. UTC | #2
> -----Original Message-----
> From: Taneja, Archit
> Sent: Friday, August 05, 2011 12:49 PM
> To: Hiremath, Vaibhav; linux-media@vger.kernel.org
> Cc: koen@dominion.thruhere.net; Valkeinen, Tomi; linux-
> omap@vger.kernel.org; Taneja, Archit
> Subject: [PATCH] [media] OMAP_VOUT: Fix build break caused by update_mode
> removal in DSS2
> 
> The DSS2 driver does not support the configuration of the update_mode of a
> panel anymore. Remove the setting of update_mode done in omap_vout_probe().
> Ignore configuration of TE since omap_vout driver doesn't support manual
> update
> displays anyway.
> 
> Signed-off-by: Archit Taneja <archit@ti.com>
> ---
>  drivers/media/video/omap/omap_vout.c |   13 -------------
>  1 files changed, 0 insertions(+), 13 deletions(-)
> 
[Hiremath, Vaibhav] 

Acked-by: Vaibhav Hiremath <hvaibhav@ti.com>
Tested-by: Vaibhav Hiremath <hvaibhav@ti.com>

Since this is bug fix (results in build failure), I will queue up for next rc.

Thanks,
Vaibhav

> diff --git a/drivers/media/video/omap/omap_vout.c
> b/drivers/media/video/omap/omap_vout.c
> index b5ef362..b3a5ecd 100644
> --- a/drivers/media/video/omap/omap_vout.c
> +++ b/drivers/media/video/omap/omap_vout.c
> @@ -2194,19 +2194,6 @@ static int __init omap_vout_probe(struct
> platform_device *pdev)
>  					"'%s' Display already enabled\n",
>  					def_display->name);
>  			}
> -			/* set the update mode */
> -			if (def_display->caps &
> -					OMAP_DSS_DISPLAY_CAP_MANUAL_UPDATE) {
> -				if (dssdrv->enable_te)
> -					dssdrv->enable_te(def_display, 0);
> -				if (dssdrv->set_update_mode)
> -					dssdrv->set_update_mode(def_display,
> -							OMAP_DSS_UPDATE_MANUAL);
> -			} else {
> -				if (dssdrv->set_update_mode)
> -					dssdrv->set_update_mode(def_display,
> -							OMAP_DSS_UPDATE_AUTO);
> -			}
>  		}
>  	}
> 
> --
> 1.7.1

--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/drivers/media/video/omap/omap_vout.c b/drivers/media/video/omap/omap_vout.c
index b5ef362..b3a5ecd 100644
--- a/drivers/media/video/omap/omap_vout.c
+++ b/drivers/media/video/omap/omap_vout.c
@@ -2194,19 +2194,6 @@  static int __init omap_vout_probe(struct platform_device *pdev)
 					"'%s' Display already enabled\n",
 					def_display->name);
 			}
-			/* set the update mode */
-			if (def_display->caps &
-					OMAP_DSS_DISPLAY_CAP_MANUAL_UPDATE) {
-				if (dssdrv->enable_te)
-					dssdrv->enable_te(def_display, 0);
-				if (dssdrv->set_update_mode)
-					dssdrv->set_update_mode(def_display,
-							OMAP_DSS_UPDATE_MANUAL);
-			} else {
-				if (dssdrv->set_update_mode)
-					dssdrv->set_update_mode(def_display,
-							OMAP_DSS_UPDATE_AUTO);
-			}
 		}
 	}