[RESEND] drm/i915/sdvo: use the i2c bus locking functions

[RESEND] drm/i915/sdvo: use the i2c bus locking functions

[Jani Nikula]

Use i2c_lock_bus(), i2c_trylock_bus(), and i2c_unlock_bus() instead of
poking at i2c adapter's lock_ops directly.

Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
 drivers/gpu/drm/i915/display/intel_sdvo.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/gpu/drm/i915/display/intel_sdvo.c b/drivers/gpu/drm/i915/display/intel_sdvo.c
index 23c511a9a2ad..ba54c90828f4 100644
--- a/drivers/gpu/drm/i915/display/intel_sdvo.c
+++ b/drivers/gpu/drm/i915/display/intel_sdvo.c
@@ -3319,7 +3319,7 @@ static void proxy_lock_bus(struct i2c_adapter *adapter,
 	struct intel_sdvo_ddc *ddc = adapter->algo_data;
 	struct intel_sdvo *sdvo = ddc->sdvo;
 
-	sdvo->i2c->lock_ops->lock_bus(sdvo->i2c, flags);
+	i2c_lock_bus(sdvo->i2c, flags);
 }
 
 static int proxy_trylock_bus(struct i2c_adapter *adapter,
@@ -3328,7 +3328,7 @@ static int proxy_trylock_bus(struct i2c_adapter *adapter,
 	struct intel_sdvo_ddc *ddc = adapter->algo_data;
 	struct intel_sdvo *sdvo = ddc->sdvo;
 
-	return sdvo->i2c->lock_ops->trylock_bus(sdvo->i2c, flags);
+	return i2c_trylock_bus(sdvo->i2c, flags);
 }
 
 static void proxy_unlock_bus(struct i2c_adapter *adapter,
@@ -3337,7 +3337,7 @@ static void proxy_unlock_bus(struct i2c_adapter *adapter,
 	struct intel_sdvo_ddc *ddc = adapter->algo_data;
 	struct intel_sdvo *sdvo = ddc->sdvo;
 
-	sdvo->i2c->lock_ops->unlock_bus(sdvo->i2c, flags);
+	i2c_unlock_bus(sdvo->i2c, flags);
 }
 
 static const struct i2c_lock_operations proxy_lock_ops = {
-- 
2.47.3

✓ i915.CI.BAT: success for drm/i915/sdvo: use the i2c bus locking functions (rev2)

[Patchwork]

[-- Attachment #1: Type: text/plain, Size: 2057 bytes --]

== Series Details ==

Series: drm/i915/sdvo: use the i2c bus locking functions (rev2)
URL   : https://patchwork.freedesktop.org/series/165436/
State : success

== Summary ==

CI Bug Log - changes from CI_DRM_18481 -> Patchwork_165436v2
====================================================

Summary
-------

  **SUCCESS**

  No regressions found.

  External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_165436v2/index.html

Participating hosts (42 -> 40)
------------------------------

  Missing    (2): bat-dg2-13 fi-snb-2520m 

Known issues
------------

  Here are the changes found in Patchwork_165436v2 that come from known issues:

### IGT changes ###

#### Issues hit ####

  * igt@i915_selftest@live@workarounds:
    - bat-dg2-9:          [PASS][1] -> [DMESG-FAIL][2] ([i915#12061]) +1 other test dmesg-fail
   [1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_18481/bat-dg2-9/igt@i915_selftest@live@workarounds.html
   [2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_165436v2/bat-dg2-9/igt@i915_selftest@live@workarounds.html

  
#### Possible fixes ####

  * igt@i915_selftest@live@workarounds:
    - bat-arls-6:         [DMESG-FAIL][3] ([i915#12061]) -> [PASS][4] +1 other test pass
   [3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_18481/bat-arls-6/igt@i915_selftest@live@workarounds.html
   [4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_165436v2/bat-arls-6/igt@i915_selftest@live@workarounds.html

  
  [i915#12061]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/12061


Build changes
-------------

  * Linux: CI_DRM_18481 -> Patchwork_165436v2

  CI-20190529: 20190529
  CI_DRM_18481: 896e027423be1efc1b1a690bc56bafe6cf49c213 @ git://anongit.freedesktop.org/gfx-ci/linux
  IGT_8909: e68d82b442e3909dd053c97542aeb029707124cf @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git
  Patchwork_165436v2: 896e027423be1efc1b1a690bc56bafe6cf49c213 @ git://anongit.freedesktop.org/gfx-ci/linux

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_165436v2/index.html

[-- Attachment #2: Type: text/html, Size: 2745 bytes --]

✓ i915.CI.BAT: success for drm/i915/sdvo: use the i2c bus locking functions (rev2)

[Patchwork]

[-- Attachment #1: Type: text/plain, Size: 2057 bytes --]

== Series Details ==

Series: drm/i915/sdvo: use the i2c bus locking functions (rev2)
URL   : https://patchwork.freedesktop.org/series/165436/
State : success

== Summary ==

CI Bug Log - changes from CI_DRM_18481 -> Patchwork_165436v2
====================================================

Summary
-------

  **SUCCESS**

  No regressions found.

  External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_165436v2/index.html

Participating hosts (42 -> 40)
------------------------------

  Missing    (2): bat-dg2-13 fi-snb-2520m 

Known issues
------------

  Here are the changes found in Patchwork_165436v2 that come from known issues:

### IGT changes ###

#### Issues hit ####

  * igt@i915_selftest@live@workarounds:
    - bat-dg2-9:          [PASS][1] -> [DMESG-FAIL][2] ([i915#12061]) +1 other test dmesg-fail
   [1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_18481/bat-dg2-9/igt@i915_selftest@live@workarounds.html
   [2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_165436v2/bat-dg2-9/igt@i915_selftest@live@workarounds.html

  
#### Possible fixes ####

  * igt@i915_selftest@live@workarounds:
    - bat-arls-6:         [DMESG-FAIL][3] ([i915#12061]) -> [PASS][4] +1 other test pass
   [3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_18481/bat-arls-6/igt@i915_selftest@live@workarounds.html
   [4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_165436v2/bat-arls-6/igt@i915_selftest@live@workarounds.html

  
  [i915#12061]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/12061


Build changes
-------------

  * Linux: CI_DRM_18481 -> Patchwork_165436v2

  CI-20190529: 20190529
  CI_DRM_18481: 896e027423be1efc1b1a690bc56bafe6cf49c213 @ git://anongit.freedesktop.org/gfx-ci/linux
  IGT_8909: e68d82b442e3909dd053c97542aeb029707124cf @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git
  Patchwork_165436v2: 896e027423be1efc1b1a690bc56bafe6cf49c213 @ git://anongit.freedesktop.org/gfx-ci/linux

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_165436v2/index.html

[-- Attachment #2: Type: text/html, Size: 2745 bytes --]

✓ i915.CI.BAT: success for drm/i915/sdvo: use the i2c bus locking functions (rev2)

[Patchwork]

[-- Attachment #1: Type: text/plain, Size: 2057 bytes --]

== Series Details ==

Series: drm/i915/sdvo: use the i2c bus locking functions (rev2)
URL   : https://patchwork.freedesktop.org/series/165436/
State : success

== Summary ==

CI Bug Log - changes from CI_DRM_18481 -> Patchwork_165436v2
====================================================

Summary
-------

  **SUCCESS**

  No regressions found.

  External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_165436v2/index.html

Participating hosts (42 -> 40)
------------------------------

  Missing    (2): bat-dg2-13 fi-snb-2520m 

Known issues
------------

  Here are the changes found in Patchwork_165436v2 that come from known issues:

### IGT changes ###

#### Issues hit ####

  * igt@i915_selftest@live@workarounds:
    - bat-dg2-9:          [PASS][1] -> [DMESG-FAIL][2] ([i915#12061]) +1 other test dmesg-fail
   [1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_18481/bat-dg2-9/igt@i915_selftest@live@workarounds.html
   [2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_165436v2/bat-dg2-9/igt@i915_selftest@live@workarounds.html

  
#### Possible fixes ####

  * igt@i915_selftest@live@workarounds:
    - bat-arls-6:         [DMESG-FAIL][3] ([i915#12061]) -> [PASS][4] +1 other test pass
   [3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_18481/bat-arls-6/igt@i915_selftest@live@workarounds.html
   [4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_165436v2/bat-arls-6/igt@i915_selftest@live@workarounds.html

  
  [i915#12061]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/12061


Build changes
-------------

  * Linux: CI_DRM_18481 -> Patchwork_165436v2

  CI-20190529: 20190529
  CI_DRM_18481: 896e027423be1efc1b1a690bc56bafe6cf49c213 @ git://anongit.freedesktop.org/gfx-ci/linux
  IGT_8909: e68d82b442e3909dd053c97542aeb029707124cf @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git
  Patchwork_165436v2: 896e027423be1efc1b1a690bc56bafe6cf49c213 @ git://anongit.freedesktop.org/gfx-ci/linux

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_165436v2/index.html

[-- Attachment #2: Type: text/html, Size: 2745 bytes --]

Re: [RESEND] drm/i915/sdvo: use the i2c bus locking functions

[Ville Syrjälä]

On Wed, May 13, 2026 at 11:01:03AM +0300, Jani Nikula wrote:
> Use i2c_lock_bus(), i2c_trylock_bus(), and i2c_unlock_bus() instead of
> poking at i2c adapter's lock_ops directly.
> 
> Signed-off-by: Jani Nikula <jani.nikula@intel.com>

Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>

> ---
>  drivers/gpu/drm/i915/display/intel_sdvo.c | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/display/intel_sdvo.c b/drivers/gpu/drm/i915/display/intel_sdvo.c
> index 23c511a9a2ad..ba54c90828f4 100644
> --- a/drivers/gpu/drm/i915/display/intel_sdvo.c
> +++ b/drivers/gpu/drm/i915/display/intel_sdvo.c
> @@ -3319,7 +3319,7 @@ static void proxy_lock_bus(struct i2c_adapter *adapter,
>  	struct intel_sdvo_ddc *ddc = adapter->algo_data;
>  	struct intel_sdvo *sdvo = ddc->sdvo;
>  
> -	sdvo->i2c->lock_ops->lock_bus(sdvo->i2c, flags);
> +	i2c_lock_bus(sdvo->i2c, flags);
>  }
>  
>  static int proxy_trylock_bus(struct i2c_adapter *adapter,
> @@ -3328,7 +3328,7 @@ static int proxy_trylock_bus(struct i2c_adapter *adapter,
>  	struct intel_sdvo_ddc *ddc = adapter->algo_data;
>  	struct intel_sdvo *sdvo = ddc->sdvo;
>  
> -	return sdvo->i2c->lock_ops->trylock_bus(sdvo->i2c, flags);
> +	return i2c_trylock_bus(sdvo->i2c, flags);
>  }
>  
>  static void proxy_unlock_bus(struct i2c_adapter *adapter,
> @@ -3337,7 +3337,7 @@ static void proxy_unlock_bus(struct i2c_adapter *adapter,
>  	struct intel_sdvo_ddc *ddc = adapter->algo_data;
>  	struct intel_sdvo *sdvo = ddc->sdvo;
>  
> -	sdvo->i2c->lock_ops->unlock_bus(sdvo->i2c, flags);
> +	i2c_unlock_bus(sdvo->i2c, flags);
>  }
>  
>  static const struct i2c_lock_operations proxy_lock_ops = {
> -- 
> 2.47.3

-- 
Ville Syrjälä
Intel

Re: [RESEND] drm/i915/sdvo: use the i2c bus locking functions

[Jani Nikula]

On Wed, 13 May 2026, Ville Syrjälä <ville.syrjala@linux.intel.com> wrote:
> On Wed, May 13, 2026 at 11:01:03AM +0300, Jani Nikula wrote:
>> Use i2c_lock_bus(), i2c_trylock_bus(), and i2c_unlock_bus() instead of
>> poking at i2c adapter's lock_ops directly.
>> 
>> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
>
> Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>

Thanks, pushed to din.

>
>> ---
>>  drivers/gpu/drm/i915/display/intel_sdvo.c | 6 +++---
>>  1 file changed, 3 insertions(+), 3 deletions(-)
>> 
>> diff --git a/drivers/gpu/drm/i915/display/intel_sdvo.c b/drivers/gpu/drm/i915/display/intel_sdvo.c
>> index 23c511a9a2ad..ba54c90828f4 100644
>> --- a/drivers/gpu/drm/i915/display/intel_sdvo.c
>> +++ b/drivers/gpu/drm/i915/display/intel_sdvo.c
>> @@ -3319,7 +3319,7 @@ static void proxy_lock_bus(struct i2c_adapter *adapter,
>>  	struct intel_sdvo_ddc *ddc = adapter->algo_data;
>>  	struct intel_sdvo *sdvo = ddc->sdvo;
>>  
>> -	sdvo->i2c->lock_ops->lock_bus(sdvo->i2c, flags);
>> +	i2c_lock_bus(sdvo->i2c, flags);
>>  }
>>  
>>  static int proxy_trylock_bus(struct i2c_adapter *adapter,
>> @@ -3328,7 +3328,7 @@ static int proxy_trylock_bus(struct i2c_adapter *adapter,
>>  	struct intel_sdvo_ddc *ddc = adapter->algo_data;
>>  	struct intel_sdvo *sdvo = ddc->sdvo;
>>  
>> -	return sdvo->i2c->lock_ops->trylock_bus(sdvo->i2c, flags);
>> +	return i2c_trylock_bus(sdvo->i2c, flags);
>>  }
>>  
>>  static void proxy_unlock_bus(struct i2c_adapter *adapter,
>> @@ -3337,7 +3337,7 @@ static void proxy_unlock_bus(struct i2c_adapter *adapter,
>>  	struct intel_sdvo_ddc *ddc = adapter->algo_data;
>>  	struct intel_sdvo *sdvo = ddc->sdvo;
>>  
>> -	sdvo->i2c->lock_ops->unlock_bus(sdvo->i2c, flags);
>> +	i2c_unlock_bus(sdvo->i2c, flags);
>>  }
>>  
>>  static const struct i2c_lock_operations proxy_lock_ops = {
>> -- 
>> 2.47.3

-- 
Jani Nikula, Intel