Changeset 19073 for src/linux/universal/linux-3.3/drivers/gpu/drm/radeon/radeon_connectors.c

Timestamp:

04/20/12 12:40:43 (13 months ago)

Author:

BrainSlayer

Message:

kernel update

File:

• src/linux/universal/linux-3.3/drivers/gpu/drm/radeon/radeon_connectors.c (modified) (3 diffs)

src/linux/universal/linux-3.3/drivers/gpu/drm/radeon/radeon_connectors.c

@@ -947 +947 @@
                         encoder = obj_to_encoder(obj);
 
-                        if (encoder->encoder_type != DRM_MODE_ENCODER_DAC ||
+                        if (encoder->encoder_type != DRM_MODE_ENCODER_DAC &&
                             encoder->encoder_type != DRM_MODE_ENCODER_TVDAC)
                                 continue;
@@ -977 +977 @@
          * processor.
          */
+out:
         if ((!rdev->is_atom_bios) &&
             (ret == connector_status_disconnected) &&
@@ -984 +985 @@
         }
 
-out:
         /* updated in get modes as well since we need to know if it's analog or digital */
         radeon_connector_update_scratch_regs(connector, ret);