aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/gma500/framebuffer.c
diff options
context:
space:
mode:
authorPatrik Jakobsson <patrik.r.jakobsson@gmail.com>2011-12-19 16:40:33 -0500
committerDave Airlie <airlied@redhat.com>2011-12-20 05:23:07 -0500
commit1730f89bfcff353484672cdcefbef13b2f374176 (patch)
treeac13c154f05e05cc527df52dce8fb5caa7826c03 /drivers/gpu/drm/gma500/framebuffer.c
parent352b16a0e16eb29fd268dafab7816bf85bfc4d21 (diff)
gma500: Fix encoder type checking for connectors
Fix cases where we need to know what encoder type is behind a given connector. Signed-off-by: Patrik Jakobsson <patrik.r.jakobsson@gmail.com> Signed-off-by: Alan Cox <alan@linux.intel.com> Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/gma500/framebuffer.c')
-rw-r--r--drivers/gpu/drm/gma500/framebuffer.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/gpu/drm/gma500/framebuffer.c b/drivers/gpu/drm/gma500/framebuffer.c
index 75cfafe2ff81..791c0ef1a65b 100644
--- a/drivers/gpu/drm/gma500/framebuffer.c
+++ b/drivers/gpu/drm/gma500/framebuffer.c
@@ -747,13 +747,13 @@ static void psb_setup_outputs(struct drm_device *dev)
747 747
748 list_for_each_entry(connector, &dev->mode_config.connector_list, 748 list_for_each_entry(connector, &dev->mode_config.connector_list,
749 head) { 749 head) {
750 struct psb_intel_output *psb_intel_output = 750 struct psb_intel_encoder *psb_intel_encoder =
751 to_psb_intel_output(connector); 751 psb_intel_attached_encoder(connector);
752 struct drm_encoder *encoder = &psb_intel_output->enc; 752 struct drm_encoder *encoder = &psb_intel_encoder->base;
753 int crtc_mask = 0, clone_mask = 0; 753 int crtc_mask = 0, clone_mask = 0;
754 754
755 /* valid crtcs */ 755 /* valid crtcs */
756 switch (psb_intel_output->type) { 756 switch (psb_intel_encoder->type) {
757 case INTEL_OUTPUT_ANALOG: 757 case INTEL_OUTPUT_ANALOG:
758 crtc_mask = (1 << 0); 758 crtc_mask = (1 << 0);
759 clone_mask = (1 << INTEL_OUTPUT_ANALOG); 759 clone_mask = (1 << INTEL_OUTPUT_ANALOG);