niansa-misc/linux
1
0
Fork 0
mirror of synced 2025-03-06 20:59:54 +01:00
Code Issues Projects Releases Packages Wiki Activity

Revert "drm/i915: Remove i915_gem_object_get_dirty_page()"

Browse source 
These commits caused a regression on Lenovo t520 sandybridge
machine belonging to reporter. We are reverting them for 5.10
for other reasons, so just do it for 5.9 as well.

This reverts commit 763fedd6a2.

Reported-by: Harald Arnesen <harald@skogtun.org>
Signed-off-by: Dave Airlie <airied@redhat.com>
This commit is contained in:
Dave Airlie 2020-09-08 15:40:43 +10:00
parent 8052ff431a
commit 4993a8a378
2 changed files with 18 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
drivers/gpu/drm/i915/gem/i915_gem_object.h
View file

@ -258,6 +258,10 @@ struct page *
i915_gem_object_get_page(struct drm_i915_gem_object *obj, i915_gem_object_get_page(struct drm_i915_gem_object *obj,
unsigned int n); unsigned int n);
struct page *
i915_gem_object_get_dirty_page(struct drm_i915_gem_object *obj,
unsigned int n);
dma_addr_t dma_addr_t
i915_gem_object_get_dma_address_len(struct drm_i915_gem_object *obj, i915_gem_object_get_dma_address_len(struct drm_i915_gem_object *obj,
unsigned long n, unsigned long n,

14
drivers/gpu/drm/i915/gem/i915_gem_pages.c
View file

@ -548,6 +548,20 @@ i915_gem_object_get_page(struct drm_i915_gem_object *obj, unsigned int n)
return nth_page(sg_page(sg), offset); return nth_page(sg_page(sg), offset);
} }
/* Like i915_gem_object_get_page(), but mark the returned page dirty */
struct page *
i915_gem_object_get_dirty_page(struct drm_i915_gem_object *obj,
unsigned int n)
{
struct page *page;
page = i915_gem_object_get_page(obj, n);
if (!obj->mm.dirty)
set_page_dirty(page);
return page;
}
dma_addr_t dma_addr_t
i915_gem_object_get_dma_address_len(struct drm_i915_gem_object *obj, i915_gem_object_get_dma_address_len(struct drm_i915_gem_object *obj,
unsigned long n, unsigned long n,