diff options
author | Daniel Vetter | 2015-02-10 18:16:11 +0100 |
---|---|---|
committer | Daniel Vetter | 2015-02-13 23:28:19 +0100 |
commit | 30af77c4c80f98c72b27cb497aa660ef9474e6cf (patch) | |
tree | de61e0a3400e84be53d122bf59881bf840979519 /drivers/gpu/drm/i915/intel_display.c | |
parent | drm/i915: Switch intel_fb_align_height to fb format modifiers (diff) | |
download | kernel-qcow2-linux-30af77c4c80f98c72b27cb497aa660ef9474e6cf.tar.gz kernel-qcow2-linux-30af77c4c80f98c72b27cb497aa660ef9474e6cf.tar.xz kernel-qcow2-linux-30af77c4c80f98c72b27cb497aa660ef9474e6cf.zip |
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>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_display.c')
-rw-r--r-- | drivers/gpu/drm/i915/intel_display.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index a2bb905c2372..a954263663a9 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -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; |