Skip to content

Commit 185b248

Browse files
juhapekkahogander
authored andcommitted
drm/i915/display: in skl_surf_address check for dpt-vma
touch dpt_vma->node only if dpt-vma is not NULL Signed-off-by: Juha-Pekka Heikkila <juhapekka.heikkila@gmail.com> Reviewed-by: Jouni Högander <jouni.hogander@intel.com> Signed-off-by: Jouni Högander <jouni.hogander@intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20231116150225.204233-2-juhapekka.heikkila@gmail.com
1 parent 1aba671 commit 185b248

1 file changed

Lines changed: 2 additions & 1 deletion

File tree

drivers/gpu/drm/i915/display/skl_universal_plane.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1006,7 +1006,8 @@ static u32 skl_surf_address(const struct intel_plane_state *plane_state,
10061006
* The DPT object contains only one vma, so the VMA's offset
10071007
* within the DPT is always 0.
10081008
*/
1009-
drm_WARN_ON(&i915->drm, plane_state->dpt_vma->node.start);
1009+
drm_WARN_ON(&i915->drm, plane_state->dpt_vma &&
1010+
plane_state->dpt_vma->node.start);
10101011
drm_WARN_ON(&i915->drm, offset & 0x1fffff);
10111012
return offset >> 9;
10121013
} else {

0 commit comments

Comments
 (0)