public inbox for intel-gfx@lists.freedesktop.org
 help / color / mirror / Atom feed
* [PATCH 0/3] Various cleanups on intel_panel.c
@ 2016-12-13  8:02 Mika Kahola
  2016-12-13  8:02 ` [PATCH 1/3] drm/i915: Intel panel detection cleanup Mika Kahola
                   ` (4 more replies)
  0 siblings, 5 replies; 7+ messages in thread
From: Mika Kahola @ 2016-12-13  8:02 UTC (permalink / raw)
  To: intel-gfx

Proposal for cleanup. Let's favor dev_priv instead of dev in intel_panel.c
functions. Cleanup for HZ to PWM functions to unify the look and feel of
these functions.

Mika Kahola (3):
  drm/i915: Intel panel detection cleanup
  drm/i915: Intel panel downclock cleanup
  drm/i915: Hz to PWM for i965

 drivers/gpu/drm/i915/intel_dp.c    |  5 +++--
 drivers/gpu/drm/i915/intel_drv.h   |  4 ++--
 drivers/gpu/drm/i915/intel_lvds.c  |  4 ++--
 drivers/gpu/drm/i915/intel_panel.c | 13 +++++--------
 4 files changed, 12 insertions(+), 14 deletions(-)

-- 
2.7.4

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

^ permalink raw reply	[flat|nested] 7+ messages in thread
* [PATCH 1/3] drm/i915: Intel panel detection cleanup
  2016-12-13  8:02 [PATCH 0/3] Various cleanups on intel_panel.c Mika Kahola
@ 2016-12-13  8:02 ` Mika Kahola
  2016-12-13  8:02 ` [PATCH 2/3] drm/i915: Intel panel downclock cleanup Mika Kahola
                   ` (3 subsequent siblings)
  4 siblings, 0 replies; 7+ messages in thread
From: Mika Kahola @ 2016-12-13  8:02 UTC (permalink / raw)
  To: intel-gfx

Let's switch to use private dev_priv instead of dev when detecting
intel panels.

Signed-off-by: Mika Kahola <mika.kahola@intel.com>
---
 drivers/gpu/drm/i915/intel_dp.c    | 3 ++-
 drivers/gpu/drm/i915/intel_drv.h   | 2 +-
 drivers/gpu/drm/i915/intel_lvds.c  | 4 ++--
 drivers/gpu/drm/i915/intel_panel.c | 4 +---
 4 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
index 9dfbde4..d95c445 100644
--- a/drivers/gpu/drm/i915/intel_dp.c
+++ b/drivers/gpu/drm/i915/intel_dp.c
@@ -4152,9 +4152,10 @@ static enum drm_connector_status
 edp_detect(struct intel_dp *intel_dp)
 {
 	struct drm_device *dev = intel_dp_to_dev(intel_dp);
+	struct drm_i915_private *dev_priv = to_i915(dev);
 	enum drm_connector_status status;
 
-	status = intel_panel_detect(dev);
+	status = intel_panel_detect(dev_priv);
 	if (status == connector_status_unknown)
 		status = connector_status_connected;
 
diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
index 1d126c2..79edcf1 100644
--- a/drivers/gpu/drm/i915/intel_drv.h
+++ b/drivers/gpu/drm/i915/intel_drv.h
@@ -1592,7 +1592,7 @@ int intel_panel_setup_backlight(struct drm_connector *connector,
 void intel_panel_enable_backlight(struct intel_connector *connector);
 void intel_panel_disable_backlight(struct intel_connector *connector);
 void intel_panel_destroy_backlight(struct drm_connector *connector);
-enum drm_connector_status intel_panel_detect(struct drm_device *dev);
+enum drm_connector_status intel_panel_detect(struct drm_i915_private *dev_priv);
 extern struct drm_display_mode *intel_find_panel_downclock(
 				struct drm_device *dev,
 				struct drm_display_mode *fixed_mode,
diff --git a/drivers/gpu/drm/i915/intel_lvds.c b/drivers/gpu/drm/i915/intel_lvds.c
index ea1ce17..9ca4dc4 100644
--- a/drivers/gpu/drm/i915/intel_lvds.c
+++ b/drivers/gpu/drm/i915/intel_lvds.c
@@ -460,13 +460,13 @@ static bool intel_lvds_compute_config(struct intel_encoder *intel_encoder,
 static enum drm_connector_status
 intel_lvds_detect(struct drm_connector *connector, bool force)
 {
-	struct drm_device *dev = connector->dev;
+	struct drm_i915_private *dev_priv = to_i915(connector->dev);
 	enum drm_connector_status status;
 
 	DRM_DEBUG_KMS("[CONNECTOR:%d:%s]\n",
 		      connector->base.id, connector->name);
 
-	status = intel_panel_detect(dev);
+	status = intel_panel_detect(dev_priv);
 	if (status != connector_status_unknown)
 		return status;
 
diff --git a/drivers/gpu/drm/i915/intel_panel.c b/drivers/gpu/drm/i915/intel_panel.c
index 2332970..f6637bd 100644
--- a/drivers/gpu/drm/i915/intel_panel.c
+++ b/drivers/gpu/drm/i915/intel_panel.c
@@ -375,10 +375,8 @@ void intel_gmch_panel_fitting(struct intel_crtc *intel_crtc,
 }
 
 enum drm_connector_status
-intel_panel_detect(struct drm_device *dev)
+intel_panel_detect(struct drm_i915_private *dev_priv)
 {
-	struct drm_i915_private *dev_priv = to_i915(dev);
-
 	/* Assume that the BIOS does not lie through the OpRegion... */
 	if (!i915.panel_ignore_lid && dev_priv->opregion.lid_state) {
 		return *dev_priv->opregion.lid_state & 0x1 ?
-- 
2.7.4

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

^ permalink raw reply related	[flat|nested] 7+ messages in thread
* [PATCH 2/3] drm/i915: Intel panel downclock cleanup
  2016-12-13  8:02 [PATCH 0/3] Various cleanups on intel_panel.c Mika Kahola
  2016-12-13  8:02 ` [PATCH 1/3] drm/i915: Intel panel detection cleanup Mika Kahola
