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

Commit 43e5f612 authored by Jean Delvare's avatar Jean Delvare Committed by Dave Airlie
Browse files

drm/radeon/kms: Simplify I2C post_xfer function 



There is no point in re-doing in post_xfer all the initialization
that was already done by pre_xfer. Instead, only do the work which
differs from pre_xfer.

Signed-off-by: default avatarJean Delvare <jdelvare@suse.de>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent a88cab2b

drivers/gpu/drm/radeon/radeon_i2c.c

+22 −26
Original line number Diff line number Diff line
@@ -81,8 +81,9 @@ bool radeon_ddc_probe(struct radeon_connector *radeon_connector, bool requires_e 


/* bit banging i2c */



static void radeon_i2c_do_lock(struct radeon_i2c_chan *i2c, int lock_state)

static int pre_xfer(struct i2c_adapter *i2c_adap)

{

	struct radeon_i2c_chan *i2c = i2c_get_adapdata(i2c_adap);

	struct radeon_device *rdev = i2c->dev->dev_private;

	struct radeon_i2c_bus_rec *rec = &i2c->rec;

	uint32_t temp;
@@ -137,19 +138,30 @@ static void radeon_i2c_do_lock(struct radeon_i2c_chan *i2c, int lock_state) 
	WREG32(rec->en_data_reg, temp);



	/* mask the gpio pins for software use */

	temp = RREG32(rec->mask_clk_reg);

	if (lock_state)

		temp |= rec->mask_clk_mask;

	else

		temp &= ~rec->mask_clk_mask;

	temp = RREG32(rec->mask_clk_reg) | rec->mask_clk_mask;

	WREG32(rec->mask_clk_reg, temp);

	temp = RREG32(rec->mask_clk_reg);



	temp = RREG32(rec->mask_data_reg) | rec->mask_data_mask;

	WREG32(rec->mask_data_reg, temp);

	temp = RREG32(rec->mask_data_reg);

	if (lock_state)

		temp |= rec->mask_data_mask;

	else

		temp &= ~rec->mask_data_mask;



	return 0;

}



static void post_xfer(struct i2c_adapter *i2c_adap)

{

	struct radeon_i2c_chan *i2c = i2c_get_adapdata(i2c_adap);

	struct radeon_device *rdev = i2c->dev->dev_private;

	struct radeon_i2c_bus_rec *rec = &i2c->rec;

	uint32_t temp;



	/* unmask the gpio pins for software use */

	temp = RREG32(rec->mask_clk_reg) & ~rec->mask_clk_mask;

	WREG32(rec->mask_clk_reg, temp);

	temp = RREG32(rec->mask_clk_reg);



	temp = RREG32(rec->mask_data_reg) & ~rec->mask_data_mask;

	WREG32(rec->mask_data_reg, temp);

	temp = RREG32(rec->mask_data_reg);

}
@@ -209,22 +221,6 @@ static void set_data(void *i2c_priv, int data) 
	WREG32(rec->en_data_reg, val);

}



static int pre_xfer(struct i2c_adapter *i2c_adap)

{

	struct radeon_i2c_chan *i2c = i2c_get_adapdata(i2c_adap);



	radeon_i2c_do_lock(i2c, 1);



	return 0;

}



static void post_xfer(struct i2c_adapter *i2c_adap)

{

	struct radeon_i2c_chan *i2c = i2c_get_adapdata(i2c_adap);



	radeon_i2c_do_lock(i2c, 0);

}



/* hw i2c */



static u32 radeon_get_i2c_prescale(struct radeon_device *rdev)