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

- pick up the cmdline fix which missed the merge window (Dmitry) 

- a handful of msm fixes so i don't have to spin up msm-fixes (Various)
 - fix -Wunused-but-set-variable warning in drm_framebuffer (Qian)
 
 Cc: Dmitry Osipenko <digetx@gmail.com>
 Cc: Rob Clark <robdclark@gmail.com>
 Cc: Qian Cai <cai@lca.pw>
 -----BEGIN PGP SIGNATURE-----
 
 iQEzBAABCgAdFiEEfxcpfMSgdnQMs+QqlvcN/ahKBwoFAl05ufkACgkQlvcN/ahK
 BwqG+wf9HwVInXmP3g6DB8k+QtCUWAb6+dRjCUT+cMwZSFKjO4jhIfqr7issBgLh
 IIEjewZin9Qpfmi9J1fZpDS6OrD8C0ImxNhBsGNKh9g5T808jh7iF+wFLrWTg0Es
 EITsRG3/lsw8k/TtWceY1jnunmI528+Zlf2lxFHZ2F4pPVVg8h68NtxHuYH+6BeR
 rlOwZHMCH9YEwgZ9LBnZxgopWd0TnRPVQjRx3V8OnUVKXfHYDBhzyNvv5a0bN/Ip
 i7fkvdBmrxW7yckQBYSMgV7NIAtL5zahXTFggdeTl2CPHr1zH64Sgp+5507IBwqW
 eaeT9z5vX9fxlbIk/MfCiprBynGTPg==
 =idOt
 -----END PGP SIGNATURE-----

Merge tag 'drm-misc-fixes-2019-07-25' of git://anongit.freedesktop.org/drm/drm-misc into drm-fixes

- pick up the cmdline fix which missed the merge window (Dmitry)
- a handful of msm fixes so i don't have to spin up msm-fixes (Various)
- fix -Wunused-but-set-variable warning in drm_framebuffer (Qian)

Cc: Dmitry Osipenko <digetx@gmail.com>
Cc: Rob Clark <robdclark@gmail.com>
Cc: Qian Cai <cai@lca.pw>
Signed-off-by: Dave Airlie <airlied@redhat.com>

From: Sean Paul <sean@poorly.run>
Link: https://patchwork.freedesktop.org/patch/msgid/20190725160909.GA106249@art_vandelay
This commit is contained in:
Dave Airlie 2019-07-26 14:09:49 +10:00
parent 5f9e832c13 bbb6fc43f1
commit f480de3f4a
5 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/gpu/drm/drm_client_modeset.c
View File

@ -859,7 +859,7 @@ bool drm_client_rotation(struct drm_mode_set *modeset, unsigned int *rotation)
* simple XOR between the two handle the addition nicely.
*/
cmdline = &connector->cmdline_mode;
if (cmdline->specified) {
if (cmdline->specified && cmdline->rotation_reflection) {
unsigned int cmdline_rest, panel_rest;
unsigned int cmdline_rot, panel_rot;
unsigned int sum_rot, sum_rest;

2
drivers/gpu/drm/drm_framebuffer.c
View File

@ -835,7 +835,7 @@ static int atomic_remove_fb(struct drm_framebuffer *fb)
struct drm_device *dev = fb->dev;
struct drm_atomic_state *state;
struct drm_plane *plane;
struct drm_connector *conn;
struct drm_connector *conn __maybe_unused;
struct drm_connector_state *conn_state;
int i, ret;
unsigned plane_mask;

3
drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c
View File

@ -2221,8 +2221,6 @@ int dpu_encoder_setup(struct drm_device *dev, struct drm_encoder *enc,
if (ret)
goto fail;
spin_lock_init(&dpu_enc->enc_spinlock);
atomic_set(&dpu_enc->frame_done_timeout_ms, 0);
timer_setup(&dpu_enc->frame_done_timer,
dpu_encoder_frame_done_timeout, 0);
@ -2276,6 +2274,7 @@ struct drm_encoder *dpu_encoder_init(struct drm_device *dev,
drm_encoder_helper_add(&dpu_enc->base, &dpu_encoder_helper_funcs);
spin_lock_init(&dpu_enc->enc_spinlock);
dpu_enc->enabled = false;
return &dpu_enc->base;

2
drivers/gpu/drm/msm/msm_drv.c
View File

@ -619,7 +619,7 @@ static int context_init(struct drm_device *dev, struct drm_file *file)
msm_submitqueue_init(dev, ctx);
ctx->aspace = priv->gpu->aspace;
ctx->aspace = priv->gpu ? priv->gpu->aspace : NULL;
file->driver_priv = ctx;
return 0;

4
drivers/gpu/drm/msm/msm_gem.c
View File

@ -97,7 +97,7 @@ static struct page **get_pages(struct drm_gem_object *obj)
* because display controller, GPU, etc. are not coherent:
*/
if (msm_obj->flags & (MSM_BO_WC|MSM_BO_UNCACHED))
dma_map_sg(dev->dev, msm_obj->sgt->sgl,
dma_sync_sg_for_device(dev->dev, msm_obj->sgt->sgl,
msm_obj->sgt->nents, DMA_BIDIRECTIONAL);
}
@ -127,7 +127,7 @@ static void put_pages(struct drm_gem_object *obj)
* GPU, etc. are not coherent:
*/
if (msm_obj->flags & (MSM_BO_WC|MSM_BO_UNCACHED))
dma_unmap_sg(obj->dev->dev, msm_obj->sgt->sgl,
dma_sync_sg_for_cpu(obj->dev->dev, msm_obj->sgt->sgl,
msm_obj->sgt->nents,
DMA_BIDIRECTIONAL);