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

Commit 3d61bd42 authored by Alex Deucher's avatar Alex Deucher
Browse files

drm/radeon: fix handling for ddc type 5 on combios 



When ddc type is 5, need to look up the i2c channel
in the i2c table.

Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 9830605d

drivers/gpu/drm/radeon/radeon_combios.c

+36 −21
Original line number Original line Diff line number Diff line
@@ -719,6 +719,34 @@ static struct radeon_i2c_bus_rec combios_setup_i2c_bus(struct radeon_device *rde 
	return i2c;

	return i2c;

}

}





static struct radeon_i2c_bus_rec radeon_combios_get_i2c_info_from_table(struct radeon_device *rdev)

{

	struct drm_device *dev = rdev->ddev;

	struct radeon_i2c_bus_rec i2c;

	u16 offset;

	u8 id, blocks, clk, data;

	int i;



	i2c.valid = false;



	offset = combios_get_table_offset(dev, COMBIOS_I2C_INFO_TABLE);

	if (offset) {

		blocks = RBIOS8(offset + 2);

		for (i = 0; i < blocks; i++) {

			id = RBIOS8(offset + 3 + (i * 5) + 0);

			if (id == 136) {

				clk = RBIOS8(offset + 3 + (i * 5) + 3);

				data = RBIOS8(offset + 3 + (i * 5) + 4);

				/* gpiopad */

				i2c = combios_setup_i2c_bus(rdev, DDC_MONID,

							    (1 << clk), (1 << data));

				break;

			}

		}

	}

	return i2c;

}



void radeon_combios_i2c_init(struct radeon_device *rdev)

void radeon_combios_i2c_init(struct radeon_device *rdev)

{

{

	struct drm_device *dev = rdev->ddev;

	struct drm_device *dev = rdev->ddev;
@@ -755,30 +783,14 @@ void radeon_combios_i2c_init(struct radeon_device *rdev) 
	} else if (rdev->family == CHIP_RS300 ||

	} else if (rdev->family == CHIP_RS300 ||

		   rdev->family == CHIP_RS400 ||

		   rdev->family == CHIP_RS400 ||

		   rdev->family == CHIP_RS480) {

		   rdev->family == CHIP_RS480) {

		u16 offset;

		u8 id, blocks, clk, data;

		int i;



		/* 0x68 */

		/* 0x68 */

		i2c = combios_setup_i2c_bus(rdev, DDC_CRT2, 0, 0);

		i2c = combios_setup_i2c_bus(rdev, DDC_CRT2, 0, 0);

		rdev->i2c_bus[3] = radeon_i2c_create(dev, &i2c, "MONID");

		rdev->i2c_bus[3] = radeon_i2c_create(dev, &i2c, "MONID");





		offset = combios_get_table_offset(dev, COMBIOS_I2C_INFO_TABLE);

		if (offset) {

			blocks = RBIOS8(offset + 2);

			for (i = 0; i < blocks; i++) {

				id = RBIOS8(offset + 3 + (i * 5) + 0);

				if (id == 136) {

					clk = RBIOS8(offset + 3 + (i * 5) + 3);

					data = RBIOS8(offset + 3 + (i * 5) + 4);

		/* gpiopad */

		/* gpiopad */

					i2c = combios_setup_i2c_bus(rdev, DDC_MONID,

		i2c = radeon_combios_get_i2c_info_from_table(rdev);

								    (1 << clk), (1 << data));

		if (i2c.valid)

			rdev->i2c_bus[4] = radeon_i2c_create(dev, &i2c, "GPIOPAD_MASK");

			rdev->i2c_bus[4] = radeon_i2c_create(dev, &i2c, "GPIOPAD_MASK");

					break;

				}

			}

		}

	} else if ((rdev->family == CHIP_R200) ||

	} else if ((rdev->family == CHIP_R200) ||

		   (rdev->family >= CHIP_R300)) {

		   (rdev->family >= CHIP_R300)) {

		/* 0x68 */

		/* 0x68 */
@@ -2321,6 +2333,9 @@ bool radeon_get_legacy_connector_info_from_bios(struct drm_device *dev) 
			connector = (tmp >> 12) & 0xf;

			connector = (tmp >> 12) & 0xf;





			ddc_type = (tmp >> 8) & 0xf;

			ddc_type = (tmp >> 8) & 0xf;

			if (ddc_type == 5)

				ddc_i2c = radeon_combios_get_i2c_info_from_table(rdev);

			else

				ddc_i2c = combios_setup_i2c_bus(rdev, ddc_type, 0, 0);

				ddc_i2c = combios_setup_i2c_bus(rdev, ddc_type, 0, 0);





			switch (connector) {

			switch (connector) {