diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2019-02-05 16:48:09 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2019-02-05 16:48:08 -0800 |
| commit | a45614f0a4cceeb2acb5cfd088dd23ea341aaa94 (patch) | |
| tree | c5231c390cf5e2f911a6691ab9f07c3d52f47f0f /drivers/gpu | |
| parent | b27a053258dbbb505147b429e716a08c74a26918 (diff) | |
| parent | dd21e159de67974e3de0791a7175edb4fb2ce7a1 (diff) | |
Merge "Merge android-4.4.172 (b3e9e81) into msm-4.4"
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/drm/drm_fb_helper.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/gpu/drm/drm_fb_helper.c b/drivers/gpu/drm/drm_fb_helper.c index 5ad036741b99..e449f22c8f29 100644 --- a/drivers/gpu/drm/drm_fb_helper.c +++ b/drivers/gpu/drm/drm_fb_helper.c @@ -1109,9 +1109,14 @@ int drm_fb_helper_check_var(struct fb_var_screeninfo *var, struct drm_framebuffer *fb = fb_helper->fb; int depth; - if (var->pixclock != 0 || in_dbg_master()) + if (in_dbg_master()) return -EINVAL; + if (var->pixclock != 0) { + DRM_DEBUG("fbdev emulation doesn't support changing the pixel clock, value of pixclock is ignored\n"); + var->pixclock = 0; + } + /* Need to resize the fb object !!! */ if (var->bits_per_pixel > fb->bits_per_pixel || var->xres > fb->width || var->yres > fb->height || |