From patchwork Mon May 5 18:14:02 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: sagar.a.kamble@intel.com X-Patchwork-Id: 4116601 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 6A4BB9F23C for ; Mon, 5 May 2014 18:13:28 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id A89B32021A for ; Mon, 5 May 2014 18:13:27 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id C5EC320149 for ; Mon, 5 May 2014 18:13:25 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 552D16E059; Mon, 5 May 2014 11:13:25 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by gabe.freedesktop.org (Postfix) with ESMTP id 527836E059 for ; Mon, 5 May 2014 11:13:24 -0700 (PDT) Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga101.fm.intel.com with ESMTP; 05 May 2014 11:13:24 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.97,990,1389772800"; d="scan'208";a="526354911" Received: from sagar-desktop.iind.intel.com ([10.223.82.31]) by fmsmga001.fm.intel.com with ESMTP; 05 May 2014 11:13:20 -0700 From: sagar.a.kamble@intel.com To: intel-gfx@lists.freedesktop.org Date: Mon, 5 May 2014 23:44:02 +0530 Message-Id: <1399313644-31625-2-git-send-email-sagar.a.kamble@intel.com> X-Mailer: git-send-email 1.8.5 In-Reply-To: <1399313644-31625-1-git-send-email-sagar.a.kamble@intel.com> References: <1399313644-31625-1-git-send-email-sagar.a.kamble@intel.com> Cc: ankitprasad.r.sharma@intel.com, daniel.vetter@ffwll.ch, shashidhar.hiremath@intel.com, vandita.kulkarni@intel.com, Sagar Kamble Subject: [Intel-gfx] [PATCH v1 1/3] drm/i915: Add set_property function for planes X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Spam-Status: No, score=-4.8 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Sagar Kamble Cc: daniel.vetter@ffwll.ch Cc: jani.nikula@linux.intel.com Cc: ville.syrjala@linux.intel.com Cc: indranil.mukherjee@intel.com Cc: shashidhar.hiremath@intel.com Cc: vandita.kulkarni@intel.com Cc: vijay.a.purushothaman@intel.com Cc: ankitprasad.r.sharma@intel.com Signed-off-by: Sagar Kamble --- drivers/gpu/drm/i915/i915_dma.c | 2 ++ drivers/gpu/drm/i915/intel_sprite.c | 9 +++++++++ 2 files changed, 11 insertions(+) diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c index 96177ee..191c5e6 100644 --- a/drivers/gpu/drm/i915/i915_dma.c +++ b/drivers/gpu/drm/i915/i915_dma.c @@ -1903,6 +1903,8 @@ void i915_driver_lastclose(struct drm_device * dev) if (!dev_priv) return; + /* Restore drm properties if any to their default values */ + if (drm_core_check_feature(dev, DRIVER_MODESET)) { intel_fbdev_restore_mode(dev); vga_switcheroo_process_delayed_switch(); diff --git a/drivers/gpu/drm/i915/intel_sprite.c b/drivers/gpu/drm/i915/intel_sprite.c index 9436f18..c46e18d 100644 --- a/drivers/gpu/drm/i915/intel_sprite.c +++ b/drivers/gpu/drm/i915/intel_sprite.c @@ -1011,6 +1011,14 @@ out_unlock: return ret; } +static int intel_plane_set_property(struct drm_plane *plane, + struct drm_property *prop, + uint64_t val) +{ + int ret = -EINVAL; + return ret; +} + int intel_plane_restore(struct drm_plane *plane) { struct intel_plane *intel_plane = to_intel_plane(plane); @@ -1037,6 +1045,7 @@ static const struct drm_plane_funcs intel_plane_funcs = { .update_plane = intel_update_plane, .disable_plane = intel_disable_plane, .destroy = intel_destroy_plane, + .set_property = intel_plane_set_property, }; static uint32_t ilk_plane_formats[] = {