TWxSoftware/twx-linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

drm/i915: don't recheck for invalid pipe bpp

Browse Source 
As noticed by Daniel Vetter, intel_pipe_choose_bpp_dither should
already check for invalid bpp values and set a valid value, so remove
the recheck inside ironlake_crtc_mode_set and also replace a "default"
switch case inside ironlake_set_pipeconf with a BUG().

Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
Reviewed-by: Rodrigo Vivi <rodrigo.vivi@gmail.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
This commit is contained in:
Paulo Zanoni
2012-09-20 18:36:03 -03:00
committed by Daniel Vetter
parent 398b7a1b88
commit cc769b6257
1 changed files with 3 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/gpu/drm/i915/intel_display.c
+3 -12
View File
@@ -4626,8 +4626,8 @@ static void ironlake_set_pipeconf(struct drm_crtc *crtc,
val |= PIPE_12BPC; val |= PIPE_12BPC;
break; break;
default: default:
val |= PIPE_8BPC; /* Case prevented by intel_choose_pipe_bpp_dither. */
break; BUG();
} }
val &= ~(PIPECONF_DITHER_EN | PIPECONF_DITHER_TYPE_MASK); val &= ~(PIPECONF_DITHER_EN | PIPECONF_DITHER_TYPE_MASK);
@@ -4728,7 +4728,6 @@ static int ironlake_crtc_mode_set(struct drm_crtc *crtc,
struct fdi_m_n m_n = {0}; struct fdi_m_n m_n = {0};
u32 temp; u32 temp;
int target_clock, pixel_multiplier, lane, link_bw, factor; int target_clock, pixel_multiplier, lane, link_bw, factor;
unsigned int pipe_bpp;
bool dither; bool dither;
bool is_cpu_edp = false, is_pch_edp = false; bool is_cpu_edp = false, is_pch_edp = false;
@@ -4802,18 +4801,10 @@ static int ironlake_crtc_mode_set(struct drm_crtc *crtc,
target_clock = adjusted_mode->clock; target_clock = adjusted_mode->clock;
/* determine panel color depth */ /* determine panel color depth */
dither = intel_choose_pipe_bpp_dither(crtc, fb, &pipe_bpp, mode); dither = intel_choose_pipe_bpp_dither(crtc, fb, &intel_crtc->bpp, mode);
if (is_lvds && dev_priv->lvds_dither) if (is_lvds && dev_priv->lvds_dither)
dither = true; dither = true;
if (pipe_bpp != 18 && pipe_bpp != 24 && pipe_bpp != 30 &&
pipe_bpp != 36) {
WARN(1, "intel_choose_pipe_bpp returned invalid value %d\n",
pipe_bpp);
pipe_bpp = 24;
}
intel_crtc->bpp = pipe_bpp;
if (!lane) { if (!lane) {
/* /*
* Account for spread spectrum to avoid * Account for spread spectrum to avoid