Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 18367c0e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* 'drm-radeon-urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
  drm/radeon/kms: disable hdmi audio by default
  drm/radeon/kms: fix for radeon on systems >4GB without hardware iommu
  drm/radeon/kms: set family for use in parser.
parents 81de916f 805c2216

drivers/gpu/drm/radeon/radeon_cs.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -228,6 +228,7 @@ int radeon_cs_ioctl(struct drm_device *dev, void *data, struct drm_file *filp) 
	parser.filp = filp;

	parser.filp = filp;

	parser.rdev = rdev;

	parser.rdev = rdev;

	parser.dev = rdev->dev;

	parser.dev = rdev->dev;

	parser.family = rdev->family;

	r = radeon_cs_parser_init(&parser, data);

	r = radeon_cs_parser_init(&parser, data);

	if (r) {

	if (r) {

		DRM_ERROR("Failed to initialize parser !\n");

		DRM_ERROR("Failed to initialize parser !\n");

drivers/gpu/drm/radeon/radeon_device.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -754,6 +754,7 @@ int radeon_device_init(struct radeon_device *rdev, 
	dma_bits = rdev->need_dma32 ? 32 : 40;

	dma_bits = rdev->need_dma32 ? 32 : 40;

	r = pci_set_dma_mask(rdev->pdev, DMA_BIT_MASK(dma_bits));

	r = pci_set_dma_mask(rdev->pdev, DMA_BIT_MASK(dma_bits));

	if (r) {

	if (r) {

		rdev->need_dma32 = true;

		printk(KERN_WARNING "radeon: No suitable DMA available.\n");

		printk(KERN_WARNING "radeon: No suitable DMA available.\n");

	}

	}

drivers/gpu/drm/radeon/radeon_drv.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -113,7 +113,7 @@ int radeon_benchmarking = 0; 
int radeon_testing = 0;

int radeon_testing = 0;

int radeon_connector_table = 0;

int radeon_connector_table = 0;

int radeon_tv = 1;

int radeon_tv = 1;

int radeon_audio = 1;

int radeon_audio = 0;

int radeon_disp_priority = 0;

int radeon_disp_priority = 0;

int radeon_hw_i2c = 0;

int radeon_hw_i2c = 0;

int radeon_pcie_gen2 = 0;

int radeon_pcie_gen2 = 0;
@@ -151,7 +151,7 @@ module_param_named(connector_table, radeon_connector_table, int, 0444); 
MODULE_PARM_DESC(tv, "TV enable (0 = disable)");

MODULE_PARM_DESC(tv, "TV enable (0 = disable)");

module_param_named(tv, radeon_tv, int, 0444);

module_param_named(tv, radeon_tv, int, 0444);





MODULE_PARM_DESC(audio, "Audio enable (0 = disable)");

MODULE_PARM_DESC(audio, "Audio enable (1 = enable)");

module_param_named(audio, radeon_audio, int, 0444);

module_param_named(audio, radeon_audio, int, 0444);





MODULE_PARM_DESC(disp_priority, "Display Priority (0 = auto, 1 = normal, 2 = high)");

MODULE_PARM_DESC(disp_priority, "Display Priority (0 = auto, 1 = normal, 2 = high)");