Commit eb85d03e authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-misc-next-fixes-2019-05-08' of... 

Merge tag 'drm-misc-next-fixes-2019-05-08' of git://anongit.freedesktop.org/drm/drm-misc

 into drm-next

- A handful of fixes from -next that just missed feature freeze
- More panfrost fixes that went directly in -misc-next-fixes (various)
- Fix searchpaths during build (Masahiro)
- msm patch to fix the driver for chips without zap shader (Rob)
- Fix freeing imported buffers in drm_gem_cma_free_object() (Noralf)

Cc: Masahiro Yamada <yamada.masahiro@socionext.com>
Cc: Rob Clark <robdclark@chromium.org>
Cc: Noralf Trønnes <noralf@tronnes.org>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>

From: Sean Paul <sean@poorly.run>
Link: https://patchwork.freedesktop.org/patch/msgid/20190508205153.GA91135@art_vandelay
parents f2e8d169 15273ffd

drivers/gpu/drm/amd/amdgpu/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ 
# Makefile for the drm device driver.  This driver provides support for the

# Direct Rendering Infrastructure (DRI) in XFree86 4.1.0 and higher.



FULL_AMD_PATH=$(src)/..

FULL_AMD_PATH=$(srctree)/$(src)/..

DISPLAY_FOLDER_NAME=display

FULL_AMD_DISPLAY_PATH = $(FULL_AMD_PATH)/$(DISPLAY_FOLDER_NAME)

drivers/gpu/drm/arm/display/komeda/Makefile

+2 −2
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0



ccflags-y := \

	-I$(src)/../include \

	-I$(src)

	-I $(srctree)/$(src)/../include \

	-I $(srctree)/$(src)



komeda-y := \

	komeda_drv.o \

drivers/gpu/drm/drm_connector.c

+0 −6
Original line number Diff line number Diff line
@@ -1416,12 +1416,6 @@ EXPORT_SYMBOL(drm_mode_create_scaling_mode_property); 
 *

 *	The driver may place further restrictions within these minimum

 *	and maximum bounds.

 *

 *	The semantics for the vertical blank timestamp differ when

 *	variable refresh rate is active. The vertical blank timestamp

 *	is defined to be an estimate using the current mode's fixed

 *	refresh rate timings. The semantics for the page-flip event

 *	timestamp remain the same.

 */



/**

drivers/gpu/drm/drm_gem_cma_helper.c

+4 −4
Original line number Diff line number Diff line
@@ -186,13 +186,13 @@ void drm_gem_cma_free_object(struct drm_gem_object *gem_obj) 


	cma_obj = to_drm_gem_cma_obj(gem_obj);



	if (cma_obj->vaddr) {

		dma_free_wc(gem_obj->dev->dev, cma_obj->base.size,

			    cma_obj->vaddr, cma_obj->paddr);

	} else if (gem_obj->import_attach) {

	if (gem_obj->import_attach) {

		if (cma_obj->vaddr)

			dma_buf_vunmap(gem_obj->import_attach->dmabuf, cma_obj->vaddr);

		drm_prime_gem_destroy(gem_obj, cma_obj->sgt);

	} else if (cma_obj->vaddr) {

		dma_free_wc(gem_obj->dev->dev, cma_obj->base.size,

			    cma_obj->vaddr, cma_obj->paddr);

	}



	drm_gem_object_release(gem_obj);

drivers/gpu/drm/i915/gvt/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -5,5 +5,5 @@ GVT_SOURCE := gvt.o aperture_gm.o handlers.o vgpu.o trace_points.o firmware.o \ 
	execlist.o scheduler.o sched_policy.o mmio_context.o cmd_parser.o debugfs.o \

	fb_decoder.o dmabuf.o page_track.o



ccflags-y				+= -I$(src) -I$(src)/$(GVT_DIR)

ccflags-y				+= -I $(srctree)/$(src) -I $(srctree)/$(src)/$(GVT_DIR)/

i915-y					+= $(addprefix $(GVT_DIR)/, $(GVT_SOURCE))

CRA Git | Maintained and supported by SUSTech CRA and CCSE