linux.git/drivers/gpu/drm/vmwgfx, branch v4.5

drm/vmwgfx: Add back ->detect() and ->fill_modes()

2016-03-08T00:58:03+00:00

This partially reverts commit d56f57ac969c ("drm/gma500: Move to private
save/restore hooks") which removed these lines by mistake.

Reported-by: Sebastian Herbszt 
Acked-by: Daniel Vetter 
Signed-off-by: Thierry Reding 
Tested-by: Thomas Hellstrom 
Tested-by: Sebastian Herbszt 
Signed-off-by: Dave Airlie

drm/vmwgfx: respect 'nomodeset'

2016-01-29T00:03:44+00:00

Signed-off-by: Rob Clark 
Reviewed-by: Thomas Hellstrom .
Cc: stable@vger.kernel.org
Signed-off-by: Dave Airlie

drm/vmwgfx: Fix a width / pitch mismatch on framebuffer updates

2016-01-13T21:56:46+00:00

When the framebuffer is a vmwgfx dma buffer and a proxy surface is
created, the vmw_kms_update_proxy() function requires that the proxy
surface width and the framebuffer pitch are compatible, otherwise
display corruption occurs as seen in gnome-shell/native with software
3D. Since the framebuffer pitch is determined by user-space, allocate
a proxy surface the width of which is based on the framebuffer pitch
rather than on the framebuffer width.

Cc: 
Reported-by: Raphael Hertzog 
Tested-by:  Mati Aharoni 
Signed-off-by: Thomas Hellstrom 
Reviewed-by: Brian Paul 
Signed-off-by: Dave Airlie

drm/vmwgfx: Fix an incorrect lock check

2016-01-13T21:56:44+00:00

With CONFIG_SMP=n and CONFIG_DEBUG_SPINLOCK=y the vmwgfx kernel module
would unconditionally throw a bug when checking for a held spinlock
in the command buffer code. Fix this by using a lockdep check.

Cc: 
Reported-and-tested-by: Tetsuo Handa 
Signed-off-by: Thomas Hellstrom 
Reviewed-by: Sinclair Yeh 
Signed-off-by: Dave Airlie

Backmerge drm-fixes merge into Linus's tree into drm-next.

2015-12-23T22:08:47+00:00

This merges '5b726e06d6e8309e5c9ef4109a32caf27c71dfc8' into drm-next

Just to resolve some merges to make Daniel's life easier.

Signed-off-by: DAve Airlie

drm/vmwgfx: Constify function pointer structs

2015-12-15T12:49:04+00:00

Moves a bunch of junk to .rodata from .data.

 drivers/gpu/drm/vmwgfx/vmwgfx.ko:
-.text                       132244
+.text                       132240
-.rodata                      18296
+.rodata                      18680
-.data                         5096
+.data                         4712

Signed-off-by: Ville Syrjälä 
Reviewed-by: Alex Deucher 
Signed-off-by: Thierry Reding 
Signed-off-by: Boris Brezillon 
Link: http://patchwork.freedesktop.org/patch/msgid/1450178476-26284-28-git-send-email-boris.brezillon@free-electrons.com
Signed-off-by: Daniel Vetter

drm/vmwgfx: check kmalloc return value

2015-12-15T12:37:57+00:00

srf->sizes has been allocated and checked a few lines above; fix up
the copy-pasto so that we check srf->offsets.

Reported-by: kbuild test robot 
Signed-off-by: Rasmus Villemoes 
Signed-off-by: Thierry Reding 
Signed-off-by: Boris Brezillon 
Link: http://patchwork.freedesktop.org/patch/msgid/1450178476-26284-8-git-send-email-boris.brezillon@free-electrons.com
Signed-off-by: Daniel Vetter

drm/vmwgfx: use kzalloc in vmw_surface_define_ioctl()

2015-12-15T12:37:26+00:00

Signed-off-by: Rasmus Villemoes 
Signed-off-by: Thierry Reding 
Signed-off-by: Boris Brezillon 
Link: http://patchwork.freedesktop.org/patch/msgid/1450178476-26284-7-git-send-email-boris.brezillon@free-electrons.com
Signed-off-by: Daniel Vetter

drm: Drop drm_helper_probe_single_connector_modes_nomerge()

2015-12-11T08:32:53+00:00

Now that the mode type bit merge logic is fixed to only merge
between new probed modes, hopefully we can eliminat the special
case for qxl and virtio. That is make the merge the mode type
bits from all matching new probed modes, just like every other
driver.

qxl and virtio got excluded from the merging in
commit 3fbd6439e463 ("drm: copy mode type in drm_mode_connector_list_update()")
commit abce1ec9b08a ("Revert "drm: copy mode type in drm_mode_connector_list_update()"")
commit b87577b7c768 ("drm: try harder to avoid regression when merging mode bits")

Cc: Marc-André Lureau 
Cc: Dave Airlie 
Cc: Daniel Vetter 
Cc: Adam Jackson 
Signed-off-by: Ville Syrjälä 
[danvet: Resolve conflicts with doc updates.]
Signed-off-by: Daniel Vetter

drm: Pass 'name' to drm_encoder_init()

2015-12-11T08:13:20+00:00

Done with coccinelle for the most part. However, it thinks '...' is
part of the semantic patch, so I put an 'int DOTDOTDOT' placeholder
in its place and got rid of it with sed afterwards.

@@
identifier dev, encoder, funcs;
@@
 int drm_encoder_init(struct drm_device *dev,
                      struct drm_encoder *encoder,
                      const struct drm_encoder_funcs *funcs,
                      int encoder_type
+                     ,const char *name, int DOTDOTDOT
                      )
{ ... }

@@
identifier dev, encoder, funcs;
@@
 int drm_encoder_init(struct drm_device *dev,
                      struct drm_encoder *encoder,
                      const struct drm_encoder_funcs *funcs,
                      int encoder_type
+                     ,const char *name, int DOTDOTDOT
                      );

@@
expression E1, E2, E3, E4;
@@
 drm_encoder_init(E1, E2, E3, E4
+                 ,NULL
                  )

v2: Add ', or NULL...' to @name kernel doc (Jani)
    Annotate the function with __printf() attribute (Jani)

Signed-off-by: Ville Syrjälä 
Signed-off-by: Daniel Vetter 
Link: http://patchwork.freedesktop.org/patch/msgid/1449670818-2966-1-git-send-email-ville.syrjala@linux.intel.com