* [Intel-gfx] [PATCH] drm/i915/hdmi: prefer to_i915() over drm->dev_private to get at i915
@ 2020-02-11 13:44 Jani Nikula
2020-02-11 18:01 ` Wambui Karuga
2020-02-13 17:08 ` [Intel-gfx] ✓ Fi.CI.IGT: success for " Patchwork
0 siblings, 2 replies; 4+ messages in thread
From: Jani Nikula @ 2020-02-11 13:44 UTC (permalink / raw)
To: intel-gfx; +Cc: jani.nikula, Wambui Karuga
drm->dev_private is to be avoided. Use to_i915() on the struct
drm_device pointer instead. Rename the affected local dev_priv variables
to i915 while at it.
Cc: Wambui Karuga <wambui.karugax@gmail.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
drivers/gpu/drm/i915/display/intel_hdmi.c | 25 +++++++++--------------
1 file changed, 10 insertions(+), 15 deletions(-)
diff --git a/drivers/gpu/drm/i915/display/intel_hdmi.c b/drivers/gpu/drm/i915/display/intel_hdmi.c
index e68bafb76cb1..bee9c9b1a770 100644
--- a/drivers/gpu/drm/i915/display/intel_hdmi.c
+++ b/drivers/gpu/drm/i915/display/intel_hdmi.c
@@ -1274,10 +1274,9 @@ void intel_dp_dual_mode_set_tmds_output(struct intel_hdmi *hdmi, bool enable)
static int intel_hdmi_hdcp_read(struct intel_digital_port *intel_dig_port,
unsigned int offset, void *buffer, size_t size)
{
+ struct drm_i915_private *i915 = to_i915(intel_dig_port->base.base.dev);
struct intel_hdmi *hdmi = &intel_dig_port->hdmi;
- struct drm_i915_private *dev_priv =
- intel_dig_port->base.base.dev->dev_private;
- struct i2c_adapter *adapter = intel_gmbus_get_adapter(dev_priv,
+ struct i2c_adapter *adapter = intel_gmbus_get_adapter(i915,
hdmi->ddc_bus);
int ret;
u8 start = offset & 0xff;
@@ -1304,10 +1303,9 @@ static int intel_hdmi_hdcp_read(struct intel_digital_port *intel_dig_port,
static int intel_hdmi_hdcp_write(struct intel_digital_port *intel_dig_port,
unsigned int offset, void *buffer, size_t size)
{
+ struct drm_i915_private *i915 = to_i915(intel_dig_port->base.base.dev);
struct intel_hdmi *hdmi = &intel_dig_port->hdmi;
- struct drm_i915_private *dev_priv =
- intel_dig_port->base.base.dev->dev_private;
- struct i2c_adapter *adapter = intel_gmbus_get_adapter(dev_priv,
+ struct i2c_adapter *adapter = intel_gmbus_get_adapter(i915,
hdmi->ddc_bus);
int ret;
u8 *write_buf;
@@ -1339,10 +1337,9 @@ static
int intel_hdmi_hdcp_write_an_aksv(struct intel_digital_port *intel_dig_port,
u8 *an)
{
+ struct drm_i915_private *i915 = to_i915(intel_dig_port->base.base.dev);
struct intel_hdmi *hdmi = &intel_dig_port->hdmi;
- struct drm_i915_private *dev_priv =
- intel_dig_port->base.base.dev->dev_private;
- struct i2c_adapter *adapter = intel_gmbus_get_adapter(dev_priv,
+ struct i2c_adapter *adapter = intel_gmbus_get_adapter(i915,
hdmi->ddc_bus);
int ret;
@@ -1521,8 +1518,7 @@ int intel_hdmi_hdcp_toggle_signalling(struct intel_digital_port *intel_dig_port,
static
bool intel_hdmi_hdcp_check_link(struct intel_digital_port *intel_dig_port)
{
- struct drm_i915_private *dev_priv =
- intel_dig_port->base.base.dev->dev_private;
+ struct drm_i915_private *i915 = to_i915(intel_dig_port->base.base.dev);
struct intel_connector *connector =
intel_dig_port->hdmi.attached_connector;
enum port port = intel_dig_port->base.port;
@@ -1537,14 +1533,13 @@ bool intel_hdmi_hdcp_check_link(struct intel_digital_port *intel_dig_port)
if (ret)
return false;
- intel_de_write(dev_priv, HDCP_RPRIME(dev_priv, cpu_transcoder, port),
- ri.reg);
+ intel_de_write(i915, HDCP_RPRIME(i915, cpu_transcoder, port), ri.reg);
/* Wait for Ri prime match */
- if (wait_for(intel_de_read(dev_priv, HDCP_STATUS(dev_priv, cpu_transcoder, port)) &
+ if (wait_for(intel_de_read(i915, HDCP_STATUS(i915, cpu_transcoder, port)) &
(HDCP_STATUS_RI_MATCH | HDCP_STATUS_ENC), 1)) {
DRM_ERROR("Ri' mismatch detected, link check failed (%x)\n",
- intel_de_read(dev_priv, HDCP_STATUS(dev_priv, cpu_transcoder, port)));
+ intel_de_read(i915, HDCP_STATUS(i915, cpu_transcoder, port)));
return false;
}
return true;
--
2.20.1
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [Intel-gfx] [PATCH] drm/i915/hdmi: prefer to_i915() over drm->dev_private to get at i915
2020-02-11 13:44 [Intel-gfx] [PATCH] drm/i915/hdmi: prefer to_i915() over drm->dev_private to get at i915 Jani Nikula
@ 2020-02-11 18:01 ` Wambui Karuga
2020-02-13 18:37 ` Jani Nikula
2020-02-13 17:08 ` [Intel-gfx] ✓ Fi.CI.IGT: success for " Patchwork
1 sibling, 1 reply; 4+ messages in thread
From: Wambui Karuga @ 2020-02-11 18:01 UTC (permalink / raw)
To: Jani Nikula; +Cc: intel-gfx
On Tue, 11 Feb 2020, Jani Nikula wrote:
> drm->dev_private is to be avoided. Use to_i915() on the struct
> drm_device pointer instead. Rename the affected local dev_priv variables
> to i915 while at it.
>
Applies cleanly, and compiles.
Changes also look good to me.
Reviewed by: Wambui Karuga <wambui.karugax@gmail.com>
> Cc: Wambui Karuga <wambui.karugax@gmail.com>
> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
> ---
> drivers/gpu/drm/i915/display/intel_hdmi.c | 25 +++++++++--------------
> 1 file changed, 10 insertions(+), 15 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_hdmi.c b/drivers/gpu/drm/i915/display/intel_hdmi.c
> index e68bafb76cb1..bee9c9b1a770 100644
> --- a/drivers/gpu/drm/i915/display/intel_hdmi.c
> +++ b/drivers/gpu/drm/i915/display/intel_hdmi.c
> @@ -1274,10 +1274,9 @@ void intel_dp_dual_mode_set_tmds_output(struct intel_hdmi *hdmi, bool enable)
> static int intel_hdmi_hdcp_read(struct intel_digital_port *intel_dig_port,
> unsigned int offset, void *buffer, size_t size)
> {
> + struct drm_i915_private *i915 = to_i915(intel_dig_port->base.base.dev);
> struct intel_hdmi *hdmi = &intel_dig_port->hdmi;
> - struct drm_i915_private *dev_priv =
> - intel_dig_port->base.base.dev->dev_private;
> - struct i2c_adapter *adapter = intel_gmbus_get_adapter(dev_priv,
> + struct i2c_adapter *adapter = intel_gmbus_get_adapter(i915,
> hdmi->ddc_bus);
> int ret;
> u8 start = offset & 0xff;
> @@ -1304,10 +1303,9 @@ static int intel_hdmi_hdcp_read(struct intel_digital_port *intel_dig_port,
> static int intel_hdmi_hdcp_write(struct intel_digital_port *intel_dig_port,
> unsigned int offset, void *buffer, size_t size)
> {
> + struct drm_i915_private *i915 = to_i915(intel_dig_port->base.base.dev);
> struct intel_hdmi *hdmi = &intel_dig_port->hdmi;
> - struct drm_i915_private *dev_priv =
> - intel_dig_port->base.base.dev->dev_private;
> - struct i2c_adapter *adapter = intel_gmbus_get_adapter(dev_priv,
> + struct i2c_adapter *adapter = intel_gmbus_get_adapter(i915,
> hdmi->ddc_bus);
> int ret;
> u8 *write_buf;
> @@ -1339,10 +1337,9 @@ static
> int intel_hdmi_hdcp_write_an_aksv(struct intel_digital_port *intel_dig_port,
> u8 *an)
> {
> + struct drm_i915_private *i915 = to_i915(intel_dig_port->base.base.dev);
> struct intel_hdmi *hdmi = &intel_dig_port->hdmi;
> - struct drm_i915_private *dev_priv =
> - intel_dig_port->base.base.dev->dev_private;
> - struct i2c_adapter *adapter = intel_gmbus_get_adapter(dev_priv,
> + struct i2c_adapter *adapter = intel_gmbus_get_adapter(i915,
> hdmi->ddc_bus);
> int ret;
>
> @@ -1521,8 +1518,7 @@ int intel_hdmi_hdcp_toggle_signalling(struct intel_digital_port *intel_dig_port,
> static
> bool intel_hdmi_hdcp_check_link(struct intel_digital_port *intel_dig_port)
> {
> - struct drm_i915_private *dev_priv =
> - intel_dig_port->base.base.dev->dev_private;
> + struct drm_i915_private *i915 = to_i915(intel_dig_port->base.base.dev);
> struct intel_connector *connector =
> intel_dig_port->hdmi.attached_connector;
> enum port port = intel_dig_port->base.port;
> @@ -1537,14 +1533,13 @@ bool intel_hdmi_hdcp_check_link(struct intel_digital_port *intel_dig_port)
> if (ret)
> return false;
>
> - intel_de_write(dev_priv, HDCP_RPRIME(dev_priv, cpu_transcoder, port),
> - ri.reg);
> + intel_de_write(i915, HDCP_RPRIME(i915, cpu_transcoder, port), ri.reg);
>
> /* Wait for Ri prime match */
> - if (wait_for(intel_de_read(dev_priv, HDCP_STATUS(dev_priv, cpu_transcoder, port)) &
> + if (wait_for(intel_de_read(i915, HDCP_STATUS(i915, cpu_transcoder, port)) &
> (HDCP_STATUS_RI_MATCH | HDCP_STATUS_ENC), 1)) {
> DRM_ERROR("Ri' mismatch detected, link check failed (%x)\n",
> - intel_de_read(dev_priv, HDCP_STATUS(dev_priv, cpu_transcoder, port)));
> + intel_de_read(i915, HDCP_STATUS(i915, cpu_transcoder, port)));
> return false;
> }
> return true;
> --
> 2.20.1
>
>
_______________________________________________
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.IGT: success for drm/i915/hdmi: prefer to_i915() over drm->dev_private to get at i915
2020-02-11 13:44 [Intel-gfx] [PATCH] drm/i915/hdmi: prefer to_i915() over drm->dev_private to get at i915 Jani Nikula
2020-02-11 18:01 ` Wambui Karuga
@ 2020-02-13 17:08 ` Patchwork
1 sibling, 0 replies; 4+ messages in thread
From: Patchwork @ 2020-02-13 17:08 UTC (permalink / raw)
To: Jani Nikula; +Cc: intel-gfx
== Series Details ==
Series: drm/i915/hdmi: prefer to_i915() over drm->dev_private to get at i915
URL : https://patchwork.freedesktop.org/series/73297/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_7916_full -> Patchwork_16521_full
====================================================
Summary
-------
**SUCCESS**
No regressions found.
Known issues
------------
Here are the changes found in Patchwork_16521_full that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_exec_schedule@pi-common-bsd1:
- shard-iclb: [PASS][1] -> [SKIP][2] ([fdo#109276]) +12 similar issues
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7916/shard-iclb4/igt@gem_exec_schedule@pi-common-bsd1.html
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16521/shard-iclb8/igt@gem_exec_schedule@pi-common-bsd1.html
* igt@gem_exec_schedule@preemptive-hang-bsd:
- shard-iclb: [PASS][3] -> [SKIP][4] ([fdo#112146]) +4 similar issues
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7916/shard-iclb3/igt@gem_exec_schedule@preemptive-hang-bsd.html
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16521/shard-iclb1/igt@gem_exec_schedule@preemptive-hang-bsd.html
* igt@gem_tiled_partial_pwrite_pread@writes:
- shard-hsw: [PASS][5] -> [FAIL][6] ([i915#817])
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7916/shard-hsw2/igt@gem_tiled_partial_pwrite_pread@writes.html
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16521/shard-hsw8/igt@gem_tiled_partial_pwrite_pread@writes.html
* igt@gem_wait@write-busy-vcs1:
- shard-iclb: [PASS][7] -> [SKIP][8] ([fdo#112080]) +10 similar issues
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7916/shard-iclb1/igt@gem_wait@write-busy-vcs1.html
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16521/shard-iclb8/igt@gem_wait@write-busy-vcs1.html
* igt@kms_color@pipe-c-ctm-max:
- shard-skl: [PASS][9] -> [FAIL][10] ([i915#168])
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7916/shard-skl2/igt@kms_color@pipe-c-ctm-max.html
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16521/shard-skl10/igt@kms_color@pipe-c-ctm-max.html
* igt@kms_cursor_crc@pipe-c-cursor-suspend:
- shard-apl: [PASS][11] -> [DMESG-WARN][12] ([i915#180]) +4 similar issues
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7916/shard-apl2/igt@kms_cursor_crc@pipe-c-cursor-suspend.html
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16521/shard-apl6/igt@kms_cursor_crc@pipe-c-cursor-suspend.html
* igt@kms_frontbuffer_tracking@fbc-suspend:
- shard-kbl: [PASS][13] -> [DMESG-WARN][14] ([i915#180]) +5 similar issues
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7916/shard-kbl7/igt@kms_frontbuffer_tracking@fbc-suspend.html
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16521/shard-kbl7/igt@kms_frontbuffer_tracking@fbc-suspend.html
* igt@kms_plane_alpha_blend@pipe-b-coverage-7efc:
- shard-skl: [PASS][15] -> [FAIL][16] ([fdo#108145] / [i915#265])
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7916/shard-skl8/igt@kms_plane_alpha_blend@pipe-b-coverage-7efc.html
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16521/shard-skl4/igt@kms_plane_alpha_blend@pipe-b-coverage-7efc.html
* igt@kms_plane_lowres@pipe-a-tiling-x:
- shard-glk: [PASS][17] -> [FAIL][18] ([i915#899]) +1 similar issue
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7916/shard-glk8/igt@kms_plane_lowres@pipe-a-tiling-x.html
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16521/shard-glk2/igt@kms_plane_lowres@pipe-a-tiling-x.html
* igt@kms_psr@psr2_cursor_mmap_cpu:
- shard-iclb: [PASS][19] -> [SKIP][20] ([fdo#109441]) +2 similar issues
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7916/shard-iclb2/igt@kms_psr@psr2_cursor_mmap_cpu.html
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16521/shard-iclb4/igt@kms_psr@psr2_cursor_mmap_cpu.html
* igt@kms_setmode@basic:
- shard-apl: [PASS][21] -> [FAIL][22] ([i915#31])
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7916/shard-apl2/igt@kms_setmode@basic.html
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16521/shard-apl6/igt@kms_setmode@basic.html
- shard-hsw: [PASS][23] -> [FAIL][24] ([i915#31])
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7916/shard-hsw7/igt@kms_setmode@basic.html
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16521/shard-hsw2/igt@kms_setmode@basic.html
#### Possible fixes ####
* {igt@gem_ctx_persistence@engines-mixed-process@vecs0}:
- shard-iclb: [FAIL][25] ([i915#679]) -> [PASS][26]
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7916/shard-iclb3/igt@gem_ctx_persistence@engines-mixed-process@vecs0.html
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16521/shard-iclb3/igt@gem_ctx_persistence@engines-mixed-process@vecs0.html
* {igt@gem_ctx_persistence@legacy-engines-mixed-process@bsd}:
- shard-skl: [FAIL][27] ([i915#679]) -> [PASS][28]
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7916/shard-skl10/igt@gem_ctx_persistence@legacy-engines-mixed-process@bsd.html
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16521/shard-skl4/igt@gem_ctx_persistence@legacy-engines-mixed-process@bsd.html
* {igt@gem_ctx_persistence@legacy-engines-mixed-process@bsd1}:
- shard-skl: [INCOMPLETE][29] -> [PASS][30]
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7916/shard-skl10/igt@gem_ctx_persistence@legacy-engines-mixed-process@bsd1.html
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16521/shard-skl4/igt@gem_ctx_persistence@legacy-engines-mixed-process@bsd1.html
- shard-tglb: [FAIL][31] ([i915#679]) -> [PASS][32]
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7916/shard-tglb8/igt@gem_ctx_persistence@legacy-engines-mixed-process@bsd1.html
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16521/shard-tglb8/igt@gem_ctx_persistence@legacy-engines-mixed-process@bsd1.html
* {igt@gem_ctx_persistence@legacy-engines-mixed-process@bsd2}:
- shard-tglb: [INCOMPLETE][33] -> [PASS][34]
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7916/shard-tglb8/igt@gem_ctx_persistence@legacy-engines-mixed-process@bsd2.html
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16521/shard-tglb8/igt@gem_ctx_persistence@legacy-engines-mixed-process@bsd2.html
* igt@gem_exec_balancer@smoke:
- shard-iclb: [SKIP][35] ([fdo#110854]) -> [PASS][36]
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7916/shard-iclb5/igt@gem_exec_balancer@smoke.html
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16521/shard-iclb4/igt@gem_exec_balancer@smoke.html
* igt@gem_exec_parallel@vcs1-fds:
- shard-iclb: [SKIP][37] ([fdo#112080]) -> [PASS][38] +9 similar issues
[37]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7916/shard-iclb3/igt@gem_exec_parallel@vcs1-fds.html
[38]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16521/shard-iclb1/igt@gem_exec_parallel@vcs1-fds.html
* igt@gem_exec_schedule@pi-shared-iova-bsd2:
- shard-iclb: [SKIP][39] ([fdo#109276]) -> [PASS][40] +12 similar issues
[39]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7916/shard-iclb5/igt@gem_exec_schedule@pi-shared-iova-bsd2.html
[40]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16521/shard-iclb2/igt@gem_exec_schedule@pi-shared-iova-bsd2.html
* igt@gem_exec_schedule@preempt-other-chain-bsd:
- shard-iclb: [SKIP][41] ([fdo#112146]) -> [PASS][42] +3 similar issues
[41]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7916/shard-iclb1/igt@gem_exec_schedule@preempt-other-chain-bsd.html
[42]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16521/shard-iclb8/igt@gem_exec_schedule@preempt-other-chain-bsd.html
* igt@gem_partial_pwrite_pread@write-uncached:
- shard-hsw: [FAIL][43] ([i915#694]) -> [PASS][44] +2 similar issues
[43]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7916/shard-hsw8/igt@gem_partial_pwrite_pread@write-uncached.html
[44]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16521/shard-hsw1/igt@gem_partial_pwrite_pread@write-uncached.html
* igt@gem_ppgtt@flink-and-close-vma-leak:
- shard-apl: [FAIL][45] ([i915#644]) -> [PASS][46]
[45]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7916/shard-apl4/igt@gem_ppgtt@flink-and-close-vma-leak.html
[46]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16521/shard-apl8/igt@gem_ppgtt@flink-and-close-vma-leak.html
* igt@i915_pm_rps@reset:
- shard-iclb: [FAIL][47] ([i915#413]) -> [PASS][48]
[47]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7916/shard-iclb6/igt@i915_pm_rps@reset.html
[48]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16521/shard-iclb6/igt@i915_pm_rps@reset.html
* igt@kms_busy@basic-modeset-pipe-b:
- shard-snb: [SKIP][49] ([fdo#109271]) -> [PASS][50] +6 similar issues
[49]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7916/shard-snb6/igt@kms_busy@basic-modeset-pipe-b.html
[50]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16521/shard-snb4/igt@kms_busy@basic-modeset-pipe-b.html
* igt@kms_cursor_crc@pipe-c-cursor-256x256-sliding:
- shard-skl: [FAIL][51] ([i915#54]) -> [PASS][52]
[51]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7916/shard-skl4/igt@kms_cursor_crc@pipe-c-cursor-256x256-sliding.html
[52]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16521/shard-skl8/igt@kms_cursor_crc@pipe-c-cursor-256x256-sliding.html
* igt@kms_flip@2x-flip-vs-expired-vblank:
- shard-glk: [FAIL][53] ([i915#79]) -> [PASS][54]
[53]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7916/shard-glk6/igt@kms_flip@2x-flip-vs-expired-vblank.html
[54]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16521/shard-glk5/igt@kms_flip@2x-flip-vs-expired-vblank.html
* igt@kms_flip@flip-vs-expired-vblank-interruptible:
- shard-skl: [FAIL][55] ([i915#79]) -> [PASS][56]
[55]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7916/shard-skl1/igt@kms_flip@flip-vs-expired-vblank-interruptible.html
[56]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16521/shard-skl10/igt@kms_flip@flip-vs-expired-vblank-interruptible.html
* igt@kms_flip@plain-flip-fb-recreate-interruptible:
- shard-skl: [FAIL][57] ([i915#34]) -> [PASS][58]
[57]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7916/shard-skl3/igt@kms_flip@plain-flip-fb-recreate-interruptible.html
[58]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16521/shard-skl3/igt@kms_flip@plain-flip-fb-recreate-interruptible.html
* igt@kms_frontbuffer_tracking@psr-1p-primscrn-cur-indfb-draw-blt:
- shard-skl: [FAIL][59] ([i915#49]) -> [PASS][60]
[59]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7916/shard-skl6/igt@kms_frontbuffer_tracking@psr-1p-primscrn-cur-indfb-draw-blt.html
[60]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16521/shard-skl3/igt@kms_frontbuffer_tracking@psr-1p-primscrn-cur-indfb-draw-blt.html
* igt@kms_plane@plane-panning-bottom-right-suspend-pipe-a-planes:
- shard-kbl: [DMESG-WARN][61] ([i915#180]) -> [PASS][62] +2 similar issues
[61]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7916/shard-kbl7/igt@kms_plane@plane-panning-bottom-right-suspend-pipe-a-planes.html
[62]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16521/shard-kbl1/igt@kms_plane@plane-panning-bottom-right-suspend-pipe-a-planes.html
* igt@kms_plane_alpha_blend@pipe-a-constant-alpha-min:
- shard-skl: [FAIL][63] ([fdo#108145]) -> [PASS][64] +1 similar issue
[63]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7916/shard-skl6/igt@kms_plane_alpha_blend@pipe-a-constant-alpha-min.html
[64]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16521/shard-skl3/igt@kms_plane_alpha_blend@pipe-a-constant-alpha-min.html
* igt@kms_psr2_su@page_flip:
- shard-iclb: [SKIP][65] ([fdo#109642] / [fdo#111068]) -> [PASS][66]
[65]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7916/shard-iclb4/igt@kms_psr2_su@page_flip.html
[66]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16521/shard-iclb2/igt@kms_psr2_su@page_flip.html
* igt@kms_psr@psr2_primary_page_flip:
- shard-iclb: [SKIP][67] ([fdo#109441]) -> [PASS][68] +1 similar issue
[67]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7916/shard-iclb4/igt@kms_psr@psr2_primary_page_flip.html
[68]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16521/shard-iclb2/igt@kms_psr@psr2_primary_page_flip.html
* igt@kms_setmode@basic:
- shard-kbl: [FAIL][69] ([i915#31]) -> [PASS][70]
[69]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7916/shard-kbl6/igt@kms_setmode@basic.html
[70]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16521/shard-kbl7/igt@kms_setmode@basic.html
* igt@prime_mmap_coherency@ioctl-errors:
- shard-hsw: [FAIL][71] ([i915#831]) -> [PASS][72]
[71]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7916/shard-hsw6/igt@prime_mmap_coherency@ioctl-errors.html
[72]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16521/shard-hsw2/igt@prime_mmap_coherency@ioctl-errors.html
#### Warnings ####
* igt@gem_ctx_isolation@vcs1-nonpriv-switch:
- shard-iclb: [FAIL][73] ([IGT#28]) -> [SKIP][74] ([fdo#112080])
[73]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7916/shard-iclb2/igt@gem_ctx_isolation@vcs1-nonpriv-switch.html
[74]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16521/shard-iclb3/igt@gem_ctx_isolation@vcs1-nonpriv-switch.html
* igt@gem_tiled_blits@normal:
- shard-hsw: [FAIL][75] ([i915#818]) -> [FAIL][76] ([i915#694])
[75]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7916/shard-hsw7/igt@gem_tiled_blits@normal.html
[76]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16521/shard-hsw1/igt@gem_tiled_blits@normal.html
* igt@i915_pm_dc@dc6-dpms:
- shard-tglb: [FAIL][77] ([i915#454]) -> [SKIP][78] ([i915#468])
[77]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7916/shard-tglb5/igt@i915_pm_dc@dc6-dpms.html
[78]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16521/shard-tglb2/igt@i915_pm_dc@dc6-dpms.html
* igt@i915_pm_rpm@universal-planes:
- shard-snb: [SKIP][79] ([fdo#109271]) -> [INCOMPLETE][80] ([i915#82])
[79]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7916/shard-snb5/igt@i915_pm_rpm@universal-planes.html
[80]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16521/shard-snb6/igt@i915_pm_rpm@universal-planes.html
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[IGT#28]: https://gitlab.freedesktop.org/drm/igt-gpu-tools/issues/28
[fdo#108145]: https://bugs.freedesktop.org/show_bug.cgi?id=108145
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[fdo#109276]: https://bugs.freedesktop.org/show_bug.cgi?id=109276
[fdo#109441]: https://bugs.freedesktop.org/show_bug.cgi?id=109441
[fdo#109642]: https://bugs.freedesktop.org/show_bug.cgi?id=109642
[fdo#110854]: https://bugs.freedesktop.org/show_bug.cgi?id=110854
[fdo#111068]: https://bugs.freedesktop.org/show_bug.cgi?id=111068
[fdo#112080]: https://bugs.freedesktop.org/show_bug.cgi?id=112080
[fdo#112146]: https://bugs.freedesktop.org/show_bug.cgi?id=112146
[i915#1188]: https://gitlab.freedesktop.org/drm/intel/issues/1188
[i915#168]: https://gitlab.freedesktop.org/drm/intel/issues/168
[i915#180]: https://gitlab.freedesktop.org/drm/intel/issues/180
[i915#265]: https://gitlab.freedesktop.org/drm/intel/issues/265
[i915#31]: https://gitlab.freedesktop.org/drm/intel/issues/31
[i915#34]: https://gitlab.freedesktop.org/drm/intel/issues/34
[i915#413]: https://gitlab.freedesktop.org/drm/intel/issues/413
[i915#454]: https://gitlab.freedesktop.org/drm/intel/issues/454
[i915#468]: https://gitlab.freedesktop.org/drm/intel/issues/468
[i915#49]: https://gitlab.freedesktop.org/drm/intel/issues/49
[i915#54]: https://gitlab.freedesktop.org/drm/intel/issues/54
[i915#644]: https://gitlab.freedesktop.org/drm/intel/issues/644
[i915#679]: https://gitlab.freedesktop.org/drm/intel/issues/679
[i915#694]: https://gitlab.freedesktop.org/drm/intel/issues/694
[i915#79]: https://gitlab.freedesktop.org/drm/intel/issues/79
[i915#817]: https://gitlab.freedesktop.org/drm/intel/issues/817
[i915#818]: https://gitlab.freedesktop.org/drm/intel/issues/818
[i915#82]: https://gitlab.freedesktop.org/drm/intel/issues/82
[i915#831]: https://gitlab.freedesktop.org/drm/intel/issues/831
[i915#899]: https://gitlab.freedesktop.org/drm/intel/issues/899
Participating hosts (10 -> 10)
------------------------------
No changes in participating hosts
Build changes
-------------
* CI: CI-20190529 -> None
* Linux: CI_DRM_7916 -> Patchwork_16521
CI-20190529: 20190529
CI_DRM_7916: 6006a0cd15fdd07655be7c06729dd60b5135e42f @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_5435: 2b6d4476dde53c363b8808ed9f0dd5547ac78641 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_16521: bcd04015781c27e4f880bb402c6ecb776dffca50 @ git://anongit.freedesktop.org/gfx-ci/linux
piglit_4509: fdc5a4ca11124ab8413c7988896eec4c97336694 @ git://anongit.freedesktop.org/piglit
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16521/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
* Re: [Intel-gfx] [PATCH] drm/i915/hdmi: prefer to_i915() over drm->dev_private to get at i915
2020-02-11 18:01 ` Wambui Karuga
@ 2020-02-13 18:37 ` Jani Nikula
0 siblings, 0 replies; 4+ messages in thread
From: Jani Nikula @ 2020-02-13 18:37 UTC (permalink / raw)
To: Wambui Karuga; +Cc: intel-gfx
On Tue, 11 Feb 2020, Wambui Karuga <wambui.karugax@gmail.com> wrote:
> On Tue, 11 Feb 2020, Jani Nikula wrote:
>
>> drm->dev_private is to be avoided. Use to_i915() on the struct
>> drm_device pointer instead. Rename the affected local dev_priv variables
>> to i915 while at it.
>>
>
> Applies cleanly, and compiles.
> Changes also look good to me.
>
> Reviewed by: Wambui Karuga <wambui.karugax@gmail.com>
The "Reviewed-by:" tag should include the hyphen.
Thanks for the review, pushed to drm-intel-next-queued.
BR,
Jani.
>
>> Cc: Wambui Karuga <wambui.karugax@gmail.com>
>> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
>> ---
>> drivers/gpu/drm/i915/display/intel_hdmi.c | 25 +++++++++--------------
>> 1 file changed, 10 insertions(+), 15 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/i915/display/intel_hdmi.c b/drivers/gpu/drm/i915/display/intel_hdmi.c
>> index e68bafb76cb1..bee9c9b1a770 100644
>> --- a/drivers/gpu/drm/i915/display/intel_hdmi.c
>> +++ b/drivers/gpu/drm/i915/display/intel_hdmi.c
>> @@ -1274,10 +1274,9 @@ void intel_dp_dual_mode_set_tmds_output(struct intel_hdmi *hdmi, bool enable)
>> static int intel_hdmi_hdcp_read(struct intel_digital_port *intel_dig_port,
>> unsigned int offset, void *buffer, size_t size)
>> {
>> + struct drm_i915_private *i915 = to_i915(intel_dig_port->base.base.dev);
>> struct intel_hdmi *hdmi = &intel_dig_port->hdmi;
>> - struct drm_i915_private *dev_priv =
>> - intel_dig_port->base.base.dev->dev_private;
>> - struct i2c_adapter *adapter = intel_gmbus_get_adapter(dev_priv,
>> + struct i2c_adapter *adapter = intel_gmbus_get_adapter(i915,
>> hdmi->ddc_bus);
>> int ret;
>> u8 start = offset & 0xff;
>> @@ -1304,10 +1303,9 @@ static int intel_hdmi_hdcp_read(struct intel_digital_port *intel_dig_port,
>> static int intel_hdmi_hdcp_write(struct intel_digital_port *intel_dig_port,
>> unsigned int offset, void *buffer, size_t size)
>> {
>> + struct drm_i915_private *i915 = to_i915(intel_dig_port->base.base.dev);
>> struct intel_hdmi *hdmi = &intel_dig_port->hdmi;
>> - struct drm_i915_private *dev_priv =
>> - intel_dig_port->base.base.dev->dev_private;
>> - struct i2c_adapter *adapter = intel_gmbus_get_adapter(dev_priv,
>> + struct i2c_adapter *adapter = intel_gmbus_get_adapter(i915,
>> hdmi->ddc_bus);
>> int ret;
>> u8 *write_buf;
>> @@ -1339,10 +1337,9 @@ static
>> int intel_hdmi_hdcp_write_an_aksv(struct intel_digital_port *intel_dig_port,
>> u8 *an)
>> {
>> + struct drm_i915_private *i915 = to_i915(intel_dig_port->base.base.dev);
>> struct intel_hdmi *hdmi = &intel_dig_port->hdmi;
>> - struct drm_i915_private *dev_priv =
>> - intel_dig_port->base.base.dev->dev_private;
>> - struct i2c_adapter *adapter = intel_gmbus_get_adapter(dev_priv,
>> + struct i2c_adapter *adapter = intel_gmbus_get_adapter(i915,
>> hdmi->ddc_bus);
>> int ret;
>>
>> @@ -1521,8 +1518,7 @@ int intel_hdmi_hdcp_toggle_signalling(struct intel_digital_port *intel_dig_port,
>> static
>> bool intel_hdmi_hdcp_check_link(struct intel_digital_port *intel_dig_port)
>> {
>> - struct drm_i915_private *dev_priv =
>> - intel_dig_port->base.base.dev->dev_private;
>> + struct drm_i915_private *i915 = to_i915(intel_dig_port->base.base.dev);
>> struct intel_connector *connector =
>> intel_dig_port->hdmi.attached_connector;
>> enum port port = intel_dig_port->base.port;
>> @@ -1537,14 +1533,13 @@ bool intel_hdmi_hdcp_check_link(struct intel_digital_port *intel_dig_port)
>> if (ret)
>> return false;
>>
>> - intel_de_write(dev_priv, HDCP_RPRIME(dev_priv, cpu_transcoder, port),
>> - ri.reg);
>> + intel_de_write(i915, HDCP_RPRIME(i915, cpu_transcoder, port), ri.reg);
>>
>> /* Wait for Ri prime match */
>> - if (wait_for(intel_de_read(dev_priv, HDCP_STATUS(dev_priv, cpu_transcoder, port)) &
>> + if (wait_for(intel_de_read(i915, HDCP_STATUS(i915, cpu_transcoder, port)) &
>> (HDCP_STATUS_RI_MATCH | HDCP_STATUS_ENC), 1)) {
>> DRM_ERROR("Ri' mismatch detected, link check failed (%x)\n",
>> - intel_de_read(dev_priv, HDCP_STATUS(dev_priv, cpu_transcoder, port)));
>> + intel_de_read(i915, HDCP_STATUS(i915, cpu_transcoder, port)));
>> return false;
>> }
>> return true;
>> --
>> 2.20.1
>>
>>
--
Jani Nikula, Intel Open Source Graphics Center
_______________________________________________
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, other threads:[~2020-02-13 18:37 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-02-11 13:44 [Intel-gfx] [PATCH] drm/i915/hdmi: prefer to_i915() over drm->dev_private to get at i915 Jani Nikula
2020-02-11 18:01 ` Wambui Karuga
2020-02-13 18:37 ` Jani Nikula
2020-02-13 17:08 ` [Intel-gfx] ✓ Fi.CI.IGT: success for " Patchwork
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).