Skip to content

Commit

Permalink
drm/i915/skl: intel_format_to_fourcc() doesn't work for SKL planes
Browse files Browse the repository at this point in the history 
We will have a skl_ version shortly!

Reviewed-By: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
  • Loading branch information
@danvet
Damien Lespiau authored and danvet committed Jan 27, 2015
1 parent a55ecbe commit b35d63f
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions drivers/gpu/drm/i915/intel_display.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2316,7 +2316,7 @@ unsigned long intel_gen4_compute_page_offset(int *x, int *y,
}
}

static int intel_format_to_fourcc(int format)
static int i9xx_format_to_fourcc(int format)
{
switch (format) {
case DISPPLANE_8BPP:
Expand Down Expand Up @@ -6569,7 +6569,7 @@ static void i9xx_get_plane_config(struct intel_crtc *crtc,
plane_config->tiling = I915_TILING_X;

pixel_format = val & DISPPLANE_PIXFORMAT_MASK;
fourcc = intel_format_to_fourcc(pixel_format);
fourcc = i9xx_format_to_fourcc(pixel_format);
fb->pixel_format = fourcc;
fb->bits_per_pixel = drm_format_plane_cpp(fourcc, 0) * 8;

Expand Down Expand Up @@ -7621,7 +7621,7 @@ static void ironlake_get_plane_config(struct intel_crtc *crtc,
plane_config->tiling = I915_TILING_X;

pixel_format = val & DISPPLANE_PIXFORMAT_MASK;
fourcc = intel_format_to_fourcc(pixel_format);
fourcc = i9xx_format_to_fourcc(pixel_format);
fb->pixel_format = fourcc;
fb->bits_per_pixel = drm_format_plane_cpp(fourcc, 0) * 8;

Expand Down

0 comments on commit b35d63f

Please sign in to comment.