Commit ba217b77 authored by Rodrigo Vivi's avatar Rodrigo Vivi
Browse files

Merge drm/drm-next into drm-intel-next 



Syncing drm-intel-next and drm-intel-gt-next to unblock ADL enabling.

Signed-off-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
parents 777e687a fb5cfcaa

Documentation/gpu/i915.rst

+1 −1
Original line number Diff line number Diff line
@@ -428,7 +428,7 @@ User Batchbuffer Execution 
Logical Rings, Logical Ring Contexts and Execlists

--------------------------------------------------



.. kernel-doc:: drivers/gpu/drm/i915/gt/intel_lrc.c

.. kernel-doc:: drivers/gpu/drm/i915/gt/intel_execlists_submission.c

   :doc: Logical Rings, Logical Ring Contexts and Execlists



Global GTT views

drivers/gpu/drm/amd/amdgpu/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ amdgpu-y += \ 
	vi.o mxgpu_vi.o nbio_v6_1.o soc15.o emu_soc.o mxgpu_ai.o nbio_v7_0.o vega10_reg_init.o \

	vega20_reg_init.o nbio_v7_4.o nbio_v2_3.o nv.o navi10_reg_init.o navi14_reg_init.o \

	arct_reg_init.o navi12_reg_init.o mxgpu_nv.o sienna_cichlid_reg_init.o vangogh_reg_init.o \

	nbio_v7_2.o dimgrey_cavefish_reg_init.o

	nbio_v7_2.o dimgrey_cavefish_reg_init.o hdp_v4_0.o hdp_v5_0.o



# add DF block

amdgpu-y += \
@@ -97,6 +97,7 @@ amdgpu-y += \ 
	tonga_ih.o \

	cz_ih.o \

	vega10_ih.o \

	vega20_ih.o \

	navi10_ih.o



# add PSP block

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

+9 −3
Original line number Diff line number Diff line
@@ -88,6 +88,7 @@ 
#include "amdgpu_gfx.h"

#include "amdgpu_sdma.h"

#include "amdgpu_nbio.h"

#include "amdgpu_hdp.h"

#include "amdgpu_dm.h"

#include "amdgpu_virt.h"

#include "amdgpu_csa.h"
@@ -106,6 +107,7 @@ 
#include "amdgpu_gfxhub.h"

#include "amdgpu_df.h"

#include "amdgpu_smuio.h"

#include "amdgpu_hdp.h"



#define MAX_GPU_INSTANCE		16
@@ -607,7 +609,6 @@ struct amdgpu_asic_funcs { 
	/* invalidate hdp read cache */

	void (*invalidate_hdp)(struct amdgpu_device *adev,

			       struct amdgpu_ring *ring);

	void (*reset_hdp_ras_error_count)(struct amdgpu_device *adev);

	/* check if the asic needs a full reset of if soft reset will work */

	bool (*need_full_reset)(struct amdgpu_device *adev);

	/* initialize doorbell layout for specific asic*/
@@ -920,6 +921,9 @@ struct amdgpu_device { 
	/* nbio */

	struct amdgpu_nbio		nbio;



	/* hdp */

	struct amdgpu_hdp		hdp;



	/* smuio */

	struct amdgpu_smuio		smuio;
@@ -1201,8 +1205,10 @@ int emu_soc_asic_init(struct amdgpu_device *adev); 
#define amdgpu_asic_read_bios_from_rom(adev, b, l) (adev)->asic_funcs->read_bios_from_rom((adev), (b), (l))

#define amdgpu_asic_read_register(adev, se, sh, offset, v)((adev)->asic_funcs->read_register((adev), (se), (sh), (offset), (v)))

#define amdgpu_asic_get_config_memsize(adev) (adev)->asic_funcs->get_config_memsize((adev))

#define amdgpu_asic_flush_hdp(adev, r) (adev)->asic_funcs->flush_hdp((adev), (r))

#define amdgpu_asic_invalidate_hdp(adev, r) (adev)->asic_funcs->invalidate_hdp((adev), (r))

#define amdgpu_asic_flush_hdp(adev, r) \

	((adev)->asic_funcs->flush_hdp ? (adev)->asic_funcs->flush_hdp((adev), (r)) : (adev)->hdp.funcs->flush_hdp((adev), (r)))

#define amdgpu_asic_invalidate_hdp(adev, r) \

	((adev)->asic_funcs->invalidate_hdp ? (adev)->asic_funcs->invalidate_hdp((adev), (r)) : (adev)->hdp.funcs->invalidate_hdp((adev), (r)))

#define amdgpu_asic_need_full_reset(adev) (adev)->asic_funcs->need_full_reset((adev))

#define amdgpu_asic_init_doorbell_index(adev) (adev)->asic_funcs->init_doorbell_index((adev))

#define amdgpu_asic_get_pcie_usage(adev, cnt0, cnt1) ((adev)->asic_funcs->get_pcie_usage((adev), (cnt0), (cnt1)))

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

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

#include "gc/gc_10_1_0_offset.h"

#include "gc/gc_10_1_0_sh_mask.h"

#include "navi10_enum.h"

#include "athub/athub_2_0_0_offset.h"

#include "athub/athub_2_0_0_sh_mask.h"

#include "oss/osssys_5_0_0_offset.h"

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

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

#include "gc/gc_10_3_0_offset.h"

#include "gc/gc_10_3_0_sh_mask.h"

#include "navi10_enum.h"

#include "oss/osssys_5_0_0_offset.h"

#include "oss/osssys_5_0_0_sh_mask.h"

#include "soc15_common.h"