From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932468Ab0JLMu4 (ORCPT ); Tue, 12 Oct 2010 08:50:56 -0400 Received: from mail.windriver.com ([147.11.1.11]:45043 "EHLO mail.windriver.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932389Ab0JLMun (ORCPT ); Tue, 12 Oct 2010 08:50:43 -0400 From: Jason Wessel To: airlied@linux.ie Cc: jbarnes@virtuousgeek.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Jason Wessel Subject: [PATCH 4/5] kdb,kms: Save and restore the LUT on atomic KMS enter/exit Date: Tue, 12 Oct 2010 07:50:00 -0500 Message-Id: <1286887801-8179-5-git-send-email-jason.wessel@windriver.com> X-Mailer: git-send-email 1.6.4.rc1 In-Reply-To: <1286887801-8179-1-git-send-email-jason.wessel@windriver.com> References: <1286887801-8179-1-git-send-email-jason.wessel@windriver.com> X-OriginalArrivalTime: 12 Oct 2010 12:50:32.0844 (UTC) FILETIME=[0EAB24C0:01CB6A0C] Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org When changing VTs non-atomically the kernel works in conjunction with the Xserver in user space and receives the LUT information from the Xserver via a system call. When changing modes atomically for kdb, this information must be saved and restored without disturbing user space as if nothing ever happened. There is a short cut used by this patch where gamma_store is used as the save space. If this turns out to be a problem in the future a pre-allocated chunk of memory will be required for each crtc to save and restore the LUT information. Signed-off-by: Jason Wessel CC: Jesse Barnes CC: David Airlie CC: dri-devel@lists.freedesktop.org --- drivers/gpu/drm/drm_fb_helper.c | 32 +++++++++++++++++++++++++++++++- 1 files changed, 31 insertions(+), 1 deletions(-) diff --git a/drivers/gpu/drm/drm_fb_helper.c b/drivers/gpu/drm/drm_fb_helper.c index 625a2d5..bec6b8c 100644 --- a/drivers/gpu/drm/drm_fb_helper.c +++ b/drivers/gpu/drm/drm_fb_helper.c @@ -242,6 +242,34 @@ static int drm_fb_helper_parse_command_line(struct drm_fb_helper *fb_helper) return 0; } +static void drm_fb_helper_save_lut_atomic(struct drm_crtc *crtc, struct drm_fb_helper *helper) +{ + int size; + uint16_t *r_base, *g_base, *b_base; + int i; + + size = crtc->gamma_size * (sizeof(uint16_t)); + r_base = crtc->gamma_store; + g_base = r_base + size; + b_base = g_base + size; + + for (i = 0; i < size; i++) + helper->funcs->gamma_get(crtc, &r_base[i], &g_base[i], &b_base[i], i); +} + +static void drm_fb_helper_restore_lut_atomic(struct drm_crtc *crtc) +{ + int size; + uint16_t *r_base, *g_base, *b_base; + + size = crtc->gamma_size * (sizeof(uint16_t)); + r_base = crtc->gamma_store; + g_base = r_base + size; + b_base = g_base + size; + + crtc->funcs->gamma_set(crtc, r_base, g_base, b_base, 0, size); +} + int drm_fb_helper_debug_enter(struct fb_info *info) { struct drm_fb_helper *helper = info->par; @@ -260,12 +288,13 @@ int drm_fb_helper_debug_enter(struct fb_info *info) continue; funcs = mode_set->crtc->helper_private; + + drm_fb_helper_save_lut_atomic(mode_set->crtc, helper); funcs->mode_set_base_atomic(mode_set->crtc, mode_set->fb, mode_set->x, mode_set->y, 1); - } } @@ -309,6 +338,7 @@ int drm_fb_helper_debug_leave(struct fb_info *info) continue; } + drm_fb_helper_restore_lut_atomic(mode_set->crtc); funcs->mode_set_base_atomic(mode_set->crtc, fb, crtc->x, crtc->y, 0); } -- 1.6.3.3