git.baikalelectronics.ru Git - kernel.git/commit

]> git.baikalelectronics.ru Git - kernel.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	d1b6901e4dc312ef3dd1fea632b0a92598a0b81a
tree	a43fd6c318a8f2af763ae8186af8ecde49cad582	tree \| snapshot
parent	3c611bb6996aa7ef21b33ad1d36ed31395b2820b	commit \| diff
parent	5cd89b64ed085e49ca85b4139b5bce5b266c3427	commit \| diff

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

Commit '74cbb44c64ff ("drm/i915/psr: Tie PSR2 support to Y
coordinate requirement")' got merged to drm-intel-next-queued
but the variable was defined commit '557f283543d5 ("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 Kernel Source Tree.

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