Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.1 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D32A4C43387 for ; Thu, 17 Jan 2019 03:03:35 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A0D1220675 for ; Thu, 17 Jan 2019 03:03:35 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="OQUkmmoQ" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727671AbfAQDDf (ORCPT ); Wed, 16 Jan 2019 22:03:35 -0500 Received: from mail-lj1-f195.google.com ([209.85.208.195]:34635 "EHLO mail-lj1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727595AbfAQDDf (ORCPT ); Wed, 16 Jan 2019 22:03:35 -0500 Received: by mail-lj1-f195.google.com with SMTP id u89-v6so7287241lje.1 for ; Wed, 16 Jan 2019 19:03:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=3C21Qlt6abhOAGy6mTV8Nk+9VzIu5DplGJ9ifeJtcGc=; b=OQUkmmoQuScYUUZNfG0lSVwLdJK2AGVEfC4EPX9rH0jD1D4VlvkmjGB4IYo0jxq4w1 L3McENL1kc9RX5e/es7in76FPU80/+/oweBpU/CeOYEstvY4JaclTnKHlxKZIDkYt0Hs NX/8NLlKs31EFcGQ1zgs+GOus3p8h3nsuIiN/CyF8LXXDzYUzwIY/dTSJ1MzvFZcrpnn RWc6qmLwZac8cbtnJoU6l8WM70OF+bE0nkxu++WD6PinzQSFjRJNN9CA3IdqvHPMc+d1 fKBPGQ41//gsGxvQzYktuUrgcuJbe85OmwrzLEGe9GeNF07gUpf9EEMUHoByKQUaiDi/ ip8A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=3C21Qlt6abhOAGy6mTV8Nk+9VzIu5DplGJ9ifeJtcGc=; b=SwXaLoBG7G1+1yC9t4mvyYhPDbAx2xio6nOcqJ/Y+aLYCx9qt4a0PinK6kEZWx4Kbg tNqgnOk79WAkmDkUOKsh9H87QwnriJB18AfR4GHqhseXU9pgTVRb9mw7g4cBbZXYeP1b A0EcQOQ6QaS4HytZDxNVOgvyGOlWticrIsaIXCCzElDfUQVtTKkpaoKkDXv/0stsa9wA 7oLusf/jxvPL5SX7T7lB940Xja2NYb9eSdWD2EeU3inu1y/FUdytJmOL7h0+vppRWmtq xSb36nSt/TEo30gPhVCbH1oY8J+Vazr0YPI5M4U85F5aWuaqrpZsHJS9CRhHLi8tEWCs lCzg== X-Gm-Message-State: AJcUukdfw1PZoJSSEDJtCG8v/S10Ohr5ObqIP6jPpuVq1fRkrfUzAacy D3L69/EXg1AfPZ7ZOPE+ita+lhjs X-Google-Smtp-Source: ALg8bN6YBm/8nfMgqKC29eRMugDaf/s9gRguorhpraOdddpcin1qpa7rANO15iVPplwSYSKG0xbnRw== X-Received: by 2002:a2e:9694:: with SMTP id q20-v6mr2765140lji.173.1547694212372; Wed, 16 Jan 2019 19:03:32 -0800 (PST) Received: from localhost.localdomain (pool-109-191-228-208.is74.ru. [109.191.228.208]) by smtp.gmail.com with ESMTPSA id a19sm42175lfi.57.2019.01.16.19.03.31 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 16 Jan 2019 19:03:31 -0800 (PST) From: Ivan Mironov To: stable@vger.kernel.org Cc: Ivan Mironov , Daniel Vetter Subject: [PATCH] drm/fb-helper: Ignore the value of fb_var_screeninfo.pixclock Date: Thu, 17 Jan 2019 08:02:34 +0500 Message-Id: <20190117030234.23204-2-mironov.ivan@gmail.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org commit 66a8d5bfb518f9f12d47e1d2dce1732279f9451e upstream. Backported by adjusting patch context. Strict requirement of pixclock to be zero breaks support of SDL 1.2 which contains hardcoded table of supported video modes with non-zero pixclock values[1]. To better understand which pixclock values are considered valid and how driver should handle these values, I briefly examined few existing fbdev drivers and documentation in Documentation/fb/. And it looks like there are no strict rules on that and actual behaviour varies: * some drivers treat (pixclock == 0) as "use defaults" (uvesafb.c); * some treat (pixclock == 0) as invalid value which leads to -EINVAL (clps711x-fb.c); * some pass converted pixclock value to hardware (uvesafb.c); * some are trying to find nearest value from predefined table (vga16fb.c, video_gx.c). Given this, I believe that it should be safe to just ignore this value if changing is not supported. It seems that any portable fbdev application which was not written only for one specific device working under one specific kernel version should not rely on any particular behaviour of pixclock anyway. However, while enabling SDL1 applications to work out of the box when there is no /etc/fb.modes with valid settings, this change affects the video mode choosing logic in SDL. Depending on current screen resolution, contents of /etc/fb.modes and resolution requested by application, this may lead to user-visible difference (not always): image will be displayed in a right way, but it will be aligned to the left instead of center. There is no "right behaviour" here as well, as emulated fbdev, opposing to old fbdev drivers, simply ignores any requsts of video mode changes with resolutions smaller than current. The easiest way to reproduce this problem is to install sdl-sopwith[2], remove /etc/fb.modes file if it exists, and then try to run sopwith from console without X. At least in Fedora 29, sopwith may be simply installed from standard repositories. [1] SDL 1.2.15 source code, src/video/fbcon/SDL_fbvideo.c, vesa_timings [2] http://sdl-sopwith.sourceforge.net/ Signed-off-by: Ivan Mironov Cc: stable@vger.kernel.org # 4.4.x Cc: stable@vger.kernel.org # 4.9.x Fixes: 79e539453b34e ("DRM: i915: add mode setting support") Fixes: 771fe6b912fca ("drm/radeon: introduce kernel modesetting for radeon hardware") Fixes: 785b93ef8c309 ("drm/kms: move driver specific fb common code to helper functions (v2)") Signed-off-by: Daniel Vetter Link: https://patchwork.freedesktop.org/patch/msgid/20190108072353.28078-3-mironov.ivan@gmail.com --- drivers/gpu/drm/drm_fb_helper.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) 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 || -- 2.20.1