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

Commit 1586ba72 authored by Dave Airlie's avatar Dave Airlie
Browse files

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

A few more DPM fixes.

* 'drm-next-3.11' of git://people.freedesktop.org/~agd5f/linux:
  drm/radeon/sumo: implement support for disable_gfx_power_gating_in_uvd flag
  drm/radeon/tn: disable PG when changing UVD clocks
  drm/radeon/sumo: disable PG when changing UVD clocks
  drm/radeon/aruba: disable additional rlc features
  drm/radeon: fix endian bug in radeon_atom_get_mclk_range_table()
  drm/radeon/dpm: fix compilation with certain versions of gcc
  drm/radeon/dpm: clarify debugfs warning
parents e5ad449b 338a95a9

drivers/gpu/drm/radeon/evergreen.c

+0 −2
Original line number Diff line number Diff line
@@ -4043,8 +4043,6 @@ static void evergreen_rlc_start(struct radeon_device *rdev) 


	if (rdev->flags & RADEON_IS_IGP) {

		mask |= GFX_POWER_GATING_ENABLE | GFX_POWER_GATING_SRC;

		if (rdev->family == CHIP_ARUBA)

			mask |= DYN_PER_SIMD_PG_ENABLE | LB_CNT_SPIM_ACTIVE | LOAD_BALANCE_ENABLE;

	}



	WREG32(RLC_CNTL, mask);

drivers/gpu/drm/radeon/ni_dpm.c

+1 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ 
#include "ni_dpm.h"

#include "atom.h"

#include <linux/math64.h>

#include <linux/seq_file.h>



#define MC_CG_ARB_FREQ_F0           0x0a

#define MC_CG_ARB_FREQ_F1           0x0b

drivers/gpu/drm/radeon/radeon_atombios.c

+1 −1
Original line number Diff line number Diff line
@@ -3639,7 +3639,7 @@ int radeon_atom_get_mclk_range_table(struct radeon_device *rdev, 
					p = (u8 *)vram_module->asMemTiming;

					for (i = 0; i < mclk_range_table->num_entries; i++) {

						format = (ATOM_MEMORY_TIMING_FORMAT *)p;

						mclk_range_table->mclk[i] = format->ulClkRange;

						mclk_range_table->mclk[i] = le32_to_cpu(format->ulClkRange);

						p += mem_timing_size;

					}

				} else

drivers/gpu/drm/radeon/radeon_pm.c

+1 −1
Original line number Diff line number Diff line
@@ -1399,7 +1399,7 @@ static int radeon_debugfs_pm_info(struct seq_file *m, void *data) 
		if (rdev->asic->dpm.debugfs_print_current_performance_level)

			radeon_dpm_debugfs_print_current_performance_level(rdev, m);

		else

			seq_printf(m, "Unsupported\n");

			seq_printf(m, "Debugfs support not implemented for this asic\n");

		mutex_unlock(&rdev->pm.mutex);

	} else {

		seq_printf(m, "default engine clock: %u0 kHz\n", rdev->pm.default_sclk);

drivers/gpu/drm/radeon/rv6xx_dpm.c

+1 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ 
#include "r600_dpm.h"

#include "rv6xx_dpm.h"

#include "atom.h"

#include <linux/seq_file.h>



static u32 rv6xx_scale_count_given_unit(struct radeon_device *rdev,

					u32 unscaled_count, u32 unit);