Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d5090b96 authored by Adam Jackson's avatar Adam Jackson Committed by Keith Packard
Browse files

drm/i915: Remove redundant bit shifting from intel_gmbus_set_speed 



Signed-off-by: default avatarAdam Jackson <ajax@redhat.com>
Reviewed-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: default avatarKeith Packard <keithp@keithp.com>
parent 8bf38485

drivers/gpu/drm/i915/intel_i2c.c

+1 −7
Original line number Diff line number Diff line
@@ -422,13 +422,7 @@ void intel_gmbus_set_speed(struct i2c_adapter *adapter, int speed) 
{

	struct intel_gmbus *bus = to_intel_gmbus(adapter);



	/* speed:

	 * 0x0 = 100 KHz

	 * 0x1 = 50 KHz

	 * 0x2 = 400 KHz

	 * 0x3 = 1000 Khz

	 */

	bus->reg0 = (bus->reg0 & ~(0x3 << 8)) | (speed << 8);

	bus->reg0 = (bus->reg0 & ~(0x3 << 8)) | speed;

}



void intel_gmbus_force_bit(struct i2c_adapter *adapter, bool force_bit)

drivers/gpu/drm/i915/intel_sdvo.c

+1 −1
Original line number Diff line number Diff line
@@ -1908,7 +1908,7 @@ intel_sdvo_select_i2c_bus(struct drm_i915_private *dev_priv, 


	if (pin < GMBUS_NUM_PORTS) {

		sdvo->i2c = &dev_priv->gmbus[pin].adapter;

		intel_gmbus_set_speed(sdvo->i2c, GMBUS_RATE_1MHZ >> 8);

		intel_gmbus_set_speed(sdvo->i2c, GMBUS_RATE_1MHZ);

		intel_gmbus_force_bit(sdvo->i2c, true);

	} else {

		sdvo->i2c = &dev_priv->gmbus[GMBUS_PORT_DPB].adapter;