git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge drm/drm-next into drm-intel-gt-next
[sfrench/cifs-2.6.git]
/
drivers
/
gpu
/
drm
/
i915
/
display
/
skl_universal_plane.c
diff --git
a/drivers/gpu/drm/i915/display/skl_universal_plane.c
b/drivers/gpu/drm/i915/display/skl_universal_plane.c
index 76490cc59d8f11df931e5c0a57691dcfe600357e..4b79c2d2d6177a47c23339632fffc72c9524e36d 100644
(file)
--- a/
drivers/gpu/drm/i915/display/skl_universal_plane.c
+++ b/
drivers/gpu/drm/i915/display/skl_universal_plane.c
@@
-1848,7
+1848,7
@@
static bool bo_has_valid_encryption(struct drm_i915_gem_object *obj)
{
struct drm_i915_private *i915 = to_i915(obj->base.dev);
- return intel_pxp_key_check(
&to_gt(i915)
->pxp, obj, false) == 0;
+ return intel_pxp_key_check(
i915
->pxp, obj, false) == 0;
}
static bool pxp_is_borked(struct drm_i915_gem_object *obj)