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

Commit 5263925c authored by Dave Airlie's avatar Dave Airlie
Browse files

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

First radeon and amdgpu pull request for 4.6.  Highlights:
- ACP support for APUs with i2s audio
- CS ioctl optimizations
- GPU scheduler optimizations
- GPUVM optimizations
- Initial GPU reset support (not enabled yet)
- New powerplay sysfs interface for manually selecting clocks
- Powerplay fixes
- Virtualization fixes
- Removal of hw semaphore support
- Lots of other misc fixes and cleanups

* 'drm-next-4.6' of git://people.freedesktop.org/~agd5f/linux: (118 commits)
  drm/amdgpu: Don't call interval_tree_remove in amdgpu_mn_destroy
  drm/amdgpu: Fix race condition in amdgpu_mn_unregister
  drm/amdgpu: cleanup gem init/finit
  drm/amdgpu: rework GEM info printing
  drm/amdgpu: print the GPU offset as well in gem_info
  drm/amdgpu: optionally print the pin count in gem_info as well
  drm/amdgpu: print the BO size only once in amdgpu_gem_info
  drm/amdgpu: print pid as integer
  drm/amdgpu: remove page flip work queue v3
  drm/amdgpu: stop blocking for page filp fences
  drm/amdgpu: stop calling amdgpu_gpu_reset from the flip code
  drm/amdgpu: remove fence reset detection leftovers
  drm/amdgpu: Fix race condition in MMU notifier release
  drm/radeon: Fix WARN_ON if DRM_DP_AUX_CHARDEV is enabled
  drm/amdgpu/vi: move uvd tiling config setup into uvd code
  drm/amdgpu/vi: move sdma tiling config setup into sdma code
  drm/amdgpu/cik: move uvd tiling config setup into uvd code
  drm/amdgpu/cik: move sdma tiling config setup into sdma code
  drm/amdgpu/gfx7: rework gpu_init()
  drm/amdgpu/gfx: clean up harvest configuration (v2)
  ...
parents 08244c00 390be282

drivers/gpu/drm/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -172,6 +172,8 @@ config DRM_AMDGPU 
source "drivers/gpu/drm/amd/amdgpu/Kconfig"

source "drivers/gpu/drm/amd/powerplay/Kconfig"



source "drivers/gpu/drm/amd/acp/Kconfig"



source "drivers/gpu/drm/nouveau/Kconfig"



config DRM_I810

drivers/gpu/drm/amd/acp/Kconfig

0 → 100644
+11 −0
Original line number Diff line number Diff line 
menu "ACP Configuration"



config DRM_AMD_ACP

       bool "Enable ACP IP support"

       default y

       select MFD_CORE

       select PM_GENERIC_DOMAINS if PM

       help

	Choose this option to enable ACP IP support for AMD SOCs.



endmenu

drivers/gpu/drm/amd/acp/Makefile

0 → 100644
+8 −0
Original line number Diff line number Diff line 
#

# Makefile for the ACP, which is a sub-component

# of AMDSOC/AMDGPU drm driver.

# It provides the HW control for ACP related functionalities.



subdir-ccflags-y += -I$(AMDACPPATH)/ -I$(AMDACPPATH)/include



AMD_ACP_FILES := $(AMDACPPATH)/acp_hw.o

drivers/gpu/drm/amd/acp/acp_hw.c

0 → 100644
+50 −0
Original line number Diff line number Diff line 
/*

 * Copyright 2015 Advanced Micro Devices, Inc.

 *

 * Permission is hereby granted, free of charge, to any person obtaining a

 * copy of this software and associated documentation files (the "Software"),

 * to deal in the Software without restriction, including without limitation

 * the rights to use, copy, modify, merge, publish, distribute, sublicense,

 * and/or sell copies of the Software, and to permit persons to whom the

 * Software is furnished to do so, subject to the following conditions:

 *

 * The above copyright notice and this permission notice shall be included in

 * all copies or substantial portions of the Software.

 *

 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

 * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL

 * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR

 * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,

 * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR

 * OTHER DEALINGS IN THE SOFTWARE.

 *

 */



#include <linux/mm.h>

#include <linux/slab.h>

#include <linux/device.h>

#include <linux/delay.h>

#include <linux/errno.h>



#include "acp_gfx_if.h"



#define ACP_MODE_I2S	0

#define ACP_MODE_AZ	1



#define mmACP_AZALIA_I2S_SELECT 0x51d4



int amd_acp_hw_init(void *cgs_device,

		    unsigned acp_version_major, unsigned acp_version_minor)

{

	unsigned int acp_mode = ACP_MODE_I2S;



	if ((acp_version_major == 2) && (acp_version_minor == 2))

		acp_mode = cgs_read_register(cgs_device,

					mmACP_AZALIA_I2S_SELECT);



	if (acp_mode != ACP_MODE_I2S)

		return -ENODEV;



	return 0;

}

drivers/gpu/drm/amd/acp/include/acp_gfx_if.h

0 → 100644
+34 −0
Original line number Diff line number Diff line 
/*

 * Copyright 2015 Advanced Micro Devices, Inc.

 *

 * Permission is hereby granted, free of charge, to any person obtaining a

 * copy of this software and associated documentation files (the "Software"),

 * to deal in the Software without restriction, including without limitation

 * the rights to use, copy, modify, merge, publish, distribute, sublicense,

 * and/or sell copies of the Software, and to permit persons to whom the

 * Software is furnished to do so, subject to the following conditions:

 *

 * The above copyright notice and this permission notice shall be included in

 * all copies or substantial portions of the Software.

 *

 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

 * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL

 * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR

 * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,

 * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR

 * OTHER DEALINGS IN THE SOFTWARE.

 *

*/



#ifndef _ACP_GFX_IF_H

#define _ACP_GFX_IF_H



#include <linux/types.h>

#include "cgs_linux.h"

#include "cgs_common.h"



int amd_acp_hw_init(void *cgs_device,

		    unsigned acp_version_major, unsigned acp_version_minor);



#endif /* _ACP_GFX_IF_H */