[pull] radeon drm-next-3.14

[Alex Deucher]

On Sun, Jan 19, 2014 at 7:02 PM, Dave Airlie <airlied at gmail.com> wrote:
> On Fri, Jan 17, 2014 at 2:34 AM, Alex Deucher <alexdeucher at gmail.com> wrote:
>> Hi Dave,
>>
>> A few more changes for 3.14, mostly just bug fixes.  Note that:
>> drm/radeon: add query to fetch the max engine clock.
>> will conflict with 3.13 final, but the fix is pretty obvious.
>
> No it isn't obvious at all!
>
> Since the info numbers are ABI we can't have an 0x19 in two places
> mean different things,
>
> so this pull is broken, please add the new info at 0x20 from the
> start, and the merge conflict
> fix is to add the 0x19 and 0x20 together, is the userspace side of
> these committed?

I should have said, when merged the number for engine clock query
needs to be changed to 0x1a rather than 0x19.  The userspace side for
the engine clock query is not committed yet.  I'll send an updated
pull request.

Alex

>
> Dave.
>
>>
>> The following changes since commit 53dac830537b51df555ba5e7ebb236705b7eaa7c:
>>
>>   drm/mgag200: fix oops in cursor code. (2014-01-16 14:43:04 +1000)
>>
>> are available in the git repository at:
>>
>>   git://people.freedesktop.org/~agd5f/linux drm-next-3.14
>>
>> for you to fetch changes up to 4a8ee429cab2d62cf37f492db9861f918e79475b:
>>
>>   drm/radeon: fix endian handling in radeon_atom_init_mc_reg_table (2014-01-16 11:04:07 -0500)
>>
>> ----------------------------------------------------------------
>> Alex Deucher (16):
>>       Revert "drm/radeon: disable CIK CP semaphores for now"
>>       drm/radeon: consolidate cp hdp flushing code for CIK
>>       drm/radeon: consolidate sdma hdp flushing code for CIK
>>       drm/radeon/cik: use POLL_REG_MEM special op for sDMA HDP flush
>>       drm/radeon/cik: use WAIT_REG_MEM special op for CP HDP flush
>>       drm/radeon: disable dpm on BTC
>>       drm/radeon/cik: use hw defaults for TC_CFG registers
>>       drm/radeon: disable ss on DP for DCE3.x
>>       drm/radeon/dp: bump i2c-over-aux retries to 7
>>       drm/radeon/dp: use usleep_range rather than udelay
>>       drm/radeon/dp: sleep after powering up the display
>>       drm/radeon: add query to fetch the max engine clock.
>>       drm/radeon: handle ss percentage divider properly
>>       drm/radeon: bail early from enable ss in certain cases
>>       drm/radeon: write gfx pg bases even when gfx pg is disabled
>>       drm/radeon: fix endian handling in radeon_atom_init_mc_reg_table
>>
>> Christian König (1):
>>       drm/radeon: don't power gate paused UVD streams
>>
>>  drivers/gpu/drm/radeon/atombios_crtc.c   | 32 +++++++----
>>  drivers/gpu/drm/radeon/atombios_dp.c     | 18 +++---
>>  drivers/gpu/drm/radeon/cik.c             | 95 ++++++++++++++++----------------
>>  drivers/gpu/drm/radeon/cik_sdma.c        | 43 +++++++++++----
>>  drivers/gpu/drm/radeon/radeon_atombios.c | 19 +++++--
>>  drivers/gpu/drm/radeon/radeon_kms.c      |  7 +++
>>  drivers/gpu/drm/radeon/radeon_mode.h     |  1 +
>>  drivers/gpu/drm/radeon/radeon_pm.c       | 10 +++-
>>  drivers/gpu/drm/radeon/radeon_uvd.c      |  2 +
>>  drivers/gpu/drm/radeon/rv770_dpm.c       | 14 ++---
>>  drivers/gpu/drm/radeon/si.c              |  3 +
>>  include/uapi/drm/radeon_drm.h            |  3 +-
>>  12 files changed, 152 insertions(+), 95 deletions(-)