gitweb.dragonflybsd.org Git - linux.git/commit

author	Rodrigo Vivi <rodrigo.vivi@intel.com>
	Fri, 30 Mar 2018 18:52:33 +0000 (11:52 -0700)
committer	Rodrigo Vivi <rodrigo.vivi@intel.com>
	Fri, 30 Mar 2018 18:52:33 +0000 (11:52 -0700)
commit	1f901d59a5489e4dc7fdd339808d89b89f35483e
tree	a43fd6c318a8f2af763ae8186af8ecde49cad582	tree \| snapshot
parent	4df4925b1b26f285aa76f89d95db3388a2d55281	commit \| diff
parent	694f54f680f7fd8e9561928fbfc537d9afbc3d79	commit \| diff

Merge airlied/drm-next into drm-intel-next-queued

Commit 'aee3bac0a3a8 ("drm/i915/psr: Tie PSR2 support to Y
coordinate requirement")' got merged to drm-intel-next-queued
but the variable was defined commit 'c5fe47327b06 ("drm: Add PSR
version 3 macro") who was merged through drm-misc.

So backmerging to get drm-intel-next-queued compiling back again.

Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>

Linux Project Source (from git://github.com/torvalds/linux)

RSS Atom

drivers/gpu/drm/i915/i915_reg.h	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/intel_display.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/intel_drv.h	diff1 \|	diff2 \|	blob \| history
include/drm/drm_dp_helper.h	diff1 \|	diff2 \|	blob \| history