forked from ~ljy/RK356X_SDK_RELEASE

hc
2024-05-13 9d77db3c730780c8ef5ccd4b66403ff5675cfe4e
kernel/drivers/gpu/drm/radeon/radeon_uvd.c
....@@ -30,7 +30,7 @@
3030
3131 #include <linux/firmware.h>
3232 #include <linux/module.h>
33
-#include <drm/drmP.h>
33
+
3434 #include <drm/drm.h>
3535
3636 #include "radeon.h"
....@@ -454,7 +454,7 @@
454454 if (p->rdev->family >= CHIP_PALM)
455455 return 0;
456456
457
- /* fall through */
457
+ fallthrough;
458458 default:
459459 DRM_ERROR("UVD codec not supported by hardware %d!\n",
460460 stream_type);
....@@ -477,7 +477,7 @@
477477 return -EINVAL;
478478 }
479479
480
- f = reservation_object_get_excl(bo->tbo.resv);
480
+ f = dma_resv_get_excl(bo->tbo.base.resv);
481481 if (f) {
482482 r = radeon_fence_wait((struct radeon_fence *)f, false);
483483 if (r) {