Merge tag 'vmwgfx-next-2018-12-05' of git://people.freedesktop.org/~thomash/linux into drm-next (1f9a5dce) · Commits · 戴 / test

Documentation/gpu/drm-kms.rst

+12 −0

Original line number	Diff line number	Diff line
		@@ -554,6 +554,18 @@ Plane Composition Properties
		.. kernel-doc:: drivers/gpu/drm/drm_blend.c
		:export:

		FB_DAMAGE_CLIPS
		~~~~~~~~~~~~~~~

		.. kernel-doc:: drivers/gpu/drm/drm_damage_helper.c
		:doc: overview

		.. kernel-doc:: drivers/gpu/drm/drm_damage_helper.c
		:export:

		.. kernel-doc:: include/drm/drm_damage_helper.h
		:internal:

		Color Management Properties
		---------------------------

+0 −2

Original line number	Diff line number	Diff line
		@@ -4781,10 +4781,8 @@ T: git git://anongit.freedesktop.org/drm/drm-misc

		DRM DRIVER FOR VMWARE VIRTUAL GPU
		M: "VMware Graphics" <linux-graphics-maintainer@vmware.com>
		M: Sinclair Yeh <syeh@vmware.com>
		M: Thomas Hellstrom <thellstrom@vmware.com>
		L: dri-devel@lists.freedesktop.org
		T: git git://people.freedesktop.org/~syeh/repos_linux
		T: git git://people.freedesktop.org/~thomash/linux
		S: Supported
		F: drivers/gpu/drm/vmwgfx/

+1 −1

Original line number	Diff line number	Diff line
		@@ -37,7 +37,7 @@ drm_kms_helper-y := drm_crtc_helper.o drm_dp_helper.o drm_dsc.o drm_probe_helper
		drm_kms_helper_common.o drm_dp_dual_mode_helper.o \
		drm_simple_kms_helper.o drm_modeset_helper.o \
		drm_scdc_helper.o drm_gem_framebuffer_helper.o \
		drm_atomic_state_helper.o
		drm_atomic_state_helper.o drm_damage_helper.o

		drm_kms_helper-$(CONFIG_DRM_PANEL_BRIDGE) += bridge/panel.o
		drm_kms_helper-$(CONFIG_DRM_FBDEV_EMULATION) += drm_fb_helper.o

+22 −0

Original line number	Diff line number	Diff line
		@@ -531,6 +531,8 @@ static int drm_atomic_plane_check(const struct drm_plane_state *old_plane_state,
		struct drm_crtc *crtc = new_plane_state->crtc;
		const struct drm_framebuffer *fb = new_plane_state->fb;
		unsigned int fb_width, fb_height;
		struct drm_mode_rect *clips;
		uint32_t num_clips;
		int ret;

		/* either both CRTC and FB must be set, or neither */
		@@ -604,6 +606,26 @@ static int drm_atomic_plane_check(const struct drm_plane_state *old_plane_state,
		return -ENOSPC;
		}

		clips = drm_plane_get_damage_clips(new_plane_state);
		num_clips = drm_plane_get_damage_clips_count(new_plane_state);

		/* Make sure damage clips are valid and inside the fb. */
		while (num_clips > 0) {
		if (clips->x1 >= clips->x2 \|\|
		clips->y1 >= clips->y2 \|\|
		clips->x1 < 0 \|\|
		clips->y1 < 0 \|\|
		clips->x2 > fb_width \|\|
		clips->y2 > fb_height) {
		DRM_DEBUG_ATOMIC("[PLANE:%d:%s] invalid damage clip %d %d %d %d\n",
		plane->base.id, plane->name, clips->x1,
		clips->y1, clips->x2, clips->y2);
		return -EINVAL;
		}
		clips++;
		num_clips--;
		}

		if (plane_switching_crtc(old_plane_state, new_plane_state)) {
		DRM_DEBUG_ATOMIC("[PLANE:%d:%s] switching CRTC directly\n",
		plane->base.id, plane->name);

+3 −0

Original line number	Diff line number	Diff line
		@@ -32,6 +32,7 @@
		#include <drm/drm_crtc_helper.h>
		#include <drm/drm_atomic_helper.h>
		#include <drm/drm_writeback.h>
		#include <drm/drm_damage_helper.h>
		#include <linux/dma-fence.h>

		#include "drm_crtc_helper_internal.h"
		@@ -862,6 +863,8 @@ drm_atomic_helper_check_planes(struct drm_device *dev,

		drm_atomic_helper_plane_changed(state, old_plane_state, new_plane_state, plane);

		drm_atomic_helper_check_plane_damage(state, new_plane_state);

		if (!funcs \|\| !funcs->atomic_check)
		continue;