* [Intel-gfx] [PATCH v1] drm/i915/dsi: Drop double check for ACPI companion device
@ 2020-05-29 12:33 Andy Shevchenko
2020-05-29 13:45 ` [Intel-gfx] ✓ Fi.CI.BAT: success for " Patchwork
` (3 more replies)
0 siblings, 4 replies; 5+ messages in thread
From: Andy Shevchenko @ 2020-05-29 12:33 UTC (permalink / raw)
To: Jani Nikula, Joonas Lahtinen, Rodrigo Vivi, intel-gfx,
Daniel Vetter, dri-devel
Cc: Andy Shevchenko
acpi_dev_get_resources() does perform the NULL pointer check against
ACPI companion device which is given as function parameter. Thus,
there is no need to duplicate this check in the caller.
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
drivers/gpu/drm/i915/display/intel_dsi_vbt.c | 24 ++++++++------------
1 file changed, 10 insertions(+), 14 deletions(-)
diff --git a/drivers/gpu/drm/i915/display/intel_dsi_vbt.c b/drivers/gpu/drm/i915/display/intel_dsi_vbt.c
index 574dcfec9577..6f9e08cda964 100644
--- a/drivers/gpu/drm/i915/display/intel_dsi_vbt.c
+++ b/drivers/gpu/drm/i915/display/intel_dsi_vbt.c
@@ -426,23 +426,19 @@ static void i2c_acpi_find_adapter(struct intel_dsi *intel_dsi,
{
struct drm_device *drm_dev = intel_dsi->base.base.dev;
struct device *dev = &drm_dev->pdev->dev;
- struct acpi_device *acpi_dev;
+ struct acpi_device *acpi_dev = ACPI_COMPANION(dev);
struct list_head resource_list;
struct i2c_adapter_lookup lookup;
- acpi_dev = ACPI_COMPANION(dev);
- if (acpi_dev) {
- memset(&lookup, 0, sizeof(lookup));
- lookup.slave_addr = slave_addr;
- lookup.intel_dsi = intel_dsi;
- lookup.dev_handle = acpi_device_handle(acpi_dev);
-
- INIT_LIST_HEAD(&resource_list);
- acpi_dev_get_resources(acpi_dev, &resource_list,
- i2c_adapter_lookup,
- &lookup);
- acpi_dev_free_resource_list(&resource_list);
- }
+ memset(&lookup, 0, sizeof(lookup));
+ lookup.slave_addr = slave_addr;
+ lookup.intel_dsi = intel_dsi;
+ lookup.dev_handle = acpi_device_handle(acpi_dev);
+
+ INIT_LIST_HEAD(&resource_list);
+ acpi_dev_get_resources(acpi_dev, &resource_list,
+ i2c_adapter_lookup, &lookup);
+ acpi_dev_free_resource_list(&resource_list);
}
#else
static inline void i2c_acpi_find_adapter(struct intel_dsi *intel_dsi,
--
2.26.2
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 5+ messages in thread* [Intel-gfx] ✓ Fi.CI.BAT: success for drm/i915/dsi: Drop double check for ACPI companion device 2020-05-29 12:33 [Intel-gfx] [PATCH v1] drm/i915/dsi: Drop double check for ACPI companion device Andy Shevchenko @ 2020-05-29 13:45 ` Patchwork 2020-05-29 15:28 ` [Intel-gfx] ✓ Fi.CI.IGT: " Patchwork ` (2 subsequent siblings) 3 siblings, 0 replies; 5+ messages in thread From: Patchwork @ 2020-05-29 13:45 UTC (permalink / raw) To: Andy Shevchenko; +Cc: intel-gfx == Series Details == Series: drm/i915/dsi: Drop double check for ACPI companion device URL : https://patchwork.freedesktop.org/series/77785/ State : success == Summary == CI Bug Log - changes from CI_DRM_8553 -> Patchwork_17817 ==================================================== Summary ------- **SUCCESS** No regressions found. External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17817/index.html Known issues ------------ Here are the changes found in Patchwork_17817 that come from known issues: ### IGT changes ### #### Warnings #### * igt@i915_pm_rpm@module-reload: - fi-glk-dsi: [TIMEOUT][1] ([i915#1288]) -> [TIMEOUT][2] ([i915#1288] / [i915#1958]) [1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8553/fi-glk-dsi/igt@i915_pm_rpm@module-reload.html [2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17817/fi-glk-dsi/igt@i915_pm_rpm@module-reload.html [i915#1288]: https://gitlab.freedesktop.org/drm/intel/issues/1288 [i915#1958]: https://gitlab.freedesktop.org/drm/intel/issues/1958 Participating hosts (51 -> 44) ------------------------------ Missing (7): fi-ilk-m540 fi-hsw-4200u fi-byt-squawks fi-bsw-cyan fi-ctg-p8600 fi-byt-clapper fi-bdw-samus Build changes ------------- * Linux: CI_DRM_8553 -> Patchwork_17817 CI-20190529: 20190529 CI_DRM_8553: 9f1b8b4fcb466dc714b1f825fd93e3bbd29c7de6 @ git://anongit.freedesktop.org/gfx-ci/linux IGT_5683: 757b6e72d546fd2dbc3801a73796d67b0854021b @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools Patchwork_17817: faa5526ffe05ac74e4dfa156fa1d893db0c9835e @ git://anongit.freedesktop.org/gfx-ci/linux == Linux commits == faa5526ffe05 drm/i915/dsi: Drop double check for ACPI companion device == Logs == For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17817/index.html _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx ^ permalink raw reply [flat|nested] 5+ messages in thread
* [Intel-gfx] ✓ Fi.CI.IGT: success for drm/i915/dsi: Drop double check for ACPI companion device 2020-05-29 12:33 [Intel-gfx] [PATCH v1] drm/i915/dsi: Drop double check for ACPI companion device Andy Shevchenko 2020-05-29 13:45 ` [Intel-gfx] ✓ Fi.CI.BAT: success for " Patchwork @ 2020-05-29 15:28 ` Patchwork 2020-07-21 16:00 ` [Intel-gfx] [PATCH v1] " Andy Shevchenko 2020-07-22 11:33 ` Ville Syrjälä 3 siblings, 0 replies; 5+ messages in thread From: Patchwork @ 2020-05-29 15:28 UTC (permalink / raw) To: Andy Shevchenko; +Cc: intel-gfx == Series Details == Series: drm/i915/dsi: Drop double check for ACPI companion device URL : https://patchwork.freedesktop.org/series/77785/ State : success == Summary == CI Bug Log - changes from CI_DRM_8553_full -> Patchwork_17817_full ==================================================== Summary ------- **SUCCESS** No regressions found. Known issues ------------ Here are the changes found in Patchwork_17817_full that come from known issues: ### IGT changes ### #### Issues hit #### * igt@gem_ctx_persistence@legacy-engines-mixed-process@bsd: - shard-skl: [PASS][1] -> [FAIL][2] ([i915#1528]) [1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8553/shard-skl6/igt@gem_ctx_persistence@legacy-engines-mixed-process@bsd.html [2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17817/shard-skl9/igt@gem_ctx_persistence@legacy-engines-mixed-process@bsd.html * igt@gen9_exec_parse@allowed-all: - shard-apl: [PASS][3] -> [DMESG-WARN][4] ([i915#1436] / [i915#716]) [3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8553/shard-apl1/igt@gen9_exec_parse@allowed-all.html [4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17817/shard-apl6/igt@gen9_exec_parse@allowed-all.html * igt@kms_cursor_crc@pipe-a-cursor-64x64-random: - shard-kbl: [PASS][5] -> [FAIL][6] ([i915#54] / [i915#93] / [i915#95]) [5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8553/shard-kbl1/igt@kms_cursor_crc@pipe-a-cursor-64x64-random.html [6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17817/shard-kbl4/igt@kms_cursor_crc@pipe-a-cursor-64x64-random.html * igt@kms_cursor_crc@pipe-b-cursor-suspend: - shard-skl: [PASS][7] -> [INCOMPLETE][8] ([i915#300]) [7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8553/shard-skl1/igt@kms_cursor_crc@pipe-b-cursor-suspend.html [8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17817/shard-skl5/igt@kms_cursor_crc@pipe-b-cursor-suspend.html * igt@kms_plane_alpha_blend@pipe-a-constant-alpha-min: - shard-skl: [PASS][9] -> [FAIL][10] ([fdo#108145] / [i915#265]) [9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8553/shard-skl4/igt@kms_plane_alpha_blend@pipe-a-constant-alpha-min.html [10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17817/shard-skl6/igt@kms_plane_alpha_blend@pipe-a-constant-alpha-min.html * igt@kms_psr2_su@frontbuffer: - shard-iclb: [PASS][11] -> [SKIP][12] ([fdo#109642] / [fdo#111068]) [11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8553/shard-iclb2/igt@kms_psr2_su@frontbuffer.html [12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17817/shard-iclb3/igt@kms_psr2_su@frontbuffer.html * igt@kms_psr@psr2_cursor_render: - shard-iclb: [PASS][13] -> [SKIP][14] ([fdo#109441]) [13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8553/shard-iclb2/igt@kms_psr@psr2_cursor_render.html [14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17817/shard-iclb8/igt@kms_psr@psr2_cursor_render.html #### Possible fixes #### * igt@i915_suspend@fence-restore-untiled: - shard-kbl: [DMESG-WARN][15] ([i915#180]) -> [PASS][16] +2 similar issues [15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8553/shard-kbl1/igt@i915_suspend@fence-restore-untiled.html [16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17817/shard-kbl4/igt@i915_suspend@fence-restore-untiled.html * {igt@kms_atomic_transition@plane-all-modeset-transition-fencing@pipe-c}: - shard-kbl: [DMESG-WARN][17] ([i915#165] / [i915#180]) -> [PASS][18] [17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8553/shard-kbl2/igt@kms_atomic_transition@plane-all-modeset-transition-fencing@pipe-c.html [18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17817/shard-kbl4/igt@kms_atomic_transition@plane-all-modeset-transition-fencing@pipe-c.html * igt@kms_cursor_legacy@cursora-vs-flipb-toggle: - shard-glk: [DMESG-FAIL][19] ([i915#1925] / [i915#1926]) -> [PASS][20] [19]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8553/shard-glk7/igt@kms_cursor_legacy@cursora-vs-flipb-toggle.html [20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17817/shard-glk6/igt@kms_cursor_legacy@cursora-vs-flipb-toggle.html * igt@kms_fbcon_fbt@psr-suspend: - shard-iclb: [INCOMPLETE][21] ([i915#1185]) -> [PASS][22] [21]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8553/shard-iclb3/igt@kms_fbcon_fbt@psr-suspend.html [22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17817/shard-iclb1/igt@kms_fbcon_fbt@psr-suspend.html * {igt@kms_flip@flip-vs-expired-vblank@b-edp1}: - shard-skl: [FAIL][23] ([i915#79]) -> [PASS][24] [23]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8553/shard-skl5/igt@kms_flip@flip-vs-expired-vblank@b-edp1.html [24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17817/shard-skl10/igt@kms_flip@flip-vs-expired-vblank@b-edp1.html * igt@kms_hdr@bpc-switch-suspend: - shard-skl: [FAIL][25] ([i915#1188]) -> [PASS][26] [25]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8553/shard-skl5/igt@kms_hdr@bpc-switch-suspend.html [26]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17817/shard-skl10/igt@kms_hdr@bpc-switch-suspend.html * igt@kms_psr@psr2_sprite_mmap_gtt: - shard-iclb: [SKIP][27] ([fdo#109441]) -> [PASS][28] +1 similar issue [27]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8553/shard-iclb3/igt@kms_psr@psr2_sprite_mmap_gtt.html [28]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17817/shard-iclb2/igt@kms_psr@psr2_sprite_mmap_gtt.html * igt@kms_vblank@pipe-b-ts-continuation-suspend: - shard-apl: [DMESG-WARN][29] ([i915#180]) -> [PASS][30] +1 similar issue [29]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8553/shard-apl4/igt@kms_vblank@pipe-b-ts-continuation-suspend.html [30]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17817/shard-apl2/igt@kms_vblank@pipe-b-ts-continuation-suspend.html * igt@perf@mi-rpc: - shard-hsw: [INCOMPLETE][31] ([i915#61]) -> [PASS][32] [31]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8553/shard-hsw5/igt@perf@mi-rpc.html [32]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17817/shard-hsw8/igt@perf@mi-rpc.html * {igt@perf@polling-parameterized}: - shard-hsw: [FAIL][33] ([i915#1542]) -> [PASS][34] [33]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8553/shard-hsw6/igt@perf@polling-parameterized.html [34]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17817/shard-hsw4/igt@perf@polling-parameterized.html #### Warnings #### * igt@kms_content_protection@atomic: - shard-apl: [FAIL][35] ([fdo#110321] / [fdo#110336]) -> [FAIL][36] ([fdo#110321] / [fdo#110336] / [i915#95]) [35]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8553/shard-apl6/igt@kms_content_protection@atomic.html [36]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17817/shard-apl7/igt@kms_content_protection@atomic.html * igt@kms_content_protection@atomic-dpms: - shard-apl: [TIMEOUT][37] ([i915#1319] / [i915#1635]) -> [FAIL][38] ([fdo#110321] / [fdo#110336]) [37]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8553/shard-apl3/igt@kms_content_protection@atomic-dpms.html [38]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17817/shard-apl4/igt@kms_content_protection@atomic-dpms.html * igt@kms_content_protection@srm: - shard-apl: [TIMEOUT][39] ([i915#1319] / [i915#1635]) -> [FAIL][40] ([fdo#110321]) [39]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8553/shard-apl8/igt@kms_content_protection@srm.html [40]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17817/shard-apl1/igt@kms_content_protection@srm.html * igt@kms_plane_lowres@pipe-b-tiling-yf: - shard-hsw: [SKIP][41] ([fdo#109271] / [i915#1927]) -> [SKIP][42] ([fdo#109271]) [41]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8553/shard-hsw2/igt@kms_plane_lowres@pipe-b-tiling-yf.html [42]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17817/shard-hsw1/igt@kms_plane_lowres@pipe-b-tiling-yf.html {name}: This element is suppressed. This means it is ignored when computing the status of the difference (SUCCESS, WARNING, or FAILURE). [fdo#108145]: https://bugs.freedesktop.org/show_bug.cgi?id=108145 [fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271 [fdo#109441]: https://bugs.freedesktop.org/show_bug.cgi?id=109441 [fdo#109642]: https://bugs.freedesktop.org/show_bug.cgi?id=109642 [fdo#110321]: https://bugs.freedesktop.org/show_bug.cgi?id=110321 [fdo#110336]: https://bugs.freedesktop.org/show_bug.cgi?id=110336 [fdo#111068]: https://bugs.freedesktop.org/show_bug.cgi?id=111068 [i915#1185]: https://gitlab.freedesktop.org/drm/intel/issues/1185 [i915#1188]: https://gitlab.freedesktop.org/drm/intel/issues/1188 [i915#1319]: https://gitlab.freedesktop.org/drm/intel/issues/1319 [i915#1436]: https://gitlab.freedesktop.org/drm/intel/issues/1436 [i915#1528]: https://gitlab.freedesktop.org/drm/intel/issues/1528 [i915#1542]: https://gitlab.freedesktop.org/drm/intel/issues/1542 [i915#1635]: https://gitlab.freedesktop.org/drm/intel/issues/1635 [i915#165]: https://gitlab.freedesktop.org/drm/intel/issues/165 [i915#180]: https://gitlab.freedesktop.org/drm/intel/issues/180 [i915#1925]: https://gitlab.freedesktop.org/drm/intel/issues/1925 [i915#1926]: https://gitlab.freedesktop.org/drm/intel/issues/1926 [i915#1927]: https://gitlab.freedesktop.org/drm/intel/issues/1927 [i915#1930]: https://gitlab.freedesktop.org/drm/intel/issues/1930 [i915#1958]: https://gitlab.freedesktop.org/drm/intel/issues/1958 [i915#265]: https://gitlab.freedesktop.org/drm/intel/issues/265 [i915#300]: https://gitlab.freedesktop.org/drm/intel/issues/300 [i915#46]: https://gitlab.freedesktop.org/drm/intel/issues/46 [i915#54]: https://gitlab.freedesktop.org/drm/intel/issues/54 [i915#58]: https://gitlab.freedesktop.org/drm/intel/issues/58 [i915#61]: https://gitlab.freedesktop.org/drm/intel/issues/61 [i915#716]: https://gitlab.freedesktop.org/drm/intel/issues/716 [i915#79]: https://gitlab.freedesktop.org/drm/intel/issues/79 [i915#93]: https://gitlab.freedesktop.org/drm/intel/issues/93 [i915#95]: https://gitlab.freedesktop.org/drm/intel/issues/95 [k.org#198133]: https://bugzilla.kernel.org/show_bug.cgi?id=198133 Participating hosts (11 -> 11) ------------------------------ No changes in participating hosts Build changes ------------- * Linux: CI_DRM_8553 -> Patchwork_17817 CI-20190529: 20190529 CI_DRM_8553: 9f1b8b4fcb466dc714b1f825fd93e3bbd29c7de6 @ git://anongit.freedesktop.org/gfx-ci/linux IGT_5683: 757b6e72d546fd2dbc3801a73796d67b0854021b @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools Patchwork_17817: faa5526ffe05ac74e4dfa156fa1d893db0c9835e @ 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_17817/index.html _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [Intel-gfx] [PATCH v1] drm/i915/dsi: Drop double check for ACPI companion device 2020-05-29 12:33 [Intel-gfx] [PATCH v1] drm/i915/dsi: Drop double check for ACPI companion device Andy Shevchenko 2020-05-29 13:45 ` [Intel-gfx] ✓ Fi.CI.BAT: success for " Patchwork 2020-05-29 15:28 ` [Intel-gfx] ✓ Fi.CI.IGT: " Patchwork @ 2020-07-21 16:00 ` Andy Shevchenko 2020-07-22 11:33 ` Ville Syrjälä 3 siblings, 0 replies; 5+ messages in thread From: Andy Shevchenko @ 2020-07-21 16:00 UTC (permalink / raw) To: Jani Nikula, Joonas Lahtinen, Rodrigo Vivi, intel-gfx, Daniel Vetter, dri-devel On Fri, May 29, 2020 at 03:33:17PM +0300, Andy Shevchenko wrote: > acpi_dev_get_resources() does perform the NULL pointer check against > ACPI companion device which is given as function parameter. Thus, > there is no need to duplicate this check in the caller. Any comment so far? > Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> > --- > drivers/gpu/drm/i915/display/intel_dsi_vbt.c | 24 ++++++++------------ > 1 file changed, 10 insertions(+), 14 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_dsi_vbt.c b/drivers/gpu/drm/i915/display/intel_dsi_vbt.c > index 574dcfec9577..6f9e08cda964 100644 > --- a/drivers/gpu/drm/i915/display/intel_dsi_vbt.c > +++ b/drivers/gpu/drm/i915/display/intel_dsi_vbt.c > @@ -426,23 +426,19 @@ static void i2c_acpi_find_adapter(struct intel_dsi *intel_dsi, > { > struct drm_device *drm_dev = intel_dsi->base.base.dev; > struct device *dev = &drm_dev->pdev->dev; > - struct acpi_device *acpi_dev; > + struct acpi_device *acpi_dev = ACPI_COMPANION(dev); > struct list_head resource_list; > struct i2c_adapter_lookup lookup; > > - acpi_dev = ACPI_COMPANION(dev); > - if (acpi_dev) { > - memset(&lookup, 0, sizeof(lookup)); > - lookup.slave_addr = slave_addr; > - lookup.intel_dsi = intel_dsi; > - lookup.dev_handle = acpi_device_handle(acpi_dev); > - > - INIT_LIST_HEAD(&resource_list); > - acpi_dev_get_resources(acpi_dev, &resource_list, > - i2c_adapter_lookup, > - &lookup); > - acpi_dev_free_resource_list(&resource_list); > - } > + memset(&lookup, 0, sizeof(lookup)); > + lookup.slave_addr = slave_addr; > + lookup.intel_dsi = intel_dsi; > + lookup.dev_handle = acpi_device_handle(acpi_dev); > + > + INIT_LIST_HEAD(&resource_list); > + acpi_dev_get_resources(acpi_dev, &resource_list, > + i2c_adapter_lookup, &lookup); > + acpi_dev_free_resource_list(&resource_list); > } > #else > static inline void i2c_acpi_find_adapter(struct intel_dsi *intel_dsi, > -- > 2.26.2 > -- With Best Regards, Andy Shevchenko _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [Intel-gfx] [PATCH v1] drm/i915/dsi: Drop double check for ACPI companion device 2020-05-29 12:33 [Intel-gfx] [PATCH v1] drm/i915/dsi: Drop double check for ACPI companion device Andy Shevchenko ` (2 preceding siblings ...) 2020-07-21 16:00 ` [Intel-gfx] [PATCH v1] " Andy Shevchenko @ 2020-07-22 11:33 ` Ville Syrjälä 3 siblings, 0 replies; 5+ messages in thread From: Ville Syrjälä @ 2020-07-22 11:33 UTC (permalink / raw) To: Andy Shevchenko; +Cc: intel-gfx, dri-devel On Fri, May 29, 2020 at 03:33:17PM +0300, Andy Shevchenko wrote: > acpi_dev_get_resources() does perform the NULL pointer check against > ACPI companion device which is given as function parameter. Thus, > there is no need to duplicate this check in the caller. > > Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Sorry, I did look at this but apparently forgot to reply... > --- > drivers/gpu/drm/i915/display/intel_dsi_vbt.c | 24 ++++++++------------ > 1 file changed, 10 insertions(+), 14 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_dsi_vbt.c b/drivers/gpu/drm/i915/display/intel_dsi_vbt.c > index 574dcfec9577..6f9e08cda964 100644 > --- a/drivers/gpu/drm/i915/display/intel_dsi_vbt.c > +++ b/drivers/gpu/drm/i915/display/intel_dsi_vbt.c > @@ -426,23 +426,19 @@ static void i2c_acpi_find_adapter(struct intel_dsi *intel_dsi, > { > struct drm_device *drm_dev = intel_dsi->base.base.dev; > struct device *dev = &drm_dev->pdev->dev; > - struct acpi_device *acpi_dev; > + struct acpi_device *acpi_dev = ACPI_COMPANION(dev); > struct list_head resource_list; > struct i2c_adapter_lookup lookup; > > - acpi_dev = ACPI_COMPANION(dev); > - if (acpi_dev) { > - memset(&lookup, 0, sizeof(lookup)); > - lookup.slave_addr = slave_addr; > - lookup.intel_dsi = intel_dsi; > - lookup.dev_handle = acpi_device_handle(acpi_dev); > - > - INIT_LIST_HEAD(&resource_list); > - acpi_dev_get_resources(acpi_dev, &resource_list, > - i2c_adapter_lookup, > - &lookup); > - acpi_dev_free_resource_list(&resource_list); > - } > + memset(&lookup, 0, sizeof(lookup)); > + lookup.slave_addr = slave_addr; > + lookup.intel_dsi = intel_dsi; > + lookup.dev_handle = acpi_device_handle(acpi_dev); struct i2c_adapter_lookup lookup = { .slave_addr = ... }; ? > + > + INIT_LIST_HEAD(&resource_list); Declare as LIST_HEAD(resource_list); ? > + acpi_dev_get_resources(acpi_dev, &resource_list, > + i2c_adapter_lookup, &lookup); > + acpi_dev_free_resource_list(&resource_list); I was very confused by this code since on the first glance it appears to absolutely nothing. After a deeper look it looks like i2c_adapter_lookup() magically mutates intel_dsi->i2c_bus_num. Did I mention I hate functions with side effects? IMO would be much better if i2c_adapter_lookup() did what it says on the tin and just returned the adapter number and let the caller deal with it. But this is a pre-existing issue with the code and so not directly related to your patch. > } > #else > static inline void i2c_acpi_find_adapter(struct intel_dsi *intel_dsi, > -- > 2.26.2 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/intel-gfx -- Ville Syrjälä Intel _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx ^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2020-07-22 11:33 UTC | newest] Thread overview: 5+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2020-05-29 12:33 [Intel-gfx] [PATCH v1] drm/i915/dsi: Drop double check for ACPI companion device Andy Shevchenko 2020-05-29 13:45 ` [Intel-gfx] ✓ Fi.CI.BAT: success for " Patchwork 2020-05-29 15:28 ` [Intel-gfx] ✓ Fi.CI.IGT: " Patchwork 2020-07-21 16:00 ` [Intel-gfx] [PATCH v1] " Andy Shevchenko 2020-07-22 11:33 ` Ville Syrjälä
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox