Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bc794829 authored by Patrik Jakobsson's avatar Patrik Jakobsson Committed by Dave Airlie
Browse files

gma500: handle poulsbo cursor restriction 



Poulsbo needs a physical address in the cursor base register. We allocate a
stolen memory buffer and copy the cursor image provided by userspace into it.
When/If we get our own userspace driver we can map this stolen memory directly.
The patch also adds a mark in chip ops so we can identify devices that has this
requirement.

Signed-off-by: default avatarPatrik Jakobsson <patrik.r.jakobsson@gmail.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent ac0a5dd6

drivers/gpu/drm/gma500/cdv_device.c

+1 −0
Original line number Diff line number Diff line
@@ -563,6 +563,7 @@ const struct psb_ops cdv_chip_ops = { 
	.crtcs = 2,

	.hdmi_mask = (1 << 0) | (1 << 1),

	.lvds_mask = (1 << 1),

	.cursor_needs_phys = 0,

	.sgx_offset = MRST_SGX_OFFSET,

	.chip_setup = cdv_chip_setup,

	.errata = cdv_errata,

drivers/gpu/drm/gma500/mdfld_device.c

+1 −0
Original line number Diff line number Diff line
@@ -531,6 +531,7 @@ const struct psb_ops mdfld_chip_ops = { 
	.crtcs = 3,

	.lvds_mask = (1 << 1),

	.hdmi_mask = (1 << 1),

	.cursor_needs_phys = 0,

	.sgx_offset = MRST_SGX_OFFSET,



	.chip_setup = mdfld_chip_setup,

drivers/gpu/drm/gma500/oaktrail_device.c

+1 −0
Original line number Diff line number Diff line
@@ -544,6 +544,7 @@ const struct psb_ops oaktrail_chip_ops = { 
	.crtcs = 2,

	.hdmi_mask = (1 << 0),

	.lvds_mask = (1 << 0),

	.cursor_needs_phys = 0,

	.sgx_offset = MRST_SGX_OFFSET,



	.chip_setup = oaktrail_chip_setup,

drivers/gpu/drm/gma500/psb_device.c

+1 −0
Original line number Diff line number Diff line
@@ -373,6 +373,7 @@ const struct psb_ops psb_chip_ops = { 
	.crtcs = 2,

	.hdmi_mask = (1 << 0),

	.lvds_mask = (1 << 1),

	.cursor_needs_phys = 1,

	.sgx_offset = PSB_SGX_OFFSET,

	.chip_setup = psb_chip_setup,

	.chip_teardown = psb_chip_teardown,

drivers/gpu/drm/gma500/psb_drv.h

+1 −0
Original line number Diff line number Diff line
@@ -655,6 +655,7 @@ struct psb_ops { 
	int sgx_offset;		/* Base offset of SGX device */

	int hdmi_mask;		/* Mask of HDMI CRTCs */

	int lvds_mask;		/* Mask of LVDS CRTCs */

	int cursor_needs_phys;  /* If cursor base reg need physical address */



	/* Sub functions */

	struct drm_crtc_helper_funcs const *crtc_helper;