From: Bibby Hsieh <bibby.hsieh@mediatek.com>
To: David Airlie <airlied@linux.ie>,
Matthias Brugger <matthias.bgg@gmail.com>,
Daniel Vetter <daniel.vetter@ffwll.ch>,
dri-devel@lists.freedesktop.org,
linux-mediatek@lists.infradead.org
Cc: linux-kernel@vger.kernel.org,
Cawa Cheng <cawa.cheng@mediatek.com>,
Mao Huang <littlecvr@chromium.org>,
Yingjoe Chen <yingjoe.chen@mediatek.com>,
Sascha Hauer <kernel@pengutronix.de>,
linux-arm-kernel@lists.infradead.org
Subject: [PATCH 2/7] drm/mediatek: plane: Remove plane zpos/index
Date: Fri, 29 Jul 2016 17:04:09 +0800 [thread overview]
Message-ID: <1469783054-54567-3-git-send-email-bibby.hsieh@mediatek.com> (raw)
In-Reply-To: <1469783054-54567-1-git-send-email-bibby.hsieh@mediatek.com>
From: Daniel Kurtz <djkurtz@chromium.org>
It is not actually useful to a mtk plane to know its zpos/index, so just
remove this field.
This let's us completely remove struct mtk_drm_plane in a follow up patch.
Signed-off-by: Daniel Kurtz <djkurtz@chromium.org>
Signed-off-by: Bibby Hsieh <bibby.hsieh@mediatek.com>
---
drivers/gpu/drm/mediatek/mtk_drm_crtc.c | 2 +-
drivers/gpu/drm/mediatek/mtk_drm_plane.c | 4 +---
drivers/gpu/drm/mediatek/mtk_drm_plane.h | 4 +---
3 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/drivers/gpu/drm/mediatek/mtk_drm_crtc.c b/drivers/gpu/drm/mediatek/mtk_drm_crtc.c
index 24aa3ba..18211ab 100644
--- a/drivers/gpu/drm/mediatek/mtk_drm_crtc.c
+++ b/drivers/gpu/drm/mediatek/mtk_drm_crtc.c
@@ -559,7 +559,7 @@ int mtk_drm_crtc_create(struct drm_device *drm_dev,
(zpos == 1) ? DRM_PLANE_TYPE_CURSOR :
DRM_PLANE_TYPE_OVERLAY;
ret = mtk_plane_init(drm_dev, &mtk_crtc->planes[zpos],
- BIT(pipe), type, zpos);
+ BIT(pipe), type);
if (ret)
goto unprepare;
}
diff --git a/drivers/gpu/drm/mediatek/mtk_drm_plane.c b/drivers/gpu/drm/mediatek/mtk_drm_plane.c
index 093db07..d28db57 100644
--- a/drivers/gpu/drm/mediatek/mtk_drm_plane.c
+++ b/drivers/gpu/drm/mediatek/mtk_drm_plane.c
@@ -189,8 +189,7 @@ static const struct drm_plane_helper_funcs mtk_plane_helper_funcs = {
};
int mtk_plane_init(struct drm_device *dev, struct mtk_drm_plane *mtk_plane,
- unsigned long possible_crtcs, enum drm_plane_type type,
- unsigned int zpos)
+ unsigned long possible_crtcs, enum drm_plane_type type)
{
int err;
@@ -203,7 +202,6 @@ int mtk_plane_init(struct drm_device *dev, struct mtk_drm_plane *mtk_plane,
}
drm_plane_helper_add(&mtk_plane->base, &mtk_plane_helper_funcs);
- mtk_plane->idx = zpos;
return 0;
}
diff --git a/drivers/gpu/drm/mediatek/mtk_drm_plane.h b/drivers/gpu/drm/mediatek/mtk_drm_plane.h
index 72a7b3e..74dbeda 100644
--- a/drivers/gpu/drm/mediatek/mtk_drm_plane.h
+++ b/drivers/gpu/drm/mediatek/mtk_drm_plane.h
@@ -20,7 +20,6 @@
struct mtk_drm_plane {
struct drm_plane base;
- unsigned int idx;
};
struct mtk_plane_pending_state {
@@ -53,7 +52,6 @@ to_mtk_plane_state(struct drm_plane_state *state)
}
int mtk_plane_init(struct drm_device *dev, struct mtk_drm_plane *mtk_plane,
- unsigned long possible_crtcs, enum drm_plane_type type,
- unsigned int zpos);
+ unsigned long possible_crtcs, enum drm_plane_type type);
#endif
--
1.7.9.5
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
next prev parent reply other threads:[~2016-07-29 9:04 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-07-29 9:04 [PATCH 0/7] drm/mediatek: cleaning up and refine Bibby Hsieh
2016-07-29 9:04 ` [PATCH 1/7] drm/mediatek: Remove mtk_drm_crtc_check_flush Bibby Hsieh
2016-07-29 9:04 ` Bibby Hsieh [this message]
2016-07-29 10:14 ` [PATCH 2/7] drm/mediatek: plane: Remove plane zpos/index CK Hu
2016-07-29 9:04 ` [PATCH 3/7] drm/mediatek: Remove mtk_drm_plane Bibby Hsieh
2016-07-29 9:04 ` [PATCH 4/7] drm/mediatek: Use drm_atomic destroy_state helpers Bibby Hsieh
2016-07-29 9:04 ` [PATCH 5/7] drm/mediatek: plane: Merge mtk_plane_enable into mtk_plane_atomic_update Bibby Hsieh
2016-08-02 17:02 ` Sean Paul
2016-08-02 17:04 ` Sean Paul
2016-08-03 1:32 ` Bibby Hsieh
2016-07-29 9:04 ` [PATCH 6/7] drm/mediatek: plane: Use FB's format's cpp to compute x offset Bibby Hsieh
2016-07-29 9:04 ` [PATCH 7/7] drm/mediatek: Fix mtk_atomic_complete for runtime_pm Bibby Hsieh
2016-08-01 15:17 ` [PATCH 0/7] drm/mediatek: cleaning up and refine 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=1469783054-54567-3-git-send-email-bibby.hsieh@mediatek.com \
--to=bibby.hsieh@mediatek.com \
--cc=airlied@linux.ie \
--cc=cawa.cheng@mediatek.com \
--cc=daniel.vetter@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
--cc=kernel@pengutronix.de \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mediatek@lists.infradead.org \
--cc=littlecvr@chromium.org \
--cc=matthias.bgg@gmail.com \
--cc=yingjoe.chen@mediatek.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: 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