From: Sean Paul <seanpaul@chromium.org>
To: dri-devel@lists.freedesktop.org, inki.dae@samsung.com
Cc: marcheu@chromium.org
Subject: [PATCH v3 10/32] drm/exynos: Don't keep dpms state in encoder
Date: Tue, 29 Oct 2013 12:12:56 -0400 [thread overview]
Message-ID: <1383063198-10526-11-git-send-email-seanpaul@chromium.org> (raw)
In-Reply-To: <1383063198-10526-1-git-send-email-seanpaul@chromium.org>
This patch removes the dpms state tracking in encoder. This
state is at best confusing and at worst incorrect since the display
drivers can turn on and off without propagating the value.
Signed-off-by: Sean Paul <seanpaul@chromium.org>
---
Changes in v2: None
Changes in v3: None
drivers/gpu/drm/exynos/exynos_drm_encoder.c | 17 -----------------
1 file changed, 17 deletions(-)
diff --git a/drivers/gpu/drm/exynos/exynos_drm_encoder.c b/drivers/gpu/drm/exynos/exynos_drm_encoder.c
index 5bf1e1e..a823d53 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_encoder.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_encoder.c
@@ -28,32 +28,22 @@
* @drm_encoder: encoder object.
* @manager: specific encoder has its own manager to control a hardware
* appropriately and we can access a hardware drawing on this manager.
- * @dpms: store the encoder dpms value.
*/
struct exynos_drm_encoder {
struct drm_crtc *old_crtc;
struct drm_encoder drm_encoder;
struct exynos_drm_manager *manager;
- int dpms;
};
static void exynos_drm_encoder_dpms(struct drm_encoder *encoder, int mode)
{
struct exynos_drm_manager *manager = exynos_drm_get_manager(encoder);
- struct exynos_drm_encoder *exynos_encoder = to_exynos_encoder(encoder);
struct exynos_drm_display_ops *display_ops = manager->display_ops;
DRM_DEBUG_KMS("encoder dpms: %d\n", mode);
- if (exynos_encoder->dpms == mode) {
- DRM_DEBUG_KMS("desired dpms mode is same as previous one.\n");
- return;
- }
-
if (display_ops && display_ops->dpms)
display_ops->dpms(manager->ctx, mode);
-
- exynos_encoder->dpms = mode;
}
static bool
@@ -157,12 +147,6 @@ static void exynos_drm_encoder_commit(struct drm_encoder *encoder)
if (manager_ops && manager_ops->commit)
manager_ops->commit(manager);
-
- /*
- * In case of setcrtc, there is no way to update encoder's dpms
- * so update it here.
- */
- exynos_encoder->dpms = DRM_MODE_DPMS_ON;
}
void exynos_drm_encoder_complete_scanout(struct drm_framebuffer *fb)
@@ -281,7 +265,6 @@ exynos_drm_encoder_create(struct drm_device *dev,
if (!exynos_encoder)
return NULL;
- exynos_encoder->dpms = DRM_MODE_DPMS_OFF;
exynos_encoder->manager = manager;
encoder = &exynos_encoder->drm_encoder;
encoder->possible_crtcs = possible_crtcs;
--
1.8.4
next prev parent reply other threads:[~2013-10-29 16:13 UTC|newest]
Thread overview: 124+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-10-29 16:12 [PATCH v3 00/32] drm/exynos: Refactor parts of the exynos driver Sean Paul
2013-10-29 16:12 ` [PATCH v3 01/32] drm/exynos: Remove useless slab.h include Sean Paul
2013-10-31 10:24 ` Inki Dae
2013-10-31 23:32 ` Tomasz Figa
2013-10-29 16:12 ` [PATCH v3 02/32] drm/exynos: Merge overlay_ops into manager_ops Sean Paul
2013-10-31 23:39 ` Tomasz Figa
2013-11-01 19:50 ` Sean Paul
2013-11-01 19:55 ` Tomasz Figa
2013-11-04 7:44 ` Inki Dae
2013-10-29 16:12 ` [PATCH v3 03/32] drm/exynos: Add an initialize function to manager and display Sean Paul
2013-10-31 23:42 ` Tomasz Figa
2013-10-29 16:12 ` [PATCH v3 04/32] drm/exynos: Use manager_op initialize in fimd Sean Paul
2013-10-31 23:49 ` Tomasz Figa
2013-11-01 19:51 ` Sean Paul
2013-11-01 19:57 ` Tomasz Figa
2013-10-29 16:12 ` [PATCH v3 05/32] drm/exynos: hdmi: Implement initialize op for hdmi Sean Paul
2013-10-31 23:53 ` Tomasz Figa
2013-11-01 19:54 ` Sean Paul
2013-11-01 19:56 ` Tomasz Figa
2013-11-01 20:08 ` Sean Paul
2013-10-29 16:12 ` [PATCH v3 06/32] drm/exynos: Pass exynos_drm_manager in manager ops instead of dev Sean Paul
2013-11-01 0:19 ` Tomasz Figa
2013-11-01 20:01 ` Sean Paul
2013-11-01 20:11 ` Tomasz Figa
2013-10-29 16:12 ` [PATCH v3 07/32] drm/exynos: Remove apply manager callback Sean Paul
2013-11-08 21:05 ` Tomasz Figa
2013-10-29 16:12 ` [PATCH v3 08/32] drm/exynos: Remove dpms link between encoder/connector Sean Paul
2013-11-08 21:45 ` Tomasz Figa
2013-10-29 16:12 ` [PATCH v3 09/32] drm/exynos: Rename display_op power_on to dpms Sean Paul
2013-11-08 22:09 ` Tomasz Figa
2013-10-29 16:12 ` Sean Paul [this message]
2013-11-10 20:47 ` [PATCH v3 10/32] drm/exynos: Don't keep dpms state in encoder Tomasz Figa
2013-10-29 16:12 ` [PATCH v3 11/32] drm/exynos: Use unsigned long for possible_crtcs Sean Paul
2013-11-10 20:47 ` Tomasz Figa
2013-10-29 16:12 ` [PATCH v3 12/32] drm/exynos: Split manager/display/subdrv Sean Paul
2013-10-31 10:30 ` Inki Dae
2013-10-31 16:08 ` Sean Paul
2013-11-01 4:20 ` Inki Dae
2013-11-10 21:09 ` Tomasz Figa
2013-11-12 17:51 ` Sean Paul
2013-11-12 18:35 ` Tomasz Figa
2013-11-26 18:00 ` Olof Johansson
2013-11-27 10:04 ` Thierry Reding
2013-11-28 23:04 ` Tomasz Figa
2013-11-29 7:52 ` Daniel Vetter
2013-11-29 9:10 ` Tomasz Figa
2013-11-29 10:25 ` Daniel Vetter
2013-11-29 14:13 ` Rob Clark
2013-11-29 17:05 ` Tomasz Figa
2013-11-29 18:35 ` Rob Clark
2013-11-30 5:25 ` Inki Dae
2013-12-03 21:38 ` Sean Paul
2013-11-29 10:16 ` Thierry Reding
2013-10-29 16:12 ` [PATCH v3 13/32] drm/exynos: hdmi: remove the i2c drivers and use devtree Sean Paul
2013-11-10 20:46 ` Tomasz Figa
2013-11-11 8:44 ` Thierry Reding
2013-11-28 13:30 ` Tomasz Figa
2013-11-29 10:24 ` Thierry Reding
2013-12-03 0:37 ` Olof Johansson
2013-10-29 16:13 ` [PATCH v3 14/32] drm/exynos: Remove exynos_drm_hdmi shim Sean Paul
2013-11-10 21:24 ` Tomasz Figa
2013-10-29 16:13 ` [PATCH v3 15/32] drm/exynos: Use drm_mode_copy to copy modes Sean Paul
2013-11-10 21:27 ` Tomasz Figa
2013-10-29 16:13 ` [PATCH v3 16/32] drm/exynos: Disable unused crtc planes from crtc Sean Paul
2013-11-10 21:29 ` Tomasz Figa
2013-10-29 16:13 ` [PATCH v3 17/32] drm/exynos: Add mode_set manager operation Sean Paul
2013-11-10 21:31 ` Tomasz Figa
2013-10-29 16:13 ` [PATCH v3 18/32] drm/exynos: Implement mode_fixup " Sean Paul
2013-11-10 21:33 ` Tomasz Figa
2013-10-29 16:13 ` [PATCH v3 19/32] drm/exynos: Use mode_set to configure fimd Sean Paul
2013-11-10 22:03 ` Tomasz Figa
2013-11-15 13:49 ` Daniel Kurtz
2013-11-15 13:53 ` Daniel Kurtz
2013-11-28 22:57 ` Tomasz Figa
2013-12-04 22:37 ` Sean Paul
2013-10-29 16:13 ` [PATCH v3 20/32] drm/exynos: Remove unused/useless fimd_context members Sean Paul
2013-11-11 1:19 ` Tomasz Figa
2013-10-29 16:13 ` [PATCH v3 21/32] drm/exynos: Move dp driver from video/ to drm/ Sean Paul
2013-10-31 10:46 ` Inki Dae
2013-10-31 16:05 ` Sean Paul
2013-10-31 23:06 ` Jingoo Han
2013-10-31 23:11 ` Tomasz Figa
2013-10-31 23:23 ` Jingoo Han
2013-10-31 23:27 ` Tomasz Figa
2013-10-31 23:55 ` Jingoo Han
2013-11-01 0:01 ` Tomasz Figa
[not found] ` <3513711.0qTZKxmOZX@flatron>
2013-12-04 23:07 ` Sean Paul
2013-10-29 16:13 ` [PATCH v3 22/32] drm/exynos: Move display implementation into dp Sean Paul
[not found] ` <1383063198-10526-23-git-send-email-seanpaul-F7+t8E8rja9g9hUCZPvPmw@public.gmane.org>
2013-11-11 1:53 ` Tomasz Figa
2013-10-29 16:13 ` [PATCH v3 23/32] ARM: dts: Move display-timings node from fimd to dp Sean Paul
2013-10-29 16:13 ` [PATCH v3 24/32] drm/exynos: Implement dpms display callback in DP Sean Paul
2013-11-11 2:04 ` Tomasz Figa
2013-10-29 16:13 ` [PATCH v3 25/32] drm/exynos: Clean up FIMD power on/off routines Sean Paul
2013-10-31 10:54 ` Inki Dae
[not found] ` <1630995.NnKzZB9Rl5@flatron>
2013-11-11 4:08 ` Inki Dae
2013-11-11 2:09 ` Tomasz Figa
2013-10-29 16:13 ` [PATCH v3 26/32] drm/exynos: Consolidate suspend/resume in drm_drv Sean Paul
2013-11-29 14:58 ` Tomasz Figa
2013-12-19 16:48 ` Inki Dae
2013-10-29 16:13 ` [PATCH v3 27/32] drm/exynos: Add create_connector callback Sean Paul
2013-11-11 2:19 ` Tomasz Figa
2013-12-03 5:01 ` Inki Dae
2013-10-29 16:13 ` [PATCH v3 28/32] drm/exynos: Implement drm_connector in hdmi directly Sean Paul
2013-11-29 15:58 ` Tomasz Figa
2013-12-02 9:46 ` Thierry Reding
2013-12-02 9:54 ` Tomasz Figa
2013-10-29 16:13 ` [PATCH v3 29/32] drm/exynos: Implement drm_connector directly in dp driver Sean Paul
2013-11-29 16:04 ` Tomasz Figa
2013-12-03 4:45 ` Inki Dae
2013-12-04 6:46 ` Inki Dae
2013-10-29 16:13 ` [PATCH v3 30/32] drm/exynos: Implement drm_connector directly in vidi driver Sean Paul
2013-11-29 16:13 ` Tomasz Figa
2013-12-03 4:47 ` Inki Dae
2013-12-04 6:47 ` Inki Dae
2013-10-29 16:13 ` [PATCH v3 31/32] drm/exynos: Move lvds bridge discovery into DP driver Sean Paul
2013-11-29 16:55 ` Tomasz Figa
2013-11-30 5:18 ` Inki Dae
2013-11-30 12:27 ` Tomasz Figa
2013-10-29 16:13 ` [PATCH v3 32/32] drm/exynos: Remove the exynos_drm_connector shim Sean Paul
2013-11-29 16:14 ` Tomasz Figa
2013-11-07 5:48 ` [PATCH v3 00/32] drm/exynos: Refactor parts of the exynos driver Inki Dae
2013-11-07 18:20 ` Sean Paul
2013-11-08 21:01 ` Tomasz Figa
2013-11-08 21:22 ` Sean Paul
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=1383063198-10526-11-git-send-email-seanpaul@chromium.org \
--to=seanpaul@chromium.org \
--cc=dri-devel@lists.freedesktop.org \
--cc=inki.dae@samsung.com \
--cc=marcheu@chromium.org \
/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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).