aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/gma500/psb_drv.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/psb_drv.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/psb_drv.c')
-rw-r--r--drivers/gpu/drm/gma500/psb_drv.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/gma500/psb_drv.c b/drivers/gpu/drm/gma500/psb_drv.c
index add3156cd8bf..b4aee0ac2dfd 100644
--- a/drivers/gpu/drm/gma500/psb_drv.c
+++ b/drivers/gpu/drm/gma500/psb_drv.c
@@ -276,7 +276,7 @@ static int psb_driver_load(struct drm_device *dev, unsigned long chipset)
276 int ret = -ENOMEM; 276 int ret = -ENOMEM;
277 uint32_t tt_pages; 277 uint32_t tt_pages;
278 struct drm_connector *connector; 278 struct drm_connector *connector;
279 struct psb_intel_output *psb_intel_output; 279 struct psb_intel_encoder *psb_intel_encoder;
280 280
281 dev_priv = kzalloc(sizeof(*dev_priv), GFP_KERNEL); 281 dev_priv = kzalloc(sizeof(*dev_priv), GFP_KERNEL);
282 if (dev_priv == NULL) 282 if (dev_priv == NULL)
@@ -390,9 +390,9 @@ static int psb_driver_load(struct drm_device *dev, unsigned long chipset)
390 /* Only add backlight support if we have LVDS output */ 390 /* Only add backlight support if we have LVDS output */
391 list_for_each_entry(connector, &dev->mode_config.connector_list, 391 list_for_each_entry(connector, &dev->mode_config.connector_list,
392 head) { 392 head) {
393 psb_intel_output = to_psb_intel_output(connector); 393 psb_intel_encoder = psb_intel_attached_encoder(connector);
394 394
395 switch (psb_intel_output->type) { 395 switch (psb_intel_encoder->type) {
396 case INTEL_OUTPUT_LVDS: 396 case INTEL_OUTPUT_LVDS:
397 case INTEL_OUTPUT_MIPI: 397 case INTEL_OUTPUT_MIPI:
398 ret = gma_backlight_init(dev); 398 ret = gma_backlight_init(dev);