From b35d63fae6a2a3a0e1949228de07f795a73f23d0 Mon Sep 17 00:00:00 2001 From: Damien Lespiau Date: Tue, 20 Jan 2015 12:51:50 +0000 Subject: [PATCH] drm/i915/skl: intel_format_to_fourcc() doesn't work for SKL planes We will have a skl_ version shortly! Reviewed-By: Tvrtko Ursulin Signed-off-by: Damien Lespiau Signed-off-by: Daniel Vetter --- drivers/gpu/drm/i915/intel_display.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 95bb420..bd5b9a6 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -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: @@ -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; @@ -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; -- 2.7.4