From: Andrzej Hajda <a.hajda@samsung.com> To: dri-devel@lists.freedesktop.org (open list:DRM DRIVERS) Cc: Andrzej Hajda <a.hajda@samsung.com>, Marek Szyprowski <m.szyprowski@samsung.com>, David Airlie <airlied@linux.ie>, Inki Dae <inki.dae@samsung.com>, Joonyoung Shim <jy0922.shim@samsung.com>, Seung-Woo Kim <sw0312.kim@samsung.com>, Kyungmin Park <kyungmin.park@samsung.com>, Kukjin Kim <kgene.kim@samsung.com>, Daniel Vetter <daniel.vetter@intel.com>, Jani Nikula <jani.nikula@linux.intel.com>, dri-devel@lists.freedesktop.org (open list:DRM DRIVERS), linux-kernel@vger.kernel.org (open list), linux-samsung-soc@vger.kernel.org (moderated list:ARM/S5P EXYNOS AR...), intel-gfx@lists.freedesktop.org (open list:INTEL DRM DRIVERS...) Subject: [PATCH RFC 1/4] drm/i915: set PM callbacks only if modeset is turned off Date: Fri, 03 Oct 2014 10:24:10 +0200 [thread overview] Message-ID: <1412324653-30677-2-git-send-email-a.hajda@samsung.com> (raw) In-Reply-To: <1412324653-30677-1-git-send-email-a.hajda@samsung.com> Currently suspend and resume callbacks are called only if driver have modeset feature disabled. This patch moves the check directly to i915 driver, it will allow to remove the check from the core in the future. Signed-off-by: Andrzej Hajda <a.hajda@samsung.com> --- drivers/gpu/drm/i915/i915_drv.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c index 3870c73..481f62f 100644 --- a/drivers/gpu/drm/i915/i915_drv.c +++ b/drivers/gpu/drm/i915/i915_drv.c @@ -1617,10 +1617,6 @@ static struct drm_driver driver = { .postclose = i915_driver_postclose, .set_busid = drm_pci_set_busid, - /* Used in place of i915_pm_ops for non-DRIVER_MODESET */ - .suspend = i915_suspend, - .resume = i915_resume_legacy, - .device_is_agp = i915_driver_device_is_agp, .master_create = i915_master_create, .master_destroy = i915_master_destroy, @@ -1684,6 +1680,8 @@ static int __init i915_init(void) if (!(driver.driver_features & DRIVER_MODESET)) { driver.get_vblank_timestamp = NULL; + driver.suspend = i915_suspend; + driver.resume = i915_resume_legacy; #ifndef CONFIG_DRM_I915_UMS /* Silently fail loading to not upset userspace. */ DRM_DEBUG_DRIVER("KMS and UMS disabled.\n"); -- 1.9.1
WARNING: multiple messages have this Message-ID (diff)
From: Andrzej Hajda <a.hajda@samsung.com> Cc: Kukjin Kim <kgene.kim@samsung.com>, "open list:INTEL DRM DRIVERS..." <intel-gfx@lists.freedesktop.org>, Seung-Woo Kim <sw0312.kim@samsung.com>, open list <linux-kernel@vger.kernel.org>, Andrzej Hajda <a.hajda@samsung.com>, Kyungmin Park <kyungmin.park@samsung.com>, "moderated list:ARM/S5P EXYNOS AR..." <linux-samsung-soc@vger.kernel.org>, "open list:DRM DRIVERS" <dri-devel@lists.freedesktop.org>, Daniel Vetter <daniel.vetter@intel.com>, Marek Szyprowski <m.szyprowski@samsung.com> Subject: [PATCH RFC 1/4] drm/i915: set PM callbacks only if modeset is turned off Date: Fri, 03 Oct 2014 10:24:10 +0200 [thread overview] Message-ID: <1412324653-30677-2-git-send-email-a.hajda@samsung.com> (raw) In-Reply-To: <1412324653-30677-1-git-send-email-a.hajda@samsung.com> Currently suspend and resume callbacks are called only if driver have modeset feature disabled. This patch moves the check directly to i915 driver, it will allow to remove the check from the core in the future. Signed-off-by: Andrzej Hajda <a.hajda@samsung.com> --- drivers/gpu/drm/i915/i915_drv.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c index 3870c73..481f62f 100644 --- a/drivers/gpu/drm/i915/i915_drv.c +++ b/drivers/gpu/drm/i915/i915_drv.c @@ -1617,10 +1617,6 @@ static struct drm_driver driver = { .postclose = i915_driver_postclose, .set_busid = drm_pci_set_busid, - /* Used in place of i915_pm_ops for non-DRIVER_MODESET */ - .suspend = i915_suspend, - .resume = i915_resume_legacy, - .device_is_agp = i915_driver_device_is_agp, .master_create = i915_master_create, .master_destroy = i915_master_destroy, @@ -1684,6 +1680,8 @@ static int __init i915_init(void) if (!(driver.driver_features & DRIVER_MODESET)) { driver.get_vblank_timestamp = NULL; + driver.suspend = i915_suspend; + driver.resume = i915_resume_legacy; #ifndef CONFIG_DRM_I915_UMS /* Silently fail loading to not upset userspace. */ DRM_DEBUG_DRIVER("KMS and UMS disabled.\n"); -- 1.9.1
next prev parent reply other threads:[~2014-10-03 8:26 UTC|newest] Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top 2014-10-03 8:24 [PATCH RFC 0/4] drm/core: restore suspend/resume calbacks in KMS drm drivers Andrzej Hajda 2014-10-03 8:24 ` Andrzej Hajda 2014-10-03 8:24 ` Andrzej Hajda [this message] 2014-10-03 8:24 ` [PATCH RFC 1/4] drm/i915: set PM callbacks only if modeset is turned off Andrzej Hajda 2014-10-03 8:24 ` [PATCH RFC 2/4] drm/core: re-enable suspend/resume callbacks for KMS drivers Andrzej Hajda 2014-10-03 8:24 ` Andrzej Hajda 2014-10-03 8:24 ` [PATCH RFC 3/4] drm/exynos: remove master component PM callbacks Andrzej Hajda 2014-10-03 8:24 ` Andrzej Hajda 2014-10-03 8:24 ` [PATCH RFC 4/4] drm/exynos: correct connector->dpms field before resuming Andrzej Hajda 2014-10-03 8:24 ` Andrzej Hajda 2014-10-03 8:31 ` [PATCH RFC 0/4] drm/core: restore suspend/resume calbacks in KMS drm drivers Daniel Vetter 2014-10-03 8:31 ` Daniel Vetter 2014-10-03 9:42 ` Andrzej Hajda 2014-10-03 9:42 ` Andrzej Hajda 2014-10-03 11:39 ` Daniel Vetter 2014-10-03 11:39 ` Daniel Vetter 2014-10-03 15:22 ` Russell King - ARM Linux 2014-10-03 15:22 ` Russell King - ARM Linux
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1412324653-30677-2-git-send-email-a.hajda@samsung.com \ --to=a.hajda@samsung.com \ --cc=airlied@linux.ie \ --cc=daniel.vetter@intel.com \ --cc=dri-devel@lists.freedesktop.org \ --cc=inki.dae@samsung.com \ --cc=intel-gfx@lists.freedesktop.org \ --cc=jani.nikula@linux.intel.com \ --cc=jy0922.shim@samsung.com \ --cc=kgene.kim@samsung.com \ --cc=kyungmin.park@samsung.com \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-samsung-soc@vger.kernel.org \ --cc=m.szyprowski@samsung.com \ --cc=sw0312.kim@samsung.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.