* [PATCH 0/3] use encoder type to identify display
@ 2018-08-28 23:02 Jeykumar Sankaran
[not found] ` <1535497338-30389-1-git-send-email-jsanka-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org>
2018-08-30 15:57 ` [PATCH 0/3] use encoder type to identify display Sean Paul
0 siblings, 2 replies; 6+ messages in thread
From: Jeykumar Sankaran @ 2018-08-28 23:02 UTC (permalink / raw)
To: dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW,
freedreno-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW,
linux-arm-msm-u79uwXL29TY76Z2rM5mHXA
Cc: hoegsberg-hpIqsD4AKlfQT0dZR+AlfA, Jeykumar Sankaran,
seanpaul-F7+t8E8rja9g9hUCZPvPmw,
robdclark-Re5JQEeQqe8AvxtiuMwx3w
DPU is broken with patch [1]. This patch cleans up few stale codes
and fixes the DPU bug by using encoder type to identify displays.
[1] https://patchwork.kernel.org/patch/10568269/
Thanks.
Jeykumar Sankaran (3):
drm/msm/dpu: remove stale display port programming
drm/msm/dpu: remove unwanted encoder type mapping
drm/msm/dpu: use encoder type to identify display type
drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 32 ++++++++---------------------
1 file changed, 9 insertions(+), 23 deletions(-)
--
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project
_______________________________________________
Freedreno mailing list
Freedreno@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/freedreno
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 1/3] drm/msm/dpu: remove stale display port programming
[not found] ` <1535497338-30389-1-git-send-email-jsanka-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org>
@ 2018-08-28 23:02 ` Jeykumar Sankaran
2018-08-28 23:02 ` [PATCH 2/3] drm/msm/dpu: remove unwanted encoder type mapping Jeykumar Sankaran
2018-08-28 23:02 ` [PATCH 3/3] drm/msm/dpu: use encoder type to identify display type Jeykumar Sankaran
2 siblings, 0 replies; 6+ messages in thread
From: Jeykumar Sankaran @ 2018-08-28 23:02 UTC (permalink / raw)
To: dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW,
freedreno-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW,
linux-arm-msm-u79uwXL29TY76Z2rM5mHXA
Cc: hoegsberg-hpIqsD4AKlfQT0dZR+AlfA, Jeykumar Sankaran,
seanpaul-F7+t8E8rja9g9hUCZPvPmw,
robdclark-Re5JQEeQqe8AvxtiuMwx3w
Remove stale display port programming. It can be
added back with DPU support for display port.
Signed-off-by: Jeykumar Sankaran <jsanka@codeaurora.org>
---
drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 6 ------
1 file changed, 6 deletions(-)
diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c
index 1b4de34..5b07f63 100644
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c
@@ -1111,12 +1111,6 @@ static void _dpu_encoder_virt_enable_helper(struct drm_encoder *drm_enc)
return;
}
- if (dpu_enc->disp_info.intf_type == DRM_MODE_CONNECTOR_DisplayPort &&
- dpu_enc->cur_master->hw_mdptop &&
- dpu_enc->cur_master->hw_mdptop->ops.intf_audio_select)
- dpu_enc->cur_master->hw_mdptop->ops.intf_audio_select(
- dpu_enc->cur_master->hw_mdptop);
-
if (dpu_enc->cur_master->hw_mdptop &&
dpu_enc->cur_master->hw_mdptop->ops.reset_ubwc)
dpu_enc->cur_master->hw_mdptop->ops.reset_ubwc(
--
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project
_______________________________________________
Freedreno mailing list
Freedreno@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/freedreno
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 2/3] drm/msm/dpu: remove unwanted encoder type mapping
[not found] ` <1535497338-30389-1-git-send-email-jsanka-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org>
2018-08-28 23:02 ` [PATCH 1/3] drm/msm/dpu: remove stale display port programming Jeykumar Sankaran
@ 2018-08-28 23:02 ` Jeykumar Sankaran
2018-08-28 23:02 ` [PATCH 3/3] drm/msm/dpu: use encoder type to identify display type Jeykumar Sankaran
2 siblings, 0 replies; 6+ messages in thread
From: Jeykumar Sankaran @ 2018-08-28 23:02 UTC (permalink / raw)
To: dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW,
freedreno-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW,
linux-arm-msm-u79uwXL29TY76Z2rM5mHXA
Cc: hoegsberg-hpIqsD4AKlfQT0dZR+AlfA, Jeykumar Sankaran,
seanpaul-F7+t8E8rja9g9hUCZPvPmw,
robdclark-Re5JQEeQqe8AvxtiuMwx3w
This change gets rid of unwanted connector-encoder type
mapping used for dsi-staging driver. Now that DPU will
be using upstream DSI driver, remove the stale code.
Signed-off-by: Jeykumar Sankaran <jsanka@codeaurora.org>
---
drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 20 ++++++--------------
1 file changed, 6 insertions(+), 14 deletions(-)
diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c
index 5b07f63..26c80b6 100644
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c
@@ -2200,8 +2200,7 @@ static int dpu_encoder_virt_add_phys_encs(
static int dpu_encoder_setup_display(struct dpu_encoder_virt *dpu_enc,
struct dpu_kms *dpu_kms,
- struct msm_display_info *disp_info,
- int *drm_enc_mode)
+ struct msm_display_info *disp_info)
{
int ret = 0;
int i = 0;
@@ -2222,16 +2221,11 @@ static int dpu_encoder_setup_display(struct dpu_encoder_virt *dpu_enc,
DPU_DEBUG("\n");
- if (disp_info->intf_type == DRM_MODE_CONNECTOR_DSI) {
- *drm_enc_mode = DRM_MODE_ENCODER_DSI;
+ switch (disp_info->intf_type) {
+ case DRM_MODE_CONNECTOR_DSI:
intf_type = INTF_DSI;
- } else if (disp_info->intf_type == DRM_MODE_CONNECTOR_HDMIA) {
- *drm_enc_mode = DRM_MODE_ENCODER_TMDS;
- intf_type = INTF_HDMI;
- } else if (disp_info->intf_type == DRM_MODE_CONNECTOR_DisplayPort) {
- *drm_enc_mode = DRM_MODE_ENCODER_TMDS;
- intf_type = INTF_DP;
- } else {
+ break;
+ default:
DPU_ERROR_ENC(dpu_enc, "unsupported display interface type\n");
return -EINVAL;
}
@@ -2352,14 +2346,12 @@ int dpu_encoder_setup(struct drm_device *dev, struct drm_encoder *enc,
struct dpu_kms *dpu_kms = to_dpu_kms(priv->kms);
struct drm_encoder *drm_enc = NULL;
struct dpu_encoder_virt *dpu_enc = NULL;
- int drm_enc_mode = DRM_MODE_ENCODER_NONE;
int ret = 0;
dpu_enc = to_dpu_encoder_virt(enc);
mutex_init(&dpu_enc->enc_lock);
- ret = dpu_encoder_setup_display(dpu_enc, dpu_kms, disp_info,
- &drm_enc_mode);
+ ret = dpu_encoder_setup_display(dpu_enc, dpu_kms, disp_info);
if (ret)
goto fail;
--
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project
_______________________________________________
Freedreno mailing list
Freedreno@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/freedreno
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 3/3] drm/msm/dpu: use encoder type to identify display type
[not found] ` <1535497338-30389-1-git-send-email-jsanka-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org>
2018-08-28 23:02 ` [PATCH 1/3] drm/msm/dpu: remove stale display port programming Jeykumar Sankaran
2018-08-28 23:02 ` [PATCH 2/3] drm/msm/dpu: remove unwanted encoder type mapping Jeykumar Sankaran
@ 2018-08-28 23:02 ` Jeykumar Sankaran
[not found] ` <1535497338-30389-4-git-send-email-jsanka-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org>
2 siblings, 1 reply; 6+ messages in thread
From: Jeykumar Sankaran @ 2018-08-28 23:02 UTC (permalink / raw)
To: dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW,
freedreno-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW,
linux-arm-msm-u79uwXL29TY76Z2rM5mHXA
Cc: hoegsberg-hpIqsD4AKlfQT0dZR+AlfA, Jeykumar Sankaran,
seanpaul-F7+t8E8rja9g9hUCZPvPmw,
robdclark-Re5JQEeQqe8AvxtiuMwx3w
With patch [1], DPU is broken since it continues to use
incorrect connector_type to identify the display type. Update
DPU to use the encoder type to get the info.
[1] https://patchwork.kernel.org/patch/10568269/
Signed-off-by: Jeykumar Sankaran <jsanka@codeaurora.org>
---
drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c
index 26c80b6..5b0e944 100644
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c
@@ -525,7 +525,7 @@ void dpu_encoder_helper_split_config(
hw_mdptop = phys_enc->hw_mdptop;
disp_info = &dpu_enc->disp_info;
- if (disp_info->intf_type != DRM_MODE_CONNECTOR_DSI)
+ if (disp_info->intf_type != DRM_MODE_ENCODER_DSI)
return;
/**
@@ -1873,7 +1873,7 @@ void dpu_encoder_kickoff(struct drm_encoder *drm_enc)
phys->ops.handle_post_kickoff(phys);
}
- if (dpu_enc->disp_info.intf_type == DRM_MODE_CONNECTOR_DSI &&
+ if (dpu_enc->disp_info.intf_type == DRM_MODE_ENCODER_DSI &&
!_dpu_encoder_wakeup_time(drm_enc, &wakeup_time)) {
trace_dpu_enc_early_kickoff(DRMID(drm_enc),
ktime_to_ms(wakeup_time));
@@ -2222,7 +2222,7 @@ static int dpu_encoder_setup_display(struct dpu_encoder_virt *dpu_enc,
DPU_DEBUG("\n");
switch (disp_info->intf_type) {
- case DRM_MODE_CONNECTOR_DSI:
+ case DRM_MODE_ENCODER_DSI:
intf_type = INTF_DSI;
break;
default:
@@ -2362,7 +2362,7 @@ int dpu_encoder_setup(struct drm_device *dev, struct drm_encoder *enc,
timer_setup(&dpu_enc->frame_done_timer,
dpu_encoder_frame_done_timeout, 0);
- if (disp_info->intf_type == DRM_MODE_CONNECTOR_DSI)
+ if (disp_info->intf_type == DRM_MODE_ENCODER_DSI)
timer_setup(&dpu_enc->vsync_event_timer,
dpu_encoder_vsync_event_handler,
0);
--
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project
_______________________________________________
Freedreno mailing list
Freedreno@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/freedreno
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH 3/3] drm/msm/dpu: use encoder type to identify display type
[not found] ` <1535497338-30389-4-git-send-email-jsanka-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org>
@ 2018-08-29 19:57 ` Jordan Crouse
0 siblings, 0 replies; 6+ messages in thread
From: Jordan Crouse @ 2018-08-29 19:57 UTC (permalink / raw)
To: Jeykumar Sankaran
Cc: linux-arm-msm-u79uwXL29TY76Z2rM5mHXA,
dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW,
robdclark-Re5JQEeQqe8AvxtiuMwx3w,
seanpaul-F7+t8E8rja9g9hUCZPvPmw,
hoegsberg-hpIqsD4AKlfQT0dZR+AlfA,
freedreno-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW
On Tue, Aug 28, 2018 at 04:02:18PM -0700, Jeykumar Sankaran wrote:
> With patch [1], DPU is broken since it continues to use
> incorrect connector_type to identify the display type. Update
> DPU to use the encoder type to get the info.
>
> [1] https://patchwork.kernel.org/patch/10568269/
This plus [1] takes care of all the warnings and other noise I was seeing during
boot. Thanks for this.
Acked-by: Jordan Crouse <jcrouse@codeaurora.org>
> Signed-off-by: Jeykumar Sankaran <jsanka@codeaurora.org>
> ---
> drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c
> index 26c80b6..5b0e944 100644
> --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c
> +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c
> @@ -525,7 +525,7 @@ void dpu_encoder_helper_split_config(
> hw_mdptop = phys_enc->hw_mdptop;
> disp_info = &dpu_enc->disp_info;
>
> - if (disp_info->intf_type != DRM_MODE_CONNECTOR_DSI)
> + if (disp_info->intf_type != DRM_MODE_ENCODER_DSI)
> return;
>
> /**
> @@ -1873,7 +1873,7 @@ void dpu_encoder_kickoff(struct drm_encoder *drm_enc)
> phys->ops.handle_post_kickoff(phys);
> }
>
> - if (dpu_enc->disp_info.intf_type == DRM_MODE_CONNECTOR_DSI &&
> + if (dpu_enc->disp_info.intf_type == DRM_MODE_ENCODER_DSI &&
> !_dpu_encoder_wakeup_time(drm_enc, &wakeup_time)) {
> trace_dpu_enc_early_kickoff(DRMID(drm_enc),
> ktime_to_ms(wakeup_time));
> @@ -2222,7 +2222,7 @@ static int dpu_encoder_setup_display(struct dpu_encoder_virt *dpu_enc,
> DPU_DEBUG("\n");
>
> switch (disp_info->intf_type) {
> - case DRM_MODE_CONNECTOR_DSI:
> + case DRM_MODE_ENCODER_DSI:
> intf_type = INTF_DSI;
> break;
> default:
> @@ -2362,7 +2362,7 @@ int dpu_encoder_setup(struct drm_device *dev, struct drm_encoder *enc,
> timer_setup(&dpu_enc->frame_done_timer,
> dpu_encoder_frame_done_timeout, 0);
>
> - if (disp_info->intf_type == DRM_MODE_CONNECTOR_DSI)
> + if (disp_info->intf_type == DRM_MODE_ENCODER_DSI)
> timer_setup(&dpu_enc->vsync_event_timer,
> dpu_encoder_vsync_event_handler,
> 0);
> --
> The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
> a Linux Foundation Collaborative Project
>
> _______________________________________________
> Freedreno mailing list
> Freedreno@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/freedreno
--
The Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum,
a Linux Foundation Collaborative Project
_______________________________________________
Freedreno mailing list
Freedreno@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/freedreno
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 0/3] use encoder type to identify display
2018-08-28 23:02 [PATCH 0/3] use encoder type to identify display Jeykumar Sankaran
[not found] ` <1535497338-30389-1-git-send-email-jsanka-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org>
@ 2018-08-30 15:57 ` Sean Paul
1 sibling, 0 replies; 6+ messages in thread
From: Sean Paul @ 2018-08-30 15:57 UTC (permalink / raw)
To: Jeykumar Sankaran
Cc: linux-arm-msm, dri-devel, seanpaul, hoegsberg, freedreno
On Tue, Aug 28, 2018 at 04:02:15PM -0700, Jeykumar Sankaran wrote:
> DPU is broken with patch [1]. This patch cleans up few stale codes
> and fixes the DPU bug by using encoder type to identify displays.
>
> [1] https://patchwork.kernel.org/patch/10568269/
>
> Thanks.
>
> Jeykumar Sankaran (3):
> drm/msm/dpu: remove stale display port programming
> drm/msm/dpu: remove unwanted encoder type mapping
> drm/msm/dpu: use encoder type to identify display type
Entire series is
Reviewed-by: Sean Paul <seanpaul@chromium.org>
I've pushed them to dpu-staging/for-next
Thanks,
Sean
>
> drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 32 ++++++++---------------------
> 1 file changed, 9 insertions(+), 23 deletions(-)
>
> --
> The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
> a Linux Foundation Collaborative Project
>
--
Sean Paul, Software Engineer, Google / Chromium OS
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2018-08-30 15:57 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-08-28 23:02 [PATCH 0/3] use encoder type to identify display Jeykumar Sankaran
[not found] ` <1535497338-30389-1-git-send-email-jsanka-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org>
2018-08-28 23:02 ` [PATCH 1/3] drm/msm/dpu: remove stale display port programming Jeykumar Sankaran
2018-08-28 23:02 ` [PATCH 2/3] drm/msm/dpu: remove unwanted encoder type mapping Jeykumar Sankaran
2018-08-28 23:02 ` [PATCH 3/3] drm/msm/dpu: use encoder type to identify display type Jeykumar Sankaran
[not found] ` <1535497338-30389-4-git-send-email-jsanka-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org>
2018-08-29 19:57 ` Jordan Crouse
2018-08-30 15:57 ` [PATCH 0/3] use encoder type to identify display Sean Paul
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.