From: Maxime Ripard <maxime@cerno.tech>
Date: Mon, 26 Apr 2021 12:03:09 +0000 (+0200)
Subject: Merge drm/drm-next into drm-misc-next
X-Git-Tag: v5.15~303^2~28^2~539
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=355b60296143a090039211c5f0e1463f84aab65a;p=platform%2Fkernel%2Flinux-starfive.git

Merge drm/drm-next into drm-misc-next

Christian needs some patches from drm/next

Signed-off-by: Maxime Ripard <maxime@cerno.tech>
---

355b60296143a090039211c5f0e1463f84aab65a
diff --cc drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
index 485f249d063a,1345f7eba011..fe4e5880509d
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
@@@ -56,7 -77,11 +56,8 @@@ static void amdgpu_bo_destroy(struct tt
  {
  	struct amdgpu_device *adev = amdgpu_ttm_adev(tbo->bdev);
  	struct amdgpu_bo *bo = ttm_to_amdgpu_bo(tbo);
+ 	struct amdgpu_bo_user *ubo;
  
 -	if (bo->tbo.pin_count > 0)
 -		amdgpu_bo_subtract_pin_size(bo);
 -
  	amdgpu_bo_kunmap(bo);
  
  	if (bo->tbo.base.import_attach)
diff --cc drivers/gpu/drm/i915/i915_drv.c
index e1ae7b804c01,c2329bc44f55..7fe7bc4d6ca9
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@@ -38,9 -38,7 +38,8 @@@
  #include <linux/slab.h>
  #include <linux/vga_switcheroo.h>
  #include <linux/vt.h>
- #include <acpi/video.h>
  
 +#include <drm/drm_aperture.h>
  #include <drm/drm_atomic_helper.h>
  #include <drm/drm_ioctl.h>
  #include <drm/drm_irq.h>