diff options
author | Francisco Jerez <currojerez@riseup.net> | 2010-07-03 12:36:39 -0400 |
---|---|---|
committer | Ben Skeggs <bskeggs@redhat.com> | 2010-07-12 20:13:23 -0400 |
commit | 6e86e0419471d11ed3d4d46039ee90e8cb85806c (patch) | |
tree | 176b7ffdef1bd434bb4d9223f33d0f9de8b33ebc /drivers/gpu/drm/nouveau/nouveau_connector.c | |
parent | 2ed06b7d974a750ccb90ff88f5b7a870b89db966 (diff) |
drm/nouveau: Fix a couple of sparse warnings.
Signed-off-by: Francisco Jerez <currojerez@riseup.net>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nouveau_connector.c')
-rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_connector.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_connector.c b/drivers/gpu/drm/nouveau/nouveau_connector.c index c2524ca099da..464b3dca94a4 100644 --- a/drivers/gpu/drm/nouveau/nouveau_connector.c +++ b/drivers/gpu/drm/nouveau/nouveau_connector.c | |||
@@ -585,7 +585,6 @@ nouveau_connector_get_modes(struct drm_connector *connector) | |||
585 | struct drm_nouveau_private *dev_priv = dev->dev_private; | 585 | struct drm_nouveau_private *dev_priv = dev->dev_private; |
586 | struct nouveau_connector *nv_connector = nouveau_connector(connector); | 586 | struct nouveau_connector *nv_connector = nouveau_connector(connector); |
587 | struct nouveau_encoder *nv_encoder = nv_connector->detected_encoder; | 587 | struct nouveau_encoder *nv_encoder = nv_connector->detected_encoder; |
588 | struct drm_display_mode mode; | ||
589 | int ret = 0; | 588 | int ret = 0; |
590 | 589 | ||
591 | /* destroy the native mode, the attached monitor could have changed. | 590 | /* destroy the native mode, the attached monitor could have changed. |
@@ -600,9 +599,9 @@ nouveau_connector_get_modes(struct drm_connector *connector) | |||
600 | else | 599 | else |
601 | if (nv_encoder->dcb->type == OUTPUT_LVDS && | 600 | if (nv_encoder->dcb->type == OUTPUT_LVDS && |
602 | (nv_encoder->dcb->lvdsconf.use_straps_for_mode || | 601 | (nv_encoder->dcb->lvdsconf.use_straps_for_mode || |
603 | dev_priv->vbios.fp_no_ddc) && | 602 | dev_priv->vbios.fp_no_ddc) && nouveau_bios_fp_mode(dev, NULL)) { |
604 | nouveau_bios_fp_mode(dev, &mode)) { | 603 | nv_connector->native_mode = drm_mode_create(dev); |
605 | nv_connector->native_mode = drm_mode_duplicate(dev, &mode); | 604 | nouveau_bios_fp_mode(dev, nv_connector->native_mode); |
606 | } | 605 | } |
607 | 606 | ||
608 | /* Find the native mode if this is a digital panel, if we didn't | 607 | /* Find the native mode if this is a digital panel, if we didn't |