* [PATCH 1/2] Return from mtk_ovl_layer_config after mtk_ovl_layer_off
@ 2019-12-11 15:49 ` Mark Yacoub
0 siblings, 0 replies; 22+ messages in thread
From: Mark Yacoub @ 2019-12-11 15:49 UTC (permalink / raw)
To: CK Hu, dri-devel
Cc: Daniele Castagna, Philipp Zabel, David Airlie, Sean Paul,
Daniel Vetter, Matthias Brugger, linux-mediatek,
linux-arm-kernel, Mark Yacoub
drm/mediatek: return if plane pending state is disabled.
If the plane pending state is disabled, call mtk_ovl_layer_off then
return.
This guarantees that that the state is valid for all operations when the
pending state is enabled.
Suggested-by: Sean Paul <seanpaul@chromium.org>
To: CK Hu <ck.hu@mediatek.com>
To: dri-devel@lists.freedesktop.org
Cc: Daniele Castagna <dcastagna@chromium.org>
Cc: Philipp Zabel <p.zabel@pengutronix.de>
Cc: David Airlie <airlied@linux.ie>
Cc: Daniel Vetter <daniel@ffwll.ch>
Cc: Matthias Brugger <matthias.bgg@gmail.com>
Cc: linux-arm-kernel@lists.infradead.org
Cc: linux-mediatek@lists.infradead.org
Signed-off-by: Mark Yacoub <markyacoub@google.com>
---
drivers/gpu/drm/mediatek/mtk_disp_ovl.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/drivers/gpu/drm/mediatek/mtk_disp_ovl.c b/drivers/gpu/drm/mediatek/mtk_disp_ovl.c
index 4a55bb6e2213..526b595eeff9 100644
--- a/drivers/gpu/drm/mediatek/mtk_disp_ovl.c
+++ b/drivers/gpu/drm/mediatek/mtk_disp_ovl.c
@@ -260,8 +260,10 @@ static void mtk_ovl_layer_config(struct mtk_ddp_comp *comp, unsigned int idx,
unsigned int src_size = (pending->height << 16) | pending->width;
unsigned int con;
- if (!pending->enable)
+ if (!pending->enable) {
mtk_ovl_layer_off(comp, idx);
+ return;
+ }
con = ovl_fmt_convert(ovl, fmt);
if (idx != 0)
@@ -283,8 +285,7 @@ static void mtk_ovl_layer_config(struct mtk_ddp_comp *comp, unsigned int idx,
writel_relaxed(offset, comp->regs + DISP_REG_OVL_OFFSET(idx));
writel_relaxed(addr, comp->regs + DISP_REG_OVL_ADDR(ovl, idx));
- if (pending->enable)
- mtk_ovl_layer_on(comp, idx);
+ mtk_ovl_layer_on(comp, idx);
}
static void mtk_ovl_bgclr_in_on(struct mtk_ddp_comp *comp)
--
2.24.0.525.g8f36a354ae-goog
_______________________________________________
Linux-mediatek mailing list
Linux-mediatek@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-mediatek
^ permalink raw reply related [flat|nested] 22+ messages in thread
* [PATCH 1/2] Return from mtk_ovl_layer_config after mtk_ovl_layer_off
@ 2019-12-11 15:49 ` Mark Yacoub
0 siblings, 0 replies; 22+ messages in thread
From: Mark Yacoub @ 2019-12-11 15:49 UTC (permalink / raw)
To: CK Hu, dri-devel
Cc: Daniele Castagna, Philipp Zabel, David Airlie, Sean Paul,
Daniel Vetter, Matthias Brugger, linux-mediatek,
linux-arm-kernel, Mark Yacoub
drm/mediatek: return if plane pending state is disabled.
If the plane pending state is disabled, call mtk_ovl_layer_off then
return.
This guarantees that that the state is valid for all operations when the
pending state is enabled.
Suggested-by: Sean Paul <seanpaul@chromium.org>
To: CK Hu <ck.hu@mediatek.com>
To: dri-devel@lists.freedesktop.org
Cc: Daniele Castagna <dcastagna@chromium.org>
Cc: Philipp Zabel <p.zabel@pengutronix.de>
Cc: David Airlie <airlied@linux.ie>
Cc: Daniel Vetter <daniel@ffwll.ch>
Cc: Matthias Brugger <matthias.bgg@gmail.com>
Cc: linux-arm-kernel@lists.infradead.org
Cc: linux-mediatek@lists.infradead.org
Signed-off-by: Mark Yacoub <markyacoub@google.com>
---
drivers/gpu/drm/mediatek/mtk_disp_ovl.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/drivers/gpu/drm/mediatek/mtk_disp_ovl.c b/drivers/gpu/drm/mediatek/mtk_disp_ovl.c
index 4a55bb6e2213..526b595eeff9 100644
--- a/drivers/gpu/drm/mediatek/mtk_disp_ovl.c
+++ b/drivers/gpu/drm/mediatek/mtk_disp_ovl.c
@@ -260,8 +260,10 @@ static void mtk_ovl_layer_config(struct mtk_ddp_comp *comp, unsigned int idx,
unsigned int src_size = (pending->height << 16) | pending->width;
unsigned int con;
- if (!pending->enable)
+ if (!pending->enable) {
mtk_ovl_layer_off(comp, idx);
+ return;
+ }
con = ovl_fmt_convert(ovl, fmt);
if (idx != 0)
@@ -283,8 +285,7 @@ static void mtk_ovl_layer_config(struct mtk_ddp_comp *comp, unsigned int idx,
writel_relaxed(offset, comp->regs + DISP_REG_OVL_OFFSET(idx));
writel_relaxed(addr, comp->regs + DISP_REG_OVL_ADDR(ovl, idx));
- if (pending->enable)
- mtk_ovl_layer_on(comp, idx);
+ mtk_ovl_layer_on(comp, idx);
}
static void mtk_ovl_bgclr_in_on(struct mtk_ddp_comp *comp)
--
2.24.0.525.g8f36a354ae-goog
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 22+ messages in thread
* [PATCH 1/2] Return from mtk_ovl_layer_config after mtk_ovl_layer_off
@ 2019-12-11 15:49 ` Mark Yacoub
0 siblings, 0 replies; 22+ messages in thread
From: Mark Yacoub @ 2019-12-11 15:49 UTC (permalink / raw)
To: CK Hu, dri-devel
Cc: Daniele Castagna, David Airlie, Sean Paul, Matthias Brugger,
linux-mediatek, linux-arm-kernel, Mark Yacoub
drm/mediatek: return if plane pending state is disabled.
If the plane pending state is disabled, call mtk_ovl_layer_off then
return.
This guarantees that that the state is valid for all operations when the
pending state is enabled.
Suggested-by: Sean Paul <seanpaul@chromium.org>
To: CK Hu <ck.hu@mediatek.com>
To: dri-devel@lists.freedesktop.org
Cc: Daniele Castagna <dcastagna@chromium.org>
Cc: Philipp Zabel <p.zabel@pengutronix.de>
Cc: David Airlie <airlied@linux.ie>
Cc: Daniel Vetter <daniel@ffwll.ch>
Cc: Matthias Brugger <matthias.bgg@gmail.com>
Cc: linux-arm-kernel@lists.infradead.org
Cc: linux-mediatek@lists.infradead.org
Signed-off-by: Mark Yacoub <markyacoub@google.com>
---
drivers/gpu/drm/mediatek/mtk_disp_ovl.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/drivers/gpu/drm/mediatek/mtk_disp_ovl.c b/drivers/gpu/drm/mediatek/mtk_disp_ovl.c
index 4a55bb6e2213..526b595eeff9 100644
--- a/drivers/gpu/drm/mediatek/mtk_disp_ovl.c
+++ b/drivers/gpu/drm/mediatek/mtk_disp_ovl.c
@@ -260,8 +260,10 @@ static void mtk_ovl_layer_config(struct mtk_ddp_comp *comp, unsigned int idx,
unsigned int src_size = (pending->height << 16) | pending->width;
unsigned int con;
- if (!pending->enable)
+ if (!pending->enable) {
mtk_ovl_layer_off(comp, idx);
+ return;
+ }
con = ovl_fmt_convert(ovl, fmt);
if (idx != 0)
@@ -283,8 +285,7 @@ static void mtk_ovl_layer_config(struct mtk_ddp_comp *comp, unsigned int idx,
writel_relaxed(offset, comp->regs + DISP_REG_OVL_OFFSET(idx));
writel_relaxed(addr, comp->regs + DISP_REG_OVL_ADDR(ovl, idx));
- if (pending->enable)
- mtk_ovl_layer_on(comp, idx);
+ mtk_ovl_layer_on(comp, idx);
}
static void mtk_ovl_bgclr_in_on(struct mtk_ddp_comp *comp)
--
2.24.0.525.g8f36a354ae-goog
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply related [flat|nested] 22+ messages in thread
* [PATCH 2/2] Turn off Alpha bit when plane format has no alpha
2019-12-11 15:49 ` Mark Yacoub
(?)
@ 2019-12-11 15:49 ` Mark Yacoub
-1 siblings, 0 replies; 22+ messages in thread
From: Mark Yacoub @ 2019-12-11 15:49 UTC (permalink / raw)
To: CK Hu, dri-devel
Cc: Daniele Castagna, Philipp Zabel, David Airlie, Sean Paul,
Daniel Vetter, Matthias Brugger, linux-mediatek,
linux-arm-kernel, Mark Yacoub
drm/mediatek: Add OVL_CON_ALPHA only when the plane format has_alpha.
This change enables XR24 format to be displayed as an overlay on top of
the primary plane.
Suggested-by: Sean Paul <seanpaul@chromium.org>
To: CK Hu <ck.hu@mediatek.com>
To: dri-devel@lists.freedesktop.org
Cc: Daniele Castagna <dcastagna@chromium.org>
Cc: Philipp Zabel <p.zabel@pengutronix.de>
Cc: David Airlie <airlied@linux.ie>
Cc: Daniel Vetter <daniel@ffwll.ch>
Cc: Matthias Brugger <matthias.bgg@gmail.com>
Cc: linux-arm-kernel@lists.infradead.org
Cc: linux-mediatek@lists.infradead.org
Signed-off-by: Mark Yacoub <markyacoub@google.com>
---
drivers/gpu/drm/mediatek/mtk_disp_ovl.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/mediatek/mtk_disp_ovl.c b/drivers/gpu/drm/mediatek/mtk_disp_ovl.c
index 526b595eeff9..a7851756dddf 100644
--- a/drivers/gpu/drm/mediatek/mtk_disp_ovl.c
+++ b/drivers/gpu/drm/mediatek/mtk_disp_ovl.c
@@ -266,7 +266,7 @@ static void mtk_ovl_layer_config(struct mtk_ddp_comp *comp, unsigned int idx,
}
con = ovl_fmt_convert(ovl, fmt);
- if (idx != 0)
+ if (state->base.fb->format->has_alpha)
con |= OVL_CON_AEN | OVL_CON_ALPHA;
if (pending->rotation & DRM_MODE_REFLECT_Y) {
--
2.24.0.525.g8f36a354ae-goog
_______________________________________________
Linux-mediatek mailing list
Linux-mediatek@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-mediatek
^ permalink raw reply related [flat|nested] 22+ messages in thread
* [PATCH 2/2] Turn off Alpha bit when plane format has no alpha
@ 2019-12-11 15:49 ` Mark Yacoub
0 siblings, 0 replies; 22+ messages in thread
From: Mark Yacoub @ 2019-12-11 15:49 UTC (permalink / raw)
To: CK Hu, dri-devel
Cc: Daniele Castagna, Philipp Zabel, David Airlie, Sean Paul,
Daniel Vetter, Matthias Brugger, linux-mediatek,
linux-arm-kernel, Mark Yacoub
drm/mediatek: Add OVL_CON_ALPHA only when the plane format has_alpha.
This change enables XR24 format to be displayed as an overlay on top of
the primary plane.
Suggested-by: Sean Paul <seanpaul@chromium.org>
To: CK Hu <ck.hu@mediatek.com>
To: dri-devel@lists.freedesktop.org
Cc: Daniele Castagna <dcastagna@chromium.org>
Cc: Philipp Zabel <p.zabel@pengutronix.de>
Cc: David Airlie <airlied@linux.ie>
Cc: Daniel Vetter <daniel@ffwll.ch>
Cc: Matthias Brugger <matthias.bgg@gmail.com>
Cc: linux-arm-kernel@lists.infradead.org
Cc: linux-mediatek@lists.infradead.org
Signed-off-by: Mark Yacoub <markyacoub@google.com>
---
drivers/gpu/drm/mediatek/mtk_disp_ovl.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/mediatek/mtk_disp_ovl.c b/drivers/gpu/drm/mediatek/mtk_disp_ovl.c
index 526b595eeff9..a7851756dddf 100644
--- a/drivers/gpu/drm/mediatek/mtk_disp_ovl.c
+++ b/drivers/gpu/drm/mediatek/mtk_disp_ovl.c
@@ -266,7 +266,7 @@ static void mtk_ovl_layer_config(struct mtk_ddp_comp *comp, unsigned int idx,
}
con = ovl_fmt_convert(ovl, fmt);
- if (idx != 0)
+ if (state->base.fb->format->has_alpha)
con |= OVL_CON_AEN | OVL_CON_ALPHA;
if (pending->rotation & DRM_MODE_REFLECT_Y) {
--
2.24.0.525.g8f36a354ae-goog
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 22+ messages in thread
* [PATCH 2/2] Turn off Alpha bit when plane format has no alpha
@ 2019-12-11 15:49 ` Mark Yacoub
0 siblings, 0 replies; 22+ messages in thread
From: Mark Yacoub @ 2019-12-11 15:49 UTC (permalink / raw)
To: CK Hu, dri-devel
Cc: Daniele Castagna, David Airlie, Sean Paul, Matthias Brugger,
linux-mediatek, linux-arm-kernel, Mark Yacoub
drm/mediatek: Add OVL_CON_ALPHA only when the plane format has_alpha.
This change enables XR24 format to be displayed as an overlay on top of
the primary plane.
Suggested-by: Sean Paul <seanpaul@chromium.org>
To: CK Hu <ck.hu@mediatek.com>
To: dri-devel@lists.freedesktop.org
Cc: Daniele Castagna <dcastagna@chromium.org>
Cc: Philipp Zabel <p.zabel@pengutronix.de>
Cc: David Airlie <airlied@linux.ie>
Cc: Daniel Vetter <daniel@ffwll.ch>
Cc: Matthias Brugger <matthias.bgg@gmail.com>
Cc: linux-arm-kernel@lists.infradead.org
Cc: linux-mediatek@lists.infradead.org
Signed-off-by: Mark Yacoub <markyacoub@google.com>
---
drivers/gpu/drm/mediatek/mtk_disp_ovl.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/mediatek/mtk_disp_ovl.c b/drivers/gpu/drm/mediatek/mtk_disp_ovl.c
index 526b595eeff9..a7851756dddf 100644
--- a/drivers/gpu/drm/mediatek/mtk_disp_ovl.c
+++ b/drivers/gpu/drm/mediatek/mtk_disp_ovl.c
@@ -266,7 +266,7 @@ static void mtk_ovl_layer_config(struct mtk_ddp_comp *comp, unsigned int idx,
}
con = ovl_fmt_convert(ovl, fmt);
- if (idx != 0)
+ if (state->base.fb->format->has_alpha)
con |= OVL_CON_AEN | OVL_CON_ALPHA;
if (pending->rotation & DRM_MODE_REFLECT_Y) {
--
2.24.0.525.g8f36a354ae-goog
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply related [flat|nested] 22+ messages in thread
* Re: [PATCH 1/2] Return from mtk_ovl_layer_config after mtk_ovl_layer_off
2019-12-11 15:49 ` Mark Yacoub
(?)
@ 2019-12-12 4:45 ` CK Hu
-1 siblings, 0 replies; 22+ messages in thread
From: CK Hu @ 2019-12-12 4:45 UTC (permalink / raw)
To: Mark Yacoub
Cc: Daniele Castagna, Philipp Zabel, David Airlie, dri-devel,
Sean Paul, Daniel Vetter, Matthias Brugger, linux-mediatek,
linux-arm-kernel
Hi, Mark:
On Wed, 2019-12-11 at 10:49 -0500, Mark Yacoub wrote:
> drm/mediatek: return if plane pending state is disabled.
>
> If the plane pending state is disabled, call mtk_ovl_layer_off then
> return.
> This guarantees that that the state is valid for all operations when the
> pending state is enabled.
Reviewed-by: CK Hu <ck.hu@mediatek.com>
>
> Suggested-by: Sean Paul <seanpaul@chromium.org>
> To: CK Hu <ck.hu@mediatek.com>
> To: dri-devel@lists.freedesktop.org
> Cc: Daniele Castagna <dcastagna@chromium.org>
> Cc: Philipp Zabel <p.zabel@pengutronix.de>
> Cc: David Airlie <airlied@linux.ie>
> Cc: Daniel Vetter <daniel@ffwll.ch>
> Cc: Matthias Brugger <matthias.bgg@gmail.com>
> Cc: linux-arm-kernel@lists.infradead.org
> Cc: linux-mediatek@lists.infradead.org
> Signed-off-by: Mark Yacoub <markyacoub@google.com>
> ---
> drivers/gpu/drm/mediatek/mtk_disp_ovl.c | 7 ++++---
> 1 file changed, 4 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/gpu/drm/mediatek/mtk_disp_ovl.c b/drivers/gpu/drm/mediatek/mtk_disp_ovl.c
> index 4a55bb6e2213..526b595eeff9 100644
> --- a/drivers/gpu/drm/mediatek/mtk_disp_ovl.c
> +++ b/drivers/gpu/drm/mediatek/mtk_disp_ovl.c
> @@ -260,8 +260,10 @@ static void mtk_ovl_layer_config(struct mtk_ddp_comp *comp, unsigned int idx,
> unsigned int src_size = (pending->height << 16) | pending->width;
> unsigned int con;
>
> - if (!pending->enable)
> + if (!pending->enable) {
> mtk_ovl_layer_off(comp, idx);
> + return;
> + }
>
> con = ovl_fmt_convert(ovl, fmt);
> if (idx != 0)
> @@ -283,8 +285,7 @@ static void mtk_ovl_layer_config(struct mtk_ddp_comp *comp, unsigned int idx,
> writel_relaxed(offset, comp->regs + DISP_REG_OVL_OFFSET(idx));
> writel_relaxed(addr, comp->regs + DISP_REG_OVL_ADDR(ovl, idx));
>
> - if (pending->enable)
> - mtk_ovl_layer_on(comp, idx);
> + mtk_ovl_layer_on(comp, idx);
> }
>
> static void mtk_ovl_bgclr_in_on(struct mtk_ddp_comp *comp)
_______________________________________________
Linux-mediatek mailing list
Linux-mediatek@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-mediatek
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PATCH 1/2] Return from mtk_ovl_layer_config after mtk_ovl_layer_off
@ 2019-12-12 4:45 ` CK Hu
0 siblings, 0 replies; 22+ messages in thread
From: CK Hu @ 2019-12-12 4:45 UTC (permalink / raw)
To: Mark Yacoub
Cc: Daniele Castagna, Philipp Zabel, David Airlie, dri-devel,
Sean Paul, Daniel Vetter, Matthias Brugger, linux-mediatek,
linux-arm-kernel
Hi, Mark:
On Wed, 2019-12-11 at 10:49 -0500, Mark Yacoub wrote:
> drm/mediatek: return if plane pending state is disabled.
>
> If the plane pending state is disabled, call mtk_ovl_layer_off then
> return.
> This guarantees that that the state is valid for all operations when the
> pending state is enabled.
Reviewed-by: CK Hu <ck.hu@mediatek.com>
>
> Suggested-by: Sean Paul <seanpaul@chromium.org>
> To: CK Hu <ck.hu@mediatek.com>
> To: dri-devel@lists.freedesktop.org
> Cc: Daniele Castagna <dcastagna@chromium.org>
> Cc: Philipp Zabel <p.zabel@pengutronix.de>
> Cc: David Airlie <airlied@linux.ie>
> Cc: Daniel Vetter <daniel@ffwll.ch>
> Cc: Matthias Brugger <matthias.bgg@gmail.com>
> Cc: linux-arm-kernel@lists.infradead.org
> Cc: linux-mediatek@lists.infradead.org
> Signed-off-by: Mark Yacoub <markyacoub@google.com>
> ---
> drivers/gpu/drm/mediatek/mtk_disp_ovl.c | 7 ++++---
> 1 file changed, 4 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/gpu/drm/mediatek/mtk_disp_ovl.c b/drivers/gpu/drm/mediatek/mtk_disp_ovl.c
> index 4a55bb6e2213..526b595eeff9 100644
> --- a/drivers/gpu/drm/mediatek/mtk_disp_ovl.c
> +++ b/drivers/gpu/drm/mediatek/mtk_disp_ovl.c
> @@ -260,8 +260,10 @@ static void mtk_ovl_layer_config(struct mtk_ddp_comp *comp, unsigned int idx,
> unsigned int src_size = (pending->height << 16) | pending->width;
> unsigned int con;
>
> - if (!pending->enable)
> + if (!pending->enable) {
> mtk_ovl_layer_off(comp, idx);
> + return;
> + }
>
> con = ovl_fmt_convert(ovl, fmt);
> if (idx != 0)
> @@ -283,8 +285,7 @@ static void mtk_ovl_layer_config(struct mtk_ddp_comp *comp, unsigned int idx,
> writel_relaxed(offset, comp->regs + DISP_REG_OVL_OFFSET(idx));
> writel_relaxed(addr, comp->regs + DISP_REG_OVL_ADDR(ovl, idx));
>
> - if (pending->enable)
> - mtk_ovl_layer_on(comp, idx);
> + mtk_ovl_layer_on(comp, idx);
> }
>
> static void mtk_ovl_bgclr_in_on(struct mtk_ddp_comp *comp)
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PATCH 1/2] Return from mtk_ovl_layer_config after mtk_ovl_layer_off
@ 2019-12-12 4:45 ` CK Hu
0 siblings, 0 replies; 22+ messages in thread
From: CK Hu @ 2019-12-12 4:45 UTC (permalink / raw)
To: Mark Yacoub
Cc: Daniele Castagna, David Airlie, dri-devel, Sean Paul,
Matthias Brugger, linux-mediatek, linux-arm-kernel
Hi, Mark:
On Wed, 2019-12-11 at 10:49 -0500, Mark Yacoub wrote:
> drm/mediatek: return if plane pending state is disabled.
>
> If the plane pending state is disabled, call mtk_ovl_layer_off then
> return.
> This guarantees that that the state is valid for all operations when the
> pending state is enabled.
Reviewed-by: CK Hu <ck.hu@mediatek.com>
>
> Suggested-by: Sean Paul <seanpaul@chromium.org>
> To: CK Hu <ck.hu@mediatek.com>
> To: dri-devel@lists.freedesktop.org
> Cc: Daniele Castagna <dcastagna@chromium.org>
> Cc: Philipp Zabel <p.zabel@pengutronix.de>
> Cc: David Airlie <airlied@linux.ie>
> Cc: Daniel Vetter <daniel@ffwll.ch>
> Cc: Matthias Brugger <matthias.bgg@gmail.com>
> Cc: linux-arm-kernel@lists.infradead.org
> Cc: linux-mediatek@lists.infradead.org
> Signed-off-by: Mark Yacoub <markyacoub@google.com>
> ---
> drivers/gpu/drm/mediatek/mtk_disp_ovl.c | 7 ++++---
> 1 file changed, 4 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/gpu/drm/mediatek/mtk_disp_ovl.c b/drivers/gpu/drm/mediatek/mtk_disp_ovl.c
> index 4a55bb6e2213..526b595eeff9 100644
> --- a/drivers/gpu/drm/mediatek/mtk_disp_ovl.c
> +++ b/drivers/gpu/drm/mediatek/mtk_disp_ovl.c
> @@ -260,8 +260,10 @@ static void mtk_ovl_layer_config(struct mtk_ddp_comp *comp, unsigned int idx,
> unsigned int src_size = (pending->height << 16) | pending->width;
> unsigned int con;
>
> - if (!pending->enable)
> + if (!pending->enable) {
> mtk_ovl_layer_off(comp, idx);
> + return;
> + }
>
> con = ovl_fmt_convert(ovl, fmt);
> if (idx != 0)
> @@ -283,8 +285,7 @@ static void mtk_ovl_layer_config(struct mtk_ddp_comp *comp, unsigned int idx,
> writel_relaxed(offset, comp->regs + DISP_REG_OVL_OFFSET(idx));
> writel_relaxed(addr, comp->regs + DISP_REG_OVL_ADDR(ovl, idx));
>
> - if (pending->enable)
> - mtk_ovl_layer_on(comp, idx);
> + mtk_ovl_layer_on(comp, idx);
> }
>
> static void mtk_ovl_bgclr_in_on(struct mtk_ddp_comp *comp)
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PATCH 2/2] Turn off Alpha bit when plane format has no alpha
2019-12-11 15:49 ` Mark Yacoub
(?)
@ 2019-12-12 4:45 ` CK Hu
-1 siblings, 0 replies; 22+ messages in thread
From: CK Hu @ 2019-12-12 4:45 UTC (permalink / raw)
To: Mark Yacoub
Cc: Daniele Castagna, Philipp Zabel, David Airlie, dri-devel,
Sean Paul, Daniel Vetter, Matthias Brugger, linux-mediatek,
linux-arm-kernel
Hi, Mark:
On Wed, 2019-12-11 at 10:49 -0500, Mark Yacoub wrote:
> drm/mediatek: Add OVL_CON_ALPHA only when the plane format has_alpha.
>
> This change enables XR24 format to be displayed as an overlay on top of
> the primary plane.
Reviewed-by: CK Hu <ck.hu@mediatek.com>
>
> Suggested-by: Sean Paul <seanpaul@chromium.org>
> To: CK Hu <ck.hu@mediatek.com>
> To: dri-devel@lists.freedesktop.org
> Cc: Daniele Castagna <dcastagna@chromium.org>
> Cc: Philipp Zabel <p.zabel@pengutronix.de>
> Cc: David Airlie <airlied@linux.ie>
> Cc: Daniel Vetter <daniel@ffwll.ch>
> Cc: Matthias Brugger <matthias.bgg@gmail.com>
> Cc: linux-arm-kernel@lists.infradead.org
> Cc: linux-mediatek@lists.infradead.org
> Signed-off-by: Mark Yacoub <markyacoub@google.com>
> ---
> drivers/gpu/drm/mediatek/mtk_disp_ovl.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/mediatek/mtk_disp_ovl.c b/drivers/gpu/drm/mediatek/mtk_disp_ovl.c
> index 526b595eeff9..a7851756dddf 100644
> --- a/drivers/gpu/drm/mediatek/mtk_disp_ovl.c
> +++ b/drivers/gpu/drm/mediatek/mtk_disp_ovl.c
> @@ -266,7 +266,7 @@ static void mtk_ovl_layer_config(struct mtk_ddp_comp *comp, unsigned int idx,
> }
>
> con = ovl_fmt_convert(ovl, fmt);
> - if (idx != 0)
> + if (state->base.fb->format->has_alpha)
> con |= OVL_CON_AEN | OVL_CON_ALPHA;
>
> if (pending->rotation & DRM_MODE_REFLECT_Y) {
_______________________________________________
Linux-mediatek mailing list
Linux-mediatek@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-mediatek
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PATCH 2/2] Turn off Alpha bit when plane format has no alpha
@ 2019-12-12 4:45 ` CK Hu
0 siblings, 0 replies; 22+ messages in thread
From: CK Hu @ 2019-12-12 4:45 UTC (permalink / raw)
To: Mark Yacoub
Cc: Daniele Castagna, Philipp Zabel, David Airlie, dri-devel,
Sean Paul, Daniel Vetter, Matthias Brugger, linux-mediatek,
linux-arm-kernel
Hi, Mark:
On Wed, 2019-12-11 at 10:49 -0500, Mark Yacoub wrote:
> drm/mediatek: Add OVL_CON_ALPHA only when the plane format has_alpha.
>
> This change enables XR24 format to be displayed as an overlay on top of
> the primary plane.
Reviewed-by: CK Hu <ck.hu@mediatek.com>
>
> Suggested-by: Sean Paul <seanpaul@chromium.org>
> To: CK Hu <ck.hu@mediatek.com>
> To: dri-devel@lists.freedesktop.org
> Cc: Daniele Castagna <dcastagna@chromium.org>
> Cc: Philipp Zabel <p.zabel@pengutronix.de>
> Cc: David Airlie <airlied@linux.ie>
> Cc: Daniel Vetter <daniel@ffwll.ch>
> Cc: Matthias Brugger <matthias.bgg@gmail.com>
> Cc: linux-arm-kernel@lists.infradead.org
> Cc: linux-mediatek@lists.infradead.org
> Signed-off-by: Mark Yacoub <markyacoub@google.com>
> ---
> drivers/gpu/drm/mediatek/mtk_disp_ovl.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/mediatek/mtk_disp_ovl.c b/drivers/gpu/drm/mediatek/mtk_disp_ovl.c
> index 526b595eeff9..a7851756dddf 100644
> --- a/drivers/gpu/drm/mediatek/mtk_disp_ovl.c
> +++ b/drivers/gpu/drm/mediatek/mtk_disp_ovl.c
> @@ -266,7 +266,7 @@ static void mtk_ovl_layer_config(struct mtk_ddp_comp *comp, unsigned int idx,
> }
>
> con = ovl_fmt_convert(ovl, fmt);
> - if (idx != 0)
> + if (state->base.fb->format->has_alpha)
> con |= OVL_CON_AEN | OVL_CON_ALPHA;
>
> if (pending->rotation & DRM_MODE_REFLECT_Y) {
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PATCH 2/2] Turn off Alpha bit when plane format has no alpha
@ 2019-12-12 4:45 ` CK Hu
0 siblings, 0 replies; 22+ messages in thread
From: CK Hu @ 2019-12-12 4:45 UTC (permalink / raw)
To: Mark Yacoub
Cc: Daniele Castagna, David Airlie, dri-devel, Sean Paul,
Matthias Brugger, linux-mediatek, linux-arm-kernel
Hi, Mark:
On Wed, 2019-12-11 at 10:49 -0500, Mark Yacoub wrote:
> drm/mediatek: Add OVL_CON_ALPHA only when the plane format has_alpha.
>
> This change enables XR24 format to be displayed as an overlay on top of
> the primary plane.
Reviewed-by: CK Hu <ck.hu@mediatek.com>
>
> Suggested-by: Sean Paul <seanpaul@chromium.org>
> To: CK Hu <ck.hu@mediatek.com>
> To: dri-devel@lists.freedesktop.org
> Cc: Daniele Castagna <dcastagna@chromium.org>
> Cc: Philipp Zabel <p.zabel@pengutronix.de>
> Cc: David Airlie <airlied@linux.ie>
> Cc: Daniel Vetter <daniel@ffwll.ch>
> Cc: Matthias Brugger <matthias.bgg@gmail.com>
> Cc: linux-arm-kernel@lists.infradead.org
> Cc: linux-mediatek@lists.infradead.org
> Signed-off-by: Mark Yacoub <markyacoub@google.com>
> ---
> drivers/gpu/drm/mediatek/mtk_disp_ovl.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/mediatek/mtk_disp_ovl.c b/drivers/gpu/drm/mediatek/mtk_disp_ovl.c
> index 526b595eeff9..a7851756dddf 100644
> --- a/drivers/gpu/drm/mediatek/mtk_disp_ovl.c
> +++ b/drivers/gpu/drm/mediatek/mtk_disp_ovl.c
> @@ -266,7 +266,7 @@ static void mtk_ovl_layer_config(struct mtk_ddp_comp *comp, unsigned int idx,
> }
>
> con = ovl_fmt_convert(ovl, fmt);
> - if (idx != 0)
> + if (state->base.fb->format->has_alpha)
> con |= OVL_CON_AEN | OVL_CON_ALPHA;
>
> if (pending->rotation & DRM_MODE_REFLECT_Y) {
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PATCH 1/2] Return from mtk_ovl_layer_config after mtk_ovl_layer_off
2019-12-12 4:45 ` CK Hu
(?)
@ 2019-12-12 14:13 ` Sean Paul
-1 siblings, 0 replies; 22+ messages in thread
From: Sean Paul @ 2019-12-12 14:13 UTC (permalink / raw)
To: CK Hu
Cc: Daniele Castagna, David Airlie, dri-devel, Sean Paul,
Matthias Brugger, moderated list:ARM/Mediatek SoC support,
linux-arm-kernel, Mark Yacoub
On Wed, Dec 11, 2019 at 11:45 PM CK Hu <ck.hu@mediatek.com> wrote:
>
> Hi, Mark:
>
> On Wed, 2019-12-11 at 10:49 -0500, Mark Yacoub wrote:
> > drm/mediatek: return if plane pending state is disabled.
> >
> > If the plane pending state is disabled, call mtk_ovl_layer_off then
> > return.
> > This guarantees that that the state is valid for all operations when the
> > pending state is enabled.
>
> Reviewed-by: CK Hu <ck.hu@mediatek.com>
>
Thanks for reviewing these patches, CK. When you apply them to your
tree, could you please fixup the subjects with the correct prefixes?
Both patches are also
Reviewed-by: Sean Paul <seanpaul@chromium.org>
Sean
> >
> > Suggested-by: Sean Paul <seanpaul@chromium.org>
> > To: CK Hu <ck.hu@mediatek.com>
> > To: dri-devel@lists.freedesktop.org
> > Cc: Daniele Castagna <dcastagna@chromium.org>
> > Cc: Philipp Zabel <p.zabel@pengutronix.de>
> > Cc: David Airlie <airlied@linux.ie>
> > Cc: Daniel Vetter <daniel@ffwll.ch>
> > Cc: Matthias Brugger <matthias.bgg@gmail.com>
> > Cc: linux-arm-kernel@lists.infradead.org
> > Cc: linux-mediatek@lists.infradead.org
> > Signed-off-by: Mark Yacoub <markyacoub@google.com>
> > ---
> > drivers/gpu/drm/mediatek/mtk_disp_ovl.c | 7 ++++---
> > 1 file changed, 4 insertions(+), 3 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/mediatek/mtk_disp_ovl.c b/drivers/gpu/drm/mediatek/mtk_disp_ovl.c
> > index 4a55bb6e2213..526b595eeff9 100644
> > --- a/drivers/gpu/drm/mediatek/mtk_disp_ovl.c
> > +++ b/drivers/gpu/drm/mediatek/mtk_disp_ovl.c
> > @@ -260,8 +260,10 @@ static void mtk_ovl_layer_config(struct mtk_ddp_comp *comp, unsigned int idx,
> > unsigned int src_size = (pending->height << 16) | pending->width;
> > unsigned int con;
> >
> > - if (!pending->enable)
> > + if (!pending->enable) {
> > mtk_ovl_layer_off(comp, idx);
> > + return;
> > + }
> >
> > con = ovl_fmt_convert(ovl, fmt);
> > if (idx != 0)
> > @@ -283,8 +285,7 @@ static void mtk_ovl_layer_config(struct mtk_ddp_comp *comp, unsigned int idx,
> > writel_relaxed(offset, comp->regs + DISP_REG_OVL_OFFSET(idx));
> > writel_relaxed(addr, comp->regs + DISP_REG_OVL_ADDR(ovl, idx));
> >
> > - if (pending->enable)
> > - mtk_ovl_layer_on(comp, idx);
> > + mtk_ovl_layer_on(comp, idx);
> > }
> >
> > static void mtk_ovl_bgclr_in_on(struct mtk_ddp_comp *comp)
>
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel
_______________________________________________
Linux-mediatek mailing list
Linux-mediatek@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-mediatek
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PATCH 1/2] Return from mtk_ovl_layer_config after mtk_ovl_layer_off
@ 2019-12-12 14:13 ` Sean Paul
0 siblings, 0 replies; 22+ messages in thread
From: Sean Paul @ 2019-12-12 14:13 UTC (permalink / raw)
To: CK Hu
Cc: Daniele Castagna, David Airlie, dri-devel, Sean Paul,
Matthias Brugger, moderated list:ARM/Mediatek SoC support,
linux-arm-kernel, Mark Yacoub
On Wed, Dec 11, 2019 at 11:45 PM CK Hu <ck.hu@mediatek.com> wrote:
>
> Hi, Mark:
>
> On Wed, 2019-12-11 at 10:49 -0500, Mark Yacoub wrote:
> > drm/mediatek: return if plane pending state is disabled.
> >
> > If the plane pending state is disabled, call mtk_ovl_layer_off then
> > return.
> > This guarantees that that the state is valid for all operations when the
> > pending state is enabled.
>
> Reviewed-by: CK Hu <ck.hu@mediatek.com>
>
Thanks for reviewing these patches, CK. When you apply them to your
tree, could you please fixup the subjects with the correct prefixes?
Both patches are also
Reviewed-by: Sean Paul <seanpaul@chromium.org>
Sean
> >
> > Suggested-by: Sean Paul <seanpaul@chromium.org>
> > To: CK Hu <ck.hu@mediatek.com>
> > To: dri-devel@lists.freedesktop.org
> > Cc: Daniele Castagna <dcastagna@chromium.org>
> > Cc: Philipp Zabel <p.zabel@pengutronix.de>
> > Cc: David Airlie <airlied@linux.ie>
> > Cc: Daniel Vetter <daniel@ffwll.ch>
> > Cc: Matthias Brugger <matthias.bgg@gmail.com>
> > Cc: linux-arm-kernel@lists.infradead.org
> > Cc: linux-mediatek@lists.infradead.org
> > Signed-off-by: Mark Yacoub <markyacoub@google.com>
> > ---
> > drivers/gpu/drm/mediatek/mtk_disp_ovl.c | 7 ++++---
> > 1 file changed, 4 insertions(+), 3 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/mediatek/mtk_disp_ovl.c b/drivers/gpu/drm/mediatek/mtk_disp_ovl.c
> > index 4a55bb6e2213..526b595eeff9 100644
> > --- a/drivers/gpu/drm/mediatek/mtk_disp_ovl.c
> > +++ b/drivers/gpu/drm/mediatek/mtk_disp_ovl.c
> > @@ -260,8 +260,10 @@ static void mtk_ovl_layer_config(struct mtk_ddp_comp *comp, unsigned int idx,
> > unsigned int src_size = (pending->height << 16) | pending->width;
> > unsigned int con;
> >
> > - if (!pending->enable)
> > + if (!pending->enable) {
> > mtk_ovl_layer_off(comp, idx);
> > + return;
> > + }
> >
> > con = ovl_fmt_convert(ovl, fmt);
> > if (idx != 0)
> > @@ -283,8 +285,7 @@ static void mtk_ovl_layer_config(struct mtk_ddp_comp *comp, unsigned int idx,
> > writel_relaxed(offset, comp->regs + DISP_REG_OVL_OFFSET(idx));
> > writel_relaxed(addr, comp->regs + DISP_REG_OVL_ADDR(ovl, idx));
> >
> > - if (pending->enable)
> > - mtk_ovl_layer_on(comp, idx);
> > + mtk_ovl_layer_on(comp, idx);
> > }
> >
> > static void mtk_ovl_bgclr_in_on(struct mtk_ddp_comp *comp)
>
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PATCH 1/2] Return from mtk_ovl_layer_config after mtk_ovl_layer_off
@ 2019-12-12 14:13 ` Sean Paul
0 siblings, 0 replies; 22+ messages in thread
From: Sean Paul @ 2019-12-12 14:13 UTC (permalink / raw)
To: CK Hu
Cc: Daniele Castagna, David Airlie, dri-devel, Sean Paul,
Matthias Brugger, moderated list:ARM/Mediatek SoC support,
linux-arm-kernel, Mark Yacoub
On Wed, Dec 11, 2019 at 11:45 PM CK Hu <ck.hu@mediatek.com> wrote:
>
> Hi, Mark:
>
> On Wed, 2019-12-11 at 10:49 -0500, Mark Yacoub wrote:
> > drm/mediatek: return if plane pending state is disabled.
> >
> > If the plane pending state is disabled, call mtk_ovl_layer_off then
> > return.
> > This guarantees that that the state is valid for all operations when the
> > pending state is enabled.
>
> Reviewed-by: CK Hu <ck.hu@mediatek.com>
>
Thanks for reviewing these patches, CK. When you apply them to your
tree, could you please fixup the subjects with the correct prefixes?
Both patches are also
Reviewed-by: Sean Paul <seanpaul@chromium.org>
Sean
> >
> > Suggested-by: Sean Paul <seanpaul@chromium.org>
> > To: CK Hu <ck.hu@mediatek.com>
> > To: dri-devel@lists.freedesktop.org
> > Cc: Daniele Castagna <dcastagna@chromium.org>
> > Cc: Philipp Zabel <p.zabel@pengutronix.de>
> > Cc: David Airlie <airlied@linux.ie>
> > Cc: Daniel Vetter <daniel@ffwll.ch>
> > Cc: Matthias Brugger <matthias.bgg@gmail.com>
> > Cc: linux-arm-kernel@lists.infradead.org
> > Cc: linux-mediatek@lists.infradead.org
> > Signed-off-by: Mark Yacoub <markyacoub@google.com>
> > ---
> > drivers/gpu/drm/mediatek/mtk_disp_ovl.c | 7 ++++---
> > 1 file changed, 4 insertions(+), 3 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/mediatek/mtk_disp_ovl.c b/drivers/gpu/drm/mediatek/mtk_disp_ovl.c
> > index 4a55bb6e2213..526b595eeff9 100644
> > --- a/drivers/gpu/drm/mediatek/mtk_disp_ovl.c
> > +++ b/drivers/gpu/drm/mediatek/mtk_disp_ovl.c
> > @@ -260,8 +260,10 @@ static void mtk_ovl_layer_config(struct mtk_ddp_comp *comp, unsigned int idx,
> > unsigned int src_size = (pending->height << 16) | pending->width;
> > unsigned int con;
> >
> > - if (!pending->enable)
> > + if (!pending->enable) {
> > mtk_ovl_layer_off(comp, idx);
> > + return;
> > + }
> >
> > con = ovl_fmt_convert(ovl, fmt);
> > if (idx != 0)
> > @@ -283,8 +285,7 @@ static void mtk_ovl_layer_config(struct mtk_ddp_comp *comp, unsigned int idx,
> > writel_relaxed(offset, comp->regs + DISP_REG_OVL_OFFSET(idx));
> > writel_relaxed(addr, comp->regs + DISP_REG_OVL_ADDR(ovl, idx));
> >
> > - if (pending->enable)
> > - mtk_ovl_layer_on(comp, idx);
> > + mtk_ovl_layer_on(comp, idx);
> > }
> >
> > static void mtk_ovl_bgclr_in_on(struct mtk_ddp_comp *comp)
>
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PATCH 1/2] Return from mtk_ovl_layer_config after mtk_ovl_layer_off
2019-12-12 14:13 ` Sean Paul
(?)
@ 2019-12-13 2:34 ` CK Hu
-1 siblings, 0 replies; 22+ messages in thread
From: CK Hu @ 2019-12-13 2:34 UTC (permalink / raw)
To: Sean Paul
Cc: Daniele Castagna, David Airlie, dri-devel, Sean Paul,
Matthias Brugger, moderated list:ARM/Mediatek SoC support,
linux-arm-kernel, Mark Yacoub
Hi, Sean:
On Thu, 2019-12-12 at 09:13 -0500, Sean Paul wrote:
> On Wed, Dec 11, 2019 at 11:45 PM CK Hu <ck.hu@mediatek.com> wrote:
> >
> > Hi, Mark:
> >
> > On Wed, 2019-12-11 at 10:49 -0500, Mark Yacoub wrote:
> > > drm/mediatek: return if plane pending state is disabled.
> > >
> > > If the plane pending state is disabled, call mtk_ovl_layer_off then
> > > return.
> > > This guarantees that that the state is valid for all operations when the
> > > pending state is enabled.
> >
> > Reviewed-by: CK Hu <ck.hu@mediatek.com>
> >
>
> Thanks for reviewing these patches, CK. When you apply them to your
> tree, could you please fixup the subjects with the correct prefixes?
Thanks for your notice. I've already planed to do so.
Regards,
CK
>
> Both patches are also
>
> Reviewed-by: Sean Paul <seanpaul@chromium.org>
>
> Sean
>
> > >
> > > Suggested-by: Sean Paul <seanpaul@chromium.org>
> > > To: CK Hu <ck.hu@mediatek.com>
> > > To: dri-devel@lists.freedesktop.org
> > > Cc: Daniele Castagna <dcastagna@chromium.org>
> > > Cc: Philipp Zabel <p.zabel@pengutronix.de>
> > > Cc: David Airlie <airlied@linux.ie>
> > > Cc: Daniel Vetter <daniel@ffwll.ch>
> > > Cc: Matthias Brugger <matthias.bgg@gmail.com>
> > > Cc: linux-arm-kernel@lists.infradead.org
> > > Cc: linux-mediatek@lists.infradead.org
> > > Signed-off-by: Mark Yacoub <markyacoub@google.com>
> > > ---
> > > drivers/gpu/drm/mediatek/mtk_disp_ovl.c | 7 ++++---
> > > 1 file changed, 4 insertions(+), 3 deletions(-)
> > >
> > > diff --git a/drivers/gpu/drm/mediatek/mtk_disp_ovl.c b/drivers/gpu/drm/mediatek/mtk_disp_ovl.c
> > > index 4a55bb6e2213..526b595eeff9 100644
> > > --- a/drivers/gpu/drm/mediatek/mtk_disp_ovl.c
> > > +++ b/drivers/gpu/drm/mediatek/mtk_disp_ovl.c
> > > @@ -260,8 +260,10 @@ static void mtk_ovl_layer_config(struct mtk_ddp_comp *comp, unsigned int idx,
> > > unsigned int src_size = (pending->height << 16) | pending->width;
> > > unsigned int con;
> > >
> > > - if (!pending->enable)
> > > + if (!pending->enable) {
> > > mtk_ovl_layer_off(comp, idx);
> > > + return;
> > > + }
> > >
> > > con = ovl_fmt_convert(ovl, fmt);
> > > if (idx != 0)
> > > @@ -283,8 +285,7 @@ static void mtk_ovl_layer_config(struct mtk_ddp_comp *comp, unsigned int idx,
> > > writel_relaxed(offset, comp->regs + DISP_REG_OVL_OFFSET(idx));
> > > writel_relaxed(addr, comp->regs + DISP_REG_OVL_ADDR(ovl, idx));
> > >
> > > - if (pending->enable)
> > > - mtk_ovl_layer_on(comp, idx);
> > > + mtk_ovl_layer_on(comp, idx);
> > > }
> > >
> > > static void mtk_ovl_bgclr_in_on(struct mtk_ddp_comp *comp)
> >
> > _______________________________________________
> > dri-devel mailing list
> > dri-devel@lists.freedesktop.org
> > https://lists.freedesktop.org/mailman/listinfo/dri-devel
>
> _______________________________________________
> Linux-mediatek mailing list
> Linux-mediatek@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-mediatek
_______________________________________________
Linux-mediatek mailing list
Linux-mediatek@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-mediatek
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PATCH 1/2] Return from mtk_ovl_layer_config after mtk_ovl_layer_off
@ 2019-12-13 2:34 ` CK Hu
0 siblings, 0 replies; 22+ messages in thread
From: CK Hu @ 2019-12-13 2:34 UTC (permalink / raw)
To: Sean Paul
Cc: Daniele Castagna, David Airlie, dri-devel, Sean Paul,
Matthias Brugger, moderated list:ARM/Mediatek SoC support,
linux-arm-kernel, Mark Yacoub
Hi, Sean:
On Thu, 2019-12-12 at 09:13 -0500, Sean Paul wrote:
> On Wed, Dec 11, 2019 at 11:45 PM CK Hu <ck.hu@mediatek.com> wrote:
> >
> > Hi, Mark:
> >
> > On Wed, 2019-12-11 at 10:49 -0500, Mark Yacoub wrote:
> > > drm/mediatek: return if plane pending state is disabled.
> > >
> > > If the plane pending state is disabled, call mtk_ovl_layer_off then
> > > return.
> > > This guarantees that that the state is valid for all operations when the
> > > pending state is enabled.
> >
> > Reviewed-by: CK Hu <ck.hu@mediatek.com>
> >
>
> Thanks for reviewing these patches, CK. When you apply them to your
> tree, could you please fixup the subjects with the correct prefixes?
Thanks for your notice. I've already planed to do so.
Regards,
CK
>
> Both patches are also
>
> Reviewed-by: Sean Paul <seanpaul@chromium.org>
>
> Sean
>
> > >
> > > Suggested-by: Sean Paul <seanpaul@chromium.org>
> > > To: CK Hu <ck.hu@mediatek.com>
> > > To: dri-devel@lists.freedesktop.org
> > > Cc: Daniele Castagna <dcastagna@chromium.org>
> > > Cc: Philipp Zabel <p.zabel@pengutronix.de>
> > > Cc: David Airlie <airlied@linux.ie>
> > > Cc: Daniel Vetter <daniel@ffwll.ch>
> > > Cc: Matthias Brugger <matthias.bgg@gmail.com>
> > > Cc: linux-arm-kernel@lists.infradead.org
> > > Cc: linux-mediatek@lists.infradead.org
> > > Signed-off-by: Mark Yacoub <markyacoub@google.com>
> > > ---
> > > drivers/gpu/drm/mediatek/mtk_disp_ovl.c | 7 ++++---
> > > 1 file changed, 4 insertions(+), 3 deletions(-)
> > >
> > > diff --git a/drivers/gpu/drm/mediatek/mtk_disp_ovl.c b/drivers/gpu/drm/mediatek/mtk_disp_ovl.c
> > > index 4a55bb6e2213..526b595eeff9 100644
> > > --- a/drivers/gpu/drm/mediatek/mtk_disp_ovl.c
> > > +++ b/drivers/gpu/drm/mediatek/mtk_disp_ovl.c
> > > @@ -260,8 +260,10 @@ static void mtk_ovl_layer_config(struct mtk_ddp_comp *comp, unsigned int idx,
> > > unsigned int src_size = (pending->height << 16) | pending->width;
> > > unsigned int con;
> > >
> > > - if (!pending->enable)
> > > + if (!pending->enable) {
> > > mtk_ovl_layer_off(comp, idx);
> > > + return;
> > > + }
> > >
> > > con = ovl_fmt_convert(ovl, fmt);
> > > if (idx != 0)
> > > @@ -283,8 +285,7 @@ static void mtk_ovl_layer_config(struct mtk_ddp_comp *comp, unsigned int idx,
> > > writel_relaxed(offset, comp->regs + DISP_REG_OVL_OFFSET(idx));
> > > writel_relaxed(addr, comp->regs + DISP_REG_OVL_ADDR(ovl, idx));
> > >
> > > - if (pending->enable)
> > > - mtk_ovl_layer_on(comp, idx);
> > > + mtk_ovl_layer_on(comp, idx);
> > > }
> > >
> > > static void mtk_ovl_bgclr_in_on(struct mtk_ddp_comp *comp)
> >
> > _______________________________________________
> > dri-devel mailing list
> > dri-devel@lists.freedesktop.org
> > https://lists.freedesktop.org/mailman/listinfo/dri-devel
>
> _______________________________________________
> Linux-mediatek mailing list
> Linux-mediatek@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-mediatek
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PATCH 1/2] Return from mtk_ovl_layer_config after mtk_ovl_layer_off
@ 2019-12-13 2:34 ` CK Hu
0 siblings, 0 replies; 22+ messages in thread
From: CK Hu @ 2019-12-13 2:34 UTC (permalink / raw)
To: Sean Paul
Cc: Daniele Castagna, David Airlie, dri-devel, Sean Paul,
Matthias Brugger, moderated list:ARM/Mediatek SoC support,
linux-arm-kernel, Mark Yacoub
Hi, Sean:
On Thu, 2019-12-12 at 09:13 -0500, Sean Paul wrote:
> On Wed, Dec 11, 2019 at 11:45 PM CK Hu <ck.hu@mediatek.com> wrote:
> >
> > Hi, Mark:
> >
> > On Wed, 2019-12-11 at 10:49 -0500, Mark Yacoub wrote:
> > > drm/mediatek: return if plane pending state is disabled.
> > >
> > > If the plane pending state is disabled, call mtk_ovl_layer_off then
> > > return.
> > > This guarantees that that the state is valid for all operations when the
> > > pending state is enabled.
> >
> > Reviewed-by: CK Hu <ck.hu@mediatek.com>
> >
>
> Thanks for reviewing these patches, CK. When you apply them to your
> tree, could you please fixup the subjects with the correct prefixes?
Thanks for your notice. I've already planed to do so.
Regards,
CK
>
> Both patches are also
>
> Reviewed-by: Sean Paul <seanpaul@chromium.org>
>
> Sean
>
> > >
> > > Suggested-by: Sean Paul <seanpaul@chromium.org>
> > > To: CK Hu <ck.hu@mediatek.com>
> > > To: dri-devel@lists.freedesktop.org
> > > Cc: Daniele Castagna <dcastagna@chromium.org>
> > > Cc: Philipp Zabel <p.zabel@pengutronix.de>
> > > Cc: David Airlie <airlied@linux.ie>
> > > Cc: Daniel Vetter <daniel@ffwll.ch>
> > > Cc: Matthias Brugger <matthias.bgg@gmail.com>
> > > Cc: linux-arm-kernel@lists.infradead.org
> > > Cc: linux-mediatek@lists.infradead.org
> > > Signed-off-by: Mark Yacoub <markyacoub@google.com>
> > > ---
> > > drivers/gpu/drm/mediatek/mtk_disp_ovl.c | 7 ++++---
> > > 1 file changed, 4 insertions(+), 3 deletions(-)
> > >
> > > diff --git a/drivers/gpu/drm/mediatek/mtk_disp_ovl.c b/drivers/gpu/drm/mediatek/mtk_disp_ovl.c
> > > index 4a55bb6e2213..526b595eeff9 100644
> > > --- a/drivers/gpu/drm/mediatek/mtk_disp_ovl.c
> > > +++ b/drivers/gpu/drm/mediatek/mtk_disp_ovl.c
> > > @@ -260,8 +260,10 @@ static void mtk_ovl_layer_config(struct mtk_ddp_comp *comp, unsigned int idx,
> > > unsigned int src_size = (pending->height << 16) | pending->width;
> > > unsigned int con;
> > >
> > > - if (!pending->enable)
> > > + if (!pending->enable) {
> > > mtk_ovl_layer_off(comp, idx);
> > > + return;
> > > + }
> > >
> > > con = ovl_fmt_convert(ovl, fmt);
> > > if (idx != 0)
> > > @@ -283,8 +285,7 @@ static void mtk_ovl_layer_config(struct mtk_ddp_comp *comp, unsigned int idx,
> > > writel_relaxed(offset, comp->regs + DISP_REG_OVL_OFFSET(idx));
> > > writel_relaxed(addr, comp->regs + DISP_REG_OVL_ADDR(ovl, idx));
> > >
> > > - if (pending->enable)
> > > - mtk_ovl_layer_on(comp, idx);
> > > + mtk_ovl_layer_on(comp, idx);
> > > }
> > >
> > > static void mtk_ovl_bgclr_in_on(struct mtk_ddp_comp *comp)
> >
> > _______________________________________________
> > dri-devel mailing list
> > dri-devel@lists.freedesktop.org
> > https://lists.freedesktop.org/mailman/listinfo/dri-devel
>
> _______________________________________________
> Linux-mediatek mailing list
> Linux-mediatek@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-mediatek
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PATCH 1/2] Return from mtk_ovl_layer_config after mtk_ovl_layer_off
2019-12-11 15:49 ` Mark Yacoub
(?)
@ 2019-12-25 2:25 ` CK Hu
-1 siblings, 0 replies; 22+ messages in thread
From: CK Hu @ 2019-12-25 2:25 UTC (permalink / raw)
To: Mark Yacoub
Cc: Daniele Castagna, Philipp Zabel, David Airlie, dri-devel,
Sean Paul, Daniel Vetter, Matthias Brugger, linux-mediatek,
linux-arm-kernel
Hi, Mark:
On Wed, 2019-12-11 at 10:49 -0500, Mark Yacoub wrote:
> drm/mediatek: return if plane pending state is disabled.
>
> If the plane pending state is disabled, call mtk_ovl_layer_off then
> return.
> This guarantees that that the state is valid for all operations when the
> pending state is enabled.
For this series, applied to mediatek-drm-next-5.6 [1], thanks.
[1]
https://github.com/ckhu-mediatek/linux.git-tags/commits/mediatek-drm-next-5.6
Regards,
CK
>
> Suggested-by: Sean Paul <seanpaul@chromium.org>
> To: CK Hu <ck.hu@mediatek.com>
> To: dri-devel@lists.freedesktop.org
> Cc: Daniele Castagna <dcastagna@chromium.org>
> Cc: Philipp Zabel <p.zabel@pengutronix.de>
> Cc: David Airlie <airlied@linux.ie>
> Cc: Daniel Vetter <daniel@ffwll.ch>
> Cc: Matthias Brugger <matthias.bgg@gmail.com>
> Cc: linux-arm-kernel@lists.infradead.org
> Cc: linux-mediatek@lists.infradead.org
> Signed-off-by: Mark Yacoub <markyacoub@google.com>
> ---
> drivers/gpu/drm/mediatek/mtk_disp_ovl.c | 7 ++++---
> 1 file changed, 4 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/gpu/drm/mediatek/mtk_disp_ovl.c b/drivers/gpu/drm/mediatek/mtk_disp_ovl.c
> index 4a55bb6e2213..526b595eeff9 100644
> --- a/drivers/gpu/drm/mediatek/mtk_disp_ovl.c
> +++ b/drivers/gpu/drm/mediatek/mtk_disp_ovl.c
> @@ -260,8 +260,10 @@ static void mtk_ovl_layer_config(struct mtk_ddp_comp *comp, unsigned int idx,
> unsigned int src_size = (pending->height << 16) | pending->width;
> unsigned int con;
>
> - if (!pending->enable)
> + if (!pending->enable) {
> mtk_ovl_layer_off(comp, idx);
> + return;
> + }
>
> con = ovl_fmt_convert(ovl, fmt);
> if (idx != 0)
> @@ -283,8 +285,7 @@ static void mtk_ovl_layer_config(struct mtk_ddp_comp *comp, unsigned int idx,
> writel_relaxed(offset, comp->regs + DISP_REG_OVL_OFFSET(idx));
> writel_relaxed(addr, comp->regs + DISP_REG_OVL_ADDR(ovl, idx));
>
> - if (pending->enable)
> - mtk_ovl_layer_on(comp, idx);
> + mtk_ovl_layer_on(comp, idx);
> }
>
> static void mtk_ovl_bgclr_in_on(struct mtk_ddp_comp *comp)
_______________________________________________
Linux-mediatek mailing list
Linux-mediatek@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-mediatek
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PATCH 1/2] Return from mtk_ovl_layer_config after mtk_ovl_layer_off
@ 2019-12-25 2:25 ` CK Hu
0 siblings, 0 replies; 22+ messages in thread
From: CK Hu @ 2019-12-25 2:25 UTC (permalink / raw)
To: Mark Yacoub
Cc: Daniele Castagna, Philipp Zabel, David Airlie, dri-devel,
Sean Paul, Daniel Vetter, Matthias Brugger, linux-mediatek,
linux-arm-kernel
Hi, Mark:
On Wed, 2019-12-11 at 10:49 -0500, Mark Yacoub wrote:
> drm/mediatek: return if plane pending state is disabled.
>
> If the plane pending state is disabled, call mtk_ovl_layer_off then
> return.
> This guarantees that that the state is valid for all operations when the
> pending state is enabled.
For this series, applied to mediatek-drm-next-5.6 [1], thanks.
[1]
https://github.com/ckhu-mediatek/linux.git-tags/commits/mediatek-drm-next-5.6
Regards,
CK
>
> Suggested-by: Sean Paul <seanpaul@chromium.org>
> To: CK Hu <ck.hu@mediatek.com>
> To: dri-devel@lists.freedesktop.org
> Cc: Daniele Castagna <dcastagna@chromium.org>
> Cc: Philipp Zabel <p.zabel@pengutronix.de>
> Cc: David Airlie <airlied@linux.ie>
> Cc: Daniel Vetter <daniel@ffwll.ch>
> Cc: Matthias Brugger <matthias.bgg@gmail.com>
> Cc: linux-arm-kernel@lists.infradead.org
> Cc: linux-mediatek@lists.infradead.org
> Signed-off-by: Mark Yacoub <markyacoub@google.com>
> ---
> drivers/gpu/drm/mediatek/mtk_disp_ovl.c | 7 ++++---
> 1 file changed, 4 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/gpu/drm/mediatek/mtk_disp_ovl.c b/drivers/gpu/drm/mediatek/mtk_disp_ovl.c
> index 4a55bb6e2213..526b595eeff9 100644
> --- a/drivers/gpu/drm/mediatek/mtk_disp_ovl.c
> +++ b/drivers/gpu/drm/mediatek/mtk_disp_ovl.c
> @@ -260,8 +260,10 @@ static void mtk_ovl_layer_config(struct mtk_ddp_comp *comp, unsigned int idx,
> unsigned int src_size = (pending->height << 16) | pending->width;
> unsigned int con;
>
> - if (!pending->enable)
> + if (!pending->enable) {
> mtk_ovl_layer_off(comp, idx);
> + return;
> + }
>
> con = ovl_fmt_convert(ovl, fmt);
> if (idx != 0)
> @@ -283,8 +285,7 @@ static void mtk_ovl_layer_config(struct mtk_ddp_comp *comp, unsigned int idx,
> writel_relaxed(offset, comp->regs + DISP_REG_OVL_OFFSET(idx));
> writel_relaxed(addr, comp->regs + DISP_REG_OVL_ADDR(ovl, idx));
>
> - if (pending->enable)
> - mtk_ovl_layer_on(comp, idx);
> + mtk_ovl_layer_on(comp, idx);
> }
>
> static void mtk_ovl_bgclr_in_on(struct mtk_ddp_comp *comp)
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PATCH 1/2] Return from mtk_ovl_layer_config after mtk_ovl_layer_off
@ 2019-12-25 2:25 ` CK Hu
0 siblings, 0 replies; 22+ messages in thread
From: CK Hu @ 2019-12-25 2:25 UTC (permalink / raw)
To: Mark Yacoub
Cc: Daniele Castagna, David Airlie, dri-devel, Sean Paul,
Matthias Brugger, linux-mediatek, linux-arm-kernel
Hi, Mark:
On Wed, 2019-12-11 at 10:49 -0500, Mark Yacoub wrote:
> drm/mediatek: return if plane pending state is disabled.
>
> If the plane pending state is disabled, call mtk_ovl_layer_off then
> return.
> This guarantees that that the state is valid for all operations when the
> pending state is enabled.
For this series, applied to mediatek-drm-next-5.6 [1], thanks.
[1]
https://github.com/ckhu-mediatek/linux.git-tags/commits/mediatek-drm-next-5.6
Regards,
CK
>
> Suggested-by: Sean Paul <seanpaul@chromium.org>
> To: CK Hu <ck.hu@mediatek.com>
> To: dri-devel@lists.freedesktop.org
> Cc: Daniele Castagna <dcastagna@chromium.org>
> Cc: Philipp Zabel <p.zabel@pengutronix.de>
> Cc: David Airlie <airlied@linux.ie>
> Cc: Daniel Vetter <daniel@ffwll.ch>
> Cc: Matthias Brugger <matthias.bgg@gmail.com>
> Cc: linux-arm-kernel@lists.infradead.org
> Cc: linux-mediatek@lists.infradead.org
> Signed-off-by: Mark Yacoub <markyacoub@google.com>
> ---
> drivers/gpu/drm/mediatek/mtk_disp_ovl.c | 7 ++++---
> 1 file changed, 4 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/gpu/drm/mediatek/mtk_disp_ovl.c b/drivers/gpu/drm/mediatek/mtk_disp_ovl.c
> index 4a55bb6e2213..526b595eeff9 100644
> --- a/drivers/gpu/drm/mediatek/mtk_disp_ovl.c
> +++ b/drivers/gpu/drm/mediatek/mtk_disp_ovl.c
> @@ -260,8 +260,10 @@ static void mtk_ovl_layer_config(struct mtk_ddp_comp *comp, unsigned int idx,
> unsigned int src_size = (pending->height << 16) | pending->width;
> unsigned int con;
>
> - if (!pending->enable)
> + if (!pending->enable) {
> mtk_ovl_layer_off(comp, idx);
> + return;
> + }
>
> con = ovl_fmt_convert(ovl, fmt);
> if (idx != 0)
> @@ -283,8 +285,7 @@ static void mtk_ovl_layer_config(struct mtk_ddp_comp *comp, unsigned int idx,
> writel_relaxed(offset, comp->regs + DISP_REG_OVL_OFFSET(idx));
> writel_relaxed(addr, comp->regs + DISP_REG_OVL_ADDR(ovl, idx));
>
> - if (pending->enable)
> - mtk_ovl_layer_on(comp, idx);
> + mtk_ovl_layer_on(comp, idx);
> }
>
> static void mtk_ovl_bgclr_in_on(struct mtk_ddp_comp *comp)
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PATCH 1/2] Return from mtk_ovl_layer_config after mtk_ovl_layer_off
2019-12-25 2:25 ` CK Hu
(?)
(?)
@ 2019-12-25 2:43 ` Mark Yacoub
-1 siblings, 0 replies; 22+ messages in thread
From: Mark Yacoub @ 2019-12-25 2:43 UTC (permalink / raw)
To: CK Hu
Cc: Daniele Castagna, David Airlie, dri-devel, Sean Paul,
Matthias Brugger, linux-mediatek, linux-arm-kernel
[-- Attachment #1.1: Type: text/plain, Size: 2347 bytes --]
Thanks for the update!
On Tue, Dec 24, 2019, 9:25 PM CK Hu <ck.hu@mediatek.com> wrote:
> Hi, Mark:
>
> On Wed, 2019-12-11 at 10:49 -0500, Mark Yacoub wrote:
> > drm/mediatek: return if plane pending state is disabled.
> >
> > If the plane pending state is disabled, call mtk_ovl_layer_off then
> > return.
> > This guarantees that that the state is valid for all operations when the
> > pending state is enabled.
>
> For this series, applied to mediatek-drm-next-5.6 [1], thanks.
>
> [1]
>
> https://github.com/ckhu-mediatek/linux.git-tags/commits/mediatek-drm-next-5.6
>
> Regards,
> CK
>
> >
> > Suggested-by: Sean Paul <seanpaul@chromium.org>
> > To: CK Hu <ck.hu@mediatek.com>
> > To: dri-devel@lists.freedesktop.org
> > Cc: Daniele Castagna <dcastagna@chromium.org>
> > Cc: Philipp Zabel <p.zabel@pengutronix.de>
> > Cc: David Airlie <airlied@linux.ie>
> > Cc: Daniel Vetter <daniel@ffwll.ch>
> > Cc: Matthias Brugger <matthias.bgg@gmail.com>
> > Cc: linux-arm-kernel@lists.infradead.org
> > Cc: linux-mediatek@lists.infradead.org
> > Signed-off-by: Mark Yacoub <markyacoub@google.com>
> > ---
> > drivers/gpu/drm/mediatek/mtk_disp_ovl.c | 7 ++++---
> > 1 file changed, 4 insertions(+), 3 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/mediatek/mtk_disp_ovl.c
> b/drivers/gpu/drm/mediatek/mtk_disp_ovl.c
> > index 4a55bb6e2213..526b595eeff9 100644
> > --- a/drivers/gpu/drm/mediatek/mtk_disp_ovl.c
> > +++ b/drivers/gpu/drm/mediatek/mtk_disp_ovl.c
> > @@ -260,8 +260,10 @@ static void mtk_ovl_layer_config(struct
> mtk_ddp_comp *comp, unsigned int idx,
> > unsigned int src_size = (pending->height << 16) | pending->width;
> > unsigned int con;
> >
> > - if (!pending->enable)
> > + if (!pending->enable) {
> > mtk_ovl_layer_off(comp, idx);
> > + return;
> > + }
> >
> > con = ovl_fmt_convert(ovl, fmt);
> > if (idx != 0)
> > @@ -283,8 +285,7 @@ static void mtk_ovl_layer_config(struct mtk_ddp_comp
> *comp, unsigned int idx,
> > writel_relaxed(offset, comp->regs + DISP_REG_OVL_OFFSET(idx));
> > writel_relaxed(addr, comp->regs + DISP_REG_OVL_ADDR(ovl, idx));
> >
> > - if (pending->enable)
> > - mtk_ovl_layer_on(comp, idx);
> > + mtk_ovl_layer_on(comp, idx);
> > }
> >
> > static void mtk_ovl_bgclr_in_on(struct mtk_ddp_comp *comp)
>
>
[-- Attachment #1.2: Type: text/html, Size: 4084 bytes --]
[-- Attachment #2: Type: text/plain, Size: 160 bytes --]
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 22+ messages in thread
end of thread, other threads:[~2019-12-25 10:19 UTC | newest]
Thread overview: 22+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-12-11 15:49 [PATCH 1/2] Return from mtk_ovl_layer_config after mtk_ovl_layer_off Mark Yacoub
2019-12-11 15:49 ` Mark Yacoub
2019-12-11 15:49 ` Mark Yacoub
2019-12-11 15:49 ` [PATCH 2/2] Turn off Alpha bit when plane format has no alpha Mark Yacoub
2019-12-11 15:49 ` Mark Yacoub
2019-12-11 15:49 ` Mark Yacoub
2019-12-12 4:45 ` CK Hu
2019-12-12 4:45 ` CK Hu
2019-12-12 4:45 ` CK Hu
2019-12-12 4:45 ` [PATCH 1/2] Return from mtk_ovl_layer_config after mtk_ovl_layer_off CK Hu
2019-12-12 4:45 ` CK Hu
2019-12-12 4:45 ` CK Hu
2019-12-12 14:13 ` Sean Paul
2019-12-12 14:13 ` Sean Paul
2019-12-12 14:13 ` Sean Paul
2019-12-13 2:34 ` CK Hu
2019-12-13 2:34 ` CK Hu
2019-12-13 2:34 ` CK Hu
2019-12-25 2:25 ` CK Hu
2019-12-25 2:25 ` CK Hu
2019-12-25 2:25 ` CK Hu
2019-12-25 2:43 ` Mark Yacoub
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.