@ 2016-12-13  8:02 ` Mika Kahola
  2016-12-13  8:02 ` [PATCH 3/3] drm/i915: Hz to PWM for i965 Mika Kahola
                   ` (2 subsequent siblings)
  4 siblings, 0 replies; 7+ messages in thread
From: Mika Kahola @ 2016-12-13  8:02 UTC (permalink / raw)
  To: intel-gfx

Let's switch to use dev_priv instead of dev when calling
intel_find_panel_downclock() function.

Signed-off-by: Mika Kahola <mika.kahola@intel.com>
---
 drivers/gpu/drm/i915/intel_dp.c    | 2 +-
 drivers/gpu/drm/i915/intel_drv.h   | 2 +-
 drivers/gpu/drm/i915/intel_panel.c | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
index d95c445..4cec029 100644
--- a/drivers/gpu/drm/i915/intel_dp.c
+++ b/drivers/gpu/drm/i915/intel_dp.c
@@ -5493,7 +5493,7 @@ intel_dp_drrs_init(struct intel_connector *intel_connector,
 	}
 
 	downclock_mode = intel_find_panel_downclock
-					(dev, fixed_mode, connector);
+					(dev_priv, fixed_mode, connector);
 
 	if (!downclock_mode) {
 		DRM_DEBUG_KMS("Downclock mode is not found. DRRS not supported\n");
diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
index 79edcf1..eb4bd6a 100644
--- a/drivers/gpu/drm/i915/intel_drv.h
+++ b/drivers/gpu/drm/i915/intel_drv.h
@@ -1594,7 +1594,7 @@ void intel_panel_disable_backlight(struct intel_connector *connector);
 void intel_panel_destroy_backlight(struct drm_connector *connector);
 enum drm_connector_status intel_panel_detect(struct drm_i915_private *dev_priv);
 extern struct drm_display_mode *intel_find_panel_downclock(
-				struct drm_device *dev,
+				struct drm_i915_private *dev_priv,
 				struct drm_display_mode *fixed_mode,
 				struct drm_connector *connector);
 
diff --git a/drivers/gpu/drm/i915/intel_panel.c b/drivers/gpu/drm/i915/intel_panel.c
index f6637bd..41427a45 100644
--- a/drivers/gpu/drm/i915/intel_panel.c
+++ b/drivers/gpu/drm/i915/intel_panel.c
@@ -48,7 +48,7 @@ intel_fixed_panel_mode(const struct drm_display_mode *fixed_mode,
 
 /**
  * intel_find_panel_downclock - find the reduced downclock for LVDS in EDID
- * @dev: drm device
+ * @dev_priv: i915 device instance
  * @fixed_mode : panel native mode
  * @connector: LVDS/eDP connector
  *
@@ -56,7 +56,7 @@ intel_fixed_panel_mode(const struct drm_display_mode *fixed_mode,
  * Find the reduced downclock for LVDS/eDP in EDID.
  */
 struct drm_display_mode *
-intel_find_panel_downclock(struct drm_device *dev,
+intel_find_panel_downclock(struct drm_i915_private *dev_priv,
 			struct drm_display_mode *fixed_mode,
 			struct drm_connector *connector)
 {
@@ -94,7 +94,7 @@ intel_find_panel_downclock(struct drm_device *dev,
 	}
 
 	if (temp_downclock < fixed_mode->clock)
-		return drm_mode_duplicate(dev, tmp_mode);
+		return drm_mode_duplicate(&dev_priv->drm, tmp_mode);
 	else
 		return NULL;
 }
-- 
2.7.4

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

^ permalink raw reply related	[flat|nested] 7+ messages in thread
* [PATCH 3/3] drm/i915: Hz to PWM for i965
  2016-12-13  8:02 [PATCH 0/3] Various cleanups on intel_panel.c Mika Kahola
  2016-12-13  8:02 ` [PATCH 1/3] drm/i915: Intel panel detection cleanup Mika Kahola
  2016-12-13  8:02 ` [PATCH 2/3] drm/i915: Intel panel downclock cleanup Mika Kahola
@ 2016-12-13  8:02 ` Mika Kahola
  2016-12-13  8:51 ` ✗ Fi.CI.BAT: failure for Various cleanups on intel_panel.c Patchwork
  2016-12-13  9:16 ` [PATCH 0/3] " Jani Nikula
  4 siblings, 0 replies; 7+ messages in thread
From: Mika Kahola @ 2016-12-13  8:02 UTC (permalink / raw)
  To: intel-gfx

Unify function structure as any other *_hz_to_pwm() functions are
structured.

Signed-off-by: Mika Kahola <mika.kahola@intel.com>
---
 drivers/gpu/drm/i915/intel_panel.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/i915/intel_panel.c b/drivers/gpu/drm/i915/intel_panel.c
index 41427a45..a67da98 100644
--- a/drivers/gpu/drm/i915/intel_panel.c
+++ b/drivers/gpu/drm/i915/intel_panel.c
@@ -1330,8 +1330,7 @@ static u32 i9xx_hz_to_pwm(struct intel_connector *connector, u32 pwm_freq_hz)
  */
 static u32 i965_hz_to_pwm(struct intel_connector *connector, u32 pwm_freq_hz)
 {
-	struct drm_device *dev = connector->base.dev;
-	struct drm_i915_private *dev_priv = to_i915(dev);
+	struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
 	int clock;
 
 	if (IS_G4X(dev_priv))
-- 
2.7.4

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

^ permalink raw reply related	[flat|nested] 7+ messages in thread
* ✗ Fi.CI.BAT: failure for Various cleanups on intel_panel.c
  2016-12-13  8:02 [PATCH 0/3] Various cleanups on intel_panel.c Mika Kahola
                   ` (2 preceding siblings ...)
  2016-12-13  8:02 ` [PATCH 3/3] drm/i915: Hz to PWM for i965 Mika Kahola
@ 2016-12-13  8:51 ` Patchwork
  2016-12-13  9:16 ` [PATCH 0/3] " Jani Nikula
  4 siblings, 0 replies; 7+ messages in thread
From: Patchwork @ 2016-12-13  8:51 UTC (permalink / raw)
  To: Mika Kahola; +Cc: intel-gfx

== Series Details ==

Series: Various cleanups on intel_panel.c
URL   : https://patchwork.freedesktop.org/series/16731/
State : failure

== Summary ==

Series 16731v1 Various cleanups on intel_panel.c
https://patchwork.freedesktop.org/api/1.0/series/16731/revisions/1/mbox/

Test drv_module_reload:
        Subgroup basic-reload-inject:
                pass       -> INCOMPLETE (fi-kbl-7500u)
Test kms_pipe_crc_basic:
        Subgroup suspend-read-crc-pipe-c:
                pass       -> DMESG-WARN (fi-bsw-n3050)

fi-bdw-5557u     total:247  pass:233  dwarn:0   dfail:0   fail:0   skip:14 
fi-bsw-n3050     total:247  pass:207  dwarn:1   dfail:0   fail:0   skip:39 
fi-bxt-t5700     total:247  pass:220  dwarn:0   dfail:0   fail:0   skip:27 
fi-byt-j1900     total:247  pass:220  dwarn:0   dfail:0   fail:0   skip:27 
fi-byt-n2820     total:247  pass:216  dwarn:0   dfail:0   fail:0   skip:31 
fi-hsw-4770      total:247  pass:228  dwarn:0   dfail:0   fail:0   skip:19 
fi-hsw-4770r     total:247  pass:228  dwarn:0   dfail:0   fail:0   skip:19 
fi-ilk-650       total:247  pass:195  dwarn:0   dfail:0   fail:0   skip:52 
fi-ivb-3520m     total:247  pass:226  dwarn:0   dfail:0   fail:0   skip:21 
fi-ivb-3770      total:247  pass:226  dwarn:0   dfail:0   fail:0   skip:21 
fi-kbl-7500u     total:7    pass:6    dwarn:0   dfail:0   fail:0   skip:0  
fi-skl-6260u     total:247  pass:234  dwarn:0   dfail:0   fail:0   skip:13 
fi-skl-6700hq    total:247  pass:227  dwarn:0   dfail:0   fail:0   skip:20 
fi-skl-6700k     total:247  pass:224  dwarn:3   dfail:0   fail:0   skip:20 
fi-skl-6770hq    total:247  pass:234  dwarn:0   dfail:0   fail:0   skip:13 
fi-snb-2520m     total:247  pass:216  dwarn:0   dfail:0   fail:0   skip:31 
fi-snb-2600      total:247  pass:215  dwarn:0   dfail:0   fail:0   skip:32 

ac15a853c56c1a95a992f39ca2c1579e68b73a71 drm-tip: 2016y-12m-12d-15h-25m-32s UTC integration manifest
a67be34 drm/i915: Hz to PWM for i965
bca1b9f drm/i915: Intel panel downclock cleanup
64c8520 drm/i915: Intel panel detection cleanup

== Logs ==

For more details see: https://intel-gfx-ci.01.org/CI/Patchwork_3271/
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply	[flat|nested] 7+ messages in thread
* Re: [PATCH 0/3] Various cleanups on intel_panel.c
  2016-12-13  8:02 [PATCH 0/3] Various cleanups on intel_panel.c Mika Kahola
                   ` (3 preceding siblings ...)
  2016-12-13  8:51 ` ✗ Fi.CI.BAT: failure for Various cleanups on intel_panel.c Patchwork
@ 2016-12-13  9:16 ` Jani Nikula
  2016-12-13 15:28   ` Jani Nikula
  4 siblings, 1 reply; 7+ messages in thread
From: Jani Nikula @ 2016-12-13  9:16 UTC (permalink / raw)
  To: Mika Kahola, intel-gfx

On Tue, 13 Dec 2016, Mika Kahola <mika.kahola@intel.com> wrote:
> Proposal for cleanup. Let's favor dev_priv instead of dev in intel_panel.c
> functions. Cleanup for HZ to PWM functions to unify the look and feel of
> these functions.
>
> Mika Kahola (3):
>   drm/i915: Intel panel detection cleanup
>   drm/i915: Intel panel downclock cleanup
>   drm/i915: Hz to PWM for i965

On the series,

Reviewed-by: Jani Nikula <jani.nikula@intel.com>


>
>  drivers/gpu/drm/i915/intel_dp.c    |  5 +++--
>  drivers/gpu/drm/i915/intel_drv.h   |  4 ++--
>  drivers/gpu/drm/i915/intel_lvds.c  |  4 ++--
>  drivers/gpu/drm/i915/intel_panel.c | 13 +++++--------
>  4 files changed, 12 insertions(+), 14 deletions(-)

-- 
Jani Nikula, Intel Open Source Technology Center
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply	[flat|nested] 7+ messages in thread
* Re: [PATCH 0/3] Various cleanups on intel_panel.c
  2016-12-13  9:16 ` [PATCH 0/3] " Jani Nikula
@ 2016-12-13 15:28   ` Jani Nikula
  0 siblings, 0 replies; 7+ messages in thread
From: Jani Nikula @ 2016-12-13 15:28 UTC (permalink / raw)
  To: Mika Kahola, intel-gfx

On Tue, 13 Dec 2016, Jani Nikula <jani.nikula@linux.intel.com> wrote:
> On Tue, 13 Dec 2016, Mika Kahola <mika.kahola@intel.com> wrote:
>> Proposal for cleanup. Let's favor dev_priv instead of dev in intel_panel.c
>> functions. Cleanup for HZ to PWM functions to unify the look and feel of
>> these functions.
>>
>> Mika Kahola (3):
>>   drm/i915: Intel panel detection cleanup
>>   drm/i915: Intel panel downclock cleanup
>>   drm/i915: Hz to PWM for i965
>
> On the series,
>
> Reviewed-by: Jani Nikula <jani.nikula@intel.com>

And pushed the lot to dinq, thanks for the patches.

BR,
Jani.

>
>
>>
>>  drivers/gpu/drm/i915/intel_dp.c    |  5 +++--
>>  drivers/gpu/drm/i915/intel_drv.h   |  4 ++--
>>  drivers/gpu/drm/i915/intel_lvds.c  |  4 ++--
>>  drivers/gpu/drm/i915/intel_panel.c | 13 +++++--------
>>  4 files changed, 12 insertions(+), 14 deletions(-)

-- 
Jani Nikula, Intel Open Source Technology Center
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply	[flat|nested] 7+ messages in thread
end of thread, other threads:[~2016-12-13 15:28 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-12-13  8:02 [PATCH 0/3] Various cleanups on intel_panel.c Mika Kahola
2016-12-13  8:02 ` [PATCH 1/3] drm/i915: Intel panel detection cleanup Mika Kahola
2016-12-13  8:02 ` [PATCH 2/3] drm/i915: Intel panel downclock cleanup Mika Kahola
2016-12-13  8:02 ` [PATCH 3/3] drm/i915: Hz to PWM for i965 Mika Kahola
2016-12-13  8:51 ` ✗ Fi.CI.BAT: failure for Various cleanups on intel_panel.c Patchwork
2016-12-13  9:16 ` [PATCH 0/3] " Jani Nikula
2016-12-13 15:28   ` Jani Nikula

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox