diff options
| author | Takashi Iwai <tiwai@suse.de> | 2024-05-08 18:16:58 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2024-05-08 18:16:58 +0200 |
| commit | 9b61b2069681b60d0d0bedbd0fe3c70123dddb19 (patch) | |
| tree | 483407944dd3037584b8825e0d33feb7f4eddf5f /drivers/gpu/drm/i915/display/intel_cursor.c | |
| parent | b9112b17950c955071abfd4331d4daa162d6ec4d (diff) | |
| parent | 2ff85dc64df5bc0ff12e2f4e23fae7bbadbf1d5d (diff) | |
| download | linux-stable-9b61b2069681b60d0d0bedbd0fe3c70123dddb19.tar.gz linux-stable-9b61b2069681b60d0d0bedbd0fe3c70123dddb19.tar.bz2 linux-stable-9b61b2069681b60d0d0bedbd0fe3c70123dddb19.zip | |
Merge branch 'topic/hda-config-pm-cleanup' into for-next
Pull HD-audio CONFIG_PM cleanup.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'drivers/gpu/drm/i915/display/intel_cursor.c')
| -rw-r--r-- | drivers/gpu/drm/i915/display/intel_cursor.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/gpu/drm/i915/display/intel_cursor.c b/drivers/gpu/drm/i915/display/intel_cursor.c index f8b33999d43f..0d3da55e1c24 100644 --- a/drivers/gpu/drm/i915/display/intel_cursor.c +++ b/drivers/gpu/drm/i915/display/intel_cursor.c @@ -36,12 +36,10 @@ static u32 intel_cursor_base(const struct intel_plane_state *plane_state) { struct drm_i915_private *dev_priv = to_i915(plane_state->uapi.plane->dev); - const struct drm_framebuffer *fb = plane_state->hw.fb; - struct drm_i915_gem_object *obj = intel_fb_obj(fb); u32 base; if (DISPLAY_INFO(dev_priv)->cursor_needs_physical) - base = i915_gem_object_get_dma_address(obj, 0); + base = plane_state->phys_dma_addr; else base = intel_plane_ggtt_offset(plane_state); |