Intel-GFX Archive on lore.kernel.org
 help / color / Atom feed
* [Intel-gfx] [PATCH v1] drm/i915: Fix includes and local vars order
@ 2020-05-22 12:55 Stanislav Lisovskiy
  2020-05-22 13:05 ` Chris Wilson
  2020-05-22 13:37 ` [Intel-gfx] ✓ Fi.CI.BAT: success for " Patchwork
  0 siblings, 2 replies; 4+ messages in thread
From: Stanislav Lisovskiy @ 2020-05-22 12:55 UTC (permalink / raw)
  To: intel-gfx; +Cc: chris

Removed duplicate include and fixed comment > 80 chars.

Signed-off-by: Stanislav Lisovskiy <stanislav.lisovskiy@intel.com>
---
 drivers/gpu/drm/i915/display/intel_bw.c    | 43 ++++++++++++----------
 drivers/gpu/drm/i915/display/intel_bw.h    |  2 +-
 drivers/gpu/drm/i915/display/intel_cdclk.c |  2 +-
 drivers/gpu/drm/i915/display/intel_cdclk.h |  1 +
 drivers/gpu/drm/i915/intel_pm.c            |  3 +-
 drivers/gpu/drm/i915/intel_pm.h            |  2 +-
 6 files changed, 29 insertions(+), 24 deletions(-)

diff --git a/drivers/gpu/drm/i915/display/intel_bw.c b/drivers/gpu/drm/i915/display/intel_bw.c
index 8d2f58e39595..db9ba8f922bd 100644
--- a/drivers/gpu/drm/i915/display/intel_bw.c
+++ b/drivers/gpu/drm/i915/display/intel_bw.c
@@ -5,13 +5,12 @@
 
 #include <drm/drm_atomic_state_helper.h>
 
+#include "intel_atomic.h"
 #include "intel_bw.h"
-#include "intel_pm.h"
+#include "intel_cdclk.h"
 #include "intel_display_types.h"
-#include "intel_sideband.h"
-#include "intel_atomic.h"
 #include "intel_pm.h"
