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

Commit 76a7142a authored by Dave Airlie's avatar Dave Airlie
Browse files

drm/radeon: add fake RN50 table for powerpc 



This works well enough on a js21, but it would be nice if IBM could supply
more tables for the later Power6/7 machines.

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent b829e011

drivers/gpu/drm/radeon/radeon_combios.c

+32 −0
Original line number Diff line number Diff line
@@ -1411,6 +1411,11 @@ bool radeon_get_legacy_connector_info_from_table(struct drm_device *dev) 
			rdev->mode_info.connector_table = CT_IMAC_G5_ISIGHT;

		} else

#endif /* CONFIG_PPC_PMAC */

#ifdef CONFIG_PPC64

		if (ASIC_IS_RN50(rdev))

			rdev->mode_info.connector_table = CT_RN50_POWER;

		else

#endif

			rdev->mode_info.connector_table = CT_GENERIC;

	}
@@ -1853,6 +1858,33 @@ bool radeon_get_legacy_connector_info_from_table(struct drm_device *dev) 
					    CONNECTOR_OBJECT_ID_SVIDEO,

					    &hpd);

		break;

	case CT_RN50_POWER:

		DRM_INFO("Connector Table: %d (rn50-power)\n",

			 rdev->mode_info.connector_table);

		/* VGA - primary dac */

		ddc_i2c = combios_setup_i2c_bus(rdev, RADEON_GPIO_VGA_DDC);

		hpd.hpd = RADEON_HPD_NONE;

		radeon_add_legacy_encoder(dev,

					  radeon_get_encoder_id(dev,

								ATOM_DEVICE_CRT1_SUPPORT,

								1),

					  ATOM_DEVICE_CRT1_SUPPORT);

		radeon_add_legacy_connector(dev, 0, ATOM_DEVICE_CRT1_SUPPORT,

					    DRM_MODE_CONNECTOR_VGA, &ddc_i2c,

					    CONNECTOR_OBJECT_ID_VGA,

					    &hpd);

		ddc_i2c = combios_setup_i2c_bus(rdev, RADEON_GPIO_CRT2_DDC);

		hpd.hpd = RADEON_HPD_NONE;

		radeon_add_legacy_encoder(dev,

					  radeon_get_encoder_id(dev,

								ATOM_DEVICE_CRT2_SUPPORT,

								2),

					  ATOM_DEVICE_CRT2_SUPPORT);

		radeon_add_legacy_connector(dev, 1, ATOM_DEVICE_CRT2_SUPPORT,

					    DRM_MODE_CONNECTOR_VGA, &ddc_i2c,

					    CONNECTOR_OBJECT_ID_VGA,

					    &hpd);

		break;

	default:

		DRM_INFO("Connector table: %d (invalid)\n",

			 rdev->mode_info.connector_table);

drivers/gpu/drm/radeon/radeon_mode.h

+1 −0
Original line number Diff line number Diff line
@@ -206,6 +206,7 @@ enum radeon_connector_table { 
	CT_MINI_INTERNAL,

	CT_IMAC_G5_ISIGHT,

	CT_EMAC,

	CT_RN50_POWER,

};



enum radeon_dvo_chip {