Let's keep merging display stuff through drm-intel when possible as
there's less chance of conflicting.

Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>