UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'for-upstream/malidp-fixes' of git://linux-arm.org/linux-ld into drm-next 

I have a couple of small patches for malidp to be applied in drm-next.
They have arisen from the decision to switch the writeback connectors to
always connected.

Signed-off-by: Dave Airlie <airlied@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180723145302.GA28052@e110455-lin.cambridge.arm.com
This commit is contained in:
Dave Airlie 2018-07-27 12:20:43 +10:00
parent a6f6cdefd4 2e012e76ad
commit 52ea6a115f
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/gpu/drm/arm/malidp_drv.c
View File

@ -616,6 +616,7 @@ static int malidp_bind(struct device *dev)
struct malidp_hw_device *hwdev; struct malidp_hw_device *hwdev;
struct platform_device *pdev = to_platform_device(dev); struct platform_device *pdev = to_platform_device(dev);
struct of_device_id const *dev_id; struct of_device_id const *dev_id;
struct drm_encoder *encoder;
/* number of lines for the R, G and B output */ /* number of lines for the R, G and B output */
u8 output_width[MAX_OUTPUT_CHANNELS]; u8 output_width[MAX_OUTPUT_CHANNELS];
int ret = 0, i; int ret = 0, i;
@ -737,6 +738,15 @@ static int malidp_bind(struct device *dev)
goto bind_fail; goto bind_fail;
} }
/* We expect to have a maximum of two encoders one for the actual
* display and a virtual one for the writeback connector
*/
WARN_ON(drm->mode_config.num_encoder > 2);
list_for_each_entry(encoder, &drm->mode_config.encoder_list, head) {
encoder->possible_clones =
(1 << drm->mode_config.num_encoder) - 1;
}
ret = malidp_irq_init(pdev); ret = malidp_irq_init(pdev);
if (ret < 0) if (ret < 0)
goto irq_init_fail; goto irq_init_fail;

2
drivers/gpu/drm/arm/malidp_mw.c
View File

@ -73,7 +73,7 @@ static void malidp_mw_connector_reset(struct drm_connector *connector)
static enum drm_connector_status static enum drm_connector_status
malidp_mw_connector_detect(struct drm_connector *connector, bool force) malidp_mw_connector_detect(struct drm_connector *connector, bool force)
{ {
return connector_status_disconnected; return connector_status_connected;
} }
static void malidp_mw_connector_destroy(struct drm_connector *connector) static void malidp_mw_connector_destroy(struct drm_connector *connector)