From: Ville Syrjälä Date: Tue, 20 Mar 2012 14:46:18 +0000 (+0200) Subject: gfx: drv: Check framebuffer depth with HDMI X-Git-Tag: 2.1b_release~193 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4139d02d1315f178d244c2980a747025d5fa02b4;p=platform%2Fkernel%2Fkernel-mfld-blackbay.git gfx: drv: Check framebuffer depth with HDMI The HDMI code takes an entirely separate code path for mode setting. Mode the framebuffer depth check earlier, so that the HDMI case is checked as well. Signed-off-by: Ville Syrjälä Signed-off-by: Kirill A. Shutemov --- diff --git a/drivers/staging/mrst/drv/psb_intel_display.c b/drivers/staging/mrst/drv/psb_intel_display.c index 2ad83f4..e2e4a56 100644 --- a/drivers/staging/mrst/drv/psb_intel_display.c +++ b/drivers/staging/mrst/drv/psb_intel_display.c @@ -859,7 +859,7 @@ void mdfld__intel_plane_set_alpha(int enable) REG_WRITE(dspcntr_reg, dspcntr); } -static int check_fb(struct drm_framebuffer *fb) +static int check_fb(const struct drm_framebuffer *fb) { if (!fb) return 0; @@ -1549,6 +1549,10 @@ static int mdfld_crtc_mode_set(struct drm_crtc *crtc, PSB_DEBUG_ENTRY("pipe = 0x%x\n", pipe); + ret = check_fb(crtc->fb); + if (ret) + return ret; + if (pipe == 1) { if (!ospm_power_using_hw_begin(OSPM_DISPLAY_ISLAND, true)) return 0; @@ -1600,10 +1604,6 @@ static int mdfld_crtc_mode_set(struct drm_crtc *crtc, return 0; } - ret = check_fb(crtc->fb); - if (ret) - return ret; - PSB_DEBUG_ENTRY("adjusted_hdisplay = %d\n", adjusted_mode->hdisplay); PSB_DEBUG_ENTRY("adjusted_vdisplay = %d\n",