-#include "intel_cdclk.h"
+#include "intel_sideband.h"
 
 /* Parameters for Qclk Geyserville (QGV) */
 struct intel_qgv_point {
@@ -431,13 +430,13 @@ intel_atomic_get_bw_state(struct intel_atomic_state *state)
 int skl_bw_calc_min_cdclk(struct intel_atomic_state *state)
 {
 	struct drm_i915_private *dev_priv = to_i915(state->base.dev);
-	int i;
+	struct intel_bw_state *new_bw_state = NULL;
+	struct intel_bw_state *old_bw_state = NULL;
 	const struct intel_crtc_state *crtc_state;
 	struct intel_crtc *crtc;
 	int max_bw = 0;
 	int slice_id;
-	struct intel_bw_state *new_bw_state = NULL;
-	struct intel_bw_state *old_bw_state = NULL;
+	int i;
 
 	for_each_new_intel_crtc_in_state(state, crtc, crtc_state, i) {
 		enum plane_id plane_id;
@@ -463,14 +462,17 @@ int skl_bw_calc_min_cdclk(struct intel_atomic_state *state)
 			dbuf_mask |= skl_ddb_dbuf_slice_mask(dev_priv, uv_plane_alloc);
 
 			/*
-			 * FIXME: To calculate that more properly we probably need to
-			 * to split per plane data_rate into data_rate_y and data_rate_uv
-			 * for multiplanar formats in order not to get accounted those twice
-			 * if they happen to reside on different slices.
-			 * However for pre-icl this would work anyway because we have only single
-			 * slice and for icl+ uv plane has non-zero data rate.
-			 * So in worst case those calculation are a bit pessimistic, which
-			 * shouldn't pose any significant problem anyway.
+			 * FIXME: To calculate that more properly we probably
+			 * need to to split per plane data_rate into data_rate_y
+			 * and data_rate_uv for multiplanar formats in order not
+			 * to get accounted those twice if they happen to reside
+			 * on different slices.
+			 * However for pre-icl this would work anyway because
+			 * we have only single slice and for icl+ uv plane has
+			 * non-zero data rate.
+			 * So in worst case those calculation are a bit
+			 * pessimistic, which shouldn't pose any significant
+			 * problem anyway.
 			 */
 			for_each_dbuf_slice_in_mask(slice_id, dbuf_mask)
 				crtc_bw->used_bw[slice_id] += data_rate;
@@ -478,11 +480,12 @@ int skl_bw_calc_min_cdclk(struct intel_atomic_state *state)
 
 		for_each_dbuf_slice(slice_id) {
 			/*
-			 * Current experimental observations show that contrary to BSpec
-			 * we get underruns once we exceed 64 * CDCLK for slices in total.
-			 * As a temporary measure in order not to keep CDCLK bumped up all the
-			 * time we calculate CDCLK according to this formula for  overall bw
-			 * consumed by slices.
+			 * Current experimental observations show that contrary
+			 * to BSpec we get underruns once we exceed 64 * CDCLK
+			 * for slices in total.
+			 * As a temporary measure in order not to keep CDCLK
+			 * bumped up all the time we calculate CDCLK according
+			 * to this formula for  overall bw consumed by slices.
 			 */
 			max_bw += crtc_bw->used_bw[slice_id];
 		}
diff --git a/drivers/gpu/drm/i915/display/intel_bw.h b/drivers/gpu/drm/i915/display/intel_bw.h
index af1a981dec84..46c6eecbd917 100644
--- a/drivers/gpu/drm/i915/display/intel_bw.h
+++ b/drivers/gpu/drm/i915/display/intel_bw.h
@@ -9,8 +9,8 @@
 #include <drm/drm_atomic.h>
 
 #include "intel_display.h"
-#include "intel_global_state.h"
 #include "intel_display_power.h"
+#include "intel_global_state.h"
 
 struct drm_i915_private;
 struct intel_atomic_state;
diff --git a/drivers/gpu/drm/i915/display/intel_cdclk.c b/drivers/gpu/drm/i915/display/intel_cdclk.c
index dda9bae02a86..643701cca6ba 100644
--- a/drivers/gpu/drm/i915/display/intel_cdclk.c
+++ b/drivers/gpu/drm/i915/display/intel_cdclk.c
@@ -23,10 +23,10 @@
 
 #include <linux/time.h>
 #include "intel_atomic.h"
+#include "intel_bw.h"
 #include "intel_cdclk.h"
 #include "intel_display_types.h"
 #include "intel_sideband.h"
-#include "intel_bw.h"
 
 /**
  * DOC: CDCLK / RAWCLK
diff --git a/drivers/gpu/drm/i915/display/intel_cdclk.h b/drivers/gpu/drm/i915/display/intel_cdclk.h
index d62e11d620c0..5731806e4cee 100644
--- a/drivers/gpu/drm/i915/display/intel_cdclk.h
+++ b/drivers/gpu/drm/i915/display/intel_cdclk.h
@@ -7,6 +7,7 @@
 #define __INTEL_CDCLK_H__
 
 #include <linux/types.h>
+
 #include "i915_drv.h"
 #include "intel_display.h"
 #include "intel_global_state.h"
diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
index 937d91c28de9..79b673e6051e 100644
--- a/drivers/gpu/drm/i915/intel_pm.c
+++ b/drivers/gpu/drm/i915/intel_pm.c
@@ -33,6 +33,7 @@
 #include <drm/drm_plane_helper.h>
 
 #include "display/intel_atomic.h"
+#include "display/intel_bw.h"
 #include "display/intel_display_types.h"
 #include "display/intel_fbc.h"
 #include "display/intel_sprite.h"
@@ -43,7 +44,7 @@
 #include "i915_fixed.h"
 #include "i915_irq.h"
 #include "i915_trace.h"
-#include "display/intel_bw.h"
+
 #include "intel_pm.h"
 #include "intel_sideband.h"
 #include "../../../platform/x86/intel_ips.h"
diff --git a/drivers/gpu/drm/i915/intel_pm.h b/drivers/gpu/drm/i915/intel_pm.h
index d665bf77ae80..a2473594c2db 100644
--- a/drivers/gpu/drm/i915/intel_pm.h
+++ b/drivers/gpu/drm/i915/intel_pm.h
@@ -8,10 +8,10 @@
 
 #include <linux/types.h>
 
+#include "display/intel_bw.h"
 #include "display/intel_global_state.h"
 
 #include "i915_reg.h"
-#include "display/intel_bw.h"
 
 struct drm_device;
 struct drm_i915_private;
-- 
2.24.1.485.gad05a3d8e5

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [Intel-gfx] [PATCH v1] drm/i915: Fix includes and local vars order
  2020-05-22 12:55 [Intel-gfx] [PATCH v1] drm/i915: Fix includes and local vars order Stanislav Lisovskiy
@ 2020-05-22 13:05 ` Chris Wilson
  2020-05-22 13:13   ` Lisovskiy, Stanislav
  2020-05-22 13:37 ` [Intel-gfx] ✓ Fi.CI.BAT: success for " Patchwork
  1 sibling, 1 reply; 4+ messages in thread
From: Chris Wilson @ 2020-05-22 13:05 UTC (permalink / raw)
  To: Stanislav Lisovskiy, intel-gfx

Quoting Stanislav Lisovskiy (2020-05-22 13:55:34)
> Removed duplicate include and fixed comment > 80 chars.
> 
> Signed-off-by: Stanislav Lisovskiy <stanislav.lisovskiy@intel.com>
> ---
>  drivers/gpu/drm/i915/display/intel_bw.c    | 43 ++++++++++++----------
>  drivers/gpu/drm/i915/display/intel_bw.h    |  2 +-
>  drivers/gpu/drm/i915/display/intel_cdclk.c |  2 +-
>  drivers/gpu/drm/i915/display/intel_cdclk.h |  1 +
>  drivers/gpu/drm/i915/intel_pm.c            |  3 +-
>  drivers/gpu/drm/i915/intel_pm.h            |  2 +-
>  6 files changed, 29 insertions(+), 24 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/display/intel_bw.c b/drivers/gpu/drm/i915/display/intel_bw.c
> index 8d2f58e39595..db9ba8f922bd 100644
> --- a/drivers/gpu/drm/i915/display/intel_bw.c
> +++ b/drivers/gpu/drm/i915/display/intel_bw.c
> @@ -5,13 +5,12 @@
>  
>  #include <drm/drm_atomic_state_helper.h>
>  
> +#include "intel_atomic.h"
>  #include "intel_bw.h"
> -#include "intel_pm.h"
> +#include "intel_cdclk.h"
>  #include "intel_display_types.h"
> -#include "intel_sideband.h"
> -#include "intel_atomic.h"
>  #include "intel_pm.h"
> -#include "intel_cdclk.h"
> +#include "intel_sideband.h"

There was also the accidental remove of a '\n' before
intel_bw_crtc_update()

> diff --git a/drivers/gpu/drm/i915/display/intel_cdclk.c b/drivers/gpu/drm/i915/display/intel_cdclk.c
> index dda9bae02a86..643701cca6ba 100644
> --- a/drivers/gpu/drm/i915/display/intel_cdclk.c
> +++ b/drivers/gpu/drm/i915/display/intel_cdclk.c
> @@ -23,10 +23,10 @@
>  
>  #include <linux/time.h>

\n between system and local includes

>  #include "intel_atomic.h"
> +#include "intel_bw.h"
>  #include "intel_cdclk.h"
>  #include "intel_display_types.h"
>  #include "intel_sideband.h"
> -#include "intel_bw.h"

2 more nits then
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
s/Reviewed/Critiqued/
-Chris
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [Intel-gfx] [PATCH v1] drm/i915: Fix includes and local vars order
  2020-05-22 13:05 ` Chris Wilson
@ 2020-05-22 13:13   ` Lisovskiy, Stanislav
  0 siblings, 0 replies; 4+ messages in thread
From: Lisovskiy, Stanislav @ 2020-05-22 13:13 UTC (permalink / raw)
  To: Chris Wilson; +Cc: intel-gfx

On Fri, May 22, 2020 at 02:05:26PM +0100, Chris Wilson wrote:
> Quoting Stanislav Lisovskiy (2020-05-22 13:55:34)
> > Removed duplicate include and fixed comment > 80 chars.
> > 
> > Signed-off-by: Stanislav Lisovskiy <stanislav.lisovskiy@intel.com>
> > ---
> >  drivers/gpu/drm/i915/display/intel_bw.c    | 43 ++++++++++++----------
> >  drivers/gpu/drm/i915/display/intel_bw.h    |  2 +-
> >  drivers/gpu/drm/i915/display/intel_cdclk.c |  2 +-
> >  drivers/gpu/drm/i915/display/intel_cdclk.h |  1 +
> >  drivers/gpu/drm/i915/intel_pm.c            |  3 +-
> >  drivers/gpu/drm/i915/intel_pm.h            |  2 +-
> >  6 files changed, 29 insertions(+), 24 deletions(-)
> > 
> > diff --git a/drivers/gpu/drm/i915/display/intel_bw.c b/drivers/gpu/drm/i915/display/intel_bw.c
> > index 8d2f58e39595..db9ba8f922bd 100644
> > --- a/drivers/gpu/drm/i915/display/intel_bw.c
> > +++ b/drivers/gpu/drm/i915/display/intel_bw.c
> > @@ -5,13 +5,12 @@
> >  
> >  #include <drm/drm_atomic_state_helper.h>
> >  
> > +#include "intel_atomic.h"
> >  #include "intel_bw.h"
> > -#include "intel_pm.h"
> > +#include "intel_cdclk.h"
> >  #include "intel_display_types.h"
> > -#include "intel_sideband.h"
> > -#include "intel_atomic.h"
> >  #include "intel_pm.h"
> > -#include "intel_cdclk.h"
> > +#include "intel_sideband.h"
> 
> There was also the accidental remove of a '\n' before
> intel_bw_crtc_update()

Weird..how didn't I spot this.

> 
> > diff --git a/drivers/gpu/drm/i915/display/intel_cdclk.c b/drivers/gpu/drm/i915/display/intel_cdclk.c
> > index dda9bae02a86..643701cca6ba 100644
> > --- a/drivers/gpu/drm/i915/display/intel_cdclk.c
> > +++ b/drivers/gpu/drm/i915/display/intel_cdclk.c
> > @@ -23,10 +23,10 @@
> >  
> >  #include <linux/time.h>
> 
> \n between system and local includes
> 
> >  #include "intel_atomic.h"
> > +#include "intel_bw.h"
> >  #include "intel_cdclk.h"
> >  #include "intel_display_types.h"
> >  #include "intel_sideband.h"
> > -#include "intel_bw.h"
> 
> 2 more nits then
> Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
> s/Reviewed/Critiqued/
> -Chris
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply	[flat|nested] 4+ messages in thread

* [Intel-gfx] ✓ Fi.CI.BAT: success for drm/i915: Fix includes and local vars order
  2020-05-22 12:55 [Intel-gfx] [PATCH v1] drm/i915: Fix includes and local vars order Stanislav Lisovskiy
  2020-05-22 13:05 ` Chris Wilson
@ 2020-05-22 13:37 ` Patchwork
  1 sibling, 0 replies; 4+ messages in thread
From: Patchwork @ 2020-05-22 13:37 UTC (permalink / raw)
  To: Stanislav Lisovskiy; +Cc: intel-gfx

== Series Details ==

Series: drm/i915: Fix includes and local vars order
URL   : https://patchwork.freedesktop.org/series/77555/
State : success

== Summary ==

CI Bug Log - changes from CI_DRM_8525 -> Patchwork_17758
====================================================

Summary
-------

  **SUCCESS**

  No regressions found.

  External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17758/index.html


Changes
-------

  No changes found


Participating hosts (46 -> 41)
------------------------------

  Missing    (5): fi-hsw-4200u fi-byt-squawks fi-bsw-cyan fi-byt-clapper fi-bdw-samus 


Build changes
-------------

  * Linux: CI_DRM_8525 -> Patchwork_17758

  CI-20190529: 20190529
  CI_DRM_8525: 56110c7afae3bbeb681960494b92b745c6802e1f @ git://anongit.freedesktop.org/gfx-ci/linux
  IGT_5675: 74f7488fe4f8acf901b18fc9c6c4d45a972dcad5 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
  Patchwork_17758: 87c2ef00d4d73bc4f578977e9d8017950d6ef268 @ git://anongit.freedesktop.org/gfx-ci/linux


== Linux commits ==

87c2ef00d4d7 drm/i915: Fix includes and local vars order

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17758/index.html
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, back to index

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-05-22 12:55 [Intel-gfx] [PATCH v1] drm/i915: Fix includes and local vars order Stanislav Lisovskiy
2020-05-22 13:05 ` Chris Wilson
2020-05-22 13:13   ` Lisovskiy, Stanislav
2020-05-22 13:37 ` [Intel-gfx] ✓ Fi.CI.BAT: success for " Patchwork

Intel-GFX Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/intel-gfx/0 intel-gfx/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 intel-gfx intel-gfx/ https://lore.kernel.org/intel-gfx \
		intel-gfx@lists.freedesktop.org
	public-inbox-index intel-gfx

Example config snippet for mirrors

Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.freedesktop.lists.intel-gfx


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git