Commit 30af77c4 authored Feb 10, 2015 by Daniel Vetter

drm/i915: Use fb format modifiers in skylake_update_primary_plane



Just a little demo really. We probably need to introduce skl specific
functions for a lot of the format validation stuff, or at least
helpers. Specifically I think intel_framebuffer_init and
intel_fb_align_height must be adjusted to have an i915_ and a skl_
variant. And only shared code should be converted to fb modifiers,
platform code (like the plane config readout can keep on using old
tiling_mode defines to avoid some churn).

Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>

parent 091df6cb

drivers/gpu/drm/i915/intel_display.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -2779,11 +2779,11 @@ static void skylake_update_primary_plane(struct drm_crtc *crtc,
		* The stride is either expressed as a multiple of 64 bytes chunks for
		* linear buffers or in number of tiles for tiled buffers.
		*/
		switch (obj->tiling_mode) {
		case I915_TILING_NONE:
		switch (fb->modifier[0]) {
		case DRM_FORMAT_MOD_NONE:
		stride = fb->pitches[0] >> 6;
		break;
		case I915_TILING_X:
		case I915_FORMAT_MOD_X_TILED:
		plane_ctl \|= PLANE_CTL_TILED_X;
		stride = fb->pitches[0] >> 9;
		break;