| Message ID | 20170705143154.32132-7-mahesh1.kumar@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Op 05-07-17 om 16:31 schreef Mahesh Kumar: > From: "Kumar, Mahesh" <mahesh1.kumar@intel.com> > > use same cpp value in different phase of plane WM caluclation. > > Signed-off-by: Mahesh Kumar <mahesh1.kumar@intel.com> > Reviewed-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> > --- > drivers/gpu/drm/i915/intel_pm.c | 6 ++---- > 1 file changed, 2 insertions(+), 4 deletions(-) > > diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c > index 9e2ca70bed5d..9753210d79ae 100644 > --- a/drivers/gpu/drm/i915/intel_pm.c > +++ b/drivers/gpu/drm/i915/intel_pm.c > @@ -4399,13 +4399,11 @@ static int skl_compute_plane_wm(const struct drm_i915_private *dev_priv, > width = drm_rect_width(&intel_pstate->base.src) >> 16; > } > > - cpp = fb->format->cpp[0]; > + cpp = (fb->format->format == DRM_FORMAT_NV12) ? fb->format->cpp[1] : > + fb->format->cpp[0]; > plane_pixel_rate = skl_adjusted_plane_pixel_rate(cstate, intel_pstate); > > if (drm_rotation_90_or_270(pstate->rotation)) { > - int cpp = (fb->format->format == DRM_FORMAT_NV12) ? > - fb->format->cpp[1] : > - fb->format->cpp[0]; > > switch (cpp) { > case 1: First 6 patches pushed, thanks. I'll take a closer look at the other patches on monday. :)
On Thu, 13 Jul 2017, Maarten Lankhorst <maarten.lankhorst@linux.intel.com> wrote: > Op 05-07-17 om 16:31 schreef Mahesh Kumar: >> From: "Kumar, Mahesh" <mahesh1.kumar@intel.com> >> >> use same cpp value in different phase of plane WM caluclation. >> >> Signed-off-by: Mahesh Kumar <mahesh1.kumar@intel.com> >> Reviewed-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> >> --- >> drivers/gpu/drm/i915/intel_pm.c | 6 ++---- >> 1 file changed, 2 insertions(+), 4 deletions(-) >> >> diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c >> index 9e2ca70bed5d..9753210d79ae 100644 >> --- a/drivers/gpu/drm/i915/intel_pm.c >> +++ b/drivers/gpu/drm/i915/intel_pm.c >> @@ -4399,13 +4399,11 @@ static int skl_compute_plane_wm(const struct drm_i915_private *dev_priv, >> width = drm_rect_width(&intel_pstate->base.src) >> 16; >> } >> >> - cpp = fb->format->cpp[0]; >> + cpp = (fb->format->format == DRM_FORMAT_NV12) ? fb->format->cpp[1] : >> + fb->format->cpp[0]; >> plane_pixel_rate = skl_adjusted_plane_pixel_rate(cstate, intel_pstate); >> >> if (drm_rotation_90_or_270(pstate->rotation)) { >> - int cpp = (fb->format->format == DRM_FORMAT_NV12) ? >> - fb->format->cpp[1] : >> - fb->format->cpp[0]; >> >> switch (cpp) { >> case 1: > > First 6 patches pushed, thanks. I guess I was too late with my review comments. But please do them as further cleanups. BR, Jani. > > I'll take a closer look at the other patches on monday. :) > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Hi Jani, Thanks for review. On Friday 14 July 2017 03:56 PM, Jani Nikula wrote: > On Thu, 13 Jul 2017, Maarten Lankhorst <maarten.lankhorst@linux.intel.com> wrote: >> Op 05-07-17 om 16:31 schreef Mahesh Kumar: >>> From: "Kumar, Mahesh" <mahesh1.kumar@intel.com> >>> >>> use same cpp value in different phase of plane WM caluclation. >>> >>> Signed-off-by: Mahesh Kumar <mahesh1.kumar@intel.com> >>> Reviewed-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> >>> --- >>> drivers/gpu/drm/i915/intel_pm.c | 6 ++---- >>> 1 file changed, 2 insertions(+), 4 deletions(-) >>> >>> diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c >>> index 9e2ca70bed5d..9753210d79ae 100644 >>> --- a/drivers/gpu/drm/i915/intel_pm.c >>> +++ b/drivers/gpu/drm/i915/intel_pm.c >>> @@ -4399,13 +4399,11 @@ static int skl_compute_plane_wm(const struct drm_i915_private *dev_priv, >>> width = drm_rect_width(&intel_pstate->base.src) >> 16; >>> } >>> >>> - cpp = fb->format->cpp[0]; >>> + cpp = (fb->format->format == DRM_FORMAT_NV12) ? fb->format->cpp[1] : >>> + fb->format->cpp[0]; >>> plane_pixel_rate = skl_adjusted_plane_pixel_rate(cstate, intel_pstate); >>> >>> if (drm_rotation_90_or_270(pstate->rotation)) { >>> - int cpp = (fb->format->format == DRM_FORMAT_NV12) ? >>> - fb->format->cpp[1] : >>> - fb->format->cpp[0]; >>> >>> switch (cpp) { >>> case 1: >> First 6 patches pushed, thanks. > I guess I was too late with my review comments. But please do them as > further cleanups. I'm going to push remaining patches, so please let me know if any further review comments. will address those & include as part of new series. -Mahesh > > BR, > Jani. > >> I'll take a closer look at the other patches on monday. :) >> >> _______________________________________________ >> Intel-gfx mailing list >> Intel-gfx@lists.freedesktop.org >> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c index 9e2ca70bed5d..9753210d79ae 100644 --- a/drivers/gpu/drm/i915/intel_pm.c +++ b/drivers/gpu/drm/i915/intel_pm.c @@ -4399,13 +4399,11 @@ static int skl_compute_plane_wm(const struct drm_i915_private *dev_priv, width = drm_rect_width(&intel_pstate->base.src) >> 16; } - cpp = fb->format->cpp[0]; + cpp = (fb->format->format == DRM_FORMAT_NV12) ? fb->format->cpp[1] : + fb->format->cpp[0]; plane_pixel_rate = skl_adjusted_plane_pixel_rate(cstate, intel_pstate); if (drm_rotation_90_or_270(pstate->rotation)) { - int cpp = (fb->format->format == DRM_FORMAT_NV12) ? - fb->format->cpp[1] : - fb->format->cpp[0]; switch (cpp) { case 1: