| commit | 1f901d59a5489e4dc7fdd339808d89b89f35483e | [log] [tgz] |
|---|---|---|
| author | Rodrigo Vivi <rodrigo.vivi@intel.com> | Fri Mar 30 11:52:33 2018 -0700 |
| committer | Rodrigo Vivi <rodrigo.vivi@intel.com> | Fri Mar 30 11:52:33 2018 -0700 |
| tree | a43fd6c318a8f2af763ae8186af8ecde49cad582 | |
| parent | 4df4925b1b26f285aa76f89d95db3388a2d55281 [diff] | |
| parent | 694f54f680f7fd8e9561928fbfc537d9afbc3d79 [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>