From: Stephen Rothwell Date: Wed, 8 Jan 2014 02:49:20 +0000 (+1100) Subject: Merge remote-tracking branch 'trivial/for-next' X-Git-Tag: next-20140108~33 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=acea055bdf77885a91a10d6f461933f6ae1b5027;p=karo-tx-linux.git Merge remote-tracking branch 'trivial/for-next' Conflicts: drivers/gpu/drm/qxl/Kconfig --- acea055bdf77885a91a10d6f461933f6ae1b5027 diff --cc arch/powerpc/platforms/powernv/opal-flash.c index 4aeae4f36e1d,d8773079ce19..d8f67badd1cf --- a/arch/powerpc/platforms/powernv/opal-flash.c +++ b/arch/powerpc/platforms/powernv/opal-flash.c @@@ -103,9 -103,30 +103,9 @@@ struct image_header_t uint32_t size; }; -/* Scatter/gather entry */ -struct opal_sg_entry { - void *data; - long length; -}; - -/* We calculate number of entries based on PAGE_SIZE */ -#define SG_ENTRIES_PER_NODE ((PAGE_SIZE - 16) / sizeof(struct opal_sg_entry)) - -/* - * This struct is very similar but not identical to that - * needed by the opal flash update. All we need to do for - * opal is rewrite num_entries into a version/length and - * translate the pointers to absolute. - */ -struct opal_sg_list { - unsigned long num_entries; - struct opal_sg_list *next; - struct opal_sg_entry entry[SG_ENTRIES_PER_NODE]; -}; - struct validate_flash_t { int status; /* Return status */ - void *buf; /* Candiate image buffer */ + void *buf; /* Candidate image buffer */ uint32_t buf_size; /* Image size */ uint32_t result; /* Update results token */ }; diff --cc drivers/gpu/drm/qxl/Kconfig index 66ac0ff95f5a,b5be757062b2..38c2bb72e456 --- a/drivers/gpu/drm/qxl/Kconfig +++ b/drivers/gpu/drm/qxl/Kconfig @@@ -5,9 -5,10 +5,11 @@@ config DRM_QX select FB_SYS_COPYAREA select FB_SYS_IMAGEBLIT select FB_DEFERRED_IO - select DRM_KMS_HELPER + select DRM_KMS_HELPER select DRM_KMS_FB_HELPER - select DRM_TTM + select DRM_TTM + select CRC32 help - QXL virtual GPU for Spice virtualization desktop integration. Do not enable this driver unless your distro ships a corresponding X.org QXL driver that can handle kernel modesetting. + QXL virtual GPU for Spice virtualization desktop integration. + Do not enable this driver unless your distro ships a corresponding + X.org QXL driver that can handle kernel modesetting.