diff options
author | Daniel Vetter | 2019-06-13 22:44:21 +0200 |
---|---|---|
committer | Daniel Vetter | 2019-06-14 11:36:30 +0200 |
commit | 744ed8cb8a4707f04a79904a45cf8f951a28abd6 (patch) | |
tree | 966bc8ecfc9b9a0fcc040af962f9c314a2c3b8d4 /drivers/gpu/drm/drm_gem_shmem_helper.c | |
parent | Merge tag 'drm-intel-fixes-2019-06-13' of git://anongit.freedesktop.org/drm/d... (diff) | |
parent | drm: add fallback override/firmware EDID modes workaround (diff) | |
download | kernel-qcow2-linux-744ed8cb8a4707f04a79904a45cf8f951a28abd6.tar.gz kernel-qcow2-linux-744ed8cb8a4707f04a79904a45cf8f951a28abd6.tar.xz kernel-qcow2-linux-744ed8cb8a4707f04a79904a45cf8f951a28abd6.zip |
Merge tag 'drm-misc-fixes-2019-06-13' of git://anongit.freedesktop.org/drm/drm-misc into drm-fixes
Sean writes:
meson: A few G12A fixes across the driver (Neil)
quirks: A couple quirks for GPD devices (Hans)
gem_shmem: Use writecombine when vmapping non-dmabuf BOs (Boris)
panfrost: A couple tweaks to requiring devfreq (Neil & Ezequiel)
edid: Ensure we return the override mode when ddc probe fails (Jani)
Cc: Hans de Goede <hdegoede@redhat.com>
Cc: Neil Armstrong <narmstrong@baylibre.com>
Cc: Boris Brezillon <boris.brezillon@collabora.com>
Cc: Ezequiel Garcia <ezequiel@collabora.com>
Cc: Jani Nikula <jani.nikula@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
From: Sean Paul <sean@poorly.run>
Link: https://patchwork.freedesktop.org/patch/msgid/20190613143946.GA24233@art_vandelay
Diffstat (limited to 'drivers/gpu/drm/drm_gem_shmem_helper.c')
-rw-r--r-- | drivers/gpu/drm/drm_gem_shmem_helper.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/drm_gem_shmem_helper.c b/drivers/gpu/drm/drm_gem_shmem_helper.c index 1ee208c2c85e..472ea5d81f82 100644 --- a/drivers/gpu/drm/drm_gem_shmem_helper.c +++ b/drivers/gpu/drm/drm_gem_shmem_helper.c @@ -255,7 +255,8 @@ static void *drm_gem_shmem_vmap_locked(struct drm_gem_shmem_object *shmem) if (obj->import_attach) shmem->vaddr = dma_buf_vmap(obj->import_attach->dmabuf); else - shmem->vaddr = vmap(shmem->pages, obj->size >> PAGE_SHIFT, VM_MAP, PAGE_KERNEL); + shmem->vaddr = vmap(shmem->pages, obj->size >> PAGE_SHIFT, + VM_MAP, pgprot_writecombine(PAGE_KERNEL)); if (!shmem->vaddr) { DRM_DEBUG_KMS("Failed to vmap pages\n"); |