Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 07825e4b authored by Rodrigo Vivi's avatar Rodrigo Vivi
Browse files

Merge tag 'gvt-next-2017-12-14' of https://github.com/intel/gvt-linux into drm-intel-next-queued 



gvt-next-2017-12-14:

- fixes for two coverity scan errors (Colin)
- mmio switch code refine (Changbin)
- more virtual display dmabuf fixes (Tina/Gustavo)
- misc cleanups (Pei)

Signed-off-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20171214033434.jlppjlyal5d67ya7@zhen-hp.sh.intel.com
parents 8d8c46fa 461bd622

drivers/gpu/drm/i915/gvt/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
GVT_DIR := gvt

GVT_SOURCE := gvt.o aperture_gm.o handlers.o vgpu.o trace_points.o firmware.o \

	interrupt.o gtt.o cfg_space.o opregion.o mmio.o display.o edid.o \

	execlist.o scheduler.o sched_policy.o render.o cmd_parser.o debugfs.o \

	execlist.o scheduler.o sched_policy.o mmio_context.o cmd_parser.o debugfs.o \

	fb_decoder.o dmabuf.o



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

drivers/gpu/drm/i915/gvt/dmabuf.c

+7 −8
Original line number Diff line number Diff line
@@ -520,18 +520,17 @@ void intel_vgpu_dmabuf_cleanup(struct intel_vgpu *vgpu) 
	list_for_each_safe(pos, n, &vgpu->dmabuf_obj_list_head) {

		dmabuf_obj = container_of(pos, struct intel_vgpu_dmabuf_obj,

						list);

		if (dmabuf_obj->initref) {

			dmabuf_obj->initref = false;

			dmabuf_obj_put(dmabuf_obj);

		}

		dmabuf_obj->vgpu = NULL;



		idr_remove(&vgpu->object_idr, dmabuf_obj->dmabuf_id);



		if (dmabuf_obj->vgpu)

		intel_gvt_hypervisor_put_vfio_device(vgpu);



		list_del(pos);

		dmabuf_obj->vgpu = NULL;



		/* dmabuf_obj might be freed in dmabuf_obj_put */

		if (dmabuf_obj->initref) {

			dmabuf_obj->initref = false;

			dmabuf_obj_put(dmabuf_obj);

		}



	}

	mutex_unlock(&vgpu->dmabuf_lock);

drivers/gpu/drm/i915/gvt/fb_decoder.c

+6 −0
Original line number Diff line number Diff line
@@ -222,6 +222,12 @@ int intel_vgpu_decode_primary_plane(struct intel_vgpu *vgpu, 
			val & PLANE_CTL_ORDER_RGBX,

			val & PLANE_CTL_ALPHA_MASK,

			val & PLANE_CTL_YUV422_ORDER_MASK);



		if (fmt >= ARRAY_SIZE(skl_pixel_formats)) {

			gvt_vgpu_err("Out-of-bounds pixel format index\n");

			return -EINVAL;

		}



		plane->bpp = skl_pixel_formats[fmt].bpp;

		plane->drm_format = skl_pixel_formats[fmt].drm_format;

	} else {

drivers/gpu/drm/i915/gvt/gvt.c

+2 −0
Original line number Diff line number Diff line
@@ -386,6 +386,8 @@ int intel_gvt_init_device(struct drm_i915_private *dev_priv) 
	if (ret)

		goto out_clean_idr;



	intel_gvt_init_engine_mmio_context(gvt);



	ret = intel_gvt_load_firmware(gvt);

	if (ret)

		goto out_clean_mmio_info;

drivers/gpu/drm/i915/gvt/gvt.h

+3 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ 
#include "execlist.h"

#include "scheduler.h"

#include "sched_policy.h"

#include "render.h"

#include "mmio_context.h"

#include "cmd_parser.h"

#include "fb_decoder.h"

#include "dmabuf.h"
@@ -310,6 +310,8 @@ struct intel_gvt { 
	wait_queue_head_t service_thread_wq;

	unsigned long service_request;



	struct engine_mmio *engine_mmio_list;



	struct dentry *debugfs_root;

};