]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commit
drm/i915/i2c: Track users of GMBUS force-bit
authorChris Wilson <chris@chris-wilson.co.uk>
Sat, 10 Nov 2012 15:58:21 +0000 (15:58 +0000)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Tue, 13 Nov 2012 15:10:04 +0000 (16:10 +0100)
commitf2ce9fafc1d443d49a0d1988f524a5da6e086e2c
tree43ca8b12502129c08dc7e88ba3376d1cd77582ed
parentf94982b0022f474d3c9285447d9a33b7a324e771
drm/i915/i2c: Track users of GMBUS force-bit

This fixes a regression for SDVO from

commit fbfcc4f3a0cf8bbde87646b74241faa8e37426bf
Author: Jani Nikula <jani.nikula@intel.com>
Date:   Mon Oct 22 16:12:18 2012 +0300

    drm/i915/sdvo: restore i2c adapter config on intel_sdvo_init() failures

As SDVOB and SDVOC are multiplexed on the same pin, if a chipset does
not have the second SDVO encoder, it will then remove the force-bit
setting on the common i2c adapter during teardown. All subsequent
attempts of trying to use GMBUS with SDVOB then fail.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Jani Nikula <jani.nikula@intel.com>
Cc: Mika Kuoppala <mika.kuoppala@intel.com>
[danvet: fixup inversion in the debug printout, noticed by Jani
Nikulai.]
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
drivers/gpu/drm/i915/i915_drv.h
drivers/gpu/drm/i915/intel_i2c.c