* [GIT PULL] msm drm update for component changes
@ 2014-07-09 9:34 Russell King
2014-07-09 10:56 ` Rob Clark
2014-07-22 8:51 ` Russell King
0 siblings, 2 replies; 5+ messages in thread
From: Russell King @ 2014-07-09 9:34 UTC (permalink / raw)
To: linux-arm-kernel
David,
Please incorporate the latest msm drm update for component changes, which can be found at:
git://ftp.arm.linux.org.uk/~rmk/linux-arm.git component-for-drm
with SHA1 84448288546d13d7e06fd6638fb78ddff559b399.
This updates the MSM's DRM driver for the updates merged in Greg's
driver-core tree, converting MSM to use the pre-declared array of
matches rather than walking the device tree each time we try to bind.
This will update the following files:
drivers/base/component.c | 192 ++++++++++++++++++++++++++++++++++--------
drivers/gpu/drm/msm/msm_drv.c | 83 ++++++++----------
include/linux/component.h | 7 ++
3 files changed, 199 insertions(+), 83 deletions(-)
through these changes:
Russell King (5):
component: fix missed cleanup in case of devres failure
component: ignore multiple additions of the same component
component: add support for component match array
component: fix bug with legacy API
drm: msm: update to use component match support
Many thanks.
^ permalink raw reply [flat|nested] 5+ messages in thread* [GIT PULL] msm drm update for component changes 2014-07-09 9:34 [GIT PULL] msm drm update for component changes Russell King @ 2014-07-09 10:56 ` Rob Clark 2014-07-09 12:26 ` Russell King - ARM Linux 2014-07-22 8:51 ` Russell King 1 sibling, 1 reply; 5+ messages in thread From: Rob Clark @ 2014-07-09 10:56 UTC (permalink / raw) To: linux-arm-kernel On Wed, Jul 9, 2014 at 5:34 AM, Russell King <rmk@arm.linux.org.uk> wrote: > David, > > Please incorporate the latest msm drm update for component changes, which can be found at: > > git://ftp.arm.linux.org.uk/~rmk/linux-arm.git component-for-drm > > with SHA1 84448288546d13d7e06fd6638fb78ddff559b399. > > This updates the MSM's DRM driver for the updates merged in Greg's > driver-core tree, converting MSM to use the pre-declared array of > matches rather than walking the device tree each time we try to bind. Hey Russell, do you want me to take this for my v3.17 pull req? I expect there will be some minor conflicts with the DT support I'm working on at the moment. Or does this need to be applied together with the rest of the series? In which case, maybe it should go first, and then I'd rebase msm-next on top. BR, -R > This will update the following files: > > drivers/base/component.c | 192 ++++++++++++++++++++++++++++++++++-------- > drivers/gpu/drm/msm/msm_drv.c | 83 ++++++++---------- > include/linux/component.h | 7 ++ > 3 files changed, 199 insertions(+), 83 deletions(-) > > through these changes: > > Russell King (5): > component: fix missed cleanup in case of devres failure > component: ignore multiple additions of the same component > component: add support for component match array > component: fix bug with legacy API > drm: msm: update to use component match support > > Many thanks. ^ permalink raw reply [flat|nested] 5+ messages in thread
* [GIT PULL] msm drm update for component changes 2014-07-09 10:56 ` Rob Clark @ 2014-07-09 12:26 ` Russell King - ARM Linux 2014-07-09 13:28 ` Rob Clark 0 siblings, 1 reply; 5+ messages in thread From: Russell King - ARM Linux @ 2014-07-09 12:26 UTC (permalink / raw) To: linux-arm-kernel On Wed, Jul 09, 2014 at 06:56:14AM -0400, Rob Clark wrote: > On Wed, Jul 9, 2014 at 5:34 AM, Russell King <rmk@arm.linux.org.uk> wrote: > > David, > > > > Please incorporate the latest msm drm update for component changes, which can be found at: > > > > git://ftp.arm.linux.org.uk/~rmk/linux-arm.git component-for-drm > > > > with SHA1 84448288546d13d7e06fd6638fb78ddff559b399. > > > > This updates the MSM's DRM driver for the updates merged in Greg's > > driver-core tree, converting MSM to use the pre-declared array of > > matches rather than walking the device tree each time we try to bind. > > Hey Russell, do you want me to take this for my v3.17 pull req? I > expect there will be some minor conflicts with the DT support I'm > working on at the moment. > > Or does this need to be applied together with the rest of the series? > In which case, maybe it should go first, and then I'd rebase msm-next > on top. The patch for MSM is dependent on the component changes, which have already been merged by Greg for the driver-core tree. I don't have anything following this, so if you instead want to merge my component-for-driver branch (which is what Greg's pulled, which is a sub-set of this pull), and then add this patch on top of your development, that's fine too. The only reason it's a pull request and not a single patch is to ensure that the previous component commits don't end up being duplicated with different commit IDs across several trees by being applied independently as patches (which can end up causing unnecessary git conflicts.) -- FTTC broadband for 0.8mile line: now at 9.5Mbps down 400kbps up. ^ permalink raw reply [flat|nested] 5+ messages in thread
* [GIT PULL] msm drm update for component changes 2014-07-09 12:26 ` Russell King - ARM Linux @ 2014-07-09 13:28 ` Rob Clark 0 siblings, 0 replies; 5+ messages in thread From: Rob Clark @ 2014-07-09 13:28 UTC (permalink / raw) To: linux-arm-kernel On Wed, Jul 9, 2014 at 8:26 AM, Russell King - ARM Linux <linux@arm.linux.org.uk> wrote: > On Wed, Jul 09, 2014 at 06:56:14AM -0400, Rob Clark wrote: >> On Wed, Jul 9, 2014 at 5:34 AM, Russell King <rmk@arm.linux.org.uk> wrote: >> > David, >> > >> > Please incorporate the latest msm drm update for component changes, which can be found at: >> > >> > git://ftp.arm.linux.org.uk/~rmk/linux-arm.git component-for-drm >> > >> > with SHA1 84448288546d13d7e06fd6638fb78ddff559b399. >> > >> > This updates the MSM's DRM driver for the updates merged in Greg's >> > driver-core tree, converting MSM to use the pre-declared array of >> > matches rather than walking the device tree each time we try to bind. >> >> Hey Russell, do you want me to take this for my v3.17 pull req? I >> expect there will be some minor conflicts with the DT support I'm >> working on at the moment. >> >> Or does this need to be applied together with the rest of the series? >> In which case, maybe it should go first, and then I'd rebase msm-next >> on top. > > The patch for MSM is dependent on the component changes, which have > already been merged by Greg for the driver-core tree. I don't have > anything following this, so if you instead want to merge my > component-for-driver branch (which is what Greg's pulled, which is a > sub-set of this pull), and then add this patch on top of your > development, that's fine too. ok, it sounds like it is probably easiest for Dave to take your pull req after drm-next picks up the driver-core updates? anyways, if needed, I can coordinate with Dave about that. Sounds easiest if I rebase my stuff on top of that before sending my pull req for 3.17. > The only reason it's a pull request and not a single patch is to ensure > that the previous component commits don't end up being duplicated with > different commit IDs across several trees by being applied independently > as patches (which can end up causing unnecessary git conflicts.) sure, no prob about a pull-req.. just wanted to sort out what order things get merged in BR, -R > -- > FTTC broadband for 0.8mile line: now at 9.5Mbps down 400kbps up. ^ permalink raw reply [flat|nested] 5+ messages in thread
* [GIT PULL] msm drm update for component changes 2014-07-09 9:34 [GIT PULL] msm drm update for component changes Russell King 2014-07-09 10:56 ` Rob Clark @ 2014-07-22 8:51 ` Russell King 1 sibling, 0 replies; 5+ messages in thread From: Russell King @ 2014-07-22 8:51 UTC (permalink / raw) To: linux-arm-kernel On Wed, Jul 09, 2014 at 10:34:58AM +0100, Russell King wrote: > David, > > Please incorporate the latest msm drm update for component changes, which can be found at: > > git://ftp.arm.linux.org.uk/~rmk/linux-arm.git component-for-drm Ping? > > with SHA1 84448288546d13d7e06fd6638fb78ddff559b399. > > This updates the MSM's DRM driver for the updates merged in Greg's > driver-core tree, converting MSM to use the pre-declared array of > matches rather than walking the device tree each time we try to bind. > > This will update the following files: > > drivers/base/component.c | 192 ++++++++++++++++++++++++++++++++++-------- > drivers/gpu/drm/msm/msm_drv.c | 83 ++++++++---------- > include/linux/component.h | 7 ++ > 3 files changed, 199 insertions(+), 83 deletions(-) > > through these changes: > > Russell King (5): > component: fix missed cleanup in case of devres failure > component: ignore multiple additions of the same component > component: add support for component match array > component: fix bug with legacy API > drm: msm: update to use component match support > > Many thanks. ^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2014-07-22 8:51 UTC | newest] Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2014-07-09 9:34 [GIT PULL] msm drm update for component changes Russell King 2014-07-09 10:56 ` Rob Clark 2014-07-09 12:26 ` Russell King - ARM Linux 2014-07-09 13:28 ` Rob Clark 2014-07-22 8:51 ` Russell King
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).