[PATCH 1/2] drm/i915: Fix intel_display_crc_init for !DEBUGFS

[PATCH 1/2] drm/i915: Fix intel_display_crc_init for !DEBUGFS

[Maarten Lankhorst]

The mentioned commit changes intel_display_crc_init to take a dev_priv,
but forgets to change the stub.

Cc: David Weinehall <david.weinehall@linux.intel.com>
Fixes: 36cdd0138b7f ("drm/i915: debugfs spring cleaning")
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Reported-and-by: Kim Lidström <kim@dxtr.im>
---
 drivers/gpu/drm/i915/i915_drv.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index ff96b7a69e6c..cf4d6a760b04 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -3522,7 +3522,7 @@ static inline int i915_debugfs_register(struct drm_i915_private *dev_priv) {retu
 static inline void i915_debugfs_unregister(struct drm_i915_private *dev_priv) {}
 static inline int i915_debugfs_connector_add(struct drm_connector *connector)
 { return 0; }
-static inline void intel_display_crc_init(struct drm_device *dev) {}
+static inline void intel_display_crc_init(struct drm_i915_private *dev_priv) {}
 #endif
 
 /* i915_gpu_error.c */
-- 
2.7.4

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

[PATCH 2/2] drm/i915: Add missing parameter to intel_dp_set_drrs_state documentation.

[Maarten Lankhorst]

Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
---
 drivers/gpu/drm/i915/intel_dp.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
index a3c7dd8fd406..df0773afb7f5 100644
--- a/drivers/gpu/drm/i915/intel_dp.c
+++ b/drivers/gpu/drm/i915/intel_dp.c
@@ -5049,6 +5049,7 @@ static void intel_dp_pps_init(struct drm_device *dev,
 /**
  * intel_dp_set_drrs_state - program registers for RR switch to take effect
  * @dev: DRM device
+ * @crtc_state: a pointer to the active intel_crtc_state
  * @refresh_rate: RR to be programmed
  *
  * This function gets called when refresh rate (RR) has to be changed from
-- 
2.7.4

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

Re: [PATCH 1/2] drm/i915: Fix intel_display_crc_init for !DEBUGFS

[Chris Wilson]

On Thu, Aug 25, 2016 at 11:07:01AM +0200, Maarten Lankhorst wrote:
> The mentioned commit changes intel_display_crc_init to take a dev_priv,
> but forgets to change the stub.
> 
> Cc: David Weinehall <david.weinehall@linux.intel.com>
> Fixes: 36cdd0138b7f ("drm/i915: debugfs spring cleaning")
> Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
> Reported-and-by: Kim Lidström <kim@dxtr.im>

!DEBUGFS is my curse.

Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
-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

Re: [PATCH 2/2] drm/i915: Add missing parameter to intel_dp_set_drrs_state documentation.

[Chris Wilson]

On Thu, Aug 25, 2016 at 11:07:02AM +0200, Maarten Lankhorst wrote:
> Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
> ---
>  drivers/gpu/drm/i915/intel_dp.c | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
> index a3c7dd8fd406..df0773afb7f5 100644
> --- a/drivers/gpu/drm/i915/intel_dp.c
> +++ b/drivers/gpu/drm/i915/intel_dp.c
> @@ -5049,6 +5049,7 @@ static void intel_dp_pps_init(struct drm_device *dev,
>  /**
>   * intel_dp_set_drrs_state - program registers for RR switch to take effect
>   * @dev: DRM device
> + * @crtc_state: a pointer to the active intel_crtc_state
>   * @refresh_rate: RR to be programmed
>   *
>   * This function gets called when refresh rate (RR) has to be changed from

Which is the active state? The one currently in use, or the one going to
be in use?

Silences a sphinx warning, so must be good.
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk?
-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

✗ Fi.CI.BAT: failure for series starting with [1/2] drm/i915: Fix intel_display_crc_init for !DEBUGFS

[Patchwork]

== Series Details ==

Series: series starting with [1/2] drm/i915: Fix intel_display_crc_init for !DEBUGFS
URL   : https://patchwork.freedesktop.org/series/11553/
State : failure

== Summary ==

Series 11553v1 Series without cover letter
http://patchwork.freedesktop.org/api/1.0/series/11553/revisions/1/mbox/

Test kms_pipe_crc_basic:
        Subgroup suspend-read-crc-pipe-b:
                pass       -> INCOMPLETE (fi-hsw-4770k)

fi-bdw-5557u     total:252  pass:235  dwarn:0   dfail:0   fail:2   skip:15 
fi-bsw-n3050     total:252  pass:205  dwarn:0   dfail:0   fail:1   skip:46 
fi-byt-n2820     total:252  pass:207  dwarn:0   dfail:0   fail:3   skip:42 
fi-hsw-4770k     total:210  pass:189  dwarn:0   dfail:0   fail:0   skip:20 
fi-hsw-4770r     total:252  pass:224  dwarn:0   dfail:0   fail:2   skip:26 
fi-ivb-3520m     total:252  pass:220  dwarn:0   dfail:0   fail:1   skip:31 
fi-skl-6260u     total:252  pass:236  dwarn:0   dfail:0   fail:2   skip:14 
fi-skl-6700k     total:252  pass:222  dwarn:0   dfail:0   fail:2   skip:28 
fi-snb-2520m     total:252  pass:199  dwarn:8   dfail:0   fail:2   skip:43 
fi-snb-2600      total:252  pass:199  dwarn:8   dfail:0   fail:2   skip:43 

Results at /archive/results/CI_IGT_test/Patchwork_2427/

b3add877e4b0020293e2355930d1104bac1f498f drm-intel-nightly: 2016y-08m-25d-09h-25m-36s UTC integration manifest
eec1db3 drm/i915: Add missing parameter to intel_dp_set_drrs_state documentation.
328ce72 drm/i915: Fix intel_display_crc_init for !DEBUGFS

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

Re: [PATCH 2/2] drm/i915: Add missing parameter to intel_dp_set_drrs_state documentation.

[Maarten Lankhorst]

Op 25-08-16 om 11:49 schreef Chris Wilson:
> On Thu, Aug 25, 2016 at 11:07:02AM +0200, Maarten Lankhorst wrote:
>> Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
>> ---
>>  drivers/gpu/drm/i915/intel_dp.c | 1 +
>>  1 file changed, 1 insertion(+)
>>
>> diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
>> index a3c7dd8fd406..df0773afb7f5 100644
>> --- a/drivers/gpu/drm/i915/intel_dp.c
>> +++ b/drivers/gpu/drm/i915/intel_dp.c
>> @@ -5049,6 +5049,7 @@ static void intel_dp_pps_init(struct drm_device *dev,
>>  /**
>>   * intel_dp_set_drrs_state - program registers for RR switch to take effect
>>   * @dev: DRM device
>> + * @crtc_state: a pointer to the active intel_crtc_state
>>   * @refresh_rate: RR to be programmed
>>   *
>>   * This function gets called when refresh rate (RR) has to be changed from
> Which is the active state? The one currently in use, or the one going to
> be in use?

I wrote active, because it can be called from a work item with the current state or when disabling with the old crtc state.

~Maarten

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

Re: [PATCH 1/2] drm/i915: Fix intel_display_crc_init for !DEBUGFS

[David Weinehall]

On Thu, Aug 25, 2016 at 11:07:01AM +0200, Maarten Lankhorst wrote:
> The mentioned commit changes intel_display_crc_init to take a dev_priv,
> but forgets to change the stub.

Doh!

> 
> Cc: David Weinehall <david.weinehall@linux.intel.com>
> Fixes: 36cdd0138b7f ("drm/i915: debugfs spring cleaning")
> Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
> Reported-and-by: Kim Lidström <kim@dxtr.im>

Reviewed-by: David Weinehall <david.weinehall@linux.intel.com>

> ---
>  drivers/gpu/drm/i915/i915_drv.h | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
> index ff96b7a69e6c..cf4d6a760b04 100644
> --- a/drivers/gpu/drm/i915/i915_drv.h
> +++ b/drivers/gpu/drm/i915/i915_drv.h
> @@ -3522,7 +3522,7 @@ static inline int i915_debugfs_register(struct drm_i915_private *dev_priv) {retu
>  static inline void i915_debugfs_unregister(struct drm_i915_private *dev_priv) {}
>  static inline int i915_debugfs_connector_add(struct drm_connector *connector)
>  { return 0; }
> -static inline void intel_display_crc_init(struct drm_device *dev) {}
> +static inline void intel_display_crc_init(struct drm_i915_private *dev_priv) {}
>  #endif
>  
>  /* i915_gpu_error.c */
> -- 
> 2.7.4
> 
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx