All of lore.kernel.org
 help / color / mirror / Atom feed
From: Ville Syrjala <ville.syrjala@linux.intel.com>
To: dri-devel@lists.freedesktop.org
Cc: intel-gfx@lists.freedesktop.org,
	Emil Velikov <emil.velikov@collabora.com>
Subject: [PATCH v2 02/17] drm/i915: Introduce some local intel_dp variables
Date: Fri,  3 Apr 2020 23:39:53 +0300	[thread overview]
Message-ID: <20200403204008.14864-3-ville.syrjala@linux.intel.com> (raw)
In-Reply-To: <20200403204008.14864-1-ville.syrjala@linux.intel.com>

From: Ville Syrjälä <ville.syrjala@linux.intel.com>

The drrs code dereferences mode->vrefresh via some really long chain
of structures/pointers. Couldn't get coccinelle to see through all
that so let's add some local variables to help it.

Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
---
 drivers/gpu/drm/i915/display/intel_dp.c | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i915/display/intel_dp.c
index db6ae8e9af6e..ffc2816787db 100644
--- a/drivers/gpu/drm/i915/display/intel_dp.c
+++ b/drivers/gpu/drm/i915/display/intel_dp.c
@@ -7721,6 +7721,7 @@ static void intel_edp_drrs_downclock_work(struct work_struct *work)
 void intel_edp_drrs_invalidate(struct drm_i915_private *dev_priv,
 			       unsigned int frontbuffer_bits)
 {
+	struct intel_dp *intel_dp;
 	struct drm_crtc *crtc;
 	enum pipe pipe;
 
@@ -7730,12 +7731,14 @@ void intel_edp_drrs_invalidate(struct drm_i915_private *dev_priv,
 	cancel_delayed_work(&dev_priv->drrs.work);
 
 	mutex_lock(&dev_priv->drrs.mutex);
-	if (!dev_priv->drrs.dp) {
+
+	intel_dp = dev_priv->drrs.dp;
+	if (!intel_dp) {
 		mutex_unlock(&dev_priv->drrs.mutex);
 		return;
 	}
 
-	crtc = dp_to_dig_port(dev_priv->drrs.dp)->base.base.crtc;
+	crtc = dp_to_dig_port(intel_dp)->base.base.crtc;
 	pipe = to_intel_crtc(crtc)->pipe;
 
 	frontbuffer_bits &= INTEL_FRONTBUFFER_ALL_MASK(pipe);
@@ -7744,7 +7747,7 @@ void intel_edp_drrs_invalidate(struct drm_i915_private *dev_priv,
 	/* invalidate means busy screen hence upclock */
 	if (frontbuffer_bits && dev_priv->drrs.refresh_rate_type == DRRS_LOW_RR)
 		intel_dp_set_drrs_state(dev_priv, to_intel_crtc(crtc)->config,
-			dev_priv->drrs.dp->attached_connector->panel.fixed_mode->vrefresh);
+					intel_dp->attached_connector->panel.fixed_mode->vrefresh);
 
 	mutex_unlock(&dev_priv->drrs.mutex);
 }
@@ -7764,6 +7767,7 @@ void intel_edp_drrs_invalidate(struct drm_i915_private *dev_priv,
 void intel_edp_drrs_flush(struct drm_i915_private *dev_priv,
 			  unsigned int frontbuffer_bits)
 {
+	struct intel_dp *intel_dp;
 	struct drm_crtc *crtc;
 	enum pipe pipe;
 
@@ -7773,12 +7777,14 @@ void intel_edp_drrs_flush(struct drm_i915_private *dev_priv,
 	cancel_delayed_work(&dev_priv->drrs.work);
 
 	mutex_lock(&dev_priv->drrs.mutex);
-	if (!dev_priv->drrs.dp) {
+
+	intel_dp = dev_priv->drrs.dp;
+	if (!intel_dp) {
 		mutex_unlock(&dev_priv->drrs.mutex);
 		return;
 	}
 
-	crtc = dp_to_dig_port(dev_priv->drrs.dp)->base.base.crtc;
+	crtc = dp_to_dig_port(intel_dp)->base.base.crtc;
 	pipe = to_intel_crtc(crtc)->pipe;
 
 	frontbuffer_bits &= INTEL_FRONTBUFFER_ALL_MASK(pipe);
@@ -7787,7 +7793,7 @@ void intel_edp_drrs_flush(struct drm_i915_private *dev_priv,
 	/* flush means busy screen hence upclock */
 	if (frontbuffer_bits && dev_priv->drrs.refresh_rate_type == DRRS_LOW_RR)
 		intel_dp_set_drrs_state(dev_priv, to_intel_crtc(crtc)->config,
-				dev_priv->drrs.dp->attached_connector->panel.fixed_mode->vrefresh);
+					intel_dp->attached_connector->panel.fixed_mode->vrefresh);
 
 	/*
 	 * flush also means no more activity hence schedule downclock, if all
-- 
2.24.1

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

WARNING: multiple messages have this Message-ID (diff)
From: Ville Syrjala <ville.syrjala@linux.intel.com>
To: dri-devel@lists.freedesktop.org
Cc: intel-gfx@lists.freedesktop.org,
	Emil Velikov <emil.velikov@collabora.com>
Subject: [Intel-gfx] [PATCH v2 02/17] drm/i915: Introduce some local intel_dp variables
Date: Fri,  3 Apr 2020 23:39:53 +0300	[thread overview]
Message-ID: <20200403204008.14864-3-ville.syrjala@linux.intel.com> (raw)
In-Reply-To: <20200403204008.14864-1-ville.syrjala@linux.intel.com>

From: Ville Syrjälä <ville.syrjala@linux.intel.com>

The drrs code dereferences mode->vrefresh via some really long chain
of structures/pointers. Couldn't get coccinelle to see through all
that so let's add some local variables to help it.

Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
---
 drivers/gpu/drm/i915/display/intel_dp.c | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i915/display/intel_dp.c
index db6ae8e9af6e..ffc2816787db 100644
--- a/drivers/gpu/drm/i915/display/intel_dp.c
+++ b/drivers/gpu/drm/i915/display/intel_dp.c
@@ -7721,6 +7721,7 @@ static void intel_edp_drrs_downclock_work(struct work_struct *work)
 void intel_edp_drrs_invalidate(struct drm_i915_private *dev_priv,
 			       unsigned int frontbuffer_bits)
 {
+	struct intel_dp *intel_dp;
 	struct drm_crtc *crtc;
 	enum pipe pipe;
 
@@ -7730,12 +7731,14 @@ void intel_edp_drrs_invalidate(struct drm_i915_private *dev_priv,
 	cancel_delayed_work(&dev_priv->drrs.work);
 
 	mutex_lock(&dev_priv->drrs.mutex);
-	if (!dev_priv->drrs.dp) {
+
+	intel_dp = dev_priv->drrs.dp;
+	if (!intel_dp) {
 		mutex_unlock(&dev_priv->drrs.mutex);
 		return;
 	}
 
-	crtc = dp_to_dig_port(dev_priv->drrs.dp)->base.base.crtc;
+	crtc = dp_to_dig_port(intel_dp)->base.base.crtc;
 	pipe = to_intel_crtc(crtc)->pipe;
 
 	frontbuffer_bits &= INTEL_FRONTBUFFER_ALL_MASK(pipe);
@@ -7744,7 +7747,7 @@ void intel_edp_drrs_invalidate(struct drm_i915_private *dev_priv,
 	/* invalidate means busy screen hence upclock */
 	if (frontbuffer_bits && dev_priv->drrs.refresh_rate_type == DRRS_LOW_RR)
 		intel_dp_set_drrs_state(dev_priv, to_intel_crtc(crtc)->config,
-			dev_priv->drrs.dp->attached_connector->panel.fixed_mode->vrefresh);
+					intel_dp->attached_connector->panel.fixed_mode->vrefresh);
 
 	mutex_unlock(&dev_priv->drrs.mutex);
 }
@@ -7764,6 +7767,7 @@ void intel_edp_drrs_invalidate(struct drm_i915_private *dev_priv,
 void intel_edp_drrs_flush(struct drm_i915_private *dev_priv,
 			  unsigned int frontbuffer_bits)
 {
+	struct intel_dp *intel_dp;
 	struct drm_crtc *crtc;
 	enum pipe pipe;
 
@@ -7773,12 +7777,14 @@ void intel_edp_drrs_flush(struct drm_i915_private *dev_priv,
 	cancel_delayed_work(&dev_priv->drrs.work);
 
 	mutex_lock(&dev_priv->drrs.mutex);
-	if (!dev_priv->drrs.dp) {
+
+	intel_dp = dev_priv->drrs.dp;
+	if (!intel_dp) {
 		mutex_unlock(&dev_priv->drrs.mutex);
 		return;
 	}
 
-	crtc = dp_to_dig_port(dev_priv->drrs.dp)->base.base.crtc;
+	crtc = dp_to_dig_port(intel_dp)->base.base.crtc;
 	pipe = to_intel_crtc(crtc)->pipe;
 
 	frontbuffer_bits &= INTEL_FRONTBUFFER_ALL_MASK(pipe);
@@ -7787,7 +7793,7 @@ void intel_edp_drrs_flush(struct drm_i915_private *dev_priv,
 	/* flush means busy screen hence upclock */
 	if (frontbuffer_bits && dev_priv->drrs.refresh_rate_type == DRRS_LOW_RR)
 		intel_dp_set_drrs_state(dev_priv, to_intel_crtc(crtc)->config,
-				dev_priv->drrs.dp->attached_connector->panel.fixed_mode->vrefresh);
+					intel_dp->attached_connector->panel.fixed_mode->vrefresh);
 
 	/*
 	 * flush also means no more activity hence schedule downclock, if all
-- 
2.24.1

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

  parent reply	other threads:[~2020-04-03 20:40 UTC|newest]

Thread overview: 113+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-04-03 20:39 [PATCH v2 00/17] drm: Put drm_display_mode on diet Ville Syrjala
2020-04-03 20:39 ` [Intel-gfx] " Ville Syrjala
2020-04-03 20:39 ` [PATCH v2 01/17] drm: Nuke mode->hsync Ville Syrjala
2020-04-03 20:39   ` [Intel-gfx] " Ville Syrjala
2020-04-07 18:30   ` Sam Ravnborg
2020-04-07 18:30     ` [Intel-gfx] " Sam Ravnborg
2020-04-03 20:39 ` Ville Syrjala [this message]
2020-04-03 20:39   ` [Intel-gfx] [PATCH v2 02/17] drm/i915: Introduce some local intel_dp variables Ville Syrjala
2020-04-03 20:39 ` [PATCH v2 03/17] drm: Nuke mode->vrefresh Ville Syrjala
2020-04-03 20:39   ` Ville Syrjala
2020-04-03 20:39   ` [Intel-gfx] " Ville Syrjala
2020-04-03 20:39   ` Ville Syrjala
2020-04-03 20:58   ` Laurent Pinchart
2020-04-03 20:58     ` Laurent Pinchart
2020-04-03 20:58     ` [Intel-gfx] " Laurent Pinchart
2020-04-03 20:58     ` Laurent Pinchart
2020-04-04  2:01   ` abhinavk
2020-04-04  2:01     ` abhinavk
2020-04-04  2:01     ` [Intel-gfx] " abhinavk
2020-04-04  2:01     ` abhinavk
2020-04-06  8:32     ` Jani Nikula
2020-04-06  8:32       ` Jani Nikula
2020-04-06  8:32       ` [Intel-gfx] " Jani Nikula
2020-04-06  8:32       ` Jani Nikula
2020-04-07  1:23       ` abhinavk
2020-04-07  1:23         ` abhinavk
2020-04-07  1:23         ` [Intel-gfx] " abhinavk
2020-04-07  1:23         ` abhinavk
2020-04-03 20:39 ` [PATCH v2 04/17] drm/msm/dpu: Stop copying around mode->private_flags Ville Syrjala
2020-04-03 20:39   ` [Intel-gfx] " Ville Syrjala
2020-04-03 20:39   ` Ville Syrjala
2020-04-03 20:39 ` [PATCH v2 05/17] drm: Shrink {width,height}_mm to u16 Ville Syrjala
2020-04-03 20:39   ` [Intel-gfx] " Ville Syrjala
2020-04-07 18:37   ` Sam Ravnborg
2020-04-07 18:37     ` [Intel-gfx] [PATCH v2 05/17] drm: Shrink {width, height}_mm " Sam Ravnborg
2020-04-03 20:39 ` [PATCH v2 06/17] drm: Shrink mode->type to u8 Ville Syrjala
2020-04-03 20:39   ` [Intel-gfx] " Ville Syrjala
2020-04-07 18:38   ` Sam Ravnborg
2020-04-07 18:38     ` [Intel-gfx] " Sam Ravnborg
2020-04-03 20:39 ` [PATCH v2 07/17] drm: Make mode->flags u32 Ville Syrjala
2020-04-03 20:39   ` [Intel-gfx] " Ville Syrjala
2020-04-07 18:38   ` Sam Ravnborg
2020-04-07 18:38     ` [Intel-gfx] " Sam Ravnborg
2020-04-03 20:39 ` [PATCH v2 08/17] drm: Shrink drm_display_mode timings Ville Syrjala
2020-04-03 20:39   ` [Intel-gfx] " Ville Syrjala
2020-04-07 18:43   ` Sam Ravnborg
2020-04-07 18:43     ` [Intel-gfx] " Sam Ravnborg
2020-04-03 20:40 ` [PATCH v2 09/17] drm: Flatten drm_mode_vrefresh() Ville Syrjala
2020-04-03 20:40   ` [Intel-gfx] " Ville Syrjala
2020-04-07 18:46   ` Sam Ravnborg
2020-04-07 18:46     ` [Intel-gfx] " Sam Ravnborg
2020-04-03 20:40 ` [PATCH v2 10/17] drm: Shrink mode->private_flags Ville Syrjala
2020-04-03 20:40   ` [Intel-gfx] " Ville Syrjala
2020-04-07 18:52   ` Sam Ravnborg
2020-04-07 18:52     ` [Intel-gfx] " Sam Ravnborg
2020-04-07 19:10     ` Ville Syrjälä
2020-04-07 19:10       ` [Intel-gfx] " Ville Syrjälä
2020-04-03 20:40 ` [PATCH v2 11/17] drm: pahole struct drm_display_mode Ville Syrjala
2020-04-03 20:40   ` [Intel-gfx] " Ville Syrjala
2020-04-06  0:24   ` kbuild test robot
2020-04-03 20:40 ` [PATCH v2 12/17] drm/mcde: Use mode->clock instead of reverse calculating it from the vrefresh Ville Syrjala
2020-04-03 20:40   ` [Intel-gfx] " Ville Syrjala
2020-04-07  7:27   ` Daniel Vetter
2020-04-07  7:27     ` [Intel-gfx] " Daniel Vetter
2020-04-07 18:53   ` Sam Ravnborg
2020-04-07 18:53     ` [Intel-gfx] " Sam Ravnborg
2020-04-12  0:42   ` Linus Walleij
2020-04-12  0:42     ` [Intel-gfx] " Linus Walleij
2020-04-03 20:40 ` [PATCH v2 13/17] drm/i915: Stop using mode->private_flags Ville Syrjala
2020-04-03 20:40   ` [Intel-gfx] " Ville Syrjala
2020-04-07  7:38   ` Daniel Vetter
2020-04-07  7:38     ` [Intel-gfx] " Daniel Vetter
2020-04-07 15:20     ` Ville Syrjälä
2020-04-07 15:20       ` [Intel-gfx] " Ville Syrjälä
2020-04-08  9:34       ` Jani Nikula
2020-04-08  9:34         ` Jani Nikula
2020-04-03 20:40 ` [PATCH v2 14/17] drm/i915: Replace I915_MODE_FLAG_INHERITED with a boolean Ville Syrjala
2020-04-03 20:40   ` [Intel-gfx] " Ville Syrjala
2020-04-07  7:42   ` Daniel Vetter
2020-04-07  7:42     ` [Intel-gfx] " Daniel Vetter
2020-04-03 20:40 ` [PATCH v2 15/17] drm/gma500: Stop using mode->private_flags Ville Syrjala
2020-04-03 20:40   ` [Intel-gfx] " Ville Syrjala
2020-04-07  7:46   ` Daniel Vetter
2020-04-07  7:46     ` [Intel-gfx] " Daniel Vetter
2020-04-07 18:56   ` Sam Ravnborg
2020-04-07 18:56     ` [Intel-gfx] " Sam Ravnborg
2020-04-07 19:08     ` Ville Syrjälä
2020-04-07 19:08       ` [Intel-gfx] " Ville Syrjälä
2020-04-07 19:35       ` Sam Ravnborg
2020-04-07 19:35         ` [Intel-gfx] " Sam Ravnborg
2020-04-09 19:49         ` Ville Syrjälä
2020-04-09 19:49           ` [Intel-gfx] " Ville Syrjälä
2020-04-09 19:54           ` Ville Syrjälä
2020-04-09 19:54             ` [Intel-gfx] " Ville Syrjälä
2020-04-09 20:47           ` Sam Ravnborg
2020-04-09 20:47             ` [Intel-gfx] " Sam Ravnborg
2020-04-14 15:11             ` Ville Syrjälä
2020-04-14 15:11               ` [Intel-gfx] " Ville Syrjälä
2020-04-03 20:40 ` [PATCH v2 16/17] drm: Nuke mode->private_flags Ville Syrjala
2020-04-03 20:40   ` [Intel-gfx] " Ville Syrjala
2020-04-04  1:40   ` abhinavk
2020-04-04  1:40     ` [Intel-gfx] " abhinavk
2020-04-06  9:11     ` Jani Nikula
2020-04-06  9:11       ` [Intel-gfx] " Jani Nikula
2020-04-07  1:26       ` abhinavk
2020-04-07  1:26         ` [Intel-gfx] " abhinavk
2020-04-07 18:58   ` Sam Ravnborg
2020-04-07 18:58     ` [Intel-gfx] " Sam Ravnborg
2020-04-03 20:40 ` [PATCH v2 17/17] drm: Replace mode->export_head with a boolean Ville Syrjala
2020-04-03 20:40   ` [Intel-gfx] " Ville Syrjala
2020-04-03 22:04 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for drm: Put drm_display_mode on diet (rev2) Patchwork
2020-04-03 22:29 ` [Intel-gfx] ✗ Fi.CI.BAT: failure " Patchwork
2020-04-24 17:32 ` [Intel-gfx] ✗ Fi.CI.BUILD: failure for drm: Put drm_display_mode on diet (rev3) Patchwork

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200403204008.14864-3-ville.syrjala@linux.intel.com \
    --to=ville.syrjala@linux.intel.com \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=emil.velikov@collabora.com \
    --cc=intel-gfx@lists.freedesktop.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
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.