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

Commit 7fc61f84 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge branch 'drm-fixes-3.13' of git://people.freedesktop.org/~agd5f/linux into drm-fixes 

Additional radeon fixes for 3.13.  A couple of regression fixes,
a fix for a long standing bug on certain rs690 boards with sideport, and
a buffer corruption fix for CIK parts.
* 'drm-fixes-3.13' of git://people.freedesktop.org/~agd5f/linux:
  Revert "drm/radeon: Implement radeon_pci_shutdown"
  drm/radeon: add missing display tiling setup for oland
  drm/radeon: fix typo in cik_copy_dma
  drm/radeon/cik: plug in missing blit callback
  drm/radeon/dpm: Fix hwmon crash
  drm/radeon: Fix sideport problems on certain RS690 boards
parents 5c015db7 59aebe2b

drivers/gpu/drm/radeon/atombios_crtc.c

+3 −1
Original line number Diff line number Diff line
@@ -1196,7 +1196,9 @@ static int dce4_crtc_do_set_base(struct drm_crtc *crtc, 
	} else if ((rdev->family == CHIP_TAHITI) ||

		   (rdev->family == CHIP_PITCAIRN))

		fb_format |= SI_GRPH_PIPE_CONFIG(SI_ADDR_SURF_P8_32x32_8x16);

	else if (rdev->family == CHIP_VERDE)

	else if ((rdev->family == CHIP_VERDE) ||

		 (rdev->family == CHIP_OLAND) ||

		 (rdev->family == CHIP_HAINAN)) /* for completeness.  HAINAN has no display hw */

		fb_format |= SI_GRPH_PIPE_CONFIG(SI_ADDR_SURF_P4_8x16);



	switch (radeon_crtc->crtc_id) {

drivers/gpu/drm/radeon/cik_sdma.c

+1 −1
Original line number Diff line number Diff line
@@ -458,7 +458,7 @@ int cik_copy_dma(struct radeon_device *rdev, 
		radeon_ring_write(ring, 0); /* src/dst endian swap */

		radeon_ring_write(ring, src_offset & 0xffffffff);

		radeon_ring_write(ring, upper_32_bits(src_offset) & 0xffffffff);

		radeon_ring_write(ring, dst_offset & 0xfffffffc);

		radeon_ring_write(ring, dst_offset & 0xffffffff);

		radeon_ring_write(ring, upper_32_bits(dst_offset) & 0xffffffff);

		src_offset += cur_size_in_bytes;

		dst_offset += cur_size_in_bytes;

drivers/gpu/drm/radeon/radeon_asic.c

+2 −2
Original line number Diff line number Diff line
@@ -2021,7 +2021,7 @@ static struct radeon_asic ci_asic = { 
		.hdmi_setmode = &evergreen_hdmi_setmode,

	},

	.copy = {

		.blit = NULL,

		.blit = &cik_copy_cpdma,

		.blit_ring_index = RADEON_RING_TYPE_GFX_INDEX,

		.dma = &cik_copy_dma,

		.dma_ring_index = R600_RING_TYPE_DMA_INDEX,
@@ -2122,7 +2122,7 @@ static struct radeon_asic kv_asic = { 
		.hdmi_setmode = &evergreen_hdmi_setmode,

	},

	.copy = {

		.blit = NULL,

		.blit = &cik_copy_cpdma,

		.blit_ring_index = RADEON_RING_TYPE_GFX_INDEX,

		.dma = &cik_copy_dma,

		.dma_ring_index = R600_RING_TYPE_DMA_INDEX,

drivers/gpu/drm/radeon/radeon_drv.c

+0 −10
Original line number Diff line number Diff line
@@ -508,15 +508,6 @@ static const struct file_operations radeon_driver_kms_fops = { 
#endif

};





static void

radeon_pci_shutdown(struct pci_dev *pdev)

{

	struct drm_device *dev = pci_get_drvdata(pdev);



	radeon_driver_unload_kms(dev);

}



static struct drm_driver kms_driver = {

	.driver_features =

	    DRIVER_USE_AGP |
@@ -586,7 +577,6 @@ static struct pci_driver radeon_kms_pci_driver = { 
	.probe = radeon_pci_probe,

	.remove = radeon_pci_remove,

	.driver.pm = &radeon_pm_ops,

	.shutdown = radeon_pci_shutdown,

};



static int __init radeon_init(void)

drivers/gpu/drm/radeon/radeon_pm.c

+2 −4
Original line number Diff line number Diff line
@@ -552,8 +552,7 @@ static ssize_t radeon_hwmon_show_temp_thresh(struct device *dev, 
					     struct device_attribute *attr,

					     char *buf)

{

	struct drm_device *ddev = dev_get_drvdata(dev);

	struct radeon_device *rdev = ddev->dev_private;

	struct radeon_device *rdev = dev_get_drvdata(dev);

	int hyst = to_sensor_dev_attr(attr)->index;

	int temp;
@@ -580,8 +579,7 @@ static umode_t hwmon_attributes_visible(struct kobject *kobj, 
					struct attribute *attr, int index)

{

	struct device *dev = container_of(kobj, struct device, kobj);

	struct drm_device *ddev = dev_get_drvdata(dev);

	struct radeon_device *rdev = ddev->dev_private;

	struct radeon_device *rdev = dev_get_drvdata(dev);



	/* Skip limit attributes if DPM is not enabled */

	if (rdev->pm.pm_method != PM_METHOD_DPM &&