xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Back-merge tag 'v4.7-rc5' into drm-next

Browse Source 
Linux 4.7-rc5

The fsl-dcu pull needs -rc3 so go to -rc5 for now.
This commit is contained in:
Dave Airlie
2016-07-02 15:56:01 +10:00
parent 583fa4e027 4c2e07c6a2
commit 542d972221
751 changed files with 6929 additions and 4314 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_output.c
View File

@@ -254,9 +254,10 @@ int atmel_hlcdc_create_outputs(struct drm_device *dev)
if (!ret)
ret = atmel_hlcdc_check_endpoint(dev, &ep);
of_node_put(ep_np);
if (ret)
if (ret) {
of_node_put(ep_np);
return ret;
}
}
for_each_endpoint_of_node(dev->dev->of_node, ep_np) {
@@ -264,9 +265,10 @@ int atmel_hlcdc_create_outputs(struct drm_device *dev)
if (!ret)
ret = atmel_hlcdc_attach_endpoint(dev, &ep);
of_node_put(ep_np);
if (ret)
if (ret) {
of_node_put(ep_np);
return ret;
}
}
return 0;

2
drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c
View File

@@ -339,6 +339,8 @@ atmel_hlcdc_plane_update_pos_and_size(struct atmel_hlcdc_plane *plane,
atmel_hlcdc_layer_update_cfg(&plane->layer, 13, 0xffffffff,
factor_reg);
} else {
atmel_hlcdc_layer_update_cfg(&plane->layer, 13, 0xffffffff, 0);
}
}