tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge branch 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6

* 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
drm/radeon/kms: add s/r quirk for Compaq Presario V5245EU
drm/radeon/kms: evergreen & ni reset SPI block on CP resume
drm: Fix the number of connector and encoder to cleanup functions

Linus Torvalds ebde8b02 bd823821

+12
+2
drivers/gpu/drm/drm_crtc.c
··· 499 499 mutex_lock(&dev->mode_config.mutex); 500 500 drm_mode_object_put(dev, &connector->base); 501 501 list_del(&connector->head); 502 + dev->mode_config.num_connector--; 502 503 mutex_unlock(&dev->mode_config.mutex); 503 504 } 504 505 EXPORT_SYMBOL(drm_connector_cleanup); ··· 530 529 mutex_lock(&dev->mode_config.mutex); 531 530 drm_mode_object_put(dev, &encoder->base); 532 531 list_del(&encoder->head); 532 + dev->mode_config.num_encoder--; 533 533 mutex_unlock(&dev->mode_config.mutex); 534 534 } 535 535 EXPORT_SYMBOL(drm_encoder_cleanup);
+1
drivers/gpu/drm/radeon/evergreen.c
··· 1357 1357 SOFT_RESET_PA | 1358 1358 SOFT_RESET_SH | 1359 1359 SOFT_RESET_VGT | 1360 + SOFT_RESET_SPI | 1360 1361 SOFT_RESET_SX)); 1361 1362 RREG32(GRBM_SOFT_RESET); 1362 1363 mdelay(15);
+1
drivers/gpu/drm/radeon/ni.c
··· 1159 1159 SOFT_RESET_PA | 1160 1160 SOFT_RESET_SH | 1161 1161 SOFT_RESET_VGT | 1162 + SOFT_RESET_SPI | 1162 1163 SOFT_RESET_SX)); 1163 1164 RREG32(GRBM_SOFT_RESET); 1164 1165 mdelay(15);
+8
drivers/gpu/drm/radeon/radeon_combios.c
··· 3298 3298 rdev->pdev->subsystem_device == 0x30a4) 3299 3299 return; 3300 3300 3301 + /* quirk for rs4xx Compaq Presario V5245EU laptop to make it resume 3302 + * - it hangs on resume inside the dynclk 1 table. 3303 + */ 3304 + if (rdev->family == CHIP_RS480 && 3305 + rdev->pdev->subsystem_vendor == 0x103c && 3306 + rdev->pdev->subsystem_device == 0x30ae) 3307 + return; 3308 + 3301 3309 /* DYN CLK 1 */ 3302 3310 table = combios_get_table_offset(dev, COMBIOS_DYN_CLK_1_TABLE); 3303 3311 if (table)