* [DPU PATCH 0/3] drm/msm: Fix build warnings
@ 2018-04-02 20:10 Sean Paul
[not found] ` <20180402201027.222813-1-seanpaul-F7+t8E8rja9g9hUCZPvPmw@public.gmane.org>
0 siblings, 1 reply; 8+ messages in thread
From: Sean Paul @ 2018-04-02 20:10 UTC (permalink / raw)
To: freedreno-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW,
linux-arm-msm-u79uwXL29TY76Z2rM5mHXA
Cc: jsanka-sgV2jX0FEOL9JmXXK+q4OQ, robdclark-Re5JQEeQqe8AvxtiuMwx3w,
Sean Paul, hoegsberg-F7+t8E8rja9g9hUCZPvPmw,
abhinavk-sgV2jX0FEOL9JmXXK+q4OQ
Finally got around to this, I've split the worst 2 out into their own
patches.
Sean
Sean Paul (3):
drm/msm: Fix uninitialized use of prefill_lines
drm/msm: Properly cast return with ERR_PTR
drm/msm: Fix dpu build warnings
drivers/gpu/drm/msm/disp/dpu1/dpu_connector.c | 7 ++++---
drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c | 2 +-
drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 4 ++--
drivers/gpu/drm/msm/disp/dpu1/dpu_hw_reg_dma_v1.c | 4 ++--
drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 3 +--
drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c | 1 -
drivers/gpu/drm/msm/disp/dpu1/dpu_vbif.c | 2 +-
drivers/gpu/drm/msm/dpu_dbg.c | 2 +-
8 files changed, 12 insertions(+), 13 deletions(-)
--
Sean Paul, Software Engineer, Google / Chromium OS
_______________________________________________
Freedreno mailing list
Freedreno@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/freedreno
^ permalink raw reply [flat|nested] 8+ messages in thread
* [DPU PATCH 1/3] drm/msm: Fix uninitialized use of prefill_lines
[not found] ` <20180402201027.222813-1-seanpaul-F7+t8E8rja9g9hUCZPvPmw@public.gmane.org>
@ 2018-04-02 20:10 ` Sean Paul
[not found] ` <20180402201027.222813-2-seanpaul-F7+t8E8rja9g9hUCZPvPmw@public.gmane.org>
2018-04-02 20:10 ` [DPU PATCH 2/3] drm/msm: Properly cast return with ERR_PTR Sean Paul
` (2 subsequent siblings)
3 siblings, 1 reply; 8+ messages in thread
From: Sean Paul @ 2018-04-02 20:10 UTC (permalink / raw)
To: freedreno-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW,
linux-arm-msm-u79uwXL29TY76Z2rM5mHXA
Cc: jsanka-sgV2jX0FEOL9JmXXK+q4OQ, robdclark-Re5JQEeQqe8AvxtiuMwx3w,
Sean Paul, hoegsberg-F7+t8E8rja9g9hUCZPvPmw,
abhinavk-sgV2jX0FEOL9JmXXK+q4OQ
prefill_lines initialization was removed in da61c67cdec4, but it's still
being used :(
Fixes: da61c67cdec4 drm/msm: remove hw rotation support
Cc: Jeykumar Sankaran <jsanka@codeaurora.org>
Signed-off-by: Sean Paul <seanpaul@chromium.org>
---
drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c
index 7f4182294dfd..53f5d5c52063 100644
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c
@@ -1231,7 +1231,7 @@ static int _dpu_encoder_update_rsc_client(
struct drm_crtc *crtc;
enum dpu_rsc_state rsc_state;
struct dpu_rsc_cmd_config *rsc_config;
- int ret, prefill_lines;
+ int ret;
struct msm_display_info *disp_info;
struct msm_mode_info *mode_info;
int wait_vblank_crtc_id = DPU_RSC_INVALID_CRTC_ID;
@@ -1273,7 +1273,7 @@ static int _dpu_encoder_update_rsc_client(
(rsc_config->jitter_denom != mode_info->jitter_denom)) {
rsc_config->fps = mode_info->frame_rate;
rsc_config->vtotal = mode_info->vtotal;
- rsc_config->prefill_lines = prefill_lines;
+ rsc_config->prefill_lines = mode_info->prefill_lines;
rsc_config->jitter_numer = mode_info->jitter_numer;
rsc_config->jitter_denom = mode_info->jitter_denom;
dpu_enc->rsc_state_init = false;
--
Sean Paul, Software Engineer, Google / Chromium OS
_______________________________________________
Freedreno mailing list
Freedreno@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/freedreno
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [DPU PATCH 2/3] drm/msm: Properly cast return with ERR_PTR
[not found] ` <20180402201027.222813-1-seanpaul-F7+t8E8rja9g9hUCZPvPmw@public.gmane.org>
2018-04-02 20:10 ` [DPU PATCH 1/3] drm/msm: Fix uninitialized use of prefill_lines Sean Paul
@ 2018-04-02 20:10 ` Sean Paul
2018-04-02 20:10 ` [DPU PATCH 3/3] drm/msm: Fix dpu build warnings Sean Paul
2018-04-03 8:54 ` [DPU PATCH 0/3] drm/msm: Fix " ryadav-sgV2jX0FEOL9JmXXK+q4OQ
3 siblings, 0 replies; 8+ messages in thread
From: Sean Paul @ 2018-04-02 20:10 UTC (permalink / raw)
To: freedreno-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW,
linux-arm-msm-u79uwXL29TY76Z2rM5mHXA
Cc: jsanka-sgV2jX0FEOL9JmXXK+q4OQ, robdclark-Re5JQEeQqe8AvxtiuMwx3w,
Sean Paul, hoegsberg-F7+t8E8rja9g9hUCZPvPmw,
abhinavk-sgV2jX0FEOL9JmXXK+q4OQ
Return value is an error pointer, not an int.
Fixes: 758128c1eda4 drm/msm: Populate kms->irq for dpu
Signed-off-by: Sean Paul <seanpaul@chromium.org>
---
drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c
index 74afa1a5eb7d..36657aa97bd7 100644
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c
@@ -2029,7 +2029,7 @@ struct msm_kms *dpu_kms_init(struct drm_device *dev)
irq = platform_get_irq(pdev, 0);
if (irq < 0) {
DPU_ERROR("failed to get irq: %d\n", irq);
- return irq;
+ return ERR_PTR(irq);
}
priv = dev->dev_private;
--
Sean Paul, Software Engineer, Google / Chromium OS
_______________________________________________
Freedreno mailing list
Freedreno@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/freedreno
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [DPU PATCH 3/3] drm/msm: Fix dpu build warnings
[not found] ` <20180402201027.222813-1-seanpaul-F7+t8E8rja9g9hUCZPvPmw@public.gmane.org>
2018-04-02 20:10 ` [DPU PATCH 1/3] drm/msm: Fix uninitialized use of prefill_lines Sean Paul
2018-04-02 20:10 ` [DPU PATCH 2/3] drm/msm: Properly cast return with ERR_PTR Sean Paul
@ 2018-04-02 20:10 ` Sean Paul
[not found] ` <20180402201027.222813-4-seanpaul-F7+t8E8rja9g9hUCZPvPmw@public.gmane.org>
2018-04-03 8:54 ` [DPU PATCH 0/3] drm/msm: Fix " ryadav-sgV2jX0FEOL9JmXXK+q4OQ
3 siblings, 1 reply; 8+ messages in thread
From: Sean Paul @ 2018-04-02 20:10 UTC (permalink / raw)
To: freedreno-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW,
linux-arm-msm-u79uwXL29TY76Z2rM5mHXA
Cc: jsanka-sgV2jX0FEOL9JmXXK+q4OQ, robdclark-Re5JQEeQqe8AvxtiuMwx3w,
Sean Paul, hoegsberg-F7+t8E8rja9g9hUCZPvPmw,
abhinavk-sgV2jX0FEOL9JmXXK+q4OQ
A bunch of warning fixes, build is clean now.
Signed-off-by: Sean Paul <seanpaul@chromium.org>
---
drivers/gpu/drm/msm/disp/dpu1/dpu_connector.c | 7 ++++---
drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c | 2 +-
drivers/gpu/drm/msm/disp/dpu1/dpu_hw_reg_dma_v1.c | 4 ++--
drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 1 -
drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c | 1 -
drivers/gpu/drm/msm/disp/dpu1/dpu_vbif.c | 2 +-
drivers/gpu/drm/msm/dpu_dbg.c | 2 +-
7 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_connector.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_connector.c
index 36607e36672d..a57495f95663 100644
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_connector.c
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_connector.c
@@ -32,9 +32,6 @@
#define DPU_ERROR_CONN(c, fmt, ...) DPU_ERROR("conn%d " fmt,\
(c) ? (c)->base.base.id : -1, ##__VA_ARGS__)
-static u32 dither_matrix[DITHER_MATRIX_SZ] = {
- 15, 7, 13, 5, 3, 11, 1, 9, 12, 4, 14, 6, 0, 8, 2, 10
-};
static const struct drm_prop_enum_list e_topology_name[] = {
{DPU_RM_TOPOLOGY_NONE, "dpu_none"},
@@ -226,6 +223,10 @@ void dpu_connector_unregister_event(struct drm_connector *connector,
}
#ifdef CONFIG_DRM_MSM_DSI_STAGING
+static u32 dither_matrix[DITHER_MATRIX_SZ] = {
+ 15, 7, 13, 5, 3, 11, 1, 9, 12, 4, 14, 6, 0, 8, 2, 10
+};
+
static int _dpu_connector_get_default_dither_cfg_v1(
struct dpu_connector *c_conn, void *cfg)
{
diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c
index 3308929bc9d6..b0c170373632 100644
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c
@@ -2587,7 +2587,7 @@ static void dpu_crtc_disable(struct drm_crtc *crtc)
struct dpu_crtc_irq_info *node = NULL;
struct drm_event event;
u32 power_on;
- int ret, i;
+ int ret;
if (!crtc || !crtc->dev || !crtc->dev->dev_private || !crtc->state) {
DPU_ERROR("invalid crtc\n");
diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_reg_dma_v1.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_reg_dma_v1.c
index bb4547748ce9..e0d46c545c14 100644
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_reg_dma_v1.c
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_reg_dma_v1.c
@@ -374,7 +374,7 @@ static int validate_dma_cfg(struct dpu_reg_dma_setup_ops_cfg *cfg)
}
if (cfg->dma_buf->iova & GUARD_BYTES || !cfg->dma_buf->vaddr) {
- DRM_ERROR("iova not aligned to %zx iova %x kva %pK",
+ DRM_ERROR("iova not aligned to %zx iova %llx kva %pK",
ADDR_ALIGN, cfg->dma_buf->iova,
cfg->dma_buf->vaddr);
return -EINVAL;
@@ -433,7 +433,7 @@ static int validate_kick_off_v1(struct dpu_reg_dma_kickoff_cfg *cfg)
(WRITE_TRIGGER);
if (cfg->dma_buf->iova & GUARD_BYTES) {
- DRM_ERROR("Address is not aligned to %zx iova %x", ADDR_ALIGN,
+ DRM_ERROR("Address is not aligned to %zx iova %llx", ADDR_ALIGN,
cfg->dma_buf->iova);
return -EINVAL;
}
diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c
index 36657aa97bd7..aad5a94c726a 100644
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c
@@ -426,7 +426,6 @@ static void dpu_kms_commit(struct msm_kms *kms, struct drm_atomic_state *state)
{
struct drm_crtc *crtc;
struct drm_crtc_state *crtc_state;
- struct dpu_crtc_state *cstate;
int i;
for_each_new_crtc_in_state(state, crtc, crtc_state, i) {
diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c
index 33a894e3d580..7844d6463220 100644
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c
@@ -2742,7 +2742,6 @@ dpu_plane_duplicate_state(struct drm_plane *plane)
struct dpu_plane *pdpu;
struct dpu_plane_state *pstate;
struct dpu_plane_state *old_state;
- struct drm_property *drm_prop;
if (!plane) {
DPU_ERROR("invalid plane\n");
diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_vbif.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_vbif.c
index 801155fe0989..074223383a98 100644
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_vbif.c
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_vbif.c
@@ -321,7 +321,7 @@ void dpu_debugfs_vbif_destroy(struct dpu_kms *dpu_kms)
int dpu_debugfs_vbif_init(struct dpu_kms *dpu_kms, struct dentry *debugfs_root)
{
- char vbif_name[32];
+ char vbif_name[64];
struct dentry *debugfs_vbif;
int i, j;
diff --git a/drivers/gpu/drm/msm/dpu_dbg.c b/drivers/gpu/drm/msm/dpu_dbg.c
index 8118fb72645a..8322b1cb89c9 100644
--- a/drivers/gpu/drm/msm/dpu_dbg.c
+++ b/drivers/gpu/drm/msm/dpu_dbg.c
@@ -3043,7 +3043,7 @@ int dpu_dbg_debugfs_register(struct dentry *debugfs_root)
{
static struct dpu_dbg_base *dbg = &dpu_dbg_base;
struct dpu_dbg_reg_base *blk_base;
- char debug_name[80] = "";
+ char debug_name[88] = "";
if (!debugfs_root)
return -EINVAL;
--
Sean Paul, Software Engineer, Google / Chromium OS
_______________________________________________
Freedreno mailing list
Freedreno@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/freedreno
^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [DPU PATCH 0/3] drm/msm: Fix build warnings
[not found] ` <20180402201027.222813-1-seanpaul-F7+t8E8rja9g9hUCZPvPmw@public.gmane.org>
` (2 preceding siblings ...)
2018-04-02 20:10 ` [DPU PATCH 3/3] drm/msm: Fix dpu build warnings Sean Paul
@ 2018-04-03 8:54 ` ryadav-sgV2jX0FEOL9JmXXK+q4OQ
[not found] ` <7349d8e701ac6a26d49b801edbc059ff-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org>
3 siblings, 1 reply; 8+ messages in thread
From: ryadav-sgV2jX0FEOL9JmXXK+q4OQ @ 2018-04-03 8:54 UTC (permalink / raw)
To: Sean Paul
Cc: linux-arm-msm-u79uwXL29TY76Z2rM5mHXA,
abhinavk-sgV2jX0FEOL9JmXXK+q4OQ, robdclark-Re5JQEeQqe8AvxtiuMwx3w,
jsanka-sgV2jX0FEOL9JmXXK+q4OQ,
freedreno-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW,
hoegsberg-F7+t8E8rja9g9hUCZPvPmw
On 2018-04-03 01:40, Sean Paul wrote:
> Finally got around to this, I've split the worst 2 out into their own
> patches.
>
> Sean
>
> Sean Paul (3):
> drm/msm: Fix uninitialized use of prefill_lines
> drm/msm: Properly cast return with ERR_PTR
> drm/msm: Fix dpu build warnings
Hi Sean,
Some of these issues were fixed in following patch series @
https://lists.freedesktop.org/archives/freedreno/2018-March/002067.html
Thanks
>
> drivers/gpu/drm/msm/disp/dpu1/dpu_connector.c | 7 ++++---
> drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c | 2 +-
> drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 4 ++--
> drivers/gpu/drm/msm/disp/dpu1/dpu_hw_reg_dma_v1.c | 4 ++--
> drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 3 +--
> drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c | 1 -
> drivers/gpu/drm/msm/disp/dpu1/dpu_vbif.c | 2 +-
> drivers/gpu/drm/msm/dpu_dbg.c | 2 +-
> 8 files changed, 12 insertions(+), 13 deletions(-)
_______________________________________________
Freedreno mailing list
Freedreno@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/freedreno
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [DPU PATCH 0/3] drm/msm: Fix build warnings
[not found] ` <7349d8e701ac6a26d49b801edbc059ff-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org>
@ 2018-04-04 18:33 ` Sean Paul
0 siblings, 0 replies; 8+ messages in thread
From: Sean Paul @ 2018-04-04 18:33 UTC (permalink / raw)
To: ryadav-sgV2jX0FEOL9JmXXK+q4OQ
Cc: linux-arm-msm-u79uwXL29TY76Z2rM5mHXA,
abhinavk-sgV2jX0FEOL9JmXXK+q4OQ, robdclark-Re5JQEeQqe8AvxtiuMwx3w,
Sean Paul, jsanka-sgV2jX0FEOL9JmXXK+q4OQ,
freedreno-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW,
hoegsberg-F7+t8E8rja9g9hUCZPvPmw
On Tue, Apr 03, 2018 at 02:24:16PM +0530, ryadav@codeaurora.org wrote:
> On 2018-04-03 01:40, Sean Paul wrote:
> > Finally got around to this, I've split the worst 2 out into their own
> > patches.
> >
> > Sean
> >
> > Sean Paul (3):
> > drm/msm: Fix uninitialized use of prefill_lines
> > drm/msm: Properly cast return with ERR_PTR
> > drm/msm: Fix dpu build warnings
> Hi Sean,
> Some of these issues were fixed in following patch series @
> https://lists.freedesktop.org/archives/freedreno/2018-March/002067.html
Thanks for the pointer, I had missed that series, apologies :(
I think we still need the prefill_lines fix, mind reviewing that?
Sean
> Thanks
> >
> > drivers/gpu/drm/msm/disp/dpu1/dpu_connector.c | 7 ++++---
> > drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c | 2 +-
> > drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 4 ++--
> > drivers/gpu/drm/msm/disp/dpu1/dpu_hw_reg_dma_v1.c | 4 ++--
> > drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 3 +--
> > drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c | 1 -
> > drivers/gpu/drm/msm/disp/dpu1/dpu_vbif.c | 2 +-
> > drivers/gpu/drm/msm/dpu_dbg.c | 2 +-
> > 8 files changed, 12 insertions(+), 13 deletions(-)
--
Sean Paul, Software Engineer, Google / Chromium OS
_______________________________________________
Freedreno mailing list
Freedreno@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/freedreno
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [DPU PATCH 1/3] drm/msm: Fix uninitialized use of prefill_lines
[not found] ` <20180402201027.222813-2-seanpaul-F7+t8E8rja9g9hUCZPvPmw@public.gmane.org>
@ 2018-04-05 4:51 ` ryadav-sgV2jX0FEOL9JmXXK+q4OQ
0 siblings, 0 replies; 8+ messages in thread
From: ryadav-sgV2jX0FEOL9JmXXK+q4OQ @ 2018-04-05 4:51 UTC (permalink / raw)
To: Sean Paul
Cc: linux-arm-msm-u79uwXL29TY76Z2rM5mHXA,
abhinavk-sgV2jX0FEOL9JmXXK+q4OQ, robdclark-Re5JQEeQqe8AvxtiuMwx3w,
jsanka-sgV2jX0FEOL9JmXXK+q4OQ,
freedreno-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW,
hoegsberg-F7+t8E8rja9g9hUCZPvPmw
On 2018-04-03 01:40, Sean Paul wrote:
> prefill_lines initialization was removed in da61c67cdec4, but it's
> still
> being used :(
>
> Fixes: da61c67cdec4 drm/msm: remove hw rotation support
> Cc: Jeykumar Sankaran <jsanka@codeaurora.org>
> Signed-off-by: Sean Paul <seanpaul@chromium.org>
Reviewed-by: Rajesh Yadav <ryadav@codeaurora.org>
> ---
> drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c
> b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c
> index 7f4182294dfd..53f5d5c52063 100644
> --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c
> +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c
> @@ -1231,7 +1231,7 @@ static int _dpu_encoder_update_rsc_client(
> struct drm_crtc *crtc;
> enum dpu_rsc_state rsc_state;
> struct dpu_rsc_cmd_config *rsc_config;
> - int ret, prefill_lines;
> + int ret;
> struct msm_display_info *disp_info;
> struct msm_mode_info *mode_info;
> int wait_vblank_crtc_id = DPU_RSC_INVALID_CRTC_ID;
> @@ -1273,7 +1273,7 @@ static int _dpu_encoder_update_rsc_client(
> (rsc_config->jitter_denom != mode_info->jitter_denom)) {
> rsc_config->fps = mode_info->frame_rate;
> rsc_config->vtotal = mode_info->vtotal;
> - rsc_config->prefill_lines = prefill_lines;
> + rsc_config->prefill_lines = mode_info->prefill_lines;
> rsc_config->jitter_numer = mode_info->jitter_numer;
> rsc_config->jitter_denom = mode_info->jitter_denom;
> dpu_enc->rsc_state_init = false;
_______________________________________________
Freedreno mailing list
Freedreno@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/freedreno
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [DPU PATCH 3/3] drm/msm: Fix dpu build warnings
[not found] ` <20180402201027.222813-4-seanpaul-F7+t8E8rja9g9hUCZPvPmw@public.gmane.org>
@ 2018-04-05 5:07 ` ryadav-sgV2jX0FEOL9JmXXK+q4OQ
0 siblings, 0 replies; 8+ messages in thread
From: ryadav-sgV2jX0FEOL9JmXXK+q4OQ @ 2018-04-05 5:07 UTC (permalink / raw)
To: Sean Paul
Cc: linux-arm-msm-u79uwXL29TY76Z2rM5mHXA,
abhinavk-sgV2jX0FEOL9JmXXK+q4OQ, robdclark-Re5JQEeQqe8AvxtiuMwx3w,
jsanka-sgV2jX0FEOL9JmXXK+q4OQ,
freedreno-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW,
hoegsberg-F7+t8E8rja9g9hUCZPvPmw
On 2018-04-03 01:40, Sean Paul wrote:
> A bunch of warning fixes, build is clean now.
Some of the changes done in this patch are unique and were not present
in previous patch series to fix dpu driver warnings.
Please consider refactoring this patch a bit to include the remaining
valid fixes.
Thanks,
Rajesh
>
> Signed-off-by: Sean Paul <seanpaul@chromium.org>
> ---
> drivers/gpu/drm/msm/disp/dpu1/dpu_connector.c | 7 ++++---
> drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c | 2 +-
> drivers/gpu/drm/msm/disp/dpu1/dpu_hw_reg_dma_v1.c | 4 ++--
> drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 1 -
> drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c | 1 -
> drivers/gpu/drm/msm/disp/dpu1/dpu_vbif.c | 2 +-
> drivers/gpu/drm/msm/dpu_dbg.c | 2 +-
> 7 files changed, 9 insertions(+), 10 deletions(-)
>
> diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_connector.c
> b/drivers/gpu/drm/msm/disp/dpu1/dpu_connector.c
> index 36607e36672d..a57495f95663 100644
> --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_connector.c
> +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_connector.c
> @@ -32,9 +32,6 @@
>
> #define DPU_ERROR_CONN(c, fmt, ...) DPU_ERROR("conn%d " fmt,\
> (c) ? (c)->base.base.id : -1, ##__VA_ARGS__)
> -static u32 dither_matrix[DITHER_MATRIX_SZ] = {
> - 15, 7, 13, 5, 3, 11, 1, 9, 12, 4, 14, 6, 0, 8, 2, 10
> -};
>
> static const struct drm_prop_enum_list e_topology_name[] = {
> {DPU_RM_TOPOLOGY_NONE, "dpu_none"},
> @@ -226,6 +223,10 @@ void dpu_connector_unregister_event(struct
> drm_connector *connector,
> }
>
> #ifdef CONFIG_DRM_MSM_DSI_STAGING
> +static u32 dither_matrix[DITHER_MATRIX_SZ] = {
> + 15, 7, 13, 5, 3, 11, 1, 9, 12, 4, 14, 6, 0, 8, 2, 10
> +};
> +
This change is valid.
> static int _dpu_connector_get_default_dither_cfg_v1(
> struct dpu_connector *c_conn, void *cfg)
> {
> diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c
> b/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c
> index 3308929bc9d6..b0c170373632 100644
> --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c
> +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c
> @@ -2587,7 +2587,7 @@ static void dpu_crtc_disable(struct drm_crtc
> *crtc)
> struct dpu_crtc_irq_info *node = NULL;
> struct drm_event event;
> u32 power_on;
> - int ret, i;
> + int ret;
>
> if (!crtc || !crtc->dev || !crtc->dev->dev_private || !crtc->state) {
> DPU_ERROR("invalid crtc\n");
> diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_reg_dma_v1.c
> b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_reg_dma_v1.c
> index bb4547748ce9..e0d46c545c14 100644
> --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_reg_dma_v1.c
> +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_reg_dma_v1.c
> @@ -374,7 +374,7 @@ static int validate_dma_cfg(struct
> dpu_reg_dma_setup_ops_cfg *cfg)
> }
>
> if (cfg->dma_buf->iova & GUARD_BYTES || !cfg->dma_buf->vaddr) {
> - DRM_ERROR("iova not aligned to %zx iova %x kva %pK",
> + DRM_ERROR("iova not aligned to %zx iova %llx kva %pK",
> ADDR_ALIGN, cfg->dma_buf->iova,
> cfg->dma_buf->vaddr);
> return -EINVAL;
> @@ -433,7 +433,7 @@ static int validate_kick_off_v1(struct
> dpu_reg_dma_kickoff_cfg *cfg)
> (WRITE_TRIGGER);
>
> if (cfg->dma_buf->iova & GUARD_BYTES) {
> - DRM_ERROR("Address is not aligned to %zx iova %x", ADDR_ALIGN,
> + DRM_ERROR("Address is not aligned to %zx iova %llx", ADDR_ALIGN,
> cfg->dma_buf->iova);
> return -EINVAL;
> }
This was address in
https://lists.freedesktop.org/archives/freedreno/2018-March/001944.html
> diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c
> b/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c
> index 36657aa97bd7..aad5a94c726a 100644
> --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c
> +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c
> @@ -426,7 +426,6 @@ static void dpu_kms_commit(struct msm_kms *kms,
> struct drm_atomic_state *state)
> {
> struct drm_crtc *crtc;
> struct drm_crtc_state *crtc_state;
> - struct dpu_crtc_state *cstate;
> int i;
>
> for_each_new_crtc_in_state(state, crtc, crtc_state, i) {
> diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c
> b/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c
> index 33a894e3d580..7844d6463220 100644
> --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c
> +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c
> @@ -2742,7 +2742,6 @@ dpu_plane_duplicate_state(struct drm_plane
> *plane)
> struct dpu_plane *pdpu;
> struct dpu_plane_state *pstate;
> struct dpu_plane_state *old_state;
> - struct drm_property *drm_prop;
>
> if (!plane) {
> DPU_ERROR("invalid plane\n");
> diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_vbif.c
> b/drivers/gpu/drm/msm/disp/dpu1/dpu_vbif.c
> index 801155fe0989..074223383a98 100644
> --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_vbif.c
> +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_vbif.c
> @@ -321,7 +321,7 @@ void dpu_debugfs_vbif_destroy(struct dpu_kms
> *dpu_kms)
>
> int dpu_debugfs_vbif_init(struct dpu_kms *dpu_kms, struct dentry
> *debugfs_root)
> {
> - char vbif_name[32];
> + char vbif_name[64];
This change is valid.
> struct dentry *debugfs_vbif;
> int i, j;
>
> diff --git a/drivers/gpu/drm/msm/dpu_dbg.c
> b/drivers/gpu/drm/msm/dpu_dbg.c
> index 8118fb72645a..8322b1cb89c9 100644
> --- a/drivers/gpu/drm/msm/dpu_dbg.c
> +++ b/drivers/gpu/drm/msm/dpu_dbg.c
> @@ -3043,7 +3043,7 @@ int dpu_dbg_debugfs_register(struct dentry
> *debugfs_root)
> {
> static struct dpu_dbg_base *dbg = &dpu_dbg_base;
> struct dpu_dbg_reg_base *blk_base;
> - char debug_name[80] = "";
> + char debug_name[88] = "";
This change is valid.
>
> if (!debugfs_root)
> return -EINVAL;
_______________________________________________
Freedreno mailing list
Freedreno@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/freedreno
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2018-04-05 5:07 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-04-02 20:10 [DPU PATCH 0/3] drm/msm: Fix build warnings Sean Paul
[not found] ` <20180402201027.222813-1-seanpaul-F7+t8E8rja9g9hUCZPvPmw@public.gmane.org>
2018-04-02 20:10 ` [DPU PATCH 1/3] drm/msm: Fix uninitialized use of prefill_lines Sean Paul
[not found] ` <20180402201027.222813-2-seanpaul-F7+t8E8rja9g9hUCZPvPmw@public.gmane.org>
2018-04-05 4:51 ` ryadav-sgV2jX0FEOL9JmXXK+q4OQ
2018-04-02 20:10 ` [DPU PATCH 2/3] drm/msm: Properly cast return with ERR_PTR Sean Paul
2018-04-02 20:10 ` [DPU PATCH 3/3] drm/msm: Fix dpu build warnings Sean Paul
[not found] ` <20180402201027.222813-4-seanpaul-F7+t8E8rja9g9hUCZPvPmw@public.gmane.org>
2018-04-05 5:07 ` ryadav-sgV2jX0FEOL9JmXXK+q4OQ
2018-04-03 8:54 ` [DPU PATCH 0/3] drm/msm: Fix " ryadav-sgV2jX0FEOL9JmXXK+q4OQ
[not found] ` <7349d8e701ac6a26d49b801edbc059ff-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org>
2018-04-04 18:33 ` 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.