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

Commit da36bbd0 authored by Dave Airlie's avatar Dave Airlie
Browse files

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

First round of fixes for 3.18.
- Use gart for DMA ring tests to avoid caching issues with HDP
- SI dpm stability fixes
- Performance stabilization fixes
- misc other things

* 'drm-fixes-3.18' of git://people.freedesktop.org/~agd5f/linux:
  drm/radeon: reduce sparse false positive warnings
  drm/radeon: fix vm page table block size calculation
  drm/ttm: Don't evict BOs outside of the requested placement range
  drm/ttm: Don't skip fpfn check if lpfn is 0 in ttm_bo_mem_compat
  drm/radeon: use gart memory for DMA ring tests
  drm/radeon: fix speaker allocation setup
  drm/radeon: initialize sadb to NULL in the audio code
  Revert "drm/radeon/dpm: drop clk/voltage dependency filters for SI"
  Revert "drm/radeon: drop btc_get_max_clock_from_voltage_dependency_table"
parents f114040e 01467a9b

drivers/gpu/drm/radeon/btc_dpm.c

+18 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 


#include "drmP.h"

#include "radeon.h"

#include "radeon_asic.h"

#include "btcd.h"

#include "r600_dpm.h"

#include "cypress_dpm.h"
@@ -1170,6 +1171,23 @@ static const struct radeon_blacklist_clocks btc_blacklist_clocks[] = 
        { 25000, 30000, RADEON_SCLK_UP }

};



void btc_get_max_clock_from_voltage_dependency_table(struct radeon_clock_voltage_dependency_table *table,

						     u32 *max_clock)

{

	u32 i, clock = 0;



	if ((table == NULL) || (table->count == 0)) {

		*max_clock = clock;

		return;

	}



	for (i = 0; i < table->count; i++) {

		if (clock < table->entries[i].clk)

			clock = table->entries[i].clk;

	}

	*max_clock = clock;

}



void btc_apply_voltage_dependency_rules(struct radeon_clock_voltage_dependency_table *table,

					u32 clock, u16 max_voltage, u16 *voltage)

{

drivers/gpu/drm/radeon/btc_dpm.h

+2 −0
Original line number Diff line number Diff line
@@ -46,6 +46,8 @@ void btc_adjust_clock_combinations(struct radeon_device *rdev, 
				   struct rv7xx_pl *pl);

void btc_apply_voltage_dependency_rules(struct radeon_clock_voltage_dependency_table *table,

					u32 clock, u16 max_voltage, u16 *voltage);

void btc_get_max_clock_from_voltage_dependency_table(struct radeon_clock_voltage_dependency_table *table,

						     u32 *max_clock);

void btc_apply_voltage_delta_rules(struct radeon_device *rdev,

				   u16 max_vddc, u16 max_vddci,

				   u16 *vddc, u16 *vddci);

drivers/gpu/drm/radeon/ci_dpm.c

+1 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 
#include <linux/firmware.h>

#include "drmP.h"

#include "radeon.h"

#include "radeon_asic.h"

#include "radeon_ucode.h"

#include "cikd.h"

#include "r600_dpm.h"

drivers/gpu/drm/radeon/cik_sdma.c

+12 −9
Original line number Diff line number Diff line
@@ -611,16 +611,19 @@ int cik_sdma_ring_test(struct radeon_device *rdev, 
{

	unsigned i;

	int r;

	void __iomem *ptr = (void *)rdev->vram_scratch.ptr;

	unsigned index;

	u32 tmp;

	u64 gpu_addr;



	if (!ptr) {

		DRM_ERROR("invalid vram scratch pointer\n");

		return -EINVAL;

	}

	if (ring->idx == R600_RING_TYPE_DMA_INDEX)

		index = R600_WB_DMA_RING_TEST_OFFSET;

	else

		index = CAYMAN_WB_DMA1_RING_TEST_OFFSET;



	gpu_addr = rdev->wb.gpu_addr + index;



	tmp = 0xCAFEDEAD;

	writel(tmp, ptr);

	rdev->wb.wb[index/4] = cpu_to_le32(tmp);



	r = radeon_ring_lock(rdev, ring, 5);

	if (r) {
@@ -628,14 +631,14 @@ int cik_sdma_ring_test(struct radeon_device *rdev, 
		return r;

	}

	radeon_ring_write(ring, SDMA_PACKET(SDMA_OPCODE_WRITE, SDMA_WRITE_SUB_OPCODE_LINEAR, 0));

	radeon_ring_write(ring, rdev->vram_scratch.gpu_addr & 0xfffffffc);

	radeon_ring_write(ring, upper_32_bits(rdev->vram_scratch.gpu_addr));

	radeon_ring_write(ring, lower_32_bits(gpu_addr));

	radeon_ring_write(ring, upper_32_bits(gpu_addr));

	radeon_ring_write(ring, 1); /* number of DWs to follow */

	radeon_ring_write(ring, 0xDEADBEEF);

	radeon_ring_unlock_commit(rdev, ring, false);



	for (i = 0; i < rdev->usec_timeout; i++) {

		tmp = readl(ptr);

		tmp = le32_to_cpu(rdev->wb.wb[index/4]);

		if (tmp == 0xDEADBEEF)

			break;

		DRM_UDELAY(1);

drivers/gpu/drm/radeon/cypress_dpm.c

+1 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 


#include "drmP.h"

#include "radeon.h"

#include "radeon_asic.h"

#include "evergreend.h"

#include "r600_dpm.h"

#include "cypress_dpm.h"