From patchwork Mon Nov 12 17:32:45 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Ville Syrjala X-Patchwork-Id: 1729431 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by patchwork2.kernel.org (Postfix) with ESMTP id 86836DFE80 for ; Mon, 12 Nov 2012 17:41:39 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 71D469F364 for ; Mon, 12 Nov 2012 09:41:39 -0800 (PST) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTP id 596299F0BA for ; Mon, 12 Nov 2012 09:33:33 -0800 (PST) Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga101.jf.intel.com with ESMTP; 12 Nov 2012 09:33:32 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.80,764,1344236400"; d="scan'208";a="218381142" Received: from stinkbox.fi.intel.com (HELO stinkbox) ([10.237.72.168]) by orsmga001.jf.intel.com with SMTP; 12 Nov 2012 09:33:27 -0800 Received: by stinkbox (sSMTP sendmail emulation); Mon, 12 Nov 2012 19:33:26 +0200 From: ville.syrjala@linux.intel.com To: dri-devel@lists.freedesktop.org Subject: [PATCH 07/22] drm/i915: Update CRTC properties after modeset Date: Mon, 12 Nov 2012 19:32:45 +0200 Message-Id: <1352741580-12141-8-git-send-email-ville.syrjala@linux.intel.com> X-Mailer: git-send-email 1.7.8.6 In-Reply-To: <1352741580-12141-1-git-send-email-ville.syrjala@linux.intel.com> References: <1352741580-12141-1-git-send-email-ville.syrjala@linux.intel.com> MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: dri-devel-bounces+patchwork-dri-devel=patchwork.kernel.org@lists.freedesktop.org Errors-To: dri-devel-bounces+patchwork-dri-devel=patchwork.kernel.org@lists.freedesktop.org From: Ville Syrjälä Update cursor related CRTC properties after a modeset. The cursor properties aren't handled by the drm core since not all CRTCs have cursors. Signed-off-by: Ville Syrjälä --- drivers/gpu/drm/i915/intel_display.c | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 958b21b..12d4e02 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -5802,6 +5802,8 @@ static int intel_crtc_cursor_set(struct drm_crtc *crtc, if (old_obj) intel_crtc_cursor_bo_unref(crtc, old_obj); + intel_crtc_update_properties(crtc); + return 0; } @@ -5814,6 +5816,8 @@ static int intel_crtc_cursor_move(struct drm_crtc *crtc, int x, int y) intel_crtc_update_cursor(crtc, true); + intel_crtc_update_properties(crtc); + return 0; } @@ -6763,6 +6767,8 @@ static int intel_crtc_page_flip(struct drm_crtc *crtc, trace_i915_flip_request(intel_crtc->plane, obj); + intel_crtc_update_properties(crtc); + return 0; cleanup_pending: @@ -7490,6 +7496,7 @@ next_encoder: static int intel_crtc_set_config(struct drm_mode_set *set) { struct drm_device *dev; + struct drm_crtc *crtc; struct drm_mode_set save_set; struct intel_set_config *config; int ret; @@ -7563,6 +7570,10 @@ static int intel_crtc_set_config(struct drm_mode_set *set) intel_set_config_free(config); + /* changes in one CRTC can affect the others */ + list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) + intel_crtc_update_properties(crtc); + return 0; fail: @@ -7574,6 +7585,10 @@ fail: save_set.x, save_set.y, save_set.fb)) DRM_ERROR("failed to restore config after modeset failure\n"); + /* changes in one CRTC can affect the others */ + list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) + intel_crtc_update_properties(crtc); + out_config: intel_set_config_free(config); return ret;