* [PATCH] drm/i915/skl: Correctly updating sprite wm parameter
@ 2014-12-09 5:29 sonika.jindal
2014-12-09 10:27 ` Daniel Vetter
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: sonika.jindal @ 2014-12-09 5:29 UTC (permalink / raw)
To: intel-gfx
From: Sonika Jindal <sonika.jindal@intel.com>
The pipe wm parameters is not correctly updated with sprite parameters
because it copies them for each plane from plane_list to the sprite
offset in pipe wm parameters. Since plane_list also contains primary and
cursor planes, we end up updating wrong params for sprites.
Signed-off-by: Sonika Jindal <sonika.jindal@intel.com>
---
drivers/gpu/drm/i915/intel_pm.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
index 8d182a6..4a16f9b 100644
--- a/drivers/gpu/drm/i915/intel_pm.c
+++ b/drivers/gpu/drm/i915/intel_pm.c
@@ -3301,7 +3301,8 @@ static void skl_compute_wm_pipe_parameters(struct drm_crtc *crtc,
list_for_each_entry(plane, &dev->mode_config.plane_list, head) {
struct intel_plane *intel_plane = to_intel_plane(plane);
- if (intel_plane->pipe == pipe)
+ if (intel_plane->pipe == pipe &&
+ plane->type == DRM_PLANE_TYPE_OVERLAY)
p->plane[i++] = intel_plane->wm;
}
}
--
1.7.10.4
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH] drm/i915/skl: Correctly updating sprite wm parameter
2014-12-09 5:29 [PATCH] drm/i915/skl: Correctly updating sprite wm parameter sonika.jindal
@ 2014-12-09 10:27 ` Daniel Vetter
2014-12-09 11:22 ` Jindal, Sonika
2014-12-09 12:50 ` shuang.he
2014-12-12 14:34 ` Tvrtko Ursulin
2 siblings, 1 reply; 6+ messages in thread
From: Daniel Vetter @ 2014-12-09 10:27 UTC (permalink / raw)
To: sonika.jindal; +Cc: intel-gfx
On Tue, Dec 09, 2014 at 10:59:15AM +0530, sonika.jindal@intel.com wrote:
> From: Sonika Jindal <sonika.jindal@intel.com>
>
> The pipe wm parameters is not correctly updated with sprite parameters
> because it copies them for each plane from plane_list to the sprite
> offset in pipe wm parameters. Since plane_list also contains primary and
> cursor planes, we end up updating wrong params for sprites.
>
> Signed-off-by: Sonika Jindal <sonika.jindal@intel.com>
> ---
> drivers/gpu/drm/i915/intel_pm.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
> index 8d182a6..4a16f9b 100644
> --- a/drivers/gpu/drm/i915/intel_pm.c
> +++ b/drivers/gpu/drm/i915/intel_pm.c
> @@ -3301,7 +3301,8 @@ static void skl_compute_wm_pipe_parameters(struct drm_crtc *crtc,
> list_for_each_entry(plane, &dev->mode_config.plane_list, head) {
> struct intel_plane *intel_plane = to_intel_plane(plane);
>
> - if (intel_plane->pipe == pipe)
> + if (intel_plane->pipe == pipe &&
> + plane->type == DRM_PLANE_TYPE_OVERLAY)
> p->plane[i++] = intel_plane->wm;
> }
> }
With the great unification of planes both in hw with skl+ and in software
(with Matt's recent work): Can't we just ditch the cursor/primary plane
special cases?
-Daniel
--
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] drm/i915/skl: Correctly updating sprite wm parameter
2014-12-09 10:27 ` Daniel Vetter
@ 2014-12-09 11:22 ` Jindal, Sonika
0 siblings, 0 replies; 6+ messages in thread
From: Jindal, Sonika @ 2014-12-09 11:22 UTC (permalink / raw)
To: Daniel Vetter; +Cc: intel-gfx@lists.freedesktop.org
Yes, that can be done but that might involve more changes and testing.
I am not sure who can signup for this, I can check with people though.
But for now to fix the sprite plane wm this check would be required.
Regards,
Sonika
-----Original Message-----
From: Daniel Vetter [mailto:daniel.vetter@ffwll.ch] On Behalf Of Daniel Vetter
Sent: Tuesday, December 9, 2014 3:57 PM
To: Jindal, Sonika
Cc: intel-gfx@lists.freedesktop.org
Subject: Re: [Intel-gfx] [PATCH] drm/i915/skl: Correctly updating sprite wm parameter
On Tue, Dec 09, 2014 at 10:59:15AM +0530, sonika.jindal@intel.com wrote:
> From: Sonika Jindal <sonika.jindal@intel.com>
>
> The pipe wm parameters is not correctly updated with sprite parameters
> because it copies them for each plane from plane_list to the sprite
> offset in pipe wm parameters. Since plane_list also contains primary
> and cursor planes, we end up updating wrong params for sprites.
>
> Signed-off-by: Sonika Jindal <sonika.jindal@intel.com>
> ---
> drivers/gpu/drm/i915/intel_pm.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_pm.c
> b/drivers/gpu/drm/i915/intel_pm.c index 8d182a6..4a16f9b 100644
> --- a/drivers/gpu/drm/i915/intel_pm.c
> +++ b/drivers/gpu/drm/i915/intel_pm.c
> @@ -3301,7 +3301,8 @@ static void skl_compute_wm_pipe_parameters(struct drm_crtc *crtc,
> list_for_each_entry(plane, &dev->mode_config.plane_list, head) {
> struct intel_plane *intel_plane = to_intel_plane(plane);
>
> - if (intel_plane->pipe == pipe)
> + if (intel_plane->pipe == pipe &&
> + plane->type == DRM_PLANE_TYPE_OVERLAY)
> p->plane[i++] = intel_plane->wm;
> }
> }
With the great unification of planes both in hw with skl+ and in software (with Matt's recent work): Can't we just ditch the cursor/primary plane special cases?
-Daniel
--
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] drm/i915/skl: Correctly updating sprite wm parameter
2014-12-09 5:29 [PATCH] drm/i915/skl: Correctly updating sprite wm parameter sonika.jindal
2014-12-09 10:27 ` Daniel Vetter
@ 2014-12-09 12:50 ` shuang.he
2014-12-12 14:34 ` Tvrtko Ursulin
2 siblings, 0 replies; 6+ messages in thread
From: shuang.he @ 2014-12-09 12:50 UTC (permalink / raw)
To: shuang.he, intel-gfx, sonika.jindal
Tested-By: PRC QA PRTS (Patch Regression Test System Contact: shuang.he@intel.com)
-------------------------------------Summary-------------------------------------
Platform Delta drm-intel-nightly Series Applied
PNV 364/364 364/364
ILK +3-4 362/366 361/366
SNB 448/450 448/450
IVB 497/498 497/498
BYT 289/289 289/289
HSW 563/564 563/564
BDW 417/417 417/417
-------------------------------------Detailed-------------------------------------
Platform Test drm-intel-nightly Series Applied
ILK igt_kms_flip_nonblocking-read DMESG_WARN(1, M26)PASS(3, M26M37) PASS(1, M26)
ILK igt_kms_setmode_invalid-clone-exclusive-crtc DMESG_WARN(1, M26)PASS(3, M26M37) PASS(1, M26)
*ILK igt_kms_flip_busy-flip-interruptible PASS(2, M26) DMESG_WARN(1, M26)
*ILK igt_kms_flip_flip-vs-dpms-interruptible PASS(2, M26) DMESG_WARN(1, M26)
*ILK igt_kms_flip_flip-vs-panning PASS(2, M26) DMESG_WARN(1, M26)
ILK igt_kms_flip_flip-vs-rmfb-interruptible DMESG_WARN(1, M26)PASS(3, M26M37) PASS(1, M26)
*ILK igt_kms_flip_wf_vblank-ts-check PASS(2, M26) NSPT(1, M26)
Note: You need to pay more attention to line start with '*'
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] drm/i915/skl: Correctly updating sprite wm parameter
2014-12-09 5:29 [PATCH] drm/i915/skl: Correctly updating sprite wm parameter sonika.jindal
2014-12-09 10:27 ` Daniel Vetter
2014-12-09 12:50 ` shuang.he
@ 2014-12-12 14:34 ` Tvrtko Ursulin
2014-12-15 8:55 ` Daniel Vetter
2 siblings, 1 reply; 6+ messages in thread
From: Tvrtko Ursulin @ 2014-12-12 14:34 UTC (permalink / raw)
To: sonika.jindal, intel-gfx
On 12/09/2014 05:29 AM, sonika.jindal@intel.com wrote:
> From: Sonika Jindal <sonika.jindal@intel.com>
>
> The pipe wm parameters is not correctly updated with sprite parameters
> because it copies them for each plane from plane_list to the sprite
> offset in pipe wm parameters. Since plane_list also contains primary and
> cursor planes, we end up updating wrong params for sprites.
>
> Signed-off-by: Sonika Jindal <sonika.jindal@intel.com>
> ---
> drivers/gpu/drm/i915/intel_pm.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
> index 8d182a6..4a16f9b 100644
> --- a/drivers/gpu/drm/i915/intel_pm.c
> +++ b/drivers/gpu/drm/i915/intel_pm.c
> @@ -3301,7 +3301,8 @@ static void skl_compute_wm_pipe_parameters(struct drm_crtc *crtc,
> list_for_each_entry(plane, &dev->mode_config.plane_list, head) {
> struct intel_plane *intel_plane = to_intel_plane(plane);
>
> - if (intel_plane->pipe == pipe)
> + if (intel_plane->pipe == pipe &&
> + plane->type == DRM_PLANE_TYPE_OVERLAY)
> p->plane[i++] = intel_plane->wm;
> }
> }
>
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] drm/i915/skl: Correctly updating sprite wm parameter
2014-12-12 14:34 ` Tvrtko Ursulin
@ 2014-12-15 8:55 ` Daniel Vetter
0 siblings, 0 replies; 6+ messages in thread
From: Daniel Vetter @ 2014-12-15 8:55 UTC (permalink / raw)
To: Tvrtko Ursulin; +Cc: intel-gfx
On Fri, Dec 12, 2014 at 02:34:37PM +0000, Tvrtko Ursulin wrote:
>
> On 12/09/2014 05:29 AM, sonika.jindal@intel.com wrote:
> >From: Sonika Jindal <sonika.jindal@intel.com>
> >
> >The pipe wm parameters is not correctly updated with sprite parameters
> >because it copies them for each plane from plane_list to the sprite
> >offset in pipe wm parameters. Since plane_list also contains primary and
> >cursor planes, we end up updating wrong params for sprites.
> >
> >Signed-off-by: Sonika Jindal <sonika.jindal@intel.com>
> >---
> > drivers/gpu/drm/i915/intel_pm.c | 3 ++-
> > 1 file changed, 2 insertions(+), 1 deletion(-)
> >
> >diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
> >index 8d182a6..4a16f9b 100644
> >--- a/drivers/gpu/drm/i915/intel_pm.c
> >+++ b/drivers/gpu/drm/i915/intel_pm.c
> >@@ -3301,7 +3301,8 @@ static void skl_compute_wm_pipe_parameters(struct drm_crtc *crtc,
> > list_for_each_entry(plane, &dev->mode_config.plane_list, head) {
> > struct intel_plane *intel_plane = to_intel_plane(plane);
> >
> >- if (intel_plane->pipe == pipe)
> >+ if (intel_plane->pipe == pipe &&
> >+ plane->type == DRM_PLANE_TYPE_OVERLAY)
> > p->plane[i++] = intel_plane->wm;
> > }
> > }
> >
>
> Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Queued for -next, thanks for the patch.
-Daniel
--
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2014-12-15 8:54 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-12-09 5:29 [PATCH] drm/i915/skl: Correctly updating sprite wm parameter sonika.jindal
2014-12-09 10:27 ` Daniel Vetter
2014-12-09 11:22 ` Jindal, Sonika
2014-12-09 12:50 ` shuang.he
2014-12-12 14:34 ` Tvrtko Ursulin
2014-12-15 8:55 ` Daniel Vetter
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox