* [PATCH 1/9] drm/i915: Fix random indent in i915_drm_resume()
@ 2016-07-02 14:35 Chris Wilson
2016-07-02 14:35 ` [PATCH 2/9] drm/915: Fix long lines and random indent in gen6_set_rps_thresholds() Chris Wilson
` (9 more replies)
0 siblings, 10 replies; 20+ messages in thread
From: Chris Wilson @ 2016-07-02 14:35 UTC (permalink / raw)
To: intel-gfx
smatch complains:
drivers/gpu/drm/i915/i915_drv.c:1616 i915_drm_resume() warn:
inconsistent indenting
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
---
drivers/gpu/drm/i915/i915_drv.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index 1317e348dbab..2ffcadee3570 100644
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -1613,7 +1613,7 @@ static int i915_drm_resume(struct drm_device *dev)
mutex_lock(&dev->struct_mutex);
if (i915_gem_init_hw(dev)) {
DRM_ERROR("failed to re-initialize GPU, declaring wedged!\n");
- atomic_or(I915_WEDGED, &dev_priv->gpu_error.reset_counter);
+ atomic_or(I915_WEDGED, &dev_priv->gpu_error.reset_counter);
}
mutex_unlock(&dev->struct_mutex);
--
2.8.1
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [PATCH 2/9] drm/915: Fix long lines and random indent in gen6_set_rps_thresholds()
2016-07-02 14:35 [PATCH 1/9] drm/i915: Fix random indent in i915_drm_resume() Chris Wilson
@ 2016-07-02 14:35 ` Chris Wilson
2016-07-02 17:20 ` Matthew Auld
2016-07-02 14:36 ` [PATCH 3/9] drm/i915: Fix indentation in i915_gem_framebuffer_info() Chris Wilson
` (8 subsequent siblings)
9 siblings, 1 reply; 20+ messages in thread
From: Chris Wilson @ 2016-07-02 14:35 UTC (permalink / raw)
To: intel-gfx
smatch complains:
drivers/gpu/drm/i915/intel_pm.c:4745 gen6_set_rps_thresholds() warn:
inconsistent indenting
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
---
drivers/gpu/drm/i915/intel_pm.c | 38 ++++++++++++++++++++++----------------
1 file changed, 22 insertions(+), 16 deletions(-)
diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
index d83688f9963a..e1f0ebdcddb1 100644
--- a/drivers/gpu/drm/i915/intel_pm.c
+++ b/drivers/gpu/drm/i915/intel_pm.c
@@ -4667,19 +4667,23 @@ static void gen6_set_rps_thresholds(struct drm_i915_private *dev_priv, u8 val)
new_power = dev_priv->rps.power;
switch (dev_priv->rps.power) {
case LOW_POWER:
- if (val > dev_priv->rps.efficient_freq + 1 && val > dev_priv->rps.cur_freq)
+ if (val > dev_priv->rps.efficient_freq + 1 &&
+ val > dev_priv->rps.cur_freq)
new_power = BETWEEN;
break;
case BETWEEN:
- if (val <= dev_priv->rps.efficient_freq && val < dev_priv->rps.cur_freq)
+ if (val <= dev_priv->rps.efficient_freq &&
+ val < dev_priv->rps.cur_freq)
new_power = LOW_POWER;
- else if (val >= dev_priv->rps.rp0_freq && val > dev_priv->rps.cur_freq)
+ else if (val >= dev_priv->rps.rp0_freq &&
+ val > dev_priv->rps.cur_freq)
new_power = HIGH_POWER;
break;
case HIGH_POWER:
- if (val < (dev_priv->rps.rp1_freq + dev_priv->rps.rp0_freq) >> 1 && val < dev_priv->rps.cur_freq)
+ if (val < (dev_priv->rps.rp1_freq + dev_priv->rps.rp0_freq) >> 1 &&
+ val < dev_priv->rps.cur_freq)
new_power = BETWEEN;
break;
}
@@ -4725,22 +4729,24 @@ static void gen6_set_rps_thresholds(struct drm_i915_private *dev_priv, u8 val)
}
I915_WRITE(GEN6_RP_UP_EI,
- GT_INTERVAL_FROM_US(dev_priv, ei_up));
+ GT_INTERVAL_FROM_US(dev_priv, ei_up));
I915_WRITE(GEN6_RP_UP_THRESHOLD,
- GT_INTERVAL_FROM_US(dev_priv, (ei_up * threshold_up / 100)));
+ GT_INTERVAL_FROM_US(dev_priv,
+ ei_up * threshold_up / 100));
I915_WRITE(GEN6_RP_DOWN_EI,
- GT_INTERVAL_FROM_US(dev_priv, ei_down));
+ GT_INTERVAL_FROM_US(dev_priv, ei_down));
I915_WRITE(GEN6_RP_DOWN_THRESHOLD,
- GT_INTERVAL_FROM_US(dev_priv, (ei_down * threshold_down / 100)));
-
- I915_WRITE(GEN6_RP_CONTROL,
- GEN6_RP_MEDIA_TURBO |
- GEN6_RP_MEDIA_HW_NORMAL_MODE |
- GEN6_RP_MEDIA_IS_GFX |
- GEN6_RP_ENABLE |
- GEN6_RP_UP_BUSY_AVG |
- GEN6_RP_DOWN_IDLE_AVG);
+ GT_INTERVAL_FROM_US(dev_priv,
+ ei_down * threshold_down / 100));
+
+ I915_WRITE(GEN6_RP_CONTROL,
+ GEN6_RP_MEDIA_TURBO |
+ GEN6_RP_MEDIA_HW_NORMAL_MODE |
+ GEN6_RP_MEDIA_IS_GFX |
+ GEN6_RP_ENABLE |
+ GEN6_RP_UP_BUSY_AVG |
+ GEN6_RP_DOWN_IDLE_AVG);
dev_priv->rps.power = new_power;
dev_priv->rps.up_threshold = threshold_up;
--
2.8.1
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [PATCH 3/9] drm/i915: Fix indentation in i915_gem_framebuffer_info()
2016-07-02 14:35 [PATCH 1/9] drm/i915: Fix random indent in i915_drm_resume() Chris Wilson
2016-07-02 14:35 ` [PATCH 2/9] drm/915: Fix long lines and random indent in gen6_set_rps_thresholds() Chris Wilson
@ 2016-07-02 14:36 ` Chris Wilson
2016-07-02 17:22 ` Matthew Auld
2016-07-02 14:36 ` [PATCH 4/9] drm/i915: Fix inconsistent indenting in i915_error_state_to_str() Chris Wilson
` (7 subsequent siblings)
9 siblings, 1 reply; 20+ messages in thread
From: Chris Wilson @ 2016-07-02 14:36 UTC (permalink / raw)
To: intel-gfx
smatch complains:
drivers/gpu/drm/i915/i915_debugfs.c:1390 i915_frequency_info() Function
too hairy. Giving up.
drivers/gpu/drm/i915/i915_debugfs.c:1985 i915_gem_framebuffer_info()
warn: inconsistent indenting
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
---
drivers/gpu/drm/i915/i915_debugfs.c | 26 +++++++++++++-------------
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
index 3035f06df21f..701cc5f39778 100644
--- a/drivers/gpu/drm/i915/i915_debugfs.c
+++ b/drivers/gpu/drm/i915/i915_debugfs.c
@@ -1982,19 +1982,19 @@ static int i915_gem_framebuffer_info(struct seq_file *m, void *data)
return ret;
#ifdef CONFIG_DRM_FBDEV_EMULATION
- if (to_i915(dev)->fbdev) {
- fbdev_fb = to_intel_framebuffer(to_i915(dev)->fbdev->helper.fb);
-
- seq_printf(m, "fbcon size: %d x %d, depth %d, %d bpp, modifier 0x%llx, refcount %d, obj ",
- fbdev_fb->base.width,
- fbdev_fb->base.height,
- fbdev_fb->base.depth,
- fbdev_fb->base.bits_per_pixel,
- fbdev_fb->base.modifier[0],
- drm_framebuffer_read_refcount(&fbdev_fb->base));
- describe_obj(m, fbdev_fb->obj);
- seq_putc(m, '\n');
- }
+ if (to_i915(dev)->fbdev) {
+ fbdev_fb = to_intel_framebuffer(to_i915(dev)->fbdev->helper.fb);
+
+ seq_printf(m, "fbcon size: %d x %d, depth %d, %d bpp, modifier 0x%llx, refcount %d, obj ",
+ fbdev_fb->base.width,
+ fbdev_fb->base.height,
+ fbdev_fb->base.depth,
+ fbdev_fb->base.bits_per_pixel,
+ fbdev_fb->base.modifier[0],
+ drm_framebuffer_read_refcount(&fbdev_fb->base));
+ describe_obj(m, fbdev_fb->obj);
+ seq_putc(m, '\n');
+ }
#endif
mutex_lock(&dev->mode_config.fb_lock);
--
2.8.1
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [PATCH 4/9] drm/i915: Fix inconsistent indenting in i915_error_state_to_str()
2016-07-02 14:35 [PATCH 1/9] drm/i915: Fix random indent in i915_drm_resume() Chris Wilson
2016-07-02 14:35 ` [PATCH 2/9] drm/915: Fix long lines and random indent in gen6_set_rps_thresholds() Chris Wilson
2016-07-02 14:36 ` [PATCH 3/9] drm/i915: Fix indentation in i915_gem_framebuffer_info() Chris Wilson
@ 2016-07-02 14:36 ` Chris Wilson
2016-07-02 17:23 ` Matthew Auld
2016-07-02 14:36 ` [PATCH 5/9] drm/i915: Match bitmask size to types in intel_fb_initial_config() Chris Wilson
` (6 subsequent siblings)
9 siblings, 1 reply; 20+ messages in thread
From: Chris Wilson @ 2016-07-02 14:36 UTC (permalink / raw)
To: intel-gfx
smatch complains:
drivers/gpu/drm/i915/i915_gpu_error.c:503 i915_error_state_to_str()
warn: inconsistent indenting
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
---
drivers/gpu/drm/i915/i915_gpu_error.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/i915/i915_gpu_error.c b/drivers/gpu/drm/i915/i915_gpu_error.c
index 4e476fc794bf..54f73343bfaa 100644
--- a/drivers/gpu/drm/i915/i915_gpu_error.c
+++ b/drivers/gpu/drm/i915/i915_gpu_error.c
@@ -500,7 +500,7 @@ int i915_error_state_to_str(struct drm_i915_error_state_buf *m,
hws_page[elt+1],
hws_page[elt+2],
hws_page[elt+3]);
- offset += 16;
+ offset += 16;
}
}
--
2.8.1
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [PATCH 5/9] drm/i915: Match bitmask size to types in intel_fb_initial_config()
2016-07-02 14:35 [PATCH 1/9] drm/i915: Fix random indent in i915_drm_resume() Chris Wilson
` (2 preceding siblings ...)
2016-07-02 14:36 ` [PATCH 4/9] drm/i915: Fix inconsistent indenting in i915_error_state_to_str() Chris Wilson
@ 2016-07-02 14:36 ` Chris Wilson
2016-07-02 17:40 ` Matthew Auld
2016-07-02 14:36 ` [PATCH 6/9] drm/i915: Fix inconsistent indenting in vbt_panel_init() Chris Wilson
` (5 subsequent siblings)
9 siblings, 1 reply; 20+ messages in thread
From: Chris Wilson @ 2016-07-02 14:36 UTC (permalink / raw)
To: intel-gfx
smatch complains of:
drivers/gpu/drm/i915/intel_fbdev.c:403
intel_fb_initial_config() warn: should '1 << i' be a 64 bit type?
drivers/gpu/drm/i915/intel_fbdev.c:422 intel_fb_initial_config() warn:
should '1 << i' be a 64 bit type?
drivers/gpu/drm/i915/intel_fbdev.c:501 intel_fb_initial_config() warn:
should '1 << i' be a 64 bit type?
We are prepared to iterate over a u64 but don't limit the number of
connectors we try to configure to a maximum of 64.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
---
drivers/gpu/drm/i915/intel_fbdev.c | 28 +++++++++++++++-------------
1 file changed, 15 insertions(+), 13 deletions(-)
diff --git a/drivers/gpu/drm/i915/intel_fbdev.c b/drivers/gpu/drm/i915/intel_fbdev.c
index 32e020d4c213..5205afd69ff6 100644
--- a/drivers/gpu/drm/i915/intel_fbdev.c
+++ b/drivers/gpu/drm/i915/intel_fbdev.c
@@ -362,23 +362,24 @@ static bool intel_fb_initial_config(struct drm_fb_helper *fb_helper,
bool *enabled, int width, int height)
{
struct drm_device *dev = fb_helper->dev;
+ unsigned long conn_configured, mask;
+ unsigned int count = min(fb_helper->connector_count, BITS_PER_LONG);
int i, j;
bool *save_enabled;
bool fallback = true;
int num_connectors_enabled = 0;
int num_connectors_detected = 0;
- uint64_t conn_configured = 0, mask;
int pass = 0;
- save_enabled = kcalloc(fb_helper->connector_count, sizeof(bool),
- GFP_KERNEL);
+ save_enabled = kcalloc(count, sizeof(bool), GFP_KERNEL);
if (!save_enabled)
return false;
- memcpy(save_enabled, enabled, fb_helper->connector_count);
- mask = (1 << fb_helper->connector_count) - 1;
+ memcpy(save_enabled, enabled, count);
+ mask = BIT(count) - 1;
+ conn_configured = 0;
retry:
- for (i = 0; i < fb_helper->connector_count; i++) {
+ for (i = 0; i < count; i++) {
struct drm_fb_helper_connector *fb_conn;
struct drm_connector *connector;
struct drm_encoder *encoder;
@@ -388,7 +389,7 @@ retry:
fb_conn = fb_helper->connector_info[i];
connector = fb_conn->connector;
- if (conn_configured & (1 << i))
+ if (conn_configured & BIT(i))
continue;
if (pass == 0 && !connector->has_tile)
@@ -400,7 +401,7 @@ retry:
if (!enabled[i]) {
DRM_DEBUG_KMS("connector %s not enabled, skipping\n",
connector->name);
- conn_configured |= (1 << i);
+ conn_configured |= BIT(i);
continue;
}
@@ -419,7 +420,7 @@ retry:
DRM_DEBUG_KMS("connector %s has no encoder or crtc, skipping\n",
connector->name);
enabled[i] = false;
- conn_configured |= (1 << i);
+ conn_configured |= BIT(i);
continue;
}
@@ -432,14 +433,15 @@ retry:
intel_crtc->lut_b[j] = j;
}
- new_crtc = intel_fb_helper_crtc(fb_helper, connector->state->crtc);
+ new_crtc = intel_fb_helper_crtc(fb_helper,
+ connector->state->crtc);
/*
* Make sure we're not trying to drive multiple connectors
* with a single CRTC, since our cloning support may not
* match the BIOS.
*/
- for (j = 0; j < fb_helper->connector_count; j++) {
+ for (j = 0; j < count; j++) {
if (crtcs[j] == new_crtc) {
DRM_DEBUG_KMS("fallback: cloned configuration\n");
goto bail;
@@ -498,7 +500,7 @@ retry:
modes[i]->flags & DRM_MODE_FLAG_INTERLACE ? "i" :"");
fallback = false;
- conn_configured |= (1 << i);
+ conn_configured |= BIT(i);
}
if ((conn_configured & mask) != mask) {
@@ -522,7 +524,7 @@ retry:
if (fallback) {
bail:
DRM_DEBUG_KMS("Not using firmware configuration\n");
- memcpy(enabled, save_enabled, fb_helper->connector_count);
+ memcpy(enabled, save_enabled, count);
kfree(save_enabled);
return false;
}
--
2.8.1
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [PATCH 6/9] drm/i915: Fix inconsistent indenting in vbt_panel_init()
2016-07-02 14:35 [PATCH 1/9] drm/i915: Fix random indent in i915_drm_resume() Chris Wilson
` (3 preceding siblings ...)
2016-07-02 14:36 ` [PATCH 5/9] drm/i915: Match bitmask size to types in intel_fb_initial_config() Chris Wilson
@ 2016-07-02 14:36 ` Chris Wilson
2016-07-02 17:41 ` Matthew Auld
2016-07-02 14:36 ` [PATCH 7/9] drm/i915: Fix buffer overflow in dsi_calc_mnp() Chris Wilson
` (4 subsequent siblings)
9 siblings, 1 reply; 20+ messages in thread
From: Chris Wilson @ 2016-07-02 14:36 UTC (permalink / raw)
To: intel-gfx
smatch complains:
drivers/gpu/drm/i915/intel_dsi_panel_vbt.c:657 vbt_panel_init() warn:
inconsistent indenting
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
---
drivers/gpu/drm/i915/intel_dsi_panel_vbt.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/drivers/gpu/drm/i915/intel_dsi_panel_vbt.c b/drivers/gpu/drm/i915/intel_dsi_panel_vbt.c
index 6a7044ee016f..cd154ce6b6c1 100644
--- a/drivers/gpu/drm/i915/intel_dsi_panel_vbt.c
+++ b/drivers/gpu/drm/i915/intel_dsi_panel_vbt.c
@@ -649,14 +649,13 @@ struct drm_panel *vbt_panel_init(struct intel_dsi *intel_dsi, u16 panel_id)
);
/*
- * Exit zero is unified val ths_zero and ths_exit
+ * Exit zero is unified val ths_zero and ths_exit
* minimum value for ths_exit = 110ns
* min (exit_zero_cnt * 2) = 110/UI
* exit_zero_cnt = 55/UI
*/
- if (exit_zero_cnt < (55 * ui_den / ui_num))
- if ((55 * ui_den) % ui_num)
- exit_zero_cnt += 1;
+ if (exit_zero_cnt < (55 * ui_den / ui_num) && (55 * ui_den) % ui_num)
+ exit_zero_cnt += 1;
/* clk zero count */
clk_zero_cnt = DIV_ROUND_UP(
--
2.8.1
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [PATCH 7/9] drm/i915: Fix buffer overflow in dsi_calc_mnp()
2016-07-02 14:35 [PATCH 1/9] drm/i915: Fix random indent in i915_drm_resume() Chris Wilson
` (4 preceding siblings ...)
2016-07-02 14:36 ` [PATCH 6/9] drm/i915: Fix inconsistent indenting in vbt_panel_init() Chris Wilson
@ 2016-07-02 14:36 ` Chris Wilson
2016-07-02 18:06 ` Matthew Auld
2016-07-02 14:36 ` [PATCH 8/9] drm/i915: Fix inconsistent indentation in intel_pre_enable_lvds() Chris Wilson
` (3 subsequent siblings)
9 siblings, 1 reply; 20+ messages in thread
From: Chris Wilson @ 2016-07-02 14:36 UTC (permalink / raw)
To: intel-gfx
smatch complain:
drivers/gpu/drm/i915/intel_dsi_pll.c:101 dsi_calc_mnp() error: buffer
overflow 'lfsr_converts' 39 <= 4294967234
and looks justified in doing so.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
---
drivers/gpu/drm/i915/intel_dsi_pll.c | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
diff --git a/drivers/gpu/drm/i915/intel_dsi_pll.c b/drivers/gpu/drm/i915/intel_dsi_pll.c
index d6cf1ef7f756..6ab58a01b18e 100644
--- a/drivers/gpu/drm/i915/intel_dsi_pll.c
+++ b/drivers/gpu/drm/i915/intel_dsi_pll.c
@@ -55,12 +55,10 @@ static int dsi_calc_mnp(struct drm_i915_private *dev_priv,
struct intel_crtc_state *config,
int target_dsi_clk)
{
- unsigned int calc_m = 0, calc_p = 0;
unsigned int m_min, m_max, p_min = 2, p_max = 6;
unsigned int m, n, p;
- int ref_clk;
- int delta = target_dsi_clk;
- u32 m_seed;
+ unsigned int calc_m, calc_p;
+ int delta, ref_clk;
/* target_dsi_clk is expected in kHz */
if (target_dsi_clk < 300000 || target_dsi_clk > 1150000) {
@@ -80,6 +78,10 @@ static int dsi_calc_mnp(struct drm_i915_private *dev_priv,
m_max = 92;
}
+ calc_p = p_min;
+ calc_m = m_min;
+ delta = abs(target_dsi_clk - (m_min * ref_clk) / (p_min * n));
+
for (m = m_min; m <= m_max && delta; m++) {
for (p = p_min; p <= p_max && delta; p++) {
/*
@@ -97,11 +99,10 @@ static int dsi_calc_mnp(struct drm_i915_private *dev_priv,
}
/* register has log2(N1), this works fine for powers of two */
- n = ffs(n) - 1;
- m_seed = lfsr_converts[calc_m - 62];
config->dsi_pll.ctrl = 1 << (DSI_PLL_P1_POST_DIV_SHIFT + calc_p - 2);
- config->dsi_pll.div = n << DSI_PLL_N1_DIV_SHIFT |
- m_seed << DSI_PLL_M1_DIV_SHIFT;
+ config->dsi_pll.div =
+ (ffs(n) - 1) << DSI_PLL_N1_DIV_SHIFT |
+ (u32)lfsr_converts[calc_m - 62] << DSI_PLL_M1_DIV_SHIFT;
return 0;
}
--
2.8.1
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [PATCH 8/9] drm/i915: Fix inconsistent indentation in intel_pre_enable_lvds()
2016-07-02 14:35 [PATCH 1/9] drm/i915: Fix random indent in i915_drm_resume() Chris Wilson
` (5 preceding siblings ...)
2016-07-02 14:36 ` [PATCH 7/9] drm/i915: Fix buffer overflow in dsi_calc_mnp() Chris Wilson
@ 2016-07-02 14:36 ` Chris Wilson
2016-07-02 18:07 ` Matthew Auld
2016-07-02 14:36 ` [PATCH 9/9] drm/i915: Remove check for !crtc_state in intel_plane_atomic_calc_changes() Chris Wilson
` (2 subsequent siblings)
9 siblings, 1 reply; 20+ messages in thread
From: Chris Wilson @ 2016-07-02 14:36 UTC (permalink / raw)
To: intel-gfx
smatch complains:
drivers/gpu/drm/i915/intel_lvds.c:187 intel_pre_enable_lvds() warn:
inconsistent indenting
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
---
drivers/gpu/drm/i915/intel_lvds.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/i915/intel_lvds.c b/drivers/gpu/drm/i915/intel_lvds.c
index e746e65e7093..49550470483e 100644
--- a/drivers/gpu/drm/i915/intel_lvds.c
+++ b/drivers/gpu/drm/i915/intel_lvds.c
@@ -184,8 +184,8 @@ static void intel_pre_enable_lvds(struct intel_encoder *encoder)
* panels behave in the two modes. For now, let's just maintain the
* value we got from the BIOS.
*/
- temp &= ~LVDS_A3_POWER_MASK;
- temp |= lvds_encoder->a3_power;
+ temp &= ~LVDS_A3_POWER_MASK;
+ temp |= lvds_encoder->a3_power;
/* Set the dithering flag on LVDS as needed, note that there is no
* special lvds dither control bit on pch-split platforms, dithering is
--
2.8.1
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [PATCH 9/9] drm/i915: Remove check for !crtc_state in intel_plane_atomic_calc_changes()
2016-07-02 14:35 [PATCH 1/9] drm/i915: Fix random indent in i915_drm_resume() Chris Wilson
` (6 preceding siblings ...)
2016-07-02 14:36 ` [PATCH 8/9] drm/i915: Fix inconsistent indentation in intel_pre_enable_lvds() Chris Wilson
@ 2016-07-02 14:36 ` Chris Wilson
2016-07-02 18:09 ` Matthew Auld
2016-07-02 14:58 ` ✗ Ro.CI.BAT: failure for series starting with [1/9] drm/i915: Fix random indent in i915_drm_resume() Patchwork
2016-07-02 17:17 ` [PATCH 1/9] " Matthew Auld
9 siblings, 1 reply; 20+ messages in thread
From: Chris Wilson @ 2016-07-02 14:36 UTC (permalink / raw)
To: intel-gfx
smatch spotted that:
drivers/gpu/drm/i915/intel_display.c:11986
intel_plane_atomic_calc_changes() warn: variable dereferenced before
check 'crtc_state' (see line 11972)
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
---
drivers/gpu/drm/i915/intel_display.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index f52cf4edf397..0ee707ef8beb 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -11983,8 +11983,7 @@ int intel_plane_atomic_calc_changes(struct drm_crtc_state *crtc_state,
struct drm_framebuffer *fb = plane_state->fb;
int ret;
- if (crtc_state && INTEL_INFO(dev)->gen >= 9 &&
- plane->type != DRM_PLANE_TYPE_CURSOR) {
+ if (INTEL_GEN(dev) >= 9 && plane->type != DRM_PLANE_TYPE_CURSOR) {
ret = skl_update_scaler_plane(
to_intel_crtc_state(crtc_state),
to_intel_plane_state(plane_state));
--
2.8.1
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 20+ messages in thread
* ✗ Ro.CI.BAT: failure for series starting with [1/9] drm/i915: Fix random indent in i915_drm_resume()
2016-07-02 14:35 [PATCH 1/9] drm/i915: Fix random indent in i915_drm_resume() Chris Wilson
` (7 preceding siblings ...)
2016-07-02 14:36 ` [PATCH 9/9] drm/i915: Remove check for !crtc_state in intel_plane_atomic_calc_changes() Chris Wilson
@ 2016-07-02 14:58 ` Patchwork
2016-07-02 17:17 ` [PATCH 1/9] " Matthew Auld
9 siblings, 0 replies; 20+ messages in thread
From: Patchwork @ 2016-07-02 14:58 UTC (permalink / raw)
To: Chris Wilson; +Cc: intel-gfx
== Series Details ==
Series: series starting with [1/9] drm/i915: Fix random indent in i915_drm_resume()
URL : https://patchwork.freedesktop.org/series/9413/
State : failure
== Summary ==
Series 9413v1 Series without cover letter
http://patchwork.freedesktop.org/api/1.0/series/9413/revisions/1/mbox
Test gem_exec_flush:
Subgroup basic-batch-kernel-default-uc:
pass -> DMESG-FAIL (fi-skl-i5-6260u)
Subgroup basic-batch-kernel-default-wb:
dmesg-fail -> PASS (fi-skl-i5-6260u)
Test gem_exec_suspend:
Subgroup basic-s3:
incomplete -> PASS (fi-hsw-i7-4770k)
fi-hsw-i7-4770k total:231 pass:196 dwarn:0 dfail:0 fail:2 skip:33
fi-kbl-qkkr total:231 pass:160 dwarn:29 dfail:0 fail:2 skip:40
fi-skl-i5-6260u total:231 pass:203 dwarn:0 dfail:3 fail:0 skip:25
fi-snb-i7-2600 total:231 pass:176 dwarn:0 dfail:0 fail:2 skip:53
ro-bdw-i5-5250u total:229 pass:204 dwarn:1 dfail:1 fail:0 skip:23
ro-bdw-i7-5557U total:229 pass:203 dwarn:1 dfail:2 fail:0 skip:23
ro-bdw-i7-5600u total:229 pass:190 dwarn:0 dfail:1 fail:0 skip:38
ro-bsw-n3050 total:229 pass:177 dwarn:0 dfail:1 fail:2 skip:49
ro-byt-n2820 total:229 pass:180 dwarn:0 dfail:1 fail:3 skip:45
ro-hsw-i3-4010u total:229 pass:197 dwarn:0 dfail:1 fail:0 skip:31
ro-hsw-i7-4770r total:229 pass:197 dwarn:0 dfail:1 fail:0 skip:31
ro-ilk-i7-620lm total:229 pass:157 dwarn:0 dfail:1 fail:1 skip:70
ro-ilk1-i5-650 total:224 pass:157 dwarn:0 dfail:1 fail:1 skip:65
ro-ivb-i7-3770 total:229 pass:188 dwarn:0 dfail:1 fail:0 skip:40
ro-skl3-i5-6260u total:229 pass:208 dwarn:1 dfail:1 fail:0 skip:19
ro-snb-i7-2620M total:229 pass:179 dwarn:0 dfail:1 fail:1 skip:48
fi-skl-i7-6700k failed to connect after reboot
Results at /archive/results/CI_IGT_test/RO_Patchwork_1377/
8707e23 drm-intel-nightly: 2016y-07m-01d-20h-18m-16s UTC integration manifest
b13a795 drm/i915: Remove check for !crtc_state in intel_plane_atomic_calc_changes()
72ffcac drm/i915: Fix inconsistent indentation in intel_pre_enable_lvds()
5a7d992 drm/i915: Fix buffer overflow in dsi_calc_mnp()
bd21eff drm/i915: Fix inconsistent indenting in vbt_panel_init()
2e21880 drm/i915: Match bitmask size to types in intel_fb_initial_config()
613512f drm/i915: Fix inconsistent indenting in i915_error_state_to_str()
0db3fb3 drm/i915: Fix indentation in i915_gem_framebuffer_info()
ab752c1 drm/915: Fix long lines and random indent in gen6_set_rps_thresholds()
6b7c5f2 drm/i915: Fix random indent in i915_drm_resume()
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PATCH 1/9] drm/i915: Fix random indent in i915_drm_resume()
2016-07-02 14:35 [PATCH 1/9] drm/i915: Fix random indent in i915_drm_resume() Chris Wilson
` (8 preceding siblings ...)
2016-07-02 14:58 ` ✗ Ro.CI.BAT: failure for series starting with [1/9] drm/i915: Fix random indent in i915_drm_resume() Patchwork
@ 2016-07-02 17:17 ` Matthew Auld
9 siblings, 0 replies; 20+ messages in thread
From: Matthew Auld @ 2016-07-02 17:17 UTC (permalink / raw)
To: Chris Wilson; +Cc: Intel Graphics Development
Reviewed-by: Matthew Auld <matthew.auld@intel.com>
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PATCH 2/9] drm/915: Fix long lines and random indent in gen6_set_rps_thresholds()
2016-07-02 14:35 ` [PATCH 2/9] drm/915: Fix long lines and random indent in gen6_set_rps_thresholds() Chris Wilson
@ 2016-07-02 17:20 ` Matthew Auld
0 siblings, 0 replies; 20+ messages in thread
From: Matthew Auld @ 2016-07-02 17:20 UTC (permalink / raw)
To: Chris Wilson; +Cc: Intel Graphics Development
Reviewed-by: Matthew Auld <matthew.auld@intel.com>
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PATCH 3/9] drm/i915: Fix indentation in i915_gem_framebuffer_info()
2016-07-02 14:36 ` [PATCH 3/9] drm/i915: Fix indentation in i915_gem_framebuffer_info() Chris Wilson
@ 2016-07-02 17:22 ` Matthew Auld
0 siblings, 0 replies; 20+ messages in thread
From: Matthew Auld @ 2016-07-02 17:22 UTC (permalink / raw)
To: Chris Wilson; +Cc: Intel Graphics Development
Reviewed-by: Matthew Auld <matthew.auld@intel.com>
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PATCH 4/9] drm/i915: Fix inconsistent indenting in i915_error_state_to_str()
2016-07-02 14:36 ` [PATCH 4/9] drm/i915: Fix inconsistent indenting in i915_error_state_to_str() Chris Wilson
@ 2016-07-02 17:23 ` Matthew Auld
0 siblings, 0 replies; 20+ messages in thread
From: Matthew Auld @ 2016-07-02 17:23 UTC (permalink / raw)
To: Chris Wilson; +Cc: Intel Graphics Development
Reviewed-by: Matthew Auld <matthew.auld@intel.com>
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PATCH 5/9] drm/i915: Match bitmask size to types in intel_fb_initial_config()
2016-07-02 14:36 ` [PATCH 5/9] drm/i915: Match bitmask size to types in intel_fb_initial_config() Chris Wilson
@ 2016-07-02 17:40 ` Matthew Auld
0 siblings, 0 replies; 20+ messages in thread
From: Matthew Auld @ 2016-07-02 17:40 UTC (permalink / raw)
To: Chris Wilson; +Cc: Intel Graphics Development
Reviewed-by: Matthew Auld <matthew.auld@intel.com>
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PATCH 6/9] drm/i915: Fix inconsistent indenting in vbt_panel_init()
2016-07-02 14:36 ` [PATCH 6/9] drm/i915: Fix inconsistent indenting in vbt_panel_init() Chris Wilson
@ 2016-07-02 17:41 ` Matthew Auld
0 siblings, 0 replies; 20+ messages in thread
From: Matthew Auld @ 2016-07-02 17:41 UTC (permalink / raw)
To: Chris Wilson; +Cc: Intel Graphics Development
Reviewed-by: Matthew Auld <matthew.auld@intel.com>
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PATCH 7/9] drm/i915: Fix buffer overflow in dsi_calc_mnp()
2016-07-02 14:36 ` [PATCH 7/9] drm/i915: Fix buffer overflow in dsi_calc_mnp() Chris Wilson
@ 2016-07-02 18:06 ` Matthew Auld
0 siblings, 0 replies; 20+ messages in thread
From: Matthew Auld @ 2016-07-02 18:06 UTC (permalink / raw)
To: Chris Wilson; +Cc: Intel Graphics Development
Reviewed-by: Matthew Auld <matthew.auld@intel.com>
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PATCH 8/9] drm/i915: Fix inconsistent indentation in intel_pre_enable_lvds()
2016-07-02 14:36 ` [PATCH 8/9] drm/i915: Fix inconsistent indentation in intel_pre_enable_lvds() Chris Wilson
@ 2016-07-02 18:07 ` Matthew Auld
0 siblings, 0 replies; 20+ messages in thread
From: Matthew Auld @ 2016-07-02 18:07 UTC (permalink / raw)
To: Chris Wilson; +Cc: Intel Graphics Development
Reviewed-by: Matthew Auld <matthew.auld@intel.com>
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PATCH 9/9] drm/i915: Remove check for !crtc_state in intel_plane_atomic_calc_changes()
2016-07-02 14:36 ` [PATCH 9/9] drm/i915: Remove check for !crtc_state in intel_plane_atomic_calc_changes() Chris Wilson
@ 2016-07-02 18:09 ` Matthew Auld
2016-07-02 18:32 ` Chris Wilson
0 siblings, 1 reply; 20+ messages in thread
From: Matthew Auld @ 2016-07-02 18:09 UTC (permalink / raw)
To: Chris Wilson; +Cc: Intel Graphics Development
Reviewed-by: Matthew Auld <matthew.auld@intel.com>
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PATCH 9/9] drm/i915: Remove check for !crtc_state in intel_plane_atomic_calc_changes()
2016-07-02 18:09 ` Matthew Auld
@ 2016-07-02 18:32 ` Chris Wilson
0 siblings, 0 replies; 20+ messages in thread
From: Chris Wilson @ 2016-07-02 18:32 UTC (permalink / raw)
To: Matthew Auld; +Cc: Intel Graphics Development
On Sat, Jul 02, 2016 at 07:09:21PM +0100, Matthew Auld wrote:
> Reviewed-by: Matthew Auld <matthew.auld@intel.com>
Thanks for the review, tempted to look at s/dev->dev_private/to_i915/?
:)
-Chris
--
Chris Wilson, Intel Open Source Technology Centre
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 20+ messages in thread
end of thread, other threads:[~2016-07-02 18:32 UTC | newest]
Thread overview: 20+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-07-02 14:35 [PATCH 1/9] drm/i915: Fix random indent in i915_drm_resume() Chris Wilson
2016-07-02 14:35 ` [PATCH 2/9] drm/915: Fix long lines and random indent in gen6_set_rps_thresholds() Chris Wilson
2016-07-02 17:20 ` Matthew Auld
2016-07-02 14:36 ` [PATCH 3/9] drm/i915: Fix indentation in i915_gem_framebuffer_info() Chris Wilson
2016-07-02 17:22 ` Matthew Auld
2016-07-02 14:36 ` [PATCH 4/9] drm/i915: Fix inconsistent indenting in i915_error_state_to_str() Chris Wilson
2016-07-02 17:23 ` Matthew Auld
2016-07-02 14:36 ` [PATCH 5/9] drm/i915: Match bitmask size to types in intel_fb_initial_config() Chris Wilson
2016-07-02 17:40 ` Matthew Auld
2016-07-02 14:36 ` [PATCH 6/9] drm/i915: Fix inconsistent indenting in vbt_panel_init() Chris Wilson
2016-07-02 17:41 ` Matthew Auld
2016-07-02 14:36 ` [PATCH 7/9] drm/i915: Fix buffer overflow in dsi_calc_mnp() Chris Wilson
2016-07-02 18:06 ` Matthew Auld
2016-07-02 14:36 ` [PATCH 8/9] drm/i915: Fix inconsistent indentation in intel_pre_enable_lvds() Chris Wilson
2016-07-02 18:07 ` Matthew Auld
2016-07-02 14:36 ` [PATCH 9/9] drm/i915: Remove check for !crtc_state in intel_plane_atomic_calc_changes() Chris Wilson
2016-07-02 18:09 ` Matthew Auld
2016-07-02 18:32 ` Chris Wilson
2016-07-02 14:58 ` ✗ Ro.CI.BAT: failure for series starting with [1/9] drm/i915: Fix random indent in i915_drm_resume() Patchwork
2016-07-02 17:17 ` [PATCH 1/9] " Matthew Auld
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.