summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrancisco Jerez <currojerez@riseup.net>2010-07-22 17:07:38 +0200
committerDave Airlie <airlied@redhat.com>2010-08-05 09:37:45 +1000
commita1e09b62592eb57e25f8d076ffa5b7bef18be812 (patch)
treefb8ec34351322f3735d9eb892ce9a4f80452193b
parentfca3ec01e0b40cab82cac7745e154b01969e6219 (diff)
downloadlinux-3.10-a1e09b62592eb57e25f8d076ffa5b7bef18be812.tar.gz
linux-3.10-a1e09b62592eb57e25f8d076ffa5b7bef18be812.tar.bz2
linux-3.10-a1e09b62592eb57e25f8d076ffa5b7bef18be812.zip
drm/kms: Simplify setup of the initial I2C encoder config.
In most use cases the driver will be using the same static config all the time: interpreting i2c_board_info::platform_data as the default config we can can save the GPU driver a redundant set_config() call. Signed-off-by: Francisco Jerez <currojerez@riseup.net> Signed-off-by: Dave Airlie <airlied@redhat.com>
-rw-r--r--drivers/gpu/drm/drm_encoder_slave.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/gpu/drm/drm_encoder_slave.c b/drivers/gpu/drm/drm_encoder_slave.c
index f0184696edf..d62c064fbaa 100644
--- a/drivers/gpu/drm/drm_encoder_slave.c
+++ b/drivers/gpu/drm/drm_encoder_slave.c
@@ -41,6 +41,9 @@
* &drm_encoder_slave. The @slave_funcs field will be initialized with
* the hooks provided by the slave driver.
*
+ * If @info->platform_data is non-NULL it will be used as the initial
+ * slave config.
+ *
* Returns 0 on success or a negative errno on failure, in particular,
* -ENODEV is returned when no matching driver is found.
*/
@@ -85,6 +88,10 @@ int drm_i2c_encoder_init(struct drm_device *dev,
if (err)
goto fail_unregister;
+ if (info->platform_data)
+ encoder->slave_funcs->set_config(&encoder->base,
+ info->platform_data);
+
return 0;
fail_unregister: