drm/i915/sdov: switch IS_SDVOB to a flag
With valleyview we'll have these at yet another address, so keeping track of this with an ever-growing list of registers will get ugly. This way intel_sdvo.c is fully independent of the base address of the output ports display register blocks. While at it, do 2 closely related cleanups: - use SDVO_NAME some more - change the sdvo_reg variables to uint32_t like other registers. Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk> Signed-Off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
This commit is contained in:
parent
7eea1ddf61
commit
eef4eacb6e
@ -7810,7 +7810,7 @@ static void intel_setup_outputs(struct drm_device *dev)
|
|||||||
|
|
||||||
if (I915_READ(HDMIB) & PORT_DETECTED) {
|
if (I915_READ(HDMIB) & PORT_DETECTED) {
|
||||||
/* PCH SDVOB multiplex with HDMIB */
|
/* PCH SDVOB multiplex with HDMIB */
|
||||||
found = intel_sdvo_init(dev, PCH_SDVOB);
|
found = intel_sdvo_init(dev, PCH_SDVOB, true);
|
||||||
if (!found)
|
if (!found)
|
||||||
intel_hdmi_init(dev, HDMIB);
|
intel_hdmi_init(dev, HDMIB);
|
||||||
if (!found && (I915_READ(PCH_DP_B) & DP_DETECTED))
|
if (!found && (I915_READ(PCH_DP_B) & DP_DETECTED))
|
||||||
@ -7834,7 +7834,7 @@ static void intel_setup_outputs(struct drm_device *dev)
|
|||||||
|
|
||||||
if (I915_READ(SDVOB) & SDVO_DETECTED) {
|
if (I915_READ(SDVOB) & SDVO_DETECTED) {
|
||||||
DRM_DEBUG_KMS("probing SDVOB\n");
|
DRM_DEBUG_KMS("probing SDVOB\n");
|
||||||
found = intel_sdvo_init(dev, SDVOB);
|
found = intel_sdvo_init(dev, SDVOB, true);
|
||||||
if (!found && SUPPORTS_INTEGRATED_HDMI(dev)) {
|
if (!found && SUPPORTS_INTEGRATED_HDMI(dev)) {
|
||||||
DRM_DEBUG_KMS("probing HDMI on SDVOB\n");
|
DRM_DEBUG_KMS("probing HDMI on SDVOB\n");
|
||||||
intel_hdmi_init(dev, SDVOB);
|
intel_hdmi_init(dev, SDVOB);
|
||||||
@ -7850,7 +7850,7 @@ static void intel_setup_outputs(struct drm_device *dev)
|
|||||||
|
|
||||||
if (I915_READ(SDVOB) & SDVO_DETECTED) {
|
if (I915_READ(SDVOB) & SDVO_DETECTED) {
|
||||||
DRM_DEBUG_KMS("probing SDVOC\n");
|
DRM_DEBUG_KMS("probing SDVOC\n");
|
||||||
found = intel_sdvo_init(dev, SDVOC);
|
found = intel_sdvo_init(dev, SDVOC, false);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!found && (I915_READ(SDVOC) & SDVO_DETECTED)) {
|
if (!found && (I915_READ(SDVOC) & SDVO_DETECTED)) {
|
||||||
|
@ -293,7 +293,8 @@ extern void intel_attach_broadcast_rgb_property(struct drm_connector *connector)
|
|||||||
extern void intel_crt_init(struct drm_device *dev);
|
extern void intel_crt_init(struct drm_device *dev);
|
||||||
extern void intel_hdmi_init(struct drm_device *dev, int sdvox_reg);
|
extern void intel_hdmi_init(struct drm_device *dev, int sdvox_reg);
|
||||||
void intel_dip_infoframe_csum(struct dip_infoframe *avi_if);
|
void intel_dip_infoframe_csum(struct dip_infoframe *avi_if);
|
||||||
extern bool intel_sdvo_init(struct drm_device *dev, int output_device);
|
extern bool intel_sdvo_init(struct drm_device *dev, uint32_t sdvo_reg,
|
||||||
|
bool is_sdvob);
|
||||||
extern void intel_dvo_init(struct drm_device *dev);
|
extern void intel_dvo_init(struct drm_device *dev);
|
||||||
extern void intel_tv_init(struct drm_device *dev);
|
extern void intel_tv_init(struct drm_device *dev);
|
||||||
extern void intel_mark_busy(struct drm_device *dev,
|
extern void intel_mark_busy(struct drm_device *dev,
|
||||||
|
@ -74,7 +74,7 @@ struct intel_sdvo {
|
|||||||
struct i2c_adapter ddc;
|
struct i2c_adapter ddc;
|
||||||
|
|
||||||
/* Register for the SDVO device: SDVOB or SDVOC */
|
/* Register for the SDVO device: SDVOB or SDVOC */
|
||||||
int sdvo_reg;
|
uint32_t sdvo_reg;
|
||||||
|
|
||||||
/* Active outputs controlled by this SDVO output */
|
/* Active outputs controlled by this SDVO output */
|
||||||
uint16_t controlled_output;
|
uint16_t controlled_output;
|
||||||
@ -114,6 +114,9 @@ struct intel_sdvo {
|
|||||||
*/
|
*/
|
||||||
bool is_tv;
|
bool is_tv;
|
||||||
|
|
||||||
|
/* On different gens SDVOB is at different places. */
|
||||||
|
bool is_sdvob;
|
||||||
|
|
||||||
/* This is for current tv format name */
|
/* This is for current tv format name */
|
||||||
int tv_format_index;
|
int tv_format_index;
|
||||||
|
|
||||||
@ -403,8 +406,7 @@ static const struct _sdvo_cmd_name {
|
|||||||
SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_HBUF_DATA),
|
SDVO_CMD_NAME_ENTRY(SDVO_CMD_GET_HBUF_DATA),
|
||||||
};
|
};
|
||||||
|
|
||||||
#define IS_SDVOB(reg) (reg == SDVOB || reg == PCH_SDVOB)
|
#define SDVO_NAME(svdo) ((svdo)->is_sdvob ? "SDVOB" : "SDVOC")
|
||||||
#define SDVO_NAME(svdo) (IS_SDVOB((svdo)->sdvo_reg) ? "SDVOB" : "SDVOC")
|
|
||||||
|
|
||||||
static void intel_sdvo_debug_write(struct intel_sdvo *intel_sdvo, u8 cmd,
|
static void intel_sdvo_debug_write(struct intel_sdvo *intel_sdvo, u8 cmd,
|
||||||
const void *args, int args_len)
|
const void *args, int args_len)
|
||||||
@ -1893,7 +1895,7 @@ intel_sdvo_select_ddc_bus(struct drm_i915_private *dev_priv,
|
|||||||
{
|
{
|
||||||
struct sdvo_device_mapping *mapping;
|
struct sdvo_device_mapping *mapping;
|
||||||
|
|
||||||
if (IS_SDVOB(reg))
|
if (sdvo->is_sdvob)
|
||||||
mapping = &(dev_priv->sdvo_mappings[0]);
|
mapping = &(dev_priv->sdvo_mappings[0]);
|
||||||
else
|
else
|
||||||
mapping = &(dev_priv->sdvo_mappings[1]);
|
mapping = &(dev_priv->sdvo_mappings[1]);
|
||||||
@ -1911,7 +1913,7 @@ intel_sdvo_select_i2c_bus(struct drm_i915_private *dev_priv,
|
|||||||
struct sdvo_device_mapping *mapping;
|
struct sdvo_device_mapping *mapping;
|
||||||
u8 pin;
|
u8 pin;
|
||||||
|
|
||||||
if (IS_SDVOB(reg))
|
if (sdvo->is_sdvob)
|
||||||
mapping = &dev_priv->sdvo_mappings[0];
|
mapping = &dev_priv->sdvo_mappings[0];
|
||||||
else
|
else
|
||||||
mapping = &dev_priv->sdvo_mappings[1];
|
mapping = &dev_priv->sdvo_mappings[1];
|
||||||
@ -1936,12 +1938,12 @@ intel_sdvo_is_hdmi_connector(struct intel_sdvo *intel_sdvo, int device)
|
|||||||
}
|
}
|
||||||
|
|
||||||
static u8
|
static u8
|
||||||
intel_sdvo_get_slave_addr(struct drm_device *dev, int sdvo_reg)
|
intel_sdvo_get_slave_addr(struct drm_device *dev, struct intel_sdvo *sdvo)
|
||||||
{
|
{
|
||||||
struct drm_i915_private *dev_priv = dev->dev_private;
|
struct drm_i915_private *dev_priv = dev->dev_private;
|
||||||
struct sdvo_device_mapping *my_mapping, *other_mapping;
|
struct sdvo_device_mapping *my_mapping, *other_mapping;
|
||||||
|
|
||||||
if (IS_SDVOB(sdvo_reg)) {
|
if (sdvo->is_sdvob) {
|
||||||
my_mapping = &dev_priv->sdvo_mappings[0];
|
my_mapping = &dev_priv->sdvo_mappings[0];
|
||||||
other_mapping = &dev_priv->sdvo_mappings[1];
|
other_mapping = &dev_priv->sdvo_mappings[1];
|
||||||
} else {
|
} else {
|
||||||
@ -1966,7 +1968,7 @@ intel_sdvo_get_slave_addr(struct drm_device *dev, int sdvo_reg)
|
|||||||
/* No SDVO device info is found for another DVO port,
|
/* No SDVO device info is found for another DVO port,
|
||||||
* so use mapping assumption we had before BIOS parsing.
|
* so use mapping assumption we had before BIOS parsing.
|
||||||
*/
|
*/
|
||||||
if (IS_SDVOB(sdvo_reg))
|
if (sdvo->is_sdvob)
|
||||||
return 0x70;
|
return 0x70;
|
||||||
else
|
else
|
||||||
return 0x72;
|
return 0x72;
|
||||||
@ -2482,7 +2484,7 @@ intel_sdvo_init_ddc_proxy(struct intel_sdvo *sdvo,
|
|||||||
return i2c_add_adapter(&sdvo->ddc) == 0;
|
return i2c_add_adapter(&sdvo->ddc) == 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool intel_sdvo_init(struct drm_device *dev, int sdvo_reg)
|
bool intel_sdvo_init(struct drm_device *dev, uint32_t sdvo_reg, bool is_sdvob)
|
||||||
{
|
{
|
||||||
struct drm_i915_private *dev_priv = dev->dev_private;
|
struct drm_i915_private *dev_priv = dev->dev_private;
|
||||||
struct intel_encoder *intel_encoder;
|
struct intel_encoder *intel_encoder;
|
||||||
@ -2494,7 +2496,8 @@ bool intel_sdvo_init(struct drm_device *dev, int sdvo_reg)
|
|||||||
return false;
|
return false;
|
||||||
|
|
||||||
intel_sdvo->sdvo_reg = sdvo_reg;
|
intel_sdvo->sdvo_reg = sdvo_reg;
|
||||||
intel_sdvo->slave_addr = intel_sdvo_get_slave_addr(dev, sdvo_reg) >> 1;
|
intel_sdvo->is_sdvob = is_sdvob;
|
||||||
|
intel_sdvo->slave_addr = intel_sdvo_get_slave_addr(dev, intel_sdvo) >> 1;
|
||||||
intel_sdvo_select_i2c_bus(dev_priv, intel_sdvo, sdvo_reg);
|
intel_sdvo_select_i2c_bus(dev_priv, intel_sdvo, sdvo_reg);
|
||||||
if (!intel_sdvo_init_ddc_proxy(intel_sdvo, dev)) {
|
if (!intel_sdvo_init_ddc_proxy(intel_sdvo, dev)) {
|
||||||
kfree(intel_sdvo);
|
kfree(intel_sdvo);
|
||||||
@ -2511,13 +2514,13 @@ bool intel_sdvo_init(struct drm_device *dev, int sdvo_reg)
|
|||||||
u8 byte;
|
u8 byte;
|
||||||
|
|
||||||
if (!intel_sdvo_read_byte(intel_sdvo, i, &byte)) {
|
if (!intel_sdvo_read_byte(intel_sdvo, i, &byte)) {
|
||||||
DRM_DEBUG_KMS("No SDVO device found on SDVO%c\n",
|
DRM_DEBUG_KMS("No SDVO device found on %s\n",
|
||||||
IS_SDVOB(sdvo_reg) ? 'B' : 'C');
|
SDVO_NAME(intel_sdvo));
|
||||||
goto err;
|
goto err;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (IS_SDVOB(sdvo_reg))
|
if (intel_sdvo->is_sdvob)
|
||||||
dev_priv->hotplug_supported_mask |= SDVOB_HOTPLUG_INT_STATUS;
|
dev_priv->hotplug_supported_mask |= SDVOB_HOTPLUG_INT_STATUS;
|
||||||
else
|
else
|
||||||
dev_priv->hotplug_supported_mask |= SDVOC_HOTPLUG_INT_STATUS;
|
dev_priv->hotplug_supported_mask |= SDVOC_HOTPLUG_INT_STATUS;
|
||||||
@ -2538,8 +2541,8 @@ bool intel_sdvo_init(struct drm_device *dev, int sdvo_reg)
|
|||||||
|
|
||||||
if (intel_sdvo_output_setup(intel_sdvo,
|
if (intel_sdvo_output_setup(intel_sdvo,
|
||||||
intel_sdvo->caps.output_flags) != true) {
|
intel_sdvo->caps.output_flags) != true) {
|
||||||
DRM_DEBUG_KMS("SDVO output failed to setup on SDVO%c\n",
|
DRM_DEBUG_KMS("SDVO output failed to setup on %s\n",
|
||||||
IS_SDVOB(sdvo_reg) ? 'B' : 'C');
|
SDVO_NAME(intel_sdvo));
|
||||||
goto err;
|
goto err;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user