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

Commit 31cc088a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'drm-next-2019-07-19' of git://anongit.freedesktop.org/drm/drm 

Pull drm fixes from Daniel Vetter:
 "Dave is back in shape, but now family got it so I'm doing the pull.
  Two things worthy of note:

   - nouveau feature pull was way too late, Dave&me decided to not take
     that, so Ben spun up a pull with just the fixes.

   - after some chatting with the arm display maintainers we decided to
     change a bit how that's maintained, for more oversight/review and
     cross vendor collab.

  More details below:

  nouveau:
   - bugfixes
   - TU116 enabling (minor iteration) :w

  amdgpu:
   - large pile of fixes for new hw support this release (navi, vega20)
   - audio hotplug fix
   - bunch of corner cases and small fixes all over for amdgpu/kfd

  komeda:
   - back out some new properties (from this merge window) that needs
     more pondering.

  bochs:
   - fb pitch setup

  core:
   - a new panel quirk
   - misc fixes"

* tag 'drm-next-2019-07-19' of git://anongit.freedesktop.org/drm/drm: (73 commits)
  drm/nouveau/secboot/gp102-: remove WAR for SEC2 RTOS start bug
  drm/nouveau/flcn/gp102-: improve implementation of bind_context() on SEC2/GSP
  drm/nouveau: fix memory leak in nouveau_conn_reset()
  drm/nouveau/dmem: missing mutex_lock in error path
  drm/nouveau/hwmon: return EINVAL if the GPU is powered down for sensors reads
  drm/nouveau: fix bogus GPL-2 license header
  drm/nouveau: fix bogus GPL-2 license header
  drm/nouveau/i2c: Enable i2c pads & busses during preinit
  drm/nouveau/disp/tu102-: wire up scdc parameter setter
  drm/nouveau/core: recognise TU116 chipset
  drm/nouveau/kms: disallow dual-link harder if hdmi connection detected
  drm/nouveau/disp/nv50-: fix center/aspect-corrected scaling
  drm/nouveau/disp/nv50-: force scaler for any non-default LVDS/eDP modes
  drm/nouveau/mcp89/mmu: Use mcp77_mmu_new instead of g84_mmu_new on MCP89.
  drm/amd/display: init res_pool dccg_ref, dchub_ref with xtalin_freq
  drm/amdgpu/pm: remove check for pp funcs in freq sysfs handlers
  drm/amd/display: Force uclk to max for every state
  drm/amdkfd: Remove GWS from process during uninit
  drm/amd/amdgpu: Fix offset for vmid selection in debugfs interface
  drm/amd/powerplay: update vega20 driver if to fit latest SMU firmware
  ...
parents dd4542d2 8ee79562

MAINTAINERS

+2 −2
Original line number Diff line number Diff line
@@ -1236,7 +1236,7 @@ M: James (Qian) Wang <james.qian.wang@arm.com> 
M:	Liviu Dudau <liviu.dudau@arm.com>

L:	Mali DP Maintainers <malidp@foss.arm.com>

S:	Supported

T:	git git://linux-arm.org/linux-ld.git for-upstream/mali-dp

T:	git git://anongit.freedesktop.org/drm/drm-misc

F:	drivers/gpu/drm/arm/display/include/

F:	drivers/gpu/drm/arm/display/komeda/

F:	Documentation/devicetree/bindings/display/arm,komeda.txt
@@ -1247,7 +1247,7 @@ M: Liviu Dudau <liviu.dudau@arm.com> 
M:	Brian Starkey <brian.starkey@arm.com>

L:	Mali DP Maintainers <malidp@foss.arm.com>

S:	Supported

T:	git git://linux-arm.org/linux-ld.git for-upstream/mali-dp

T:	git git://anongit.freedesktop.org/drm/drm-misc

F:	drivers/gpu/drm/arm/

F:	Documentation/devicetree/bindings/display/arm,malidp.txt

F:	Documentation/gpu/afbc.rst

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

+1 −0
Original line number Diff line number Diff line
@@ -164,6 +164,7 @@ extern int amdgpu_async_gfx_ring; 
extern int amdgpu_mcbp;

extern int amdgpu_discovery;

extern int amdgpu_mes;

extern int amdgpu_noretry;



#ifdef CONFIG_DRM_AMDGPU_SI

extern int amdgpu_si_support;

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

+5 −4
Original line number Diff line number Diff line
@@ -106,10 +106,10 @@ static int amdgpu_debugfs_process_reg_op(bool read, struct file *f, 
	ssize_t result = 0;

	int r;

	bool pm_pg_lock, use_bank, use_ring;

	unsigned instance_bank, sh_bank, se_bank, me, pipe, queue;

	unsigned instance_bank, sh_bank, se_bank, me, pipe, queue, vmid;



	pm_pg_lock = use_bank = use_ring = false;

	instance_bank = sh_bank = se_bank = me = pipe = queue = 0;

	instance_bank = sh_bank = se_bank = me = pipe = queue = vmid = 0;



	if (size & 0x3 || *pos & 0x3 ||

			((*pos & (1ULL << 62)) && (*pos & (1ULL << 61))))
@@ -135,6 +135,7 @@ static int amdgpu_debugfs_process_reg_op(bool read, struct file *f, 
		me = (*pos & GENMASK_ULL(33, 24)) >> 24;

		pipe = (*pos & GENMASK_ULL(43, 34)) >> 34;

		queue = (*pos & GENMASK_ULL(53, 44)) >> 44;

		vmid = (*pos & GENMASK_ULL(58, 54)) >> 54;



		use_ring = 1;

	} else {
@@ -152,7 +153,7 @@ static int amdgpu_debugfs_process_reg_op(bool read, struct file *f, 
					sh_bank, instance_bank);

	} else if (use_ring) {

		mutex_lock(&adev->srbm_mutex);

		amdgpu_gfx_select_me_pipe_q(adev, me, pipe, queue);

		amdgpu_gfx_select_me_pipe_q(adev, me, pipe, queue, vmid);

	}



	if (pm_pg_lock)
@@ -185,7 +186,7 @@ static int amdgpu_debugfs_process_reg_op(bool read, struct file *f, 
		amdgpu_gfx_select_se_sh(adev, 0xffffffff, 0xffffffff, 0xffffffff);

		mutex_unlock(&adev->grbm_idx_mutex);

	} else if (use_ring) {

		amdgpu_gfx_select_me_pipe_q(adev, 0, 0, 0);

		amdgpu_gfx_select_me_pipe_q(adev, 0, 0, 0, 0);

		mutex_unlock(&adev->srbm_mutex);

	}

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

+1 −0
Original line number Diff line number Diff line
@@ -2537,6 +2537,7 @@ int amdgpu_device_init(struct amdgpu_device *adev, 
	hash_init(adev->mn_hash);

	mutex_init(&adev->lock_reset);

	mutex_init(&adev->virt.dpm_mutex);

	mutex_init(&adev->psp.mutex);



	r = amdgpu_device_check_arguments(adev);

	if (r)

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

+1 −1
Original line number Diff line number Diff line
@@ -123,7 +123,7 @@ static int hw_id_map[MAX_HWIP] = { 
	[UVD_HWIP]	= UVD_HWID,

	[VCE_HWIP]	= VCE_HWID,

	[DF_HWIP]	= DF_HWID,

	[DCE_HWIP]	= DCEAZ_HWID,

	[DCE_HWIP]	= DMU_HWID,

	[OSSSYS_HWIP]	= OSSSYS_HWID,

	[SMUIO_HWIP]	= SMUIO_HWID,

	[PWR_HWIP]	= PWR_HWID,