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

Commit 5669b998 authored by Dave Airlie's avatar Dave Airlie
Browse files

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

Just a few small fixes for 4.13.

* 'drm-fixes-4.13' of git://people.freedesktop.org/~agd5f/linux:
  drm/amdgpu: Use list_del_init in amdgpu_mn_unregister
  drm/amdgpu: Fix undue fallthroughs in golden registers initialization
  drm/amdgpu: fix header on gfx9 clear state
parents 16f73eb0 68c9793d

drivers/gpu/drm/amd/amdgpu/amdgpu_mn.c

+1 −1
Original line number Diff line number Diff line
@@ -359,7 +359,7 @@ void amdgpu_mn_unregister(struct amdgpu_bo *bo) 
	head = bo->mn_list.next;



	bo->mn = NULL;

	list_del(&bo->mn_list);

	list_del_init(&bo->mn_list);



	if (list_empty(head)) {

		struct amdgpu_mn_node *node;

drivers/gpu/drm/amd/amdgpu/clearstate_gfx9.h

+21 −20
Original line number Diff line number Diff line 


/*

***************************************************************************************************

*

*  Trade secret of Advanced Micro Devices, Inc.

*  Copyright (c) 2010 Advanced Micro Devices, Inc. (unpublished)

 * Copyright 2017 Advanced Micro Devices, Inc.

 *

*  All rights reserved.  This notice is intended as a precaution against inadvertent publication and

*  does not imply publication or any waiver of confidentiality.  The year included in the foregoing

*  notice is the year of creation of the work.

 * 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:

 *

***************************************************************************************************

*/

/**

***************************************************************************************************

* @brief gfx9 Clearstate Definitions

***************************************************************************************************

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

 * all copies or substantial portions of the Software.

 *

*   Do not edit! This is a machine-generated file!

 * 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.

 *

 */

drivers/gpu/drm/amd/amdgpu/si.c

+2 −0
Original line number Diff line number Diff line
@@ -1385,6 +1385,7 @@ static void si_init_golden_registers(struct amdgpu_device *adev) 
		amdgpu_program_register_sequence(adev,

						 pitcairn_mgcg_cgcg_init,

						 (const u32)ARRAY_SIZE(pitcairn_mgcg_cgcg_init));

		break;

	case CHIP_VERDE:

		amdgpu_program_register_sequence(adev,

						 verde_golden_registers,
@@ -1409,6 +1410,7 @@ static void si_init_golden_registers(struct amdgpu_device *adev) 
		amdgpu_program_register_sequence(adev,

						 oland_mgcg_cgcg_init,

						 (const u32)ARRAY_SIZE(oland_mgcg_cgcg_init));

		break;

	case CHIP_HAINAN:

		amdgpu_program_register_sequence(adev,

						 hainan_golden_registers,