drm/amdgpu: avoid using null object of framebuffer
Subsystems (2)
PATCH 1/1 drm/amdgpu: avoid using null object of framebuffer
Instead of using state->fb->obj[0] directly, get object from framebuffer by calling drm_gem_fb_get_obj() and return error code when object is null to avoid using null object of framebuffer.
Signed-off-by Julia Zhang <[email protected]>
--- drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c +15 -2
@@ -2,6 +2,7 @@#include <drm/drm_atomic_helper.h> #include <drm/drm_simple_kms_helper.h> +#include <drm/drm_gem_framebuffer_helper.h> #include <drm/drm_vblank.h> #include "amdgpu.h"
@@ -311,7 +312,13 @@ static int amdgpu_vkms_prepare_fb(struct drm_plane *plane,return 0 ; } afb =to_amdgpu_framebuffer (new_state->fb); - obj = new_state->fb->obj[0 ]; + + obj =drm_gem_fb_get_obj (new_state->fb,0 ); +if (!obj) { +DRM_ERROR ("Failed to get obj from framebuffer\n" ); +return -EINVAL ; + } + rbo =gem_to_amdgpu_bo (obj); adev =amdgpu_ttm_adev (rbo->tbo.bdev);
@@ -365,12 +372,18 @@ static void amdgpu_vkms_cleanup_fb(struct drm_plane *plane, struct drm_plane_state *old_state) {struct amdgpu_bo *rbo; +struct drm_gem_object *obj =drm_gem_fb_get_obj (old_state->fb,0 );int r;if (!old_state->fb)return ; - rbo =gem_to_amdgpu_bo (old_state->fb->obj[0 ]); +if (!obj) { +DRM_ERROR ("Failed to get obj from framebuffer\n" ); +return ; + } + + rbo =gem_to_amdgpu_bo (obj); r =amdgpu_bo_reserve (rbo, false);if (unlikely (r)) {DRM_ERROR ("failed to reserve rbo before unpin\n" );
Signature · 1 line
2.34.1
Quoted 5 lines · Julia
Instead of using state->fb->obj[0] directly, get object from framebuffer by calling
drm_gem_fb_get_obj()and return error code when object is null to avoid using null object of framebuffer.Signed-off-by Julia Zhang <[email protected]>
Reviewed-by Huang Rui <[email protected]>
Quoted 54 lines
--- drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-)drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c +15
-2@@ -2,6 +2,7 @@#include <drm/drm_atomic_helper.h> #include <drm/drm_simple_kms_helper.h> +#include <drm/drm_gem_framebuffer_helper.h> #include <drm/drm_vblank.h> #include "amdgpu.h" @@ -311,7 +312,13 @@ static int amdgpu_vkms_prepare_fb(struct drm_plane *plane,return 0 ; } afb =to_amdgpu_framebuffer (new_state->fb); - obj = new_state->fb->obj[0 ]; + + obj =drm_gem_fb_get_obj (new_state->fb,0 ); +if (!obj) { +DRM_ERROR ("Failed to get obj from framebuffer\n" ); +return -EINVAL ; + } + rbo =gem_to_amdgpu_bo (obj); adev =amdgpu_ttm_adev (rbo->tbo.bdev);@@ -365,12 +372,18 @@ static void amdgpu_vkms_cleanup_fb(struct drm_plane *plane, struct drm_plane_state *old_state) {struct amdgpu_bo *rbo; +struct drm_gem_object *obj =drm_gem_fb_get_obj (old_state->fb,0 );int r;if (!old_state->fb)return ; - rbo =gem_to_amdgpu_bo (old_state->fb->obj[0 ]); +if (!obj) { +DRM_ERROR ("Failed to get obj from framebuffer\n" ); +return ; + } + + rbo =gem_to_amdgpu_bo (obj); r =amdgpu_bo_reserve (rbo, false);if (unlikely (r)) {DRM_ERROR ("failed to reserve rbo before unpin\n" );Signature · 1 line
2.34.1