* [PATCH v2 2/4] imx-drm: ipu-dp: Check the return value of devm_kzalloc()
2013-06-28 16:55 [PATCH v2 1/4] imx-drm: imx-drm-core: Export imx_drm_encoder_get_mux_id Fabio Estevam
@ 2013-06-28 16:55 ` Fabio Estevam
2013-06-28 16:55 ` [PATCH v2 3/4] imx-drm: ipu-dp: Remove unneeded braces Fabio Estevam
` (3 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Fabio Estevam @ 2013-06-28 16:55 UTC (permalink / raw)
To: gregkh; +Cc: kernel, shawn.guo, linux-kernel, Fabio Estevam
From: Fabio Estevam <fabio.estevam@freescale.com>
devm_kzalloc() may fail, so let's check its return value.
Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
---
Changes since v1:
- None
drivers/staging/imx-drm/ipu-v3/ipu-dp.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/drivers/staging/imx-drm/ipu-v3/ipu-dp.c b/drivers/staging/imx-drm/ipu-v3/ipu-dp.c
index 113b046..0449515 100644
--- a/drivers/staging/imx-drm/ipu-v3/ipu-dp.c
+++ b/drivers/staging/imx-drm/ipu-v3/ipu-dp.c
@@ -309,6 +309,8 @@ int ipu_dp_init(struct ipu_soc *ipu, struct device *dev, unsigned long base)
int i;
priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL);
+ if (!priv)
+ return -ENOMEM;
priv->dev = dev;
priv->ipu = ipu;
--
1.8.1.2
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH v2 3/4] imx-drm: ipu-dp: Remove unneeded braces
2013-06-28 16:55 [PATCH v2 1/4] imx-drm: imx-drm-core: Export imx_drm_encoder_get_mux_id Fabio Estevam
2013-06-28 16:55 ` [PATCH v2 2/4] imx-drm: ipu-dp: Check the return value of devm_kzalloc() Fabio Estevam
@ 2013-06-28 16:55 ` Fabio Estevam
2013-06-28 16:55 ` [PATCH v2 4/4] imx-drm: ipu-dp: Introduce IPUV3_NUM_FLOWS Fabio Estevam
` (2 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Fabio Estevam @ 2013-06-28 16:55 UTC (permalink / raw)
To: gregkh; +Cc: kernel, shawn.guo, linux-kernel, Fabio Estevam
From: Fabio Estevam <fabio.estevam@freescale.com>
No need to have braces for a single line 'if' block
Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
---
Changes since v1:
- None
drivers/staging/imx-drm/ipu-v3/ipu-dp.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/drivers/staging/imx-drm/ipu-v3/ipu-dp.c b/drivers/staging/imx-drm/ipu-v3/ipu-dp.c
index 0449515..6e0e9f1 100644
--- a/drivers/staging/imx-drm/ipu-v3/ipu-dp.c
+++ b/drivers/staging/imx-drm/ipu-v3/ipu-dp.c
@@ -317,9 +317,8 @@ int ipu_dp_init(struct ipu_soc *ipu, struct device *dev, unsigned long base)
ipu->dp_priv = priv;
priv->base = devm_ioremap(dev, base, PAGE_SIZE);
- if (!priv->base) {
+ if (!priv->base)
return -ENOMEM;
- }
mutex_init(&priv->mutex);
--
1.8.1.2
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH v2 4/4] imx-drm: ipu-dp: Introduce IPUV3_NUM_FLOWS
2013-06-28 16:55 [PATCH v2 1/4] imx-drm: imx-drm-core: Export imx_drm_encoder_get_mux_id Fabio Estevam
2013-06-28 16:55 ` [PATCH v2 2/4] imx-drm: ipu-dp: Check the return value of devm_kzalloc() Fabio Estevam
2013-06-28 16:55 ` [PATCH v2 3/4] imx-drm: ipu-dp: Remove unneeded braces Fabio Estevam
@ 2013-06-28 16:55 ` Fabio Estevam
2013-07-01 7:12 ` [PATCH v2 1/4] imx-drm: imx-drm-core: Export imx_drm_encoder_get_mux_id Philipp Zabel
2013-07-01 8:10 ` Sascha Hauer
4 siblings, 0 replies; 6+ messages in thread
From: Fabio Estevam @ 2013-06-28 16:55 UTC (permalink / raw)
To: gregkh; +Cc: kernel, shawn.guo, linux-kernel, Fabio Estevam
From: Fabio Estevam <fabio.estevam@freescale.com>
IPUv3 has a total of 3 flows (one synchronous flow and 2 asynchronous flows).
Let's add a definition for such number in order to let the code easier to
understand.
Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
---
Changes since v1:
- Merged patches 4 and 5 from previous series
- Fix the comparison logic in 'if ((flow >> 1) >= IPUV3_NUM_FLOWS)'
---
drivers/staging/imx-drm/ipu-v3/ipu-dp.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/drivers/staging/imx-drm/ipu-v3/ipu-dp.c b/drivers/staging/imx-drm/ipu-v3/ipu-dp.c
index 6e0e9f1..231afd6 100644
--- a/drivers/staging/imx-drm/ipu-v3/ipu-dp.c
+++ b/drivers/staging/imx-drm/ipu-v3/ipu-dp.c
@@ -46,6 +46,8 @@
#define DP_COM_CONF_CSC_DEF_BG (2 << 8)
#define DP_COM_CONF_CSC_DEF_BOTH (1 << 8)
+#define IPUV3_NUM_FLOWS 3
+
struct ipu_dp_priv;
struct ipu_dp {
@@ -67,7 +69,7 @@ struct ipu_dp_priv {
struct ipu_soc *ipu;
struct device *dev;
void __iomem *base;
- struct ipu_flow flow[3];
+ struct ipu_flow flow[IPUV3_NUM_FLOWS];
struct mutex mutex;
int use_count;
};
@@ -280,7 +282,7 @@ struct ipu_dp *ipu_dp_get(struct ipu_soc *ipu, unsigned int flow)
struct ipu_dp_priv *priv = ipu->dp_priv;
struct ipu_dp *dp;
- if (flow > 5)
+ if ((flow >> 1) >= IPUV3_NUM_FLOWS)
return ERR_PTR(-EINVAL);
if (flow & 1)
@@ -322,7 +324,7 @@ int ipu_dp_init(struct ipu_soc *ipu, struct device *dev, unsigned long base)
mutex_init(&priv->mutex);
- for (i = 0; i < 3; i++) {
+ for (i = 0; i < IPUV3_NUM_FLOWS; i++) {
priv->flow[i].foreground.foreground = 1;
priv->flow[i].base = priv->base + ipu_dp_flow_base[i];
priv->flow[i].priv = priv;
--
1.8.1.2
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH v2 1/4] imx-drm: imx-drm-core: Export imx_drm_encoder_get_mux_id
2013-06-28 16:55 [PATCH v2 1/4] imx-drm: imx-drm-core: Export imx_drm_encoder_get_mux_id Fabio Estevam
` (2 preceding siblings ...)
2013-06-28 16:55 ` [PATCH v2 4/4] imx-drm: ipu-dp: Introduce IPUV3_NUM_FLOWS Fabio Estevam
@ 2013-07-01 7:12 ` Philipp Zabel
2013-07-01 8:10 ` Sascha Hauer
4 siblings, 0 replies; 6+ messages in thread
From: Philipp Zabel @ 2013-07-01 7:12 UTC (permalink / raw)
To: Fabio Estevam; +Cc: gregkh, kernel, shawn.guo, linux-kernel, Fabio Estevam
Am Freitag, den 28.06.2013, 13:55 -0300 schrieb Fabio Estevam:
> From: Fabio Estevam <fabio.estevam@freescale.com>
>
> When building imx_v6_v7_defconfig with imx-drm drivers selected as modules, we
> get the following build error:
>
> ERROR: "imx_drm_encoder_get_mux_id" [drivers/staging/imx-drm/imx-ldb.ko] undefined!
>
> Export the required function to avoid this problem.
>
> Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
> ---
> Changes since v1:
> - None
>
> drivers/staging/imx-drm/imx-drm-core.c | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/drivers/staging/imx-drm/imx-drm-core.c b/drivers/staging/imx-drm/imx-drm-core.c
> index 9854a1d..6bc205b 100644
> --- a/drivers/staging/imx-drm/imx-drm-core.c
> +++ b/drivers/staging/imx-drm/imx-drm-core.c
> @@ -678,6 +678,7 @@ found:
>
> return i;
> }
> +EXPORT_SYMBOL_GPL(imx_drm_encoder_get_mux_id);
>
> /*
> * imx_drm_remove_encoder - remove an encoder
All four
Acked-by: Philipp Zabel <p.zabel@pengutronix.de>
regards
Philipp
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH v2 1/4] imx-drm: imx-drm-core: Export imx_drm_encoder_get_mux_id
2013-06-28 16:55 [PATCH v2 1/4] imx-drm: imx-drm-core: Export imx_drm_encoder_get_mux_id Fabio Estevam
` (3 preceding siblings ...)
2013-07-01 7:12 ` [PATCH v2 1/4] imx-drm: imx-drm-core: Export imx_drm_encoder_get_mux_id Philipp Zabel
@ 2013-07-01 8:10 ` Sascha Hauer
4 siblings, 0 replies; 6+ messages in thread
From: Sascha Hauer @ 2013-07-01 8:10 UTC (permalink / raw)
To: Fabio Estevam; +Cc: gregkh, kernel, shawn.guo, linux-kernel, Fabio Estevam
On Fri, Jun 28, 2013 at 01:55:27PM -0300, Fabio Estevam wrote:
> From: Fabio Estevam <fabio.estevam@freescale.com>
>
> When building imx_v6_v7_defconfig with imx-drm drivers selected as modules, we
> get the following build error:
>
> ERROR: "imx_drm_encoder_get_mux_id" [drivers/staging/imx-drm/imx-ldb.ko] undefined!
>
> Export the required function to avoid this problem.
>
> Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
All: Acked-by: Sascha Hauer <s.hauer@pengutronix.de>
Sascha
> ---
> Changes since v1:
> - None
>
> drivers/staging/imx-drm/imx-drm-core.c | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/drivers/staging/imx-drm/imx-drm-core.c b/drivers/staging/imx-drm/imx-drm-core.c
> index 9854a1d..6bc205b 100644
> --- a/drivers/staging/imx-drm/imx-drm-core.c
> +++ b/drivers/staging/imx-drm/imx-drm-core.c
> @@ -678,6 +678,7 @@ found:
>
> return i;
> }
> +EXPORT_SYMBOL_GPL(imx_drm_encoder_get_mux_id);
>
> /*
> * imx_drm_remove_encoder - remove an encoder
> --
> 1.8.1.2
>
>
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
^ permalink raw reply [flat|nested] 6+ messages in thread