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

Commit cf8efd3a authored by Patrik Jakobsson's avatar Patrik Jakobsson
Browse files

drm/gma500: Add chip specific sdvo masks 



Signed-off-by: default avatarPatrik Jakobsson <patrik.r.jakobsson@gmail.com>
parent 9d3e2f53

drivers/gpu/drm/gma500/cdv_device.c

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

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

	.lvds_mask = (1 << 1),

	.sdvo_mask = (1 << 0),

	.cursor_needs_phys = 0,

	.sgx_offset = MRST_SGX_OFFSET,

	.chip_setup = cdv_chip_setup,

drivers/gpu/drm/gma500/framebuffer.c

+1 −1
Original line number Diff line number Diff line
@@ -714,7 +714,7 @@ static void psb_setup_outputs(struct drm_device *dev) 
			clone_mask = (1 << INTEL_OUTPUT_ANALOG);

			break;

		case INTEL_OUTPUT_SDVO:

			crtc_mask = ((1 << 0) | (1 << 1));

			crtc_mask = dev_priv->ops->sdvo_mask;

			clone_mask = (1 << INTEL_OUTPUT_SDVO);

			break;

		case INTEL_OUTPUT_LVDS:

drivers/gpu/drm/gma500/oaktrail_device.c

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

	.hdmi_mask = (1 << 1),

	.lvds_mask = (1 << 0),

	.sdvo_mask = (1 << 1),

	.cursor_needs_phys = 0,

	.sgx_offset = MRST_SGX_OFFSET,

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),

	.sdvo_mask = (1 << 0),

	.cursor_needs_phys = 1,

	.sgx_offset = PSB_SGX_OFFSET,

	.chip_setup = psb_chip_setup,

drivers/gpu/drm/gma500/psb_drv.h

+1 −0
Original line number Diff line number Diff line
@@ -672,6 +672,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 sdvo_mask;		/* Mask of SDVO CRTCs */

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



	/* Sub functions */