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

Commit 1fb2d354 authored by Dave Airlie's avatar Dave Airlie
Browse files

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

Just a few small fixes.

* 'drm-fixes-4.10' of git://people.freedesktop.org/~agd5f/linux:
  Revert "drm/radeon: always apply pci shutdown callbacks"
  drm/amdgpu: fix unload driver issue for virtual display
  drm/amdgpu: check ring being ready before using
parents 99f300cf b9b487e4

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

+7 −0
Original line number Diff line number Diff line
@@ -83,6 +83,13 @@ int amdgpu_cs_get_ring(struct amdgpu_device *adev, u32 ip_type, 
		}

		break;

	}



	if (!(*out_ring && (*out_ring)->adev)) {

		DRM_ERROR("Ring %d is not initialized on IP %d\n",

			  ring, ip_type);

		return -EINVAL;

	}



	return 0;

}

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

+1 −4
Original line number Diff line number Diff line
@@ -627,11 +627,8 @@ static const struct drm_encoder_helper_funcs dce_virtual_encoder_helper_funcs = 


static void dce_virtual_encoder_destroy(struct drm_encoder *encoder)

{

	struct amdgpu_encoder *amdgpu_encoder = to_amdgpu_encoder(encoder);



	kfree(amdgpu_encoder->enc_priv);

	drm_encoder_cleanup(encoder);

	kfree(amdgpu_encoder);

	kfree(encoder);

}



static const struct drm_encoder_funcs dce_virtual_encoder_funcs = {

drivers/gpu/drm/radeon/radeon_drv.c

+3 −4
Original line number Diff line number Diff line
@@ -366,10 +366,9 @@ static void 
radeon_pci_shutdown(struct pci_dev *pdev)

{

	/* if we are running in a VM, make sure the device

	 * torn down properly on reboot/shutdown.

	 * unfortunately we can't detect certain

	 * hypervisors so just do this all the time.

	 * torn down properly on reboot/shutdown

	 */

	if (radeon_device_is_virtual())

		radeon_pci_remove(pdev);